bug #34886 [HttpKernel] fix triggering deprecation in file locator (xabbuh)

fabpot · fabpot · commit 6bf764a4edf0 · 2019-12-11T01:18:36.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpKernel] fix triggering deprecation in file locator | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #34556 | License | MIT | Doc PR | Commits ------- 142b179 fix triggering deprecation in file locator
diff --git a/src/Symfony/Component/HttpKernel/Config/FileLocator.php b/src/Symfony/Component/HttpKernel/Config/FileLocator.php
@@ -65,20 +65,24 @@ 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 (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);
-                        }
+                foreach ((array) $locations as $location) {
+                    if (null !== $currentPath && 0 === strpos($location, $currentPath)) {
+                        return $locations;
                     }
-                } 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);
+
+                    if (0 === strpos($location, $deprecatedPath) && (null === $currentPath || false === strpos($location, $currentPath))) {
+                        $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;
