Test duck-typed ServiceLocatorAwareInterface initializers

Adds tests for both `ServiceManagerConfig` and `ControllerManager`,
verifying that each can do duck-typed `ServiceLocatorAwareInterface`
injection via the initializers they register.

Author: weierophinney

test/Controller/ControllerManagerTest.php

@@ -9,20 +9,26 @@
 
 namespace ZendTest\Mvc\Controller;
 
+use PHPUnit_Framework_Error_Deprecated;
 use PHPUnit_Framework_TestCase as TestCase;
 use ReflectionClass;
 use Zend\EventManager\EventManager;
 use Zend\EventManager\SharedEventManager;
 use Zend\Mvc\Controller\ControllerManager;
 use Zend\Mvc\Controller\PluginManager as ControllerPluginManager;
 use Zend\ServiceManager\Config;
+use Zend\ServiceManager\Factory\InvokableFactory;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Console\Adapter\Virtual as ConsoleAdapter;
+use ZendTest\Mvc\Service\TestAsset\DuckTypedServiceLocatorAwareController;
 
 class ControllerManagerTest extends TestCase
 {
     public function setUp()
     {
+        // Disable deprecation notices
+        PHPUnit_Framework_Error_Deprecated::$enabled = false;
+
         $this->sharedEvents   = new SharedEventManager;
         $this->events         = $this->createEventManager($this->sharedEvents);
         $this->consoleAdapter = new ConsoleAdapter();
@@ -145,4 +151,13 @@ public function testDoNotUsePeeringServiceManagers()
         $this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotFoundException');
         $this->controllers->get('EventManager');
     }
+
+    public function testServiceLocatorAwareInitializerInjectsDuckTypedImplementations()
+    {
+        $this->controllers->setFactory(DuckTypedServiceLocatorAwareController::class, InvokableFactory::class);
+
+        $controller = $this->controllers->get(DuckTypedServiceLocatorAwareController::class);
+        $this->assertInstanceOf(DuckTypedServiceLocatorAwareController::class, $controller);
+        $this->assertSame($this->services, $controller->getServiceLocator());
+    }
 }

test/Service/ServiceManagerConfigTest.php

@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mvc\Service;
 
+use PHPUnit_Framework_Error_Deprecated;
 use PHPUnit_Framework_TestCase as TestCase;
 use ReflectionClass;
 use stdClass;
@@ -37,6 +38,9 @@ class ServiceManagerConfigTest extends TestCase
      */
     protected function setUp()
     {
+        // Disable deprecation notices
+        PHPUnit_Framework_Error_Deprecated::$enabled = false;
+
         $this->config   = new ServiceManagerConfig();
         $this->services = new ServiceManager();
         $this->config->configureServiceManager($this->services);
@@ -212,4 +216,16 @@ public function testEventManagerInitializerCanBeReplaced()
 
         $serviceManager->get('EventManagerAware');
     }
+
+    public function testServiceLocatorAwareInitializerInjectsDuckTypedImplementations()
+    {
+        $serviceManager = new ServiceManager(['factories' => [
+            TestAsset\DuckTypedServiceLocatorAware::class => InvokableFactory::class,
+        ]]);
+        (new ServiceManagerConfig())->configureServiceManager($serviceManager);
+
+        $instance = $serviceManager->get(TestAsset\DuckTypedServiceLocatorAware::class);
+        $this->assertInstanceOf(TestAsset\DuckTypedServiceLocatorAware::class, $instance);
+        $this->assertSame($serviceManager, $instance->getServiceLocator());
+    }
 }

test/Service/TestAsset/DuckTypedServiceLocatorAware.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zend-mvc 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\Service\TestAsset;
+
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class DuckTypedServiceLocatorAware
+{
+    private $container;
+
+    public function setServiceLocator(ServiceLocatorInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    public function getServiceLocator()
+    {
+        return $this->container;
+    }
+}

test/Service/TestAsset/DuckTypedServiceLocatorAwareController.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zend-mvc 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\Service\TestAsset;
+
+use Zend\Stdlib\DispatchableInterface;
+use Zend\Stdlib\RequestInterface;
+use Zend\Stdlib\ResponseInterface;
+
+class DuckTypedServiceLocatorAwareController extends DuckTypedServiceLocatorAware implements
+    DispatchableInterface
+{
+    public function dispatch(RequestInterface $request, ResponseInterface $response = null)
+    {
+    }
+}