fix triggering deprecation in file locator

xabbuh · xabbuh · commit 3e286d21ca4b · 2019-12-09T08:43:32.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/Config/FileLocator.php b/src/Symfony/Component/HttpKernel/Config/FileLocator.php
@@ -65,20 +65,30 @@ 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;
+
             // no need to trigger deprecations when the loaded file is given as absolute path
             foreach ($this->paths as $deprecatedPath) {
                 if (\is_array($locations)) {
                     foreach ($locations as $location) {
+                        if (null !== $currentPath && 0 === strpos($location, $currentPath)) {
+                            return $locations;
+                        }
+
                         if (0 === strpos($location, $deprecatedPath) && (null === $currentPath || false === strpos($location, $currentPath))) {
-                            @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);
+                            $triggerDeprecation = true;
                         }
                     }
                 } else {
                     if (0 === strpos($locations, $deprecatedPath) && (null === $currentPath || false === strpos($locations, $currentPath))) {
-                        @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);
+                        $triggerDeprecation = true;
                     }
                 }
             }
+
+            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);
+            }
         }
 
         return $locations;

Original file line number	Diff line number	Diff line change
`@@ -65,20 +65,30 @@ 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;`
	`69`	`+`
`68`	`70`	`// no need to trigger deprecations when the loaded file is given as absolute path`
`69`	`71`	`foreach ($this->paths as $deprecatedPath) {`
`70`	`72`	`if (\is_array($locations)) {`
`71`	`73`	`foreach ($locations as $location) {`
	`74`	`+ if (null !== $currentPath && 0 === strpos($location, $currentPath)) {`
	`75`	`+ return $locations;`
	`76`	`+ }`
	`77`	`+`
`72`	`78`	`if (0 === strpos($location, $deprecatedPath) && (null === $currentPath \|\| false === strpos($location, $currentPath))) {`
`73`		`- @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);`
	`79`	`+ $triggerDeprecation = true;`
`74`	`80`	`}`
`75`	`81`	`}`
`76`	`82`	`} else {`
`77`	`83`	`if (0 === strpos($locations, $deprecatedPath) && (null === $currentPath \|\| false === strpos($locations, $currentPath))) {`
`78`		`- @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);`
	`84`	`+ $triggerDeprecation = true;`
`79`	`85`	`}`
`80`	`86`	`}`
`81`	`87`	`}`
	`88`	`+`
	`89`	`+ if ($triggerDeprecation) {`
	`90`	`+ @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);`
	`91`	`+ }`
`82`	`92`	`}`
`83`	`93`
`84`	`94`	`return $locations;`