Fixed default parameters extractors for different API versions (#728)

* fixed parameters extractors for different api versions * Fix styling --------- Co-authored-by: romalytvynenko <[email protected]>
dedoc · Feb 12, 2025 · b297c9a · b297c9a
1 parent 82e5e4a
commit b297c9a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/Configuration/ParametersExtractors.php b/src/Configuration/ParametersExtractors.php
@@ -2,7 +2,9 @@
 
 namespace Dedoc\Scramble\Configuration;
 
+use Dedoc\Scramble\Support\OperationExtensions\ParameterExtractor\AttributesParametersExtractor;
 use Dedoc\Scramble\Support\OperationExtensions\ParameterExtractor\FormRequestParametersExtractor;
+use Dedoc\Scramble\Support\OperationExtensions\ParameterExtractor\MethodCallsParametersExtractor;
 use Dedoc\Scramble\Support\OperationExtensions\ParameterExtractor\PathParametersExtractor;
 use Dedoc\Scramble\Support\OperationExtensions\ParameterExtractor\ValidateCallParametersExtractor;
 use Illuminate\Support\Arr;
@@ -50,10 +52,16 @@ public function all(): array
             ValidateCallParametersExtractor::class,
         ];
 
+        $defaultAppends = [
+            MethodCallsParametersExtractor::class,
+            AttributesParametersExtractor::class,
+        ];
+
         return array_values(array_unique([
             ...$this->prepends,
             ...$base,
             ...$this->appends,
+            ...$defaultAppends,
         ]));
     }
 }
diff --git a/src/ScrambleServiceProvider.php b/src/ScrambleServiceProvider.php
@@ -4,7 +4,6 @@
 
 use Dedoc\Scramble\Configuration\GeneratorConfigCollection;
 use Dedoc\Scramble\Configuration\OperationTransformers;
-use Dedoc\Scramble\Configuration\ParametersExtractors;
 use Dedoc\Scramble\Console\Commands\AnalyzeDocumentation;
 use Dedoc\Scramble\Console\Commands\ExportDocumentation;
 use Dedoc\Scramble\Extensions\ExceptionToResponseExtension;
@@ -37,8 +36,6 @@
 use Dedoc\Scramble\Support\InferExtensions\ResponseMethodReturnTypeExtension;
 use Dedoc\Scramble\Support\InferExtensions\TypeTraceInfer;
 use Dedoc\Scramble\Support\InferExtensions\ValidatorTypeInfer;
-use Dedoc\Scramble\Support\OperationExtensions\ParameterExtractor\AttributesParametersExtractor;
-use Dedoc\Scramble\Support\OperationExtensions\ParameterExtractor\MethodCallsParametersExtractor;
 use Dedoc\Scramble\Support\TypeToSchemaExtensions\AnonymousResourceCollectionTypeToSchema;
 use Dedoc\Scramble\Support\TypeToSchemaExtensions\CollectionToSchema;
 use Dedoc\Scramble\Support\TypeToSchemaExtensions\CursorPaginatorTypeToSchema;
@@ -206,15 +203,7 @@ public function bootingPackage()
             Scramble::configure()->expose(false);
         }
 
-        $this->app->booted(function (Application $app) {
-            Scramble::configure()
-                ->withParametersExtractors(function (ParametersExtractors $parametersExtractors) {
-                    $parametersExtractors->append([
-                        MethodCallsParametersExtractor::class,
-                        AttributesParametersExtractor::class,
-                    ]);
-                });
-
+        $this->app->booted(function () {
             $this->registerRoutes();
         });
     }