fix: use invocable controllers with DI with bind by contracts

Author: AZabolotnikov

src/Services/SwaggerService.php

@@ -655,10 +655,7 @@ public function getConcreteRequest()
             return null;
         }
 
-        $parameters = $this->resolveClassMethodDependencies(
-            app($class),
-            $method
-        );
+        $parameters = $this->resolveClassMethodDependencies(app($class), $method);
 
         return Arr::first($parameters, function ($key) {
             return preg_match('/Request/', $key);

src/Traits/GetDependenciesTrait.php

@@ -39,8 +39,6 @@ protected function getClassByInterface($interfaceName)
             return null;
         }
 
-        $classFields = (new ReflectionFunction($implementation))->getStaticVariables();
-
-        return $classFields['concrete'];
+        return get_class($implementation(app()));
     }
 }

tests/SwaggerServiceTest.php

@@ -11,9 +11,11 @@
 use RonasIT\AutoDoc\Exceptions\UnsupportedDocumentationViewerException;
 use RonasIT\AutoDoc\Exceptions\WrongSecurityConfigException;
 use RonasIT\AutoDoc\Services\SwaggerService;
+use RonasIT\AutoDoc\Tests\Support\Mock\InvokableTestController;
 use RonasIT\AutoDoc\Tests\Support\Mock\TestContract;
 use RonasIT\AutoDoc\Tests\Support\Mock\TestNotificationSetting;
 use RonasIT\AutoDoc\Tests\Support\Mock\TestRequest;
+use RonasIT\AutoDoc\Tests\Support\Mock\TestRequestContract;
 use RonasIT\AutoDoc\Tests\Support\Traits\SwaggerServiceMockTrait;
 use stdClass;
 
@@ -873,4 +875,24 @@ public function testAddDataWhenInvokableClass()
 
         app(SwaggerService::class)->addData($request, $response);
     }
+
+    public function testAddDataWhenInvokableClassWithBindingContract()
+    {
+        $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);
+    }
 }

tests/TestCase.php

@@ -126,12 +126,13 @@ 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) {
+        return $request->setRouteResolver(function () use ($uri, $request, $controllerMethod, $routeConditions, $controllerClass) {
             $route = Route::get($uri)
-                ->setAction(['controller' => TestController::class . '@' . $controllerMethod])
+                ->setAction(['controller' => $controllerClass . '@' . $controllerMethod])
                 ->bind($request);
 
             foreach ($routeConditions as $condition) {

tests/fixtures/SwaggerServiceTest/tmp_data_get_user_request_invoke_bind_closure.json

@@ -0,0 +1,108 @@
+{
+  "openapi": "3.1.0",
+  "servers": [
+    {
+      "url": "http:\/\/localhost"
+    }
+  ],
+  "paths": {
+    "\/users": {
+      "get": {
+        "tags": [
+          "users"
+        ],
+        "consumes": [],
+        "produces": [
+          "application\/json"
+        ],
+        "parameters": [
+          {
+            "in": "query",
+            "name": "query",
+            "description": "string, required",
+            "schema": {
+              "type": "string"
+            },
+            "required": true
+          },
+          {
+            "in": "query",
+            "name": "user_id",
+            "description": "integer, with_to_array_rule_string_name",
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "in": "query",
+            "name": "is_email_enabled",
+            "description": "test_rule_without_to_string",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Operation successfully done",
+            "content": {
+              "application\/json": {
+                "schema": {
+                  "type": "object",
+                  "$ref": "#\/components\/schemas\/getUsers200ResponseObject"
+                },
+                "example": {
+                  "id": 2,
+                  "name": "first_client",
+                  "likes_count": 23,
+                  "role": {
+                    "id": 2,
+                    "name": "client"
+                  },
+                  "type": "reader"
+                }
+              }
+            }
+          }
+        },
+        "security": [],
+        "description": "",
+        "deprecated": false,
+        "summary": "test"
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "getUsers200ResponseObject": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "name": {
+            "type": "string"
+          },
+          "likes_count": {
+            "type": "integer"
+          },
+          "role": {
+            "type": "array"
+          },
+          "type": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  },
+  "info": {
+    "description": "This is automatically collected documentation",
+    "version": "0.0.0",
+    "title": "Name of Your Application",
+    "termsOfService": "",
+    "contact": {
+      "email": "your@email.com"
+    }
+  }
+}

tests/support/Mock/InvokableTestController.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace RonasIT\AutoDoc\Tests\Support\Mock;
+
+class InvokableTestController
+{
+    public function __invoke(TestRequestContract $someVar)
+    {
+    }
+}

tests/support/Mock/TestRequestContract.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace RonasIT\AutoDoc\Tests\Support\Mock;
+
+interface TestRequestContract
+{
+}