浏览代码

[Foundation] reorganized files

Fabien Potencier 15 年之前
父节点
当前提交
28c1fb2e4c

+ 1 - 1
src/Symfony/Foundation/Bundle/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;

+ 2 - 1
src/Symfony/Foundation/Bundle/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;

+ 8 - 7
src/Symfony/Foundation/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\UniversalClassLoader;
 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);

+ 3 - 2
src/Symfony/Foundation/bootstrap.php

@@ -127,10 +127,11 @@ interface BundleInterface
 }
 
 
-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 @@ class KernelBundle extends Bundle
 }
 
 
-namespace Symfony\Foundation\Bundle;
+namespace Symfony\Foundation\DependencyInjection;
 
 use Symfony\Components\DependencyInjection\Loader\LoaderExtension;
 use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;