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

Renamed Bundle classes to be named like the bundle itself for more clarity

This commit is contained in:
Bernhard Schussek 2010-06-22 23:20:57 +02:00 committed by Fabien Potencier
parent 4a742138e6
commit c486e1ba10
12 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Framework/DoctrineBundle/Bundle.php → src/Symfony/Framework/DoctrineBundle/DoctrineBundle.php
View File

@ -2,7 +2,7 @@
namespace Symfony\Framework\DoctrineBundle;
use Symfony\Foundation\Bundle\Bundle as BaseBundle;
use Symfony\Foundation\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Loader\Loader;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
@ -25,7 +25,7 @@ use Symfony\Framework\DoctrineBundle\DependencyInjection\DoctrineExtension;
* @author Fabien Potencier <fabien.potencier@symfony-project.com>
* @author Jonathan H. Wage <jonwage@gmail.com>
*/
class Bundle extends BaseBundle
class DoctrineBundle extends Bundle
{
/**
* Customizes the Container instance.

4
src/Symfony/Framework/DoctrineMigrationsBundle/Bundle.php → src/Symfony/Framework/DoctrineMigrationsBundle/DoctrineMigrationsBundle.php
View File

@ -2,7 +2,7 @@
namespace Symfony\Framework\DoctrineMigrationsBundle;
use Symfony\Foundation\Bundle\Bundle as BaseBundle;
use Symfony\Foundation\Bundle\Bundle;
/*
* This file is part of the Symfony framework.
@ -21,6 +21,6 @@ use Symfony\Foundation\Bundle\Bundle as BaseBundle;
* @author Fabien Potencier <fabien.potencier@symfony-project.com>
* @author Jonathan H. Wage <jonwage@gmail.com>
*/
class Bundle extends BaseBundle
class DoctrineMigrationsBundle extends Bundle
{
}

4
src/Symfony/Framework/PropelBundle/Bundle.php → src/Symfony/Framework/PropelBundle/PropelBundle.php
View File

@ -2,13 +2,13 @@
namespace Symfony\Framework\PropelBundle;
use Symfony\Foundation\Bundle\Bundle as BaseBundle;
use Symfony\Foundation\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Loader\Loader;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Framework\PropelBundle\DependencyInjection\PropelExtension;
class Bundle extends BaseBundle
class PropelBundle extends Bundle
{
public function buildContainer(ContainerInterface $container)
{

4
src/Symfony/Framework/SwiftmailerBundle/Bundle.php → src/Symfony/Framework/SwiftmailerBundle/SwiftmailerBundle.php
View File

@ -2,7 +2,7 @@
namespace Symfony\Framework\SwiftmailerBundle;
use Symfony\Foundation\Bundle\Bundle as BaseBundle;
use Symfony\Foundation\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Loader\Loader;
use Symfony\Framework\SwiftmailerBundle\DependencyInjection\SwiftmailerExtension;
@ -23,7 +23,7 @@ use Symfony\Framework\SwiftmailerBundle\DependencyInjection\SwiftmailerExtension
* @subpackage Framework_SwiftmailerBundle
* @author Fabien Potencier <fabien.potencier@symfony-project.com>
*/
class Bundle extends BaseBundle
class SwiftmailerBundle extends Bundle
{
/**
* Customizes the Container instance.

4
src/Symfony/Framework/TwigBundle/Bundle.php → src/Symfony/Framework/TwigBundle/TwigBundle.php
View File

@ -2,7 +2,7 @@
namespace Symfony\Framework\TwigBundle;
use Symfony\Foundation\Bundle\Bundle as BaseBundle;
use Symfony\Foundation\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Loader\Loader;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
@ -25,7 +25,7 @@ use Symfony\Framework\TwigBundle\DependencyInjection\TwigExtension;
* @subpackage Framework_TwigBundle
* @author Fabien Potencier <fabien.potencier@symfony-project.com>
*/
class Bundle extends BaseBundle
class TwigBundle extends Bundle
{
/**
* Customizes the Container instance.

2
src/Symfony/Framework/WebBundle/Command/InitBundleCommand.php
View File

@ -77,5 +77,7 @@ class InitBundleCommand extends Command
'namespace' => $namespace,
'bundle' => $bundle,
));
rename($targetDir.'/Bundle.php', $targetDir.'/'.$bundle.'.php');
}
}

2
src/Symfony/Framework/WebBundle/Controller/ControllerManager.php
View File

@ -112,7 +112,7 @@ class ControllerManager
$logs[] = sprintf('Failed finding controller "%s:%s" from namespace "%s" (%s)', $bundle, $controller, $namespace, $try);
}
} else {
if (!in_array($namespace.'\\'.$bundle.'\\Bundle', array_map(function ($bundle) { return get_class($bundle); }, $this->container->getKernelService()->getBundles()))) {
if (!in_array($namespace.'\\'.$bundle.'\\'.$bundle, array_map(function ($bundle) { return get_class($bundle); }, $this->container->getKernelService()->getBundles()))) {
throw new \LogicException(sprintf('To use the "%s" controller, you first need to enable the Bundle "%s" in your Kernel class.', $try, $namespace.'\\'.$bundle));
}

8
src/Symfony/Framework/WebBundle/Resources/skeleton/application/xml/Kernel.php
View File

@ -17,12 +17,12 @@ class {{ class }}Kernel extends Kernel
{
$bundles = array(
new Symfony\Foundation\Bundle\KernelBundle(),
new Symfony\Framework\WebBundle\Bundle(),
new Symfony\Framework\WebBundle\WebBundle(),
// enable third-party bundles
new Symfony\Framework\ZendBundle\Bundle(),
new Symfony\Framework\DoctrineBundle\Bundle(),
new Symfony\Framework\SwiftmailerBundle\Bundle(),
new Symfony\Framework\ZendBundle\ZendBundle(),
new Symfony\Framework\DoctrineBundle\DoctrineBundle(),
new Symfony\Framework\SwiftmailerBundle\SwiftmailerBundle(),
// register your bundles here
);

8
src/Symfony/Framework/WebBundle/Resources/skeleton/application/yaml/Kernel.php
View File

@ -17,12 +17,12 @@ class {{ class }}Kernel extends Kernel
{
$bundles = array(
new Symfony\Foundation\Bundle\KernelBundle(),
new Symfony\Framework\WebBundle\Bundle(),
new Symfony\Framework\WebBundle\WebBundle(),
// enable third-party bundles
new Symfony\Framework\ZendBundle\Bundle(),
new Symfony\Framework\DoctrineBundle\Bundle(),
new Symfony\Framework\SwiftmailerBundle\Bundle(),
new Symfony\Framework\ZendBundle\ZendBundle(),
new Symfony\Framework\DoctrineBundle\DoctrineBundle(),
new Symfony\Framework\SwiftmailerBundle\SwiftmailerBundle(),
// register your bundles here
);

4
src/Symfony/Framework/WebBundle/Resources/skeleton/bundle/Bundle.php
View File

@ -2,9 +2,9 @@
namespace {{ namespace }}\{{ bundle }};
use Symfony\Foundation\Bundle\Bundle as BaseBundle;
use Symfony\Foundation\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
class Bundle extends BaseBundle
class {{ bundle }} extends Bundle
{
}

4
src/Symfony/Framework/WebBundle/Bundle.php → src/Symfony/Framework/WebBundle/WebBundle.php
View File

@ -2,7 +2,7 @@
namespace Symfony\Framework\WebBundle;
use Symfony\Foundation\Bundle\Bundle as BaseBundle;
use Symfony\Foundation\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Loader\Loader;
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
@ -25,7 +25,7 @@ use Symfony\Framework\WebBundle\DependencyInjection\WebExtension;
* @subpackage Framework_WebBundle
* @author Fabien Potencier <fabien.potencier@symfony-project.com>
*/
class Bundle extends BaseBundle
class WebBundle extends Bundle
{
/**
* Customizes the Container instance.

4
src/Symfony/Framework/ZendBundle/Bundle.php → src/Symfony/Framework/ZendBundle/ZendBundle.php
View File

@ -2,7 +2,7 @@
namespace Symfony\Framework\ZendBundle;
use Symfony\Foundation\Bundle\Bundle as BaseBundle;
use Symfony\Foundation\Bundle\Bundle;
use Symfony\Components\DependencyInjection\ContainerInterface;
use Symfony\Components\DependencyInjection\Reference;
use Symfony\Components\DependencyInjection\Loader\Loader;
@ -24,7 +24,7 @@ use Symfony\Framework\ZendBundle\DependencyInjection\ZendExtension;
* @subpackage Framework_ZendBundle
* @author Fabien Potencier <fabien.potencier@symfony-project.com>
*/
class Bundle extends BaseBundle
class ZendBundle extends Bundle
{
/**
* Customizes the Container instance.