Merge branch 'hotfix/view-manager-delegator'

Added ViewManager delegator factory.

Author: weierophinney

CHANGELOG.md

@@ -2,11 +2,13 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.1.7 - TBD
+## 1.1.7 - 2016-05-24
 
 ### Added
 
-- Nothing.
+- Adds `Zend\Mvc\Console\Service\ViewManagerDelegatorFactory`, which listens for
+  the `ViewManager` service and, if in a console environment, returns the
+  `ConsoleViewManager` service instead.
 
 ### Deprecated
 

src/ConfigProvider.php

@@ -47,6 +47,7 @@ public function getDependencyConfig()
                 'Router'                    => [ Router\ConsoleRouterDelegatorFactory::class ],
                 SendResponseListener::class => [ Service\ConsoleResponseSenderDelegatorFactory::class ],
                 'ViewHelperManager'         => [ Service\ConsoleViewHelperManagerDelegatorFactory::class ],
+                'ViewManager'               => [ Service\ViewManagerDelegatorFactory::class ],
             ],
             'factories' => [
                 'ConsoleAdapter'               => Service\ConsoleAdapterFactory::class,

src/Service/ViewManagerDelegatorFactory.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-mvc-console for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Console\Service;
+
+use Interop\Container\ContainerInterface;
+use Zend\Console\Console;
+use Zend\ServiceManager\DelegatorFactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class ViewManagerDelegatorFactory implements DelegatorFactoryInterface
+{
+    /**
+     * Return a ConsoleViewManager if in a Console environment.
+     *
+     * @param ContainerInterface $container
+     * @param string $name
+     * @param callable $callback
+     * @param null|array $options
+     * @return \Zend\Mvc\Console\View\ViewManager|Zend\Mvc\View\Http\ViewManager
+     */
+    public function __invoke(ContainerInterface $container, $name, callable $callback, array $options = null)
+    {
+        if (! Console::isConsole() || ! $container->has('ConsoleViewManager')) {
+            return $callback();
+        }
+
+        return $container->get('ConsoleViewManager');
+    }
+
+    /**
+     * Return a ConsoleViewManager if in a Console environment. (v2)
+     *
+     * @param ServiceLocatorInterface $container
+     * @param string $name
+     * @param string $requestedName
+     * @param callable $callback
+     * @return \Zend\Mvc\Console\View\ViewManager|Zend\Mvc\View\Http\ViewManager
+     */
+    public function createDelegatorWithName(ServiceLocatorInterface $container, $name, $requestedName, $callback)
+    {
+        return $this($container, $requestedName, $callback);
+    }
+}

test/Service/ViewManagerDelegatorFactoryTest.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-mvc-console for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Mvc\Console\Service;
+
+use Interop\Container\ContainerInterface;
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Mvc\Console\Service\ViewManagerDelegatorFactory;
+
+class ViewManagerDelegatorFactoryTest extends TestCase
+{
+    use FactoryEnvironmentTrait;
+    
+    public function setUp()
+    {
+        $this->factory = new ViewManagerDelegatorFactory();
+    }
+
+    public function testReturnsReturnValueOfCallbackWhenNotInConsoleEnvironment()
+    {
+        $this->setConsoleEnvironment(false);
+
+        $callback = function () {
+            return 'FOO';
+        };
+
+        $this->assertSame(
+            $callback(),
+            $this->factory->__invoke($this->createContainer(), 'ViewManager', $callback)
+        );
+    }
+
+    public function testReturnsConsoleViewManagerWhenInConsoleEnvironment()
+    {
+        $this->setConsoleEnvironment(true);
+
+        $viewManager = (object) ['view' => true];
+        $container = $this->prophesize(ContainerInterface::class);
+        $container->has('ConsoleViewManager')->willReturn(true);
+        $container->get('ConsoleViewManager')->willReturn($viewManager);
+
+        $callback = function () {
+            return 'FOO';
+        };
+
+        $result = $this->factory->__invoke($container->reveal(), 'ViewManager', $callback);
+        $this->assertSame($viewManager, $result);
+    }
+}