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

Skip invalid PSR-0/4 classes from optimized autoloader, fixes #8403

pull/8684/head
Jordi Boggiano 2020-03-10 15:40:45 +01:00
parent 94e6cfc521
commit 24a5a0dacb
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,8 +110,7 @@ class ClassMapGenerator
foreach ($classes as $class) { foreach ($classes as $class) {
// skip classes not within the given namespace prefix // skip classes not within the given namespace prefix
// TODO enable in Composer v1.11 or 2.0 whichever comes first if (null === $autoloadType && null !== $namespace && '' !== $namespace && 0 !== strpos($class, $namespace)) {
if (/* null === $autoloadType && */ null !== $namespace && '' !== $namespace && 0 !== strpos($class, $namespace)) {
continue; continue;
} }
@ -180,19 +179,15 @@ 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)) {
foreach ($rejectedClasses as $class) { foreach ($rejectedClasses as $class) {
trigger_error( if ($io) {
"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 v2.0.", $io->writeError("<warning>Class $class located in ".preg_replace('{^'.preg_quote(getcwd()).'}', '.', $filePath, 1)." does not comply with $namespaceType autoloading standard. Skipping.</warning>");
E_USER_DEPRECATED }
);
} }
// TODO enable in Composer 2.0 return array();
//return array();
} }
// TODO enable in Composer 2.0 & unskip test in AutoloadGeneratorTest::testPSRToClassMapIgnoresNonPSRClasses return $validClasses;
//return $validClasses;
return $classes;
} }
/** /**

2
tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
View File

@ -604,8 +604,6 @@ class AutoloadGeneratorTest extends TestCase
{ {
$package = new Package('a', '1.0', '1.0'); $package = new Package('a', '1.0', '1.0');
$this->markTestSkipped('Skipped until ClassMapGenerator ignoring of invalid PSR-x classes is enabled');
$package->setAutoload(array( $package->setAutoload(array(
'psr-0' => array('psr0_' => 'psr0/'), 'psr-0' => array('psr0_' => 'psr0/'),
'psr-4' => array('psr4\\' => 'psr4/'), 'psr-4' => array('psr4\\' => 'psr4/'),