diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Foundation] reorganized files

Browse Source
This commit is contained in:
Fabien Potencier 2010-06-25 16:38:01 +02:00
parent 220f8cecec
commit 28c1fb2e4c
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Foundation/Bundle/KernelExtension.php → src/Symfony/Foundation/DependencyInjection/KernelExtension.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Symfony\Foundation\Bundle; namespace Symfony\Foundation\DependencyInjection;
use Symfony\Components\DependencyInjection\Loader\LoaderExtension; use Symfony\Components\DependencyInjection\Loader\LoaderExtension;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader; use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;

3
src/Symfony/Foundation/Bundle/KernelBundle.php → src/Symfony/Foundation/KernelBundle.php
View File

@ -1,9 +1,10 @@
<?php <?php
namespace Symfony\Foundation\Bundle; namespace Symfony\Foundation;
use Symfony\Foundation\Bundle\Bundle; use Symfony\Foundation\Bundle\Bundle;
use Symfony\Foundation\ClassCollectionLoader; use Symfony\Foundation\ClassCollectionLoader;
use Symfony\Foundation\DependencyInjection\KernelExtension;
use Symfony\Components\DependencyInjection\ContainerInterface; use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Loader\Loader; use Symfony\Components\DependencyInjection\Loader\Loader;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader; use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;

15
src/Symfony/Foundation/packager.php → src/Symfony/Foundation/Resources/bin/packager.php
View File

@ -1,6 +1,6 @@
<?php <?php
require_once __DIR__.'/UniversalClassLoader.php'; require_once __DIR__.'/../../UniversalClassLoader.php';
/* /*
* This file is part of the Symfony framework. * This file is part of the Symfony framework.
@ -15,18 +15,19 @@ use Symfony\Foundation\UniversalClassLoader;
use Symfony\Foundation\ClassCollectionLoader; use Symfony\Foundation\ClassCollectionLoader;
$loader = new UniversalClassLoader(); $loader = new UniversalClassLoader();
$loader->registerNamespaces(array('Symfony' => __DIR__.'/../..')); $loader->registerNamespaces(array('Symfony' => __DIR__.'/../../../..'));
$loader->register(); $loader->register();
if (file_exists(__DIR__.'/bootstrap.php')) { if (file_exists(__DIR__.'/../../bootstrap.php')) {
unlink(__DIR__.'/bootstrap.php'); unlink(__DIR__.'/../../bootstrap.php');
} }
ClassCollectionLoader::load(array( ClassCollectionLoader::load(array(
'Symfony\\Foundation\\Bundle\\Bundle', 'Symfony\\Foundation\\Bundle\\Bundle',
'Symfony\\Foundation\\Bundle\\BundleInterface', 'Symfony\\Foundation\\Bundle\\BundleInterface',
'Symfony\\Foundation\\Bundle\\KernelBundle', 'Symfony\\Foundation\\KernelBundle',
'Symfony\\Foundation\\Bundle\\KernelExtension', 'Symfony\\Foundation\\DependencyInjection\\KernelExtension',
'Symfony\\Foundation\\Debug\\ErrorHandler', 'Symfony\\Foundation\\Debug\\ErrorHandler',
'Symfony\\Foundation\\ClassCollectionLoader', 'Symfony\\Foundation\\ClassCollectionLoader',
'Symfony\\Foundation\\EventDispatcher', 'Symfony\\Foundation\\EventDispatcher',
), __DIR__, 'bootstrap', false); ), __DIR__.'/../..', 'bootstrap', false);

5
src/Symfony/Foundation/bootstrap.php
View File

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