Merge pull request #39 from gsteel/access-rendering-engine

Retrieve the PhpRenderer from the container if it’s there…

Author: weierophinney

src/ZendViewRendererFactory.php

@@ -62,8 +62,10 @@ public function __invoke(ContainerInterface $container)
             100
         );
 
-        // Create the renderer
-        $renderer = new PhpRenderer();
+        // Create, or Retrieve the renderer from the container
+        $renderer = ($container->has(PhpRenderer::class))
+                  ? $container->get(PhpRenderer::class)
+                  : new PhpRenderer();
         $renderer->setResolver($resolver);
 
         // Inject helpers

test/ZendViewRendererFactoryTest.php

@@ -22,6 +22,7 @@
 use Zend\View\Model\ModelInterface;
 use Zend\View\Resolver\AggregateResolver;
 use Zend\View\Resolver\TemplateMapResolver;
+use Zend\View\Renderer\PhpRenderer;
 
 class ZendViewRendererFactoryTest extends TestCase
 {
@@ -125,6 +126,7 @@ public function testCallingFactoryWithNoConfigReturnsZendViewInstance()
     {
         $this->container->has('config')->willReturn(false);
         $this->container->has(HelperPluginManager::class)->willReturn(false);
+        $this->container->has(PhpRenderer::class)->willReturn(false);
         $this->injectBaseHelpers();
         $factory = new ZendViewRendererFactory();
         $view    = $factory($this->container->reveal());
@@ -154,6 +156,7 @@ public function testConfiguresLayout()
         $this->container->has('config')->willReturn(true);
         $this->container->get('config')->willReturn($config);
         $this->container->has(HelperPluginManager::class)->willReturn(false);
+        $this->container->has(PhpRenderer::class)->willReturn(false);
         $this->injectBaseHelpers();
         $factory = new ZendViewRendererFactory();
         $view = $factory($this->container->reveal());
@@ -175,6 +178,7 @@ public function testConfiguresPaths()
         $this->container->has('config')->willReturn(true);
         $this->container->get('config')->willReturn($config);
         $this->container->has(HelperPluginManager::class)->willReturn(false);
+        $this->container->has(PhpRenderer::class)->willReturn(false);
         $this->injectBaseHelpers();
         $factory = new ZendViewRendererFactory();
         $view = $factory($this->container->reveal());
@@ -212,6 +216,7 @@ public function testConfiguresTemplateMap()
         $this->container->has('config')->willReturn(true);
         $this->container->get('config')->willReturn($config);
         $this->container->has(HelperPluginManager::class)->willReturn(false);
+        $this->container->has(PhpRenderer::class)->willReturn(false);
         $this->injectBaseHelpers();
         $factory = new ZendViewRendererFactory();
         $view = $factory($this->container->reveal());
@@ -238,6 +243,7 @@ public function testInjectsCustomHelpersIntoHelperManager()
     {
         $this->container->has('config')->willReturn(false);
         $this->container->has(HelperPluginManager::class)->willReturn(false);
+        $this->container->has(PhpRenderer::class)->willReturn(false);
         $this->injectBaseHelpers();
         $factory = new ZendViewRendererFactory();
         $view    = $factory($this->container->reveal());
@@ -255,6 +261,7 @@ public function testInjectsCustomHelpersIntoHelperManager()
     public function testWillUseHelperManagerFromContainer()
     {
         $this->container->has('config')->willReturn(false);
+        $this->container->has(PhpRenderer::class)->willReturn(false);
         $this->injectBaseHelpers();
 
         $helpers = new HelperPluginManager($this->container->reveal());
@@ -281,4 +288,18 @@ public function testInjectsCustomHelpersIntoHelperManagerFromContainer(HelperPlu
         $this->assertInstanceOf(UrlHelper::class, $helpers->get('url'));
         $this->assertInstanceOf(ServerUrlHelper::class, $helpers->get('serverurl'));
     }
+
+    public function testWillUseRendererFromContainer()
+    {
+        $engine = new PhpRenderer;
+        $this->container->has('config')->willReturn(false);
+        $this->container->has(HelperPluginManager::class)->willReturn(false);
+        $this->injectContainerService(PhpRenderer::class, $engine);
+
+        $factory = new ZendViewRendererFactory();
+        $view = $factory($this->container->reveal());
+
+        $composed = $this->fetchPhpRenderer($view);
+        $this->assertSame($engine, $composed);
+    }
 }