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

feature #13616 [HttpKernel] Add entry point to more easily create/configure the DI extension (egeloen)

Browse Source 
This PR was submitted for the 2.7 branch but it was merged into the 2.8 branch instead (closes #13616).

Discussion
----------

[HttpKernel] Add entry point to more easily create/configure the DI extension

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

Hey!

I would like to pass some dependencies to the DI extension through the bundle. In the current implementation, I need to duplicate the whole `getContainerExtension` in order to keep the extension alias check. This PR proposes to introduce an entry point for more easily do it.

What do you think?

Commits
-------

9bae1ae [HttpKernel] Add entry point to more easily create/configure the DI extension
This commit is contained in:
Fabien Potencier 2015-09-14 10:30:47 +02:00
commit 95ccd3bb34
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Symfony/Component/HttpKernel/Bundle/Bundle.php
View File

@ -72,17 +72,17 @@ abstract class Bundle extends ContainerAware implements BundleInterface
public function getContainerExtension()
{
if (null === $this->extension) {
$class = $this->getContainerExtensionClass();
if (class_exists($class)) {
$extension = new $class();
$extension = $this->createContainerExtension();
if (!$extension instanceof ExtensionInterface) {
throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', $class));
}
if (!$extension instanceof ExtensionInterface) {
throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', get_class($extension)));
}
if (null !== $extension) {
// check naming convention
$basename = preg_replace('/Bundle$/', '', $this->getName());
$expectedAlias = Container::underscore($basename);
if ($expectedAlias != $extension->getAlias()) {
throw new \LogicException(sprintf(
'Users will expect the alias of the default extension of a bundle to be the underscored version of the bundle name ("%s"). You can override "Bundle::getContainerExtension()" if you want to use "%s" or another alias.',
@ -212,4 +212,16 @@ abstract class Bundle extends ContainerAware implements BundleInterface
return $this->getNamespace().'\\DependencyInjection\\'.$basename.'Extension';
}
/**
* Creates the bundle's container extension.
*
* @return ExtensionInterface|null
*/
protected function createContainerExtension()
{
if (class_exists($class = $this->getContainerExtensionClass())) {
return new $class();
}
}
}

10
src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
View File

@ -18,6 +18,16 @@ use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\F
class BundleTest extends \PHPUnit_Framework_TestCase
{
public function testGetContainerExtension()
{
$bundle = new ExtensionPresentBundle();
$this->assertInstanceOf(
'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\DependencyInjection\ExtensionPresentExtension',
$bundle->getContainerExtension()
);
}
public function testRegisterCommands()
{
$cmd = new FooCommand();