Remove ServiceLocatorAware implementation from AbstractController

`ServiceLocatorAwareInterface` was duck-typed in `AbstractController`
previously; this commit removes that implementation.

Author: weierophinney

src/Controller/AbstractController.php

@@ -17,7 +17,6 @@
 use Zend\Http\Request as HttpRequest;
 use Zend\Mvc\InjectApplicationEventInterface;
 use Zend\Mvc\MvcEvent;
-use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Stdlib\DispatchableInterface as Dispatchable;
 use Zend\Stdlib\RequestInterface as Request;
@@ -56,11 +55,6 @@ abstract class AbstractController implements
      */
     protected $response;
 
-    /**
-     * @var ServiceLocatorInterface
-     */
-    protected $serviceLocator;
-
     /**
      * @var Event
      */
@@ -223,36 +217,6 @@ public function getEvent()
         return $this->event;
     }
 
-    /**
-     * Set serviceManager instance
-     *
-     * @param ServiceLocatorInterface $serviceLocator
-     * @return void
-     */
-    public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
-    {
-        $this->serviceLocator = $serviceLocator;
-    }
-
-    /**
-     * Retrieve serviceManager instance
-     *
-     * @return ServiceLocatorInterface
-     */
-    public function getServiceLocator()
-    {
-        trigger_error(sprintf(
-            'You are retrieving the service locator from within the class %s. Please be aware that '
-            . 'ServiceLocatorAwareInterface is deprecated and will be removed in version 3.0, along '
-            . 'with the ServiceLocatorAwareInitializer. You will need to update your class to accept '
-            . 'all dependencies at creation, either via constructor arguments or setters, and use '
-            . 'a factory to perform the injections.',
-            get_class($this)
-        ), E_USER_DEPRECATED);
-
-        return $this->serviceLocator;
-    }
-
     /**
      * Get plugin manager
      *

src/Service/ServiceManagerConfig.php

@@ -18,9 +18,7 @@
 use Zend\ModuleManager\Listener\ServiceListener;
 use Zend\ModuleManager\ModuleManager;
 use Zend\ServiceManager\Config;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceManager;
-use Zend\ServiceManager\ServiceManagerAwareInterface;
 use Zend\Stdlib\ArrayUtils;
 
 class ServiceManagerConfig extends Config
@@ -68,8 +66,6 @@ class ServiceManagerConfig extends Config
      *
      * - factory for the service 'SharedEventManager'.
      * - initializer for EventManagerAwareInterface implementations
-     * - initializer for ServiceManagerAwareInterface implementations
-     * - initializer for ServiceLocatorAwareInterface implementations
      *
      * @param  array $config
      */

test/Controller/AbstractControllerTest.php

@@ -11,7 +11,6 @@
 
 use PHPUnit_Framework_TestCase as TestCase;
 use ReflectionProperty;
-use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
  * @covers \Zend\Mvc\Controller\AbstractController
@@ -105,15 +104,4 @@ public function testSetEventManagerWithDefaultIdentifiersIncludesImplementedInte
 
         $this->controller->setEventManager($eventManager);
     }
-
-    public function testRetrievingServiceLocatorRaisesDeprecationNotice()
-    {
-        $services = $this->prophesize(ServiceLocatorInterface::class)->reveal();
-
-        $controller = new TestAsset\SampleController();
-        $controller->setServiceLocator($services);
-
-        $this->setExpectedException('PHPUnit_Framework_Error_Deprecated', 'retrieving the service locator');
-        $controller->getServiceLocator();
-    }
 }