Support except and only universally for strategies

knuckleswtf · Dec 25, 2023 · 9337163 · 9337163
1 parent fea04b1
commit 9337163
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/src/Extracting/Extractor.php b/src/Extracting/Extractor.php
@@ -208,12 +208,11 @@ protected function iterateThroughStrategies(
         $overrides = [];
         foreach ($strategies as $strategyClassOrTuple) {
             if (is_array($strategyClassOrTuple)) {
-                $strategyClass = $strategyClassOrTuple[0];
+                [$strategyClass, $settings] = $strategyClassOrTuple;
                 if ($strategyClass == 'overrides') {
-                    $overrides = $strategyClassOrTuple[1];
+                    $overrides = $settings;
                     continue;
                 }
-                $settings = $strategyClassOrTuple[1];
 
                 $routesToSkip = $settings['except'] ?? [];
                 $routesToInclude = $settings['only'] ?? [];

diff --git a/src/Extracting/Strategies/Strategy.php b/src/Extracting/Strategies/Strategy.php
@@ -42,7 +42,7 @@ abstract public function __invoke(ExtractedEndpointData $endpointData, array $se
     public static function wrapWithSettings(
         array $only = ['*'],
         array $except = [],
-        ...$settings
+        ...$otherSettings
     ): array
     {
         if (!empty($only) && !empty($except)) {
@@ -53,7 +53,7 @@ public static function wrapWithSettings(
 
         return [
             static::class,
-            $settings,
+            ['only' => $only, 'except' => $except, ...$otherSettings],
         ];
     }
 }
diff --git a/tests/Unit/ExtractorStrategiesInvocationTest.php b/tests/Unit/ExtractorStrategiesInvocationTest.php
@@ -33,7 +33,6 @@ public function only_specified_strategies_are_loaded()
                 'bodyParameters' => [
                     EmptyStrategy1::class,
                 ],
-                'responses' => [], // Making this empty so the Laravel-dependent strategies are not called
             ],
         ];
         $this->processRoute($config);
@@ -56,7 +55,6 @@ public function supports_overrides_tuples()
                     ]
                 ],
                 'bodyParameters' => [],
-                'responses' => [], // Making this empty so the Laravel-dependent strategies are not called
             ],
         ];
 
@@ -81,7 +79,6 @@ public function supports_strategy_settings_tuples()
                     ]
                 ],
                 'bodyParameters' => [],
-                'responses' => [], // Making this empty so the Laravel-dependent strategies are not called
             ],
         ];
 
@@ -101,7 +98,6 @@ public function respects_strategy_s_only_setting()
                 'bodyParameters' => [
                     [EmptyStrategy1::class, ['only' => 'GET /test']]
                 ],
-                'responses' => [],
             ],
         ];
         $this->processRoute($config);
@@ -121,7 +117,6 @@ public function respects_strategy_s_except_setting()
                 'bodyParameters' => [
                     [EmptyStrategy1::class, ['except' => 'GET /api*']]
                 ],
-                'responses' => [],
             ],
         ];
         $this->processRoute($config);
@@ -171,8 +166,6 @@ public function combines_results_from_different_strategies_in_same_stage()
         $config = [
             'strategies' => [
                 'metadata' => [PartialDummyMetadataStrategy1::class, PartialDummyMetadataStrategy2::class],
-                'bodyParameters' => [],
-                'responses' => [],
             ],
         ];
         $parsed = $this->processRoute($config);
@@ -193,8 +186,6 @@ public function missing_metadata_is_filled_in()
         $config = [
             'strategies' => [
                 'metadata' => [PartialDummyMetadataStrategy2::class],
-                'bodyParameters' => [],
-                'responses' => [],
             ],
         ];
         $parsed = $this->processRoute($config);

diff --git a/tests/Unit/RoutePatternMatcherTest.php b/tests/Unit/RoutePatternMatcherTest.php
@@ -45,4 +45,13 @@ public function matches_by_route_path()
         $this->assertFalse(RoutePatternMatcher::matches($route, ["d*"]));
     }
 
+    /** @test */
+    public function matches_route_with_multiple_methods()
+    {
+        $route = new Route(["GET", "HEAD"], "/abc", ['as' => 'users.show']);
+        $this->assertTrue(RoutePatternMatcher::matches($route, ["HEAD /abc"]));
+        $this->assertTrue(RoutePatternMatcher::matches($route, ["GET abc"]));
+        $this->assertFalse(RoutePatternMatcher::matches($route, ["POST abc"]));
+    }
+
 }