[Foundation] reorganized files

symfony · Jun 25, 2010 · 28c1fb2 · 28c1fb2
1 parent 220f8ce
commit 28c1fb2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/...ony/Foundation/Bundle/KernelExtension.php → ...n/DependencyInjection/KernelExtension.php b/...ony/Foundation/Bundle/KernelExtension.php → ...n/DependencyInjection/KernelExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Foundation\Bundle;
+namespace Symfony\Foundation\DependencyInjection;
 
 use Symfony\Components\DependencyInjection\Loader\LoaderExtension;
 use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;

diff --git a/...ymfony/Foundation/Bundle/KernelBundle.php → src/Symfony/Foundation/KernelBundle.php b/...ymfony/Foundation/Bundle/KernelBundle.php → src/Symfony/Foundation/KernelBundle.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Symfony\Foundation\Bundle;
+namespace Symfony\Foundation;
 
 use Symfony\Foundation\Bundle\Bundle;
 use Symfony\Foundation\ClassCollectionLoader;
+use Symfony\Foundation\DependencyInjection\KernelExtension;
 use Symfony\Components\DependencyInjection\ContainerInterface;
 use Symfony\Components\DependencyInjection\Loader\Loader;
 use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;

diff --git a/src/Symfony/Foundation/packager.php → ...ony/Foundation/Resources/bin/packager.php b/src/Symfony/Foundation/packager.php → ...ony/Foundation/Resources/bin/packager.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__.'/UniversalClassLoader.php';
+require_once __DIR__.'/../../UniversalClassLoader.php';
 
 /*
  * This file is part of the Symfony framework.
@@ -15,18 +15,19 @@
 use Symfony\Foundation\ClassCollectionLoader;
 
 $loader = new UniversalClassLoader();
-$loader->registerNamespaces(array('Symfony' => __DIR__.'/../..'));
+$loader->registerNamespaces(array('Symfony' => __DIR__.'/../../../..'));
 $loader->register();
 
-if (file_exists(__DIR__.'/bootstrap.php')) {
-    unlink(__DIR__.'/bootstrap.php');
+if (file_exists(__DIR__.'/../../bootstrap.php')) {
+    unlink(__DIR__.'/../../bootstrap.php');
 }
+
 ClassCollectionLoader::load(array(
     'Symfony\\Foundation\\Bundle\\Bundle',
     'Symfony\\Foundation\\Bundle\\BundleInterface',
-    'Symfony\\Foundation\\Bundle\\KernelBundle',
-    'Symfony\\Foundation\\Bundle\\KernelExtension',
+    'Symfony\\Foundation\\KernelBundle',
+    'Symfony\\Foundation\\DependencyInjection\\KernelExtension',
     'Symfony\\Foundation\\Debug\\ErrorHandler',
     'Symfony\\Foundation\\ClassCollectionLoader',
     'Symfony\\Foundation\\EventDispatcher',
-), __DIR__, 'bootstrap', false);
+), __DIR__.'/../..', 'bootstrap', false);
diff --git a/src/Symfony/Foundation/bootstrap.php b/src/Symfony/Foundation/bootstrap.php
@@ -127,10 +127,11 @@ public function shutdown(ContainerInterface $container);
 }
 
 
-namespace Symfony\Foundation\Bundle;
+namespace Symfony\Foundation;
 
 use Symfony\Foundation\Bundle\Bundle;
 use Symfony\Foundation\ClassCollectionLoader;
+use Symfony\Foundation\DependencyInjection\KernelExtension;
 use Symfony\Components\DependencyInjection\ContainerInterface;
 use Symfony\Components\DependencyInjection\Loader\Loader;
 use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
@@ -171,7 +172,7 @@ public function boot(ContainerInterface $container)
 }
 
 
-namespace Symfony\Foundation\Bundle;
+namespace Symfony\Foundation\DependencyInjection;
 
 use Symfony\Components\DependencyInjection\Loader\LoaderExtension;
 use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;