Fix missed conversion of old route rules

shalvah · shalvah · commit 2e319a101677 · 2024-02-29T20:07:20.000+01:00
diff --git a/src/Extracting/Extractor.php b/src/Extracting/Extractor.php
@@ -229,7 +229,7 @@ protected function iterateThroughStrategies(
                 }
             } else {
                 $strategyClass = $strategyClassOrTuple;
-                $settings = $rulesToApply;
+                $settings = self::transformOldRouteRulesIntoNewSettings($stage, $rulesToApply, $strategyClass);
             }
 
             $strategy = new $strategyClass($this->config);
@@ -468,6 +468,8 @@ protected function mergeInheritedMethodsData(string $stage, ExtractedEndpointDat
         }
     }
 
+    // In the past, we defined rules at the `routes` level;
+    // currently, they should be defined as parameters to the ResponseCalls strategy
     public static function transformOldRouteRulesIntoNewSettings($stage, $rulesToApply, $strategyName, $strategySettings = [])
     {
         if ($stage == 'headers' && Str::is('*RouteRules*', $strategyName)) {

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ protected function iterateThroughStrategies(`
`229`	`229`	`}`
`230`	`230`	`} else {`
`231`	`231`	`$strategyClass = $strategyClassOrTuple;`
`232`		`- $settings = $rulesToApply;`
	`232`	`+ $settings = self::transformOldRouteRulesIntoNewSettings($stage, $rulesToApply, $strategyClass);`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`$strategy = new $strategyClass($this->config);`
`@@ -468,6 +468,8 @@ protected function mergeInheritedMethodsData(string $stage, ExtractedEndpointDat`
`468`	`468`	`}`
`469`	`469`	`}`
`470`	`470`
	`471`	+ // In the past, we defined rules at the `routes` level;
	`472`	`+ // currently, they should be defined as parameters to the ResponseCalls strategy`
`471`	`473`	`public static function transformOldRouteRulesIntoNewSettings($stage, $rulesToApply, $strategyName, $strategySettings = [])`
`472`	`474`	`{`
`473`	`475`	`if ($stage == 'headers' && Str::is('RouteRules', $strategyName)) {`