added Universal* classes in the list of deprecated classes for 3.0

fabpot · fabpot · commit 642c95a63175 · 2013-02-08T17:10:00.000+01:00
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
@@ -1,6 +1,23 @@
 UPGRADE FROM 2.x to 3.0
 =======================
 
+### ClassLoader
+
+ * The `UniversalClassLoader` class has been removed in favor of `ClassLoader`. The only difference is that some method
+    names are different:
+
+      * `registerNamespaces()` -> `addPrefixes()`
+      * `registerPrefixes()` -> `addPrefixes()`
+      * `registerNamespaces()` -> `addPrefix()`
+      * `registerPrefixes()` -> `addPrefix()`
+      * `getNamespaces()` -> `getPrefixes()`
+      * `getNamespaceFallbacks()` -> `getFallbackDirs()`
+      * `getPrefixFallbacks()` -> `getFallbackDirs()`
+
+ * The `DebugUniversalClassLoader` class has been removed in favor of
+   `DebugClassLoader`. The difference is that the constructor now takes a
+   loader to wrap.
+
 ### HttpKernel
 
  * The `Symfony\Component\HttpKernel\Log\LoggerInterface` has been removed in
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerNameParserTest.php
@@ -13,16 +13,16 @@
 
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
-use Symfony\Component\ClassLoader\UniversalClassLoader;
+use Symfony\Component\ClassLoader\ClassLoader;
 
 class ControllerNameParserTest extends TestCase
 {
     protected $loader;
 
     protected function setUp()
     {
-        $this->loader = new UniversalClassLoader();
-        $this->loader->registerNamespaces(array(
+        $this->loader = new ClassLoader();
+        $this->loader->addPrefixes(array(
             'TestBundle'      => __DIR__.'/../Fixtures',
             'TestApplication' => __DIR__.'/../Fixtures',
         ));
diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php
@@ -79,18 +79,17 @@ protected function getScript($request)
         $kernel = str_replace("'", "\\'", serialize($this->kernel));
         $request = str_replace("'", "\\'", serialize($request));
 
-        $r = new \ReflectionClass('\\Symfony\\Component\\ClassLoader\\UniversalClassLoader');
+        $r = new \ReflectionClass('\\Symfony\\Component\\ClassLoader\\ClassLoader');
         $requirePath = str_replace("'", "\\'", $r->getFileName());
-
         $symfonyPath = str_replace("'", "\\'", realpath(__DIR__.'/../../..'));
 
         return <<<EOF
 <?php
 
 require_once '$requirePath';
 
-\$loader = new Symfony\Component\ClassLoader\UniversalClassLoader();
-\$loader->registerNamespaces(array('Symfony' => '$symfonyPath'));
+\$loader = new Symfony\Component\ClassLoader\ClassLoader();
+\$loader->addPrefix('Symfony', '$symfonyPath');
 \$loader->register();
 
 \$kernel = unserialize('$kernel');
diff --git a/src/Symfony/Component/HttpKernel/Tests/ClientTest.php b/src/Symfony/Component/HttpKernel/Tests/ClientTest.php
@@ -50,7 +50,7 @@ public function testGetScript()
             $this->markTestSkipped('The "Process" component is not available');
         }
 
-        if (!class_exists('Symfony\Component\ClassLoader\UniversalClassLoader')) {
+        if (!class_exists('Symfony\Component\ClassLoader\ClassLoader')) {
             $this->markTestSkipped('The "ClassLoader" component is not available');
         }
 
diff --git a/src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php b/src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-require_once __DIR__.'/../../../../ClassLoader/UniversalClassLoader.php';
+require_once __DIR__.'/../../../../ClassLoader/ClassLoader.php';
 
-use Symfony\Component\ClassLoader\UniversalClassLoader;
+use Symfony\Component\ClassLoader\ClassLoader;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Security\Acl\Dbal\Schema;
 
-$loader = new UniversalClassLoader();
-$loader->registerNamespaces(array(
+$loader = new ClassLoader();
+$loader->addPrefixes(array(
     'Symfony'                    => __DIR__.'/../../../../../..',
     'Doctrine\\Common'           => __DIR__.'/../../../../../../../vendor/doctrine-common/lib',
     'Doctrine\\DBAL\\Migrations' => __DIR__.'/../../../../../../../vendor/doctrine-migrations/lib',

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function testGetScript()`
`50`	`50`	`$this->markTestSkipped('The "Process" component is not available');`
`51`	`51`	`}`
`52`	`52`
`53`		`- if (!class_exists('Symfony\Component\ClassLoader\UniversalClassLoader')) {`
	`53`	`+ if (!class_exists('Symfony\Component\ClassLoader\ClassLoader')) {`
`54`	`54`	`$this->markTestSkipped('The "ClassLoader" component is not available');`
`55`	`55`	`}`
`56`	`56`