fixed bad merge
This commit is contained in:
parent
95ccd3bb34
commit
7d343e6430
@ -74,11 +74,11 @@ abstract class Bundle extends ContainerAware implements BundleInterface
|
|||||||
if (null === $this->extension) {
|
if (null === $this->extension) {
|
||||||
$extension = $this->createContainerExtension();
|
$extension = $this->createContainerExtension();
|
||||||
|
|
||||||
if (!$extension instanceof ExtensionInterface) {
|
|
||||||
throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', get_class($extension)));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (null !== $extension) {
|
if (null !== $extension) {
|
||||||
|
if (!$extension instanceof ExtensionInterface) {
|
||||||
|
throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', get_class($extension)));
|
||||||
|
}
|
||||||
|
|
||||||
// check naming convention
|
// check naming convention
|
||||||
$basename = preg_replace('/Bundle$/', '', $this->getName());
|
$basename = preg_replace('/Bundle$/', '', $this->getName());
|
||||||
$expectedAlias = Container::underscore($basename);
|
$expectedAlias = Container::underscore($basename);
|
||||||
|
Reference in New Issue
Block a user