diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpKernel][FileLocator] Fix deprecation message

Browse Source
This commit is contained in:
Thomas Calvet 2020-01-08 19:32:07 +01:00
parent 9589dee808
commit 18ce8399d2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/HttpKernel/Config/FileLocator.php
View File

@ -65,7 +65,7 @@ class FileLocator extends BaseFileLocator
|| (\strlen($file) > 3 && ctype_alpha($file[0]) && ':' === $file[1] && ('\\' === $file[2] || '/' === $file[2])) || (\strlen($file) > 3 && ctype_alpha($file[0]) && ':' === $file[1] && ('\\' === $file[2] || '/' === $file[2]))
|| null !== parse_url($file, PHP_URL_SCHEME) || 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 // no need to trigger deprecations when the loaded file is given as absolute path
foreach ($this->paths as $deprecatedPath) { foreach ($this->paths as $deprecatedPath) {
@ -75,13 +75,13 @@ class FileLocator extends BaseFileLocator
} }
if (0 === strpos($location, $deprecatedPath) && (null === $currentPath || false === strpos($location, $currentPath))) { 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) { if ($deprecation) {
@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); @trigger_error($deprecation, E_USER_DEPRECATED);
} }
} }