bug #35269 [HttpKernel][FileLocator] Fix deprecation message (fancyweb)

nicolas-grekas · nicolas-grekas · commit 62c4608e1754 · 2020-01-09T10:50:57.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpKernel][FileLocator] Fix deprecation message | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Ref #34886 `$deprecatedPath` is the foreach value so it only works if the last element triggers the deprecation, otherwise the value is wrong. Commits ------- 18ce839 [HttpKernel][FileLocator] Fix deprecation message
diff --git a/src/Symfony/Component/HttpKernel/Config/FileLocator.php b/src/Symfony/Component/HttpKernel/Config/FileLocator.php
@@ -65,7 +65,7 @@ public function locate($file, $currentPath = null, $first = true)
             || (\strlen($file) > 3 && ctype_alpha($file[0]) && ':' === $file[1] && ('\\' === $file[2] || '/' === $file[2]))
             || null !== parse_url($file, PHP_URL_SCHEME)
         )) {
-            $triggerDeprecation = false;
+            $deprecation = false;
 
             // no need to trigger deprecations when the loaded file is given as absolute path
             foreach ($this->paths as $deprecatedPath) {
@@ -75,13 +75,13 @@ public function locate($file, $currentPath = null, $first = true)
                     }
 
                     if (0 === strpos($location, $deprecatedPath) && (null === $currentPath || false === strpos($location, $currentPath))) {
-                        $triggerDeprecation = true;
+                        $deprecation = sprintf('Loading the file "%s" from the global resource directory "%s" is deprecated since Symfony 4.4 and will be removed in 5.0.', $file, $deprecatedPath);
                     }
                 }
             }
 
-            if ($triggerDeprecation) {
-                @trigger_error(sprintf('Loading the file "%s" from the global resource directory "%s" is deprecated since Symfony 4.4 and will be removed in 5.0.', $file, $deprecatedPath), E_USER_DEPRECATED);
+            if ($deprecation) {
+                @trigger_error($deprecation, E_USER_DEPRECATED);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function locate($file, $currentPath = null, $first = true)`
`65`	`65`	`\|\| (\strlen($file) > 3 && ctype_alpha($file[0]) && ':' === $file[1] && ('\\' === $file[2] \|\| '/' === $file[2]))`
`66`	`66`	`\|\| null !== parse_url($file, PHP_URL_SCHEME)`
`67`	`67`	`)) {`
`68`		`- $triggerDeprecation = false;`
	`68`	`+ $deprecation = false;`
`69`	`69`
`70`	`70`	`// no need to trigger deprecations when the loaded file is given as absolute path`
`71`	`71`	`foreach ($this->paths as $deprecatedPath) {`
`@@ -75,13 +75,13 @@ public function locate($file, $currentPath = null, $first = true)`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`if (0 === strpos($location, $deprecatedPath) && (null === $currentPath \|\| false === strpos($location, $currentPath))) {`
`78`		`- $triggerDeprecation = true;`
	`78`	`+ $deprecation = sprintf('Loading the file "%s" from the global resource directory "%s" is deprecated since Symfony 4.4 and will be removed in 5.0.', $file, $deprecatedPath);`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`83`		`- if ($triggerDeprecation) {`
`84`		`- @trigger_error(sprintf('Loading the file "%s" from the global resource directory "%s" is deprecated since Symfony 4.4 and will be removed in 5.0.', $file, $deprecatedPath), E_USER_DEPRECATED);`
	`83`	`+ if ($deprecation) {`
	`84`	`+ @trigger_error($deprecation, E_USER_DEPRECATED);`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`