feature #21353 [ClassLoader] Deprecated the component (nicolas-grekas)

fabpot · fabpot · commit 065ac8b003eb · 2017-01-20T07:08:15.000-08:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [ClassLoader] Deprecated the component | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Follow up of #20668 Commits ------- 8a37722 [ClassLoader] Deprecated the component
diff --git a/UPGRADE-3.3.md b/UPGRADE-3.3.md
@@ -4,8 +4,7 @@ UPGRADE FROM 3.2 to 3.3
 ClassLoader
 -----------
 
- * The ApcClassLoader, WinCacheClassLoader and XcacheClassLoader classes have been deprecated
-   in favor of the `--apcu-autoloader` option introduced in composer 1.3
+ * The component is deprecated and will be removed in 4.0. Use Composer instead.
 
 DependencyInjection
 -------------------
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
@@ -4,8 +4,7 @@ UPGRADE FROM 3.x to 4.0
 ClassLoader
 -----------
 
- * The ApcClassLoader, WinCacheClassLoader and XcacheClassLoader classes have been removed
-   in favor of the `--apcu-autoloader` option introduced in composer 1.3
+ * The component has been removed. Use Composer instead.
 
 Console
 -------
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;
 
+use Composer\Autoload\ClassLoader;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
-use Symfony\Component\ClassLoader\ClassLoader;
 
 class ControllerNameParserTest extends TestCase
 {
@@ -22,17 +22,14 @@ class ControllerNameParserTest extends TestCase
     protected function setUp()
     {
         $this->loader = new ClassLoader();
-        $this->loader->addPrefixes(array(
-            'TestBundle' => __DIR__.'/../Fixtures',
-            'TestApplication' => __DIR__.'/../Fixtures',
-        ));
+        $this->loader->add('TestBundle', __DIR__.'/../Fixtures');
+        $this->loader->add('TestApplication', __DIR__.'/../Fixtures');
         $this->loader->register();
     }
 
     protected function tearDown()
     {
-        spl_autoload_unregister(array($this->loader, 'loadClass'));
-
+        $this->loader->unregister();
         $this->loader = null;
     }
 
diff --git a/src/Symfony/Component/ClassLoader/CHANGELOG.md b/src/Symfony/Component/ClassLoader/CHANGELOG.md
@@ -4,8 +4,7 @@ CHANGELOG
 3.3.0
 -----
 
- * The ApcClassLoader, WinCacheClassLoader and XcacheClassLoader classes have been deprecated
-   in favor of the `--apcu-autoloader` option introduced in composer 1.3
+ * deprecated the component: use Composer instead
 
 3.0.0
 -----
diff --git a/src/Symfony/Component/ClassLoader/ClassLoader.php b/src/Symfony/Component/ClassLoader/ClassLoader.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\ClassLoader;
 
+@trigger_error('The '.__NAMESPACE__.'\ClassLoader class is deprecated since version 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);
+
 /**
  * ClassLoader implements an PSR-0 class loader.
  *
@@ -36,6 +38,8 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * @deprecated since version 3.3, to be removed in 4.0.
  */
 class ClassLoader
 {
diff --git a/src/Symfony/Component/ClassLoader/ClassMapGenerator.php b/src/Symfony/Component/ClassLoader/ClassMapGenerator.php
@@ -11,10 +11,14 @@
 
 namespace Symfony\Component\ClassLoader;
 
+@trigger_error('The '.__NAMESPACE__.'\ClassMapGenerator class is deprecated since version 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);
+
 /**
  * ClassMapGenerator.
  *
  * @author Gyula Sallai <salla016@gmail.com>
+ *
+ * @deprecated since version 3.3, to be removed in 4.0.
  */
 class ClassMapGenerator
 {
diff --git a/src/Symfony/Component/ClassLoader/MapClassLoader.php b/src/Symfony/Component/ClassLoader/MapClassLoader.php
@@ -11,10 +11,14 @@
 
 namespace Symfony\Component\ClassLoader;
 
+@trigger_error('The '.__NAMESPACE__.'\MapClassLoader class is deprecated since version 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);
+
 /**
  * A class loader that uses a mapping file to look up paths.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @deprecated since version 3.3, to be removed in 4.0.
  */
 class MapClassLoader
 {
diff --git a/src/Symfony/Component/ClassLoader/Psr4ClassLoader.php b/src/Symfony/Component/ClassLoader/Psr4ClassLoader.php
@@ -11,12 +11,16 @@
 
 namespace Symfony\Component\ClassLoader;
 
+@trigger_error('The '.__NAMESPACE__.'\Psr4ClassLoader class is deprecated since version 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);
+
 /**
  * A PSR-4 compatible class loader.
  *
  * See http://www.php-fig.org/psr/psr-4/
  *
  * @author Alexander M. Turek <me@derrabus.de>
+ *
+ * @deprecated since version 3.3, to be removed in 4.0.
  */
 class Psr4ClassLoader
 {
diff --git a/src/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php
@@ -13,6 +13,9 @@
 
 use Symfony\Component\ClassLoader\ClassLoader;
 
+/**
+ * @group legacy
+ */
 class ClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     public function testGetPrefixes()
diff --git a/src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php b/src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
@@ -13,6 +13,9 @@
 
 use Symfony\Component\ClassLoader\ClassMapGenerator;
 
+/**
+ * @group legacy
+ */
 class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/src/Symfony/Component/ClassLoader/Tests/Psr4ClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/Psr4ClassLoaderTest.php
@@ -13,6 +13,9 @@
 
 use Symfony\Component\ClassLoader\Psr4ClassLoader;
 
+/**
+ * @group legacy
+ */
 class Psr4ClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Debug\Tests\FatalErrorHandler;
 
 use Symfony\Component\Debug\Exception\FatalErrorException;
-use Symfony\Component\ClassLoader\ClassLoader as SymfonyClassLoader;
 use Symfony\Component\Debug\FatalErrorHandler\ClassNotFoundFatalErrorHandler;
 use Symfony\Component\Debug\DebugClassLoader;
 use Composer\Autoload\ClassLoader as ComposerClassLoader;
@@ -69,12 +68,10 @@ public function testHandleClassNotFound($error, $translatedMessage, $autoloader
 
     public function provideClassNotFoundData()
     {
-        $prefixes = array('Symfony\Component\Debug\Exception\\' => realpath(__DIR__.'/../../Exception'));
+        $autoloader = new ComposerClassLoader();
+        $autoloader->add('Symfony\Component\Debug\Exception\\', realpath(__DIR__.'/../../Exception'));
 
-        $symfonyAutoloader = new SymfonyClassLoader();
-        $symfonyAutoloader->addPrefixes($prefixes);
-
-        $debugClassLoader = new DebugClassLoader(array($symfonyAutoloader, 'loadClass'));
+        $debugClassLoader = new DebugClassLoader(array($autoloader, 'loadClass'));
 
         return array(
             array(
@@ -130,7 +127,7 @@ public function provideClassNotFoundData()
                     'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
                 ),
                 "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
-                array($symfonyAutoloader, 'loadClass'),
+                array($autoloader, 'loadClass'),
             ),
             array(
                 array(
diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json
@@ -23,7 +23,6 @@
         "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
     },
     "require-dev": {
-        "symfony/class-loader": "~2.8|~3.0",
         "symfony/http-kernel": "~2.8|~3.0"
     },
     "autoload": {
diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php
@@ -96,22 +96,29 @@ protected function getScript($request)
     {
         $kernel = str_replace("'", "\\'", serialize($this->kernel));
         $request = str_replace("'", "\\'", serialize($request));
-
-        $r = new \ReflectionClass('\\Symfony\\Component\\ClassLoader\\ClassLoader');
-        $requirePath = str_replace("'", "\\'", $r->getFileName());
-        $symfonyPath = str_replace("'", "\\'", dirname(dirname(dirname(__DIR__))));
         $errorReporting = error_reporting();
 
+        $requires = '';
+        foreach (get_declared_classes() as $class) {
+            if (0 === strpos($class, 'ComposerAutoloaderInit')) {
+                $r = new \ReflectionClass($class);
+                $file = dirname(dirname($r->getFileName())).'/autoload.php';
+                if (file_exists($file)) {
+                    $requires .= "require_once '".str_replace("'", "\\'", $file)."';\n";
+                }
+            }
+        }
+
+        if (!$requires) {
+            throw new \RuntimeException('Composer autoloader not found.');
+        }
+
         $code = <<<EOF
 <?php
 
 error_reporting($errorReporting);
 
-require_once '$requirePath';
-
-\$loader = new Symfony\Component\ClassLoader\ClassLoader();
-\$loader->addPrefix('Symfony', '$symfonyPath');
-\$loader->register();
+$requires
 
 \$kernel = unserialize('$kernel');
 \$request = unserialize('$request');

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;`
`13`	`13`
	`14`	`+use Composer\Autoload\ClassLoader;`
`14`	`15`	`use Symfony\Bundle\FrameworkBundle\Tests\TestCase;`
`15`	`16`	`use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;`
`16`		`-use Symfony\Component\ClassLoader\ClassLoader;`
`17`	`17`
`18`	`18`	`class ControllerNameParserTest extends TestCase`
`19`	`19`	`{`
`@@ -22,17 +22,14 @@ class ControllerNameParserTest extends TestCase`
`22`	`22`	`protected function setUp()`
`23`	`23`	`{`
`24`	`24`	`$this->loader = new ClassLoader();`
`25`		`- $this->loader->addPrefixes(array(`
`26`		`- 'TestBundle' => __DIR__.'/../Fixtures',`
`27`		`- 'TestApplication' => __DIR__.'/../Fixtures',`
`28`		`- ));`
	`25`	`+ $this->loader->add('TestBundle', __DIR__.'/../Fixtures');`
	`26`	`+ $this->loader->add('TestApplication', __DIR__.'/../Fixtures');`
`29`	`27`	`$this->loader->register();`
`30`	`28`	`}`
`31`	`29`
`32`	`30`	`protected function tearDown()`
`33`	`31`	`{`
`34`		`- spl_autoload_unregister(array($this->loader, 'loadClass'));`
`35`		`-`
	`32`	`+ $this->loader->unregister();`
`36`	`33`	`$this->loader = null;`
`37`	`34`	`}`
`38`	`35`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\ClassLoader;`
`13`	`13`
	`14`	`+@trigger_error('The '.__NAMESPACE__.'\ClassLoader class is deprecated since version 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* ClassLoader implements an PSR-0 class loader.`
`16`	`18`	`*`
`@@ -36,6 +38,8 @@`
`36`	`38`	`*`
`37`	`39`	`* @author Fabien Potencier <fabien@symfony.com>`
`38`	`40`	`* @author Jordi Boggiano <j.boggiano@seld.be>`
	`41`	`+ *`
	`42`	`+ * @deprecated since version 3.3, to be removed in 4.0.`
`39`	`43`	`*/`
`40`	`44`	`class ClassLoader`
`41`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,14 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\ClassLoader;`
`13`	`13`
	`14`	`+@trigger_error('The '.__NAMESPACE__.'\ClassMapGenerator class is deprecated since version 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* ClassMapGenerator.`
`16`	`18`	`*`
`17`	`19`	`* @author Gyula Sallai <salla016@gmail.com>`
	`20`	`+ *`
	`21`	`+ * @deprecated since version 3.3, to be removed in 4.0.`
`18`	`22`	`*/`
`19`	`23`	`class ClassMapGenerator`
`20`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,16 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\ClassLoader;`
`13`	`13`
	`14`	`+@trigger_error('The '.__NAMESPACE__.'\Psr4ClassLoader class is deprecated since version 3.3 and will be removed in 4.0. Use Composer instead.', E_USER_DEPRECATED);`
	`15`	`+`
`14`	`16`	`/**`
`15`	`17`	`* A PSR-4 compatible class loader.`
`16`	`18`	`*`
`17`	`19`	`* See http://www.php-fig.org/psr/psr-4/`
`18`	`20`	`*`
`19`	`21`	`* @author Alexander M. Turek <me@derrabus.de>`
	`22`	`+ *`
	`23`	`+ * @deprecated since version 3.3, to be removed in 4.0.`
`20`	`24`	`*/`
`21`	`25`	`class Psr4ClassLoader`
`22`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\ClassLoader\ClassLoader;`
`15`	`15`
	`16`	`+/**`
	`17`	`+ * @group legacy`
	`18`	`+ */`
`16`	`19`	`class ClassLoaderTest extends \PHPUnit_Framework_TestCase`
`17`	`20`	`{`
`18`	`21`	`public function testGetPrefixes()`