do not pull block from main sm

hummer2k · Oct 18, 2015 · ce6d402 · ce6d402
1 parent 7d9d0e4
commit ce6d402
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/src/ConLayout/Block/Factory/BlockFactory.php b/src/ConLayout/Block/Factory/BlockFactory.php
@@ -4,6 +4,7 @@
 
 use ConLayout\Block\BlockInterface;
 use ConLayout\Exception\BadMethodCallException;
+use ConLayout\Exception\InvalidBlockException;
 use ConLayout\Layout\LayoutInterface;
 use ConLayout\NamedParametersTrait;
 use Zend\EventManager\EventManagerAwareInterface;
@@ -87,10 +88,13 @@ public function createBlock($blockId, array $specs)
         $class = $this->getOption('class', $specs);
         if (null !== $this->blockManager && $this->blockManager->has($class)) {
             $block = $this->blockManager->get($class);
-        } elseif ($this->serviceLocator->has($class)) {
-            $block = $this->serviceLocator->get($class);
-        } else {
+        } elseif (class_exists($class)) {
             $block = new $class();
+        } else {
+            throw new InvalidBlockException(sprintf(
+                'Block "%s" could not be instantiated. Class does not exist.',
+                $class
+            ));
         }
         $block->setVariable(LayoutInterface::BLOCK_ID_VAR, $blockId);
         foreach ($this->getOption('options', $specs) as $name => $option) {

diff --git a/src/ConLayout/Exception/InvalidBlockException.php b/src/ConLayout/Exception/InvalidBlockException.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace ConLayout\Exception;
+
+use RuntimeException;
+
+/**
+ * @package ConLayout
+ * @author Cornelius Adams (conlabz GmbH) <cornelius.adams@conlabz.de>
+ */
+class InvalidBlockException extends RuntimeException implements ExceptionInterface
+{
+}
diff --git a/tests/ConLayoutTest/Block/Factory/BlockFactoryTest.php b/tests/ConLayoutTest/Block/Factory/BlockFactoryTest.php
@@ -166,23 +166,14 @@ public function testClass()
         );
     }
 
+    /**
+     * @expectedException \ConLayout\Exception\InvalidBlockException
+     */
     public function testBlockFromSm()
     {
-        $serviceManager = new ServiceManager();
-        $block = new ViewModel();
-        $serviceManager->setService('Test\Block', $block);
-
         $factory = new BlockFactory();
-        $factory->setServiceLocator($serviceManager);
-
-        $specs = [
-            'class' => 'Test\Block'
-        ];
-        $this->assertSame(
-            $block,
-            $factory->createBlock('test', $specs)
-        );
-
+        $factory->setServiceLocator(new ServiceManager());
+        $factory->createBlock('test', ['class' => 'NotExists___']);
     }
 
     public function testBlockFromBlockManager()