Remove deprecated ServiceLocatorAware initializers

- Bumps zend-servicemanager to only v3 versions.
- Removes ServiceLocatorAware initializers from both
  ServiceManagerConfig and ControllerManager

Author: weierophinney

composer.json

@@ -18,7 +18,7 @@
         "zendframework/zend-http": "^2.5.4",
         "zendframework/zend-modulemanager": "^2.7.1",
         "zendframework/zend-router": "^3.0",
-        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-servicemanager": "^3.0.3",
         "zendframework/zend-stdlib": "^2.7.5 || ^3.0",
         "zendframework/zend-view": "^2.6.3",
         "container-interop/container-interop": "^1.1"

src/Controller/ControllerManager.php

@@ -54,10 +54,6 @@ public function __construct($configOrContainerInstance, array $v3config = [])
         $this->addInitializer([$this, 'injectEventManager']);
         $this->addInitializer([$this, 'injectPluginManager']);
         parent::__construct($configOrContainerInstance, $v3config);
-
-        // Added after parent construction, as v2 abstract plugin managers add
-        // one during construction.
-        $this->addInitializer([$this, 'injectServiceLocator']);
     }
 
     /**
@@ -165,52 +161,4 @@ public function injectPluginManager($first, $second)
 
         $controller->setPluginManager($container->get('ControllerPluginManager'));
     }
-
-    /**
-     * Initializer: inject service locator
-     *
-     * @param ContainerInterface|DispatchableInterface $first Container when
-     *     using zend-servicemanager v3; controller under v2.
-     * @param DispatchableInterface|ContainerInterface $second Controller when
-     *     using zend-servicemanager v3; container under v2.
-     */
-    public function injectServiceLocator($first, $second)
-    {
-        if ($first instanceof ContainerInterface) {
-            $container = $first;
-            $controller = $second;
-        } else {
-            $container = $second;
-            $controller = $first;
-        }
-
-        // For v2, we need to pull the parent service locator
-        if (! method_exists($container, 'configure')) {
-            $container = $container->getServiceLocator() ?: $container;
-        }
-
-        // Inject AbstractController extensions that are not ServiceLocatorAware
-        // with the service manager, but do not emit a deprecation notice. We'll
-        // emit it from AbstractController::getServiceLocator() instead.
-        if (! $controller instanceof ServiceLocatorAwareInterface
-            && $controller instanceof AbstractController
-            && method_exists($controller, 'setServiceLocator')
-        ) {
-            // Do not emit deprecation notice in this case
-            $controller->setServiceLocator($container);
-        }
-
-        // If a controller implements ServiceLocatorAwareInterface explicitly, we
-        // inject, but emit a deprecation notice. Since AbstractController no longer
-        // explicitly does this, this will only affect userland controllers.
-        if ($controller instanceof ServiceLocatorAwareInterface) {
-            trigger_error(sprintf(
-                'ServiceLocatorAwareInterface is deprecated and will be removed in version 3.0, along '
-                . 'with the ServiceLocatorAwareInitializer. Please update your class %s to remove '
-                . 'the implementation, and start injecting your dependencies via factory instead.',
-                get_class($controller)
-            ), E_USER_DEPRECATED);
-            $controller->setServiceLocator($container);
-        }
-    }
 }

src/Service/ServiceManagerConfig.php

@@ -109,73 +109,6 @@ public function __construct(array $config = [])
 
                 $instance->setEventManager($container->get('EventManager'));
             },
-            'ServiceManagerAwareInitializer' => function ($first, $second) {
-                if ($first instanceof ContainerInterface) {
-                    // zend-servicemanager v3
-                    $container = $first;
-                    $instance = $second;
-                } else {
-                    // zend-servicemanager v2
-                    $container = $second;
-                    $instance = $first;
-                }
-
-                if ($container instanceof ServiceManager && $instance instanceof ServiceManagerAwareInterface) {
-                    trigger_error(sprintf(
-                        'ServiceManagerAwareInterface is deprecated and will be removed in version 3.0, along '
-                        . 'with the ServiceManagerAwareInitializer. Please update your class %s to remove '
-                        . 'the implementation, and start injecting your dependencies via factory instead.',
-                        get_class($instance)
-                    ), E_USER_DEPRECATED);
-                    $instance->setServiceManager($container);
-                }
-            },
-            'ServiceLocatorAwareInitializer' => function ($first, $second) {
-                if ($first instanceof AbstractPluginManager) {
-                    // Edge case under zend-servicemanager v2
-                    $container = $second;
-                    $instance = $first;
-                } elseif ($first instanceof ContainerInterface) {
-                    // zend-servicemanager v3
-                    $container = $first;
-                    $instance = $second;
-                } else {
-                    // zend-servicemanager v2
-                    $container = $second;
-                    $instance = $first;
-                }
-
-                // For service locator aware classes, inject the service
-                // locator, but emit a deprecation notice. Skip plugin manager
-                // implementations; they're dealt with later.
-                if ($instance instanceof ServiceLocatorAwareInterface
-                    && ! $instance instanceof AbstractPluginManager
-                ) {
-                    trigger_error(sprintf(
-                        'ServiceLocatorAwareInterface is deprecated and will be removed in version 3.0, along '
-                        . 'with the ServiceLocatorAwareInitializer. Please update your class %s to remove '
-                        . 'the implementation, and start injecting your dependencies via factory instead.',
-                        get_class($instance)
-                    ), E_USER_DEPRECATED);
-                    $instance->setServiceLocator($container);
-                }
-
-                // For service locator aware plugin managers that do not have
-                // the service locator already injected, inject it, but emit a
-                // deprecation notice.
-                if ($instance instanceof ServiceLocatorAwareInterface
-                    && $instance instanceof AbstractPluginManager
-                    && ! $instance->getServiceLocator()
-                ) {
-                    trigger_error(sprintf(
-                        'ServiceLocatorAwareInterface is deprecated and will be removed in version 3.0, along '
-                        . 'with the ServiceLocatorAwareInitializer. Please update your %s plugin manager factory '
-                        . 'to inject the parent service locator via the constructor.',
-                        get_class($instance)
-                    ), E_USER_DEPRECATED);
-                    $instance->setServiceLocator($container);
-                }
-            },
         ]);
 
         // In zend-servicemanager v2, incoming configuration is not merged