public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Change PSR-fix for optimized autoloader to only warn for now, refs #8397

pull/8406/head
Jordi Boggiano 2019-11-01 14:50:15 +01:00
parent 050707ed0c
commit f6b8643dcd
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Composer/Autoload/ClassMapGenerator.php
View File

@ -143,6 +143,10 @@ class ClassMapGenerator
{ {
$validClasses = array(); $validClasses = array();
$rejectedClasses = array(); $rejectedClasses = array();
$realSubPath = substr($filePath, strlen($basePath) + 1);
$realSubPath = substr($realSubPath, 0, strrpos($realSubPath, '.'));
foreach ($classes as $class) { foreach ($classes as $class) {
// silently skip if ns doesn't have common root // silently skip if ns doesn't have common root
if ('' !== $baseNamespace && 0 !== strpos($class, $baseNamespace)) { if ('' !== $baseNamespace && 0 !== strpos($class, $baseNamespace)) {
@ -166,8 +170,6 @@ class ClassMapGenerator
} else { } else {
throw new \RuntimeException("namespaceType must be psr-0 or psr-4, $namespaceType given"); throw new \RuntimeException("namespaceType must be psr-0 or psr-4, $namespaceType given");
} }
$realSubPath = substr($filePath, strlen($basePath) + 1);
$realSubPath = substr($realSubPath, 0, strrpos($realSubPath, '.'));
if ($subPath === $realSubPath) { if ($subPath === $realSubPath) {
$validClasses[] = $class; $validClasses[] = $class;
} else { } else {
@ -175,16 +177,21 @@ class ClassMapGenerator
} }
} }
// warn only if no valid classes, else silently skip invalid // warn only if no valid classes, else silently skip invalid
if (!empty($validClasses)) { if (empty($validClasses)) {
return $validClasses;
}
if ($io) {
foreach ($rejectedClasses as $class) { foreach ($rejectedClasses as $class) {
$io->writeError("<warning>Warning: class $class located in $filePath " trigger_error(
. "doesn't comply with $namespaceType autoloading standard. Skipping.</warning>"); "Class $class located in ".preg_replace('{^'.preg_quote(getcwd()).'}', '.', $filePath, 1)." does not comply with $namespaceType autoloading standard. It will not autoload anymore in Composer v1.11+.",
E_USER_DEPRECATED
);
} }
// TODO enable in Composer v1.11 or 2.0 whichever comes first
//return array();
} }
return array();
// TODO enable in Composer v1.11 or 2.0 whichever comes first
//return $validClasses;
return $classes;
} }
/** /**