fixed previous commit

symfony · Jan 27, 2011 · 6997fba · 6997fba
1 parent 8ccb8eb
commit 6997fba
Show file tree

Hide file tree

Showing 20 changed files with 6 additions and 6 deletions.
diff --git a/autoload.php.dist b/autoload.php.dist
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__.'/src/Symfony/Component/HttpFoundation/UniversalClassLoader.php';
+require_once __DIR__.'/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
 
 use Symfony\Component\HttpFoundation\UniversalClassLoader;
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel.php
@@ -14,7 +14,7 @@
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\DependencyInjection\Loader\LoaderInterface;
 use Symfony\Bundle\FrameworkBundle\Util\Filesystem;
-use Symfony\Component\HttpFoundation\UniversalClassLoader;
+use Symfony\Component\ClassLoader\UniversalClassLoader;
 
 class Kernel extends BaseKernel
 {

diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php
@@ -67,7 +67,7 @@ protected function getScript($request)
         $kernel = serialize($this->kernel);
         $request = serialize($request);
 
-        $r = new \ReflectionClass('\\Symfony\\Component\\HttpFoundation\\UniversalClassLoader');
+        $r = new \ReflectionClass('\\Symfony\\Component\\ClassLoader\\UniversalClassLoader');
         $requirePath = $r->getFileName();
 
         $symfonyPath = realpath(__DIR__.'/../../..');
@@ -77,7 +77,7 @@ protected function getScript($request)
 
 require_once '$requirePath';
 
-\$loader = new Symfony\Component\HttpFoundation\UniversalClassLoader();
+\$loader = new Symfony\Component\ClassLoader\UniversalClassLoader();
 \$loader->registerNamespaces(array('Symfony' => '$symfonyPath'));
 \$loader->register();
 

diff --git a/...ttpFoundation/Fixtures/Namespaced/Bar.php → ...t/ClassLoader/Fixtures/Namespaced/Bar.php b/...ttpFoundation/Fixtures/Namespaced/Bar.php → ...t/ClassLoader/Fixtures/Namespaced/Bar.php
diff --git a/...ttpFoundation/Fixtures/Namespaced/Baz.php → ...t/ClassLoader/Fixtures/Namespaced/Baz.php b/...ttpFoundation/Fixtures/Namespaced/Baz.php → ...t/ClassLoader/Fixtures/Namespaced/Baz.php
diff --git a/...ttpFoundation/Fixtures/Namespaced/Foo.php → ...t/ClassLoader/Fixtures/Namespaced/Foo.php b/...ttpFoundation/Fixtures/Namespaced/Foo.php → ...t/ClassLoader/Fixtures/Namespaced/Foo.php
diff --git a/.../HttpFoundation/Fixtures/Pearlike/Bar.php → ...ent/ClassLoader/Fixtures/Pearlike/Bar.php b/.../HttpFoundation/Fixtures/Pearlike/Bar.php → ...ent/ClassLoader/Fixtures/Pearlike/Bar.php
diff --git a/.../HttpFoundation/Fixtures/Pearlike/Baz.php → ...ent/ClassLoader/Fixtures/Pearlike/Baz.php b/.../HttpFoundation/Fixtures/Pearlike/Baz.php → ...ent/ClassLoader/Fixtures/Pearlike/Baz.php
diff --git a/.../HttpFoundation/Fixtures/Pearlike/Foo.php → ...ent/ClassLoader/Fixtures/Pearlike/Foo.php b/.../HttpFoundation/Fixtures/Pearlike/Foo.php → ...ent/ClassLoader/Fixtures/Pearlike/Foo.php
diff --git a/...xtures/alpha/NamespaceCollision/A/Bar.php → ...xtures/alpha/NamespaceCollision/A/Bar.php b/...xtures/alpha/NamespaceCollision/A/Bar.php → ...xtures/alpha/NamespaceCollision/A/Bar.php
diff --git a/...xtures/alpha/NamespaceCollision/A/Foo.php → ...xtures/alpha/NamespaceCollision/A/Foo.php b/...xtures/alpha/NamespaceCollision/A/Foo.php → ...xtures/alpha/NamespaceCollision/A/Foo.php
diff --git a/.../Fixtures/alpha/PrefixCollision/A/Bar.php → .../Fixtures/alpha/PrefixCollision/A/Bar.php b/.../Fixtures/alpha/PrefixCollision/A/Bar.php → .../Fixtures/alpha/PrefixCollision/A/Bar.php
diff --git a/.../Fixtures/alpha/PrefixCollision/A/Foo.php → .../Fixtures/alpha/PrefixCollision/A/Foo.php b/.../Fixtures/alpha/PrefixCollision/A/Foo.php → .../Fixtures/alpha/PrefixCollision/A/Foo.php
diff --git a/...tures/beta/NamespaceCollision/A/B/Bar.php → ...tures/beta/NamespaceCollision/A/B/Bar.php b/...tures/beta/NamespaceCollision/A/B/Bar.php → ...tures/beta/NamespaceCollision/A/B/Bar.php
diff --git a/...tures/beta/NamespaceCollision/A/B/Foo.php → ...tures/beta/NamespaceCollision/A/B/Foo.php b/...tures/beta/NamespaceCollision/A/B/Foo.php → ...tures/beta/NamespaceCollision/A/B/Foo.php
diff --git a/...Fixtures/beta/PrefixCollision/A/B/Bar.php → ...Fixtures/beta/PrefixCollision/A/B/Bar.php b/...Fixtures/beta/PrefixCollision/A/B/Bar.php → ...Fixtures/beta/PrefixCollision/A/B/Bar.php
diff --git a/...Fixtures/beta/PrefixCollision/A/B/Foo.php → ...Fixtures/beta/PrefixCollision/A/B/Foo.php b/...Fixtures/beta/PrefixCollision/A/B/Foo.php → ...Fixtures/beta/PrefixCollision/A/B/Foo.php
diff --git a/...n/Fixtures/fallback/Namespaced/FooBar.php → ...r/Fixtures/fallback/Namespaced/FooBar.php b/...n/Fixtures/fallback/Namespaced/FooBar.php → ...r/Fixtures/fallback/Namespaced/FooBar.php
diff --git a/...ion/Fixtures/fallback/Pearlike/FooBar.php → ...der/Fixtures/fallback/Pearlike/FooBar.php b/...ion/Fixtures/fallback/Pearlike/FooBar.php → ...der/Fixtures/fallback/Pearlike/FooBar.php
diff --git a/...tpFoundation/UniversalClassLoaderTest.php → .../ClassLoader/UniversalClassLoaderTest.php b/...tpFoundation/UniversalClassLoaderTest.php → .../ClassLoader/UniversalClassLoaderTest.php
@@ -9,9 +9,9 @@
  * 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
 {