fix: use invocable controllers with DI with bind by contracts

Author: AZabolotnikov

tests/SwaggerServiceTest.php

@@ -684,9 +684,23 @@ public function testAddDataWithNotExistsMethodOnController()
         $service->addData($request, $response);
     }
 
-    public function testAddDataWithBindingInterface()
+    public static function addDataWithBindingInterface(): array
     {
-        $this->app->bind(TestContract::class, TestRequest::class);
+        return [
+            [
+                'concrete' =>  TestRequest::class,
+            ],
+            [
+                'concrete' => fn ($app) => new TestRequest(),
+            ],
+        ];
+    }
+
+    #[DataProvider('addDataWithBindingInterface')]
+    public function testAddDataWithBindingInterface($concrete)
+    {
+        $this->app->bind(TestContract::class, $concrete);
+
         $this->mockDriverGetEmptyAndSaveProcessTmpData($this->getJsonFixture('tmp_data_get_user_request'));
 
         $service = app(SwaggerService::class);
@@ -875,44 +889,4 @@ public function testAddDataWhenInvokableClass()
 
         app(SwaggerService::class)->addData($request, $response);
     }
-
-    public function testAddDataWhenInvokableClassWithBindingContractToObject()
-    {
-        $this->mockDriverGetEmptyAndSaveProcessTmpData($this->getJsonFixture('tmp_data_get_user_request_invoke_bind_closure'));
-
-        $this->app->bind(TestRequestContract::class, fn () => new TestRequest());
-
-        $request = $this->generateRequest(
-            type: 'get',
-            uri: 'users',
-            controllerMethod: '__invoke',
-            controllerClass: InvokableTestController::class,
-        );
-
-        $response = $this->generateResponse('example_success_user_response.json', 200, [
-            'Content-type' => 'application/json',
-        ]);
-
-        app(SwaggerService::class)->addData($request, $response);
-    }
-
-    public function testAddDataWhenInvokableClassWithBindingContractToClassName()
-    {
-        $this->mockDriverGetEmptyAndSaveProcessTmpData($this->getJsonFixture('tmp_data_get_user_request_invoke_bind_closure'));
-
-        $this->app->bind(TestRequestContract::class, TestRequest::class);
-
-        $request = $this->generateRequest(
-            type: 'get',
-            uri: 'users',
-            controllerMethod: '__invoke',
-            controllerClass: InvokableTestController::class,
-        );
-
-        $response = $this->generateResponse('example_success_user_response.json', 200, [
-            'Content-type' => 'application/json',
-        ]);
-
-        app(SwaggerService::class)->addData($request, $response);
-    }
 }

tests/TestCase.php

@@ -126,13 +126,12 @@ protected function generateRequest(
         array $headers = [],
         array $routeConditions = [],
         string $controllerMethod = 'test',
-        string $controllerClass = TestController::class,
     ): Request {
         $request = $this->getBaseRequest($type, $uri, $data, $pathParams, $headers);
 
-        return $request->setRouteResolver(function () use ($uri, $request, $controllerMethod, $routeConditions, $controllerClass) {
+        return $request->setRouteResolver(function () use ($uri, $request, $controllerMethod, $routeConditions) {
             $route = Route::get($uri)
-                ->setAction(['controller' => $controllerClass . '@' . $controllerMethod])
+                ->setAction(['controller' => TestController::class . '@' . $controllerMethod])
                 ->bind($request);
 
             foreach ($routeConditions as $condition) {