fixed bad merge

symfony · Sep 14, 2015 · 7d343e6 · 7d343e6
1 parent 95ccd3b
commit 7d343e6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -74,11 +74,11 @@ public function getContainerExtension()
         if (null === $this->extension) {
             $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 (!$extension instanceof ExtensionInterface) {
+                    throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', get_class($extension)));
+                }
+
                 // check naming convention
                 $basename = preg_replace('/Bundle$/', '', $this->getName());
                 $expectedAlias = Container::underscore($basename);