8000 fixed bad merge · symfony/symfony@7d343e6 · GitHub
[go: up one dir, main page]

Skip to content

Commit 7d343e6

Browse files
committed
fixed bad merge
1 parent 95ccd3b commit 7d343e6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/Symfony/Component/HttpKernel/Bundle/Bundle.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ public function getContainerExtension()
7474
if (null === $this->extension) {
7575
$extension = $this< 83B7 /span>->createContainerExtension();
7676

77-
if (!$extension instanceof ExtensionInterface) {
78-
throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', get_class($extension)));
79-
}
80-
8177
if (null !== $extension) {
78+
if (!$extension instanceof ExtensionInterface) {
79+
throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', get_class($extension)));
80+
}
81+
8282
// check naming convention
8383
$basename = preg_replace('/Bundle$/', '', $this->getName());
8484
$expectedAlias = Container::underscore($basename);

0 commit comments

Comments
 (0)
0