Fabien Potencier пре 14 година
родитељ
комит
6997fbac0d
20 измењених фајлова са 6 додато и 6 уклоњено
  1. 1 1
      autoload.php.dist
  2. 1 1
      src/Symfony/Bundle/FrameworkBundle/Tests/Kernel.php
  3. 2 2
      src/Symfony/Component/HttpKernel/Client.php
  4. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/Namespaced/Bar.php
  5. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/Namespaced/Baz.php
  6. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/Namespaced/Foo.php
  7. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/Pearlike/Bar.php
  8. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/Pearlike/Baz.php
  9. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/Pearlike/Foo.php
  10. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/alpha/NamespaceCollision/A/Bar.php
  11. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/alpha/NamespaceCollision/A/Foo.php
  12. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/alpha/PrefixCollision/A/Bar.php
  13. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/alpha/PrefixCollision/A/Foo.php
  14. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/beta/NamespaceCollision/A/B/Bar.php
  15. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/beta/NamespaceCollision/A/B/Foo.php
  16. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/beta/PrefixCollision/A/B/Bar.php
  17. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/beta/PrefixCollision/A/B/Foo.php
  18. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/fallback/Namespaced/FooBar.php
  19. 0 0
      tests/Symfony/Tests/Component/ClassLoader/Fixtures/fallback/Pearlike/FooBar.php
  20. 2 2
      tests/Symfony/Tests/Component/HttpFoundation/UniversalClassLoaderTest.php

+ 1 - 1
autoload.php.dist

@@ -1,6 +1,6 @@
 <?php
 <?php
 
 
-require_once __DIR__.'/src/Symfony/Component/HttpFoundation/UniversalClassLoader.php';
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
 
 
 use Symfony\Component\HttpFoundation\UniversalClassLoader;
 use Symfony\Component\HttpFoundation\UniversalClassLoader;
 
 

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/Tests/Kernel.php

@@ -14,7 +14,7 @@ namespace Symfony\Bundle\FrameworkBundle\Tests;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\DependencyInjection\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\Loader\LoaderInterface;
 use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
 use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
-use Symfony\Component\HttpFoundation\UniversalClassLoader;
+use Symfony\Component\ClassLoader\UniversalClassLoader;
 
 
 class Kernel extends BaseKernel
 class Kernel extends BaseKernel
 {
 {

+ 2 - 2
src/Symfony/Component/HttpKernel/Client.php

@@ -67,7 +67,7 @@ class Client extends BaseClient
         $kernel = serialize($this->kernel);
         $kernel = serialize($this->kernel);
         $request = serialize($request);
         $request = serialize($request);
 
 
-        $r = new \ReflectionClass('\\Symfony\\Component\\HttpFoundation\\UniversalClassLoader');
+        $r = new \ReflectionClass('\\Symfony\\Component\\ClassLoader\\UniversalClassLoader');
         $requirePath = $r->getFileName();
         $requirePath = $r->getFileName();
 
 
         $symfonyPath = realpath(__DIR__.'/../../..');
         $symfonyPath = realpath(__DIR__.'/../../..');
@@ -77,7 +77,7 @@ class Client extends BaseClient
 
 
 require_once '$requirePath';
 require_once '$requirePath';
 
 
-\$loader = new Symfony\Component\HttpFoundation\UniversalClassLoader();
+\$loader = new Symfony\Component\ClassLoader\UniversalClassLoader();
 \$loader->registerNamespaces(array('Symfony' => '$symfonyPath'));
 \$loader->registerNamespaces(array('Symfony' => '$symfonyPath'));
 \$loader->register();
 \$loader->register();
 
 

tests/Symfony/Tests/Component/HttpFoundation/Fixtures/Namespaced/Bar.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/Namespaced/Bar.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/Namespaced/Baz.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/Namespaced/Baz.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/Namespaced/Foo.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/Namespaced/Foo.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/Pearlike/Bar.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/Pearlike/Bar.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/Pearlike/Baz.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/Pearlike/Baz.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/Pearlike/Foo.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/Pearlike/Foo.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/alpha/NamespaceCollision/A/Bar.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/alpha/NamespaceCollision/A/Bar.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/alpha/NamespaceCollision/A/Foo.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/alpha/NamespaceCollision/A/Foo.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/alpha/PrefixCollision/A/Bar.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/alpha/PrefixCollision/A/Bar.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/alpha/PrefixCollision/A/Foo.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/alpha/PrefixCollision/A/Foo.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/beta/NamespaceCollision/A/B/Bar.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/beta/NamespaceCollision/A/B/Bar.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/beta/NamespaceCollision/A/B/Foo.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/beta/NamespaceCollision/A/B/Foo.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/beta/PrefixCollision/A/B/Bar.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/beta/PrefixCollision/A/B/Bar.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/beta/PrefixCollision/A/B/Foo.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/beta/PrefixCollision/A/B/Foo.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/fallback/Namespaced/FooBar.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/fallback/Namespaced/FooBar.php


tests/Symfony/Tests/Component/HttpFoundation/Fixtures/fallback/Pearlike/FooBar.php → tests/Symfony/Tests/Component/ClassLoader/Fixtures/fallback/Pearlike/FooBar.php


+ 2 - 2
tests/Symfony/Tests/Component/HttpFoundation/UniversalClassLoaderTest.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  * file that was distributed with this source code.
  */
  */
 
 
-namespace Symfony\Tests\Component\HttpFoundation;
+namespace Symfony\Tests\Component\ClassLoader;
 
 
-use Symfony\Component\HttpFoundation\UniversalClassLoader;
+use Symfony\Component\ClassLoader\UniversalClassLoader;
 
 
 class UniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 class UniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
 {