Remove support for sm v2

Author: snapshotpl

src/Controller/ControllerManager.php

@@ -71,26 +71,6 @@ public function validate($plugin)
         }
     }
 
-    /**
-     * Validate a plugin (v2)
-     *
-     * {@inheritDoc}
-     *
-     * @throws Exception\InvalidControllerException
-     */
-    public function validatePlugin($plugin)
-    {
-        try {
-            $this->validate($plugin);
-        } catch (InvalidServiceException $e) {
-            throw new Exception\InvalidControllerException(
-                $e->getMessage(),
-                $e->getCode(),
-                $e
-            );
-        }
-    }
-
     /**
      * Initializer: inject EventManager instance
      *

src/Controller/Plugin/Service/ForwardFactory.php

@@ -10,10 +10,9 @@
 namespace Zend\Mvc\Controller\Plugin\Service;
 
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Exception\ServiceNotCreatedException;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\Mvc\Controller\Plugin\Forward;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
 class ForwardFactory implements FactoryInterface
 {
@@ -36,18 +35,4 @@ public function __invoke(ContainerInterface $container, $name, array $options =
 
         return new Forward($controllers);
     }
-
-    /**
-     * Create and return Forward instance
-     *
-     * For use with zend-servicemanager v2; proxies to __invoke().
-     *
-     * @param ServiceLocatorInterface $container
-     * @return Forward
-     */
-    public function createService(ServiceLocatorInterface $container)
-    {
-        $parentContainer = $container->getServiceLocator() ?: $container;
-        return $this($parentContainer, Forward::class);
-    }
 }

src/Service/AbstractPluginManagerFactory.php

@@ -11,8 +11,7 @@
 
 use Interop\Container\ContainerInterface;
 use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
 abstract class AbstractPluginManagerFactory implements FactoryInterface
 {
@@ -35,17 +34,4 @@ public function __invoke(ContainerInterface $container, $name, array $options =
         $pluginManagerClass = static::PLUGIN_MANAGER_CLASS;
         return new $pluginManagerClass($container, $options);
     }
-
-    /**
-     * Create and return AbstractPluginManager instance
-     *
-     * For use with zend-servicemanager v2; proxies to __invoke().
-     *
-     * @param ServiceLocatorInterface $container
-     * @return AbstractPluginManager
-     */
-    public function createService(ServiceLocatorInterface $container)
-    {
-        return $this($container, AbstractPluginManager::class);
-    }
 }

src/Service/ApplicationFactory.php

@@ -11,13 +11,12 @@
 
 use Interop\Container\ContainerInterface;
 use Zend\Mvc\Application;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
 class ApplicationFactory implements FactoryInterface
 {
     /**
-     * Create the Application service (v3)
+     * Create the Application service
      *
      * Creates a Zend\Mvc\Application service, passing it the configuration
      * service and the service manager instance.
@@ -36,17 +35,4 @@ public function __invoke(ContainerInterface $container, $name, array $options =
             $container->get('Response')
         );
     }
-
-    /**
-     * Create the Application service (v2)
-     *
-     * Proxies to __invoke().
-     *
-     * @param ServiceLocatorInterface $container
-     * @return Application
-     */
-    public function createService(ServiceLocatorInterface $container)
-    {
-        return $this($container, Application::class);
-    }
 }

src/Service/ConfigFactory.php

@@ -10,8 +10,8 @@
 namespace Zend\Mvc\Service;
 
 use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Traversable;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
 class ConfigFactory implements FactoryInterface
 {
@@ -27,7 +27,7 @@ class ConfigFactory implements FactoryInterface
      * @param ContainerInterface $container
      * @param string $name
      * @param null|array $options
-     * @return array|\Traversable
+     * @return array|Traversable
      */
     public function __invoke(ContainerInterface $container, $name, array $options = null)
     {
@@ -36,17 +36,4 @@ public function __invoke(ContainerInterface $container, $name, array $options =
         $moduleParams = $moduleManager->getEvent()->getParams();
         return $moduleParams['configListener']->getMergedConfig(false);
     }
-
-    /**
-     * Create and return config instance
-     *
-     * For use with zend-servicemanager v2; proxies to __invoke().
-     *
-     * @param ServiceLocatorInterface $container
-     * @return array|\Traversable
-     */
-    public function createService(ServiceLocatorInterface $container)
-    {
-        return $this($container, 'config');
-    }
 }

src/Service/ControllerManagerFactory.php

@@ -11,8 +11,7 @@
 
 use Interop\Container\ContainerInterface;
 use Zend\Mvc\Controller\ControllerManager;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
 class ControllerManagerFactory implements FactoryInterface
 {
@@ -38,17 +37,4 @@ public function __invoke(ContainerInterface $container, $name, array $options =
         }
         return new ControllerManager($container);
     }
-
-    /**
-     * Create and return ControllerManager instance
-     *
-     * For use with zend-servicemanager v2; proxies to __invoke().
-     *
-     * @param ServiceLocatorInterface $container
-     * @return ControllerManager
-     */
-    public function createService(ServiceLocatorInterface $container)
-    {
-        return $this($container, ControllerManager::class);
-    }
 }

src/Service/DispatchListenerFactory.php

@@ -11,8 +11,7 @@
 
 use Interop\Container\ContainerInterface;
 use Zend\Mvc\DispatchListener;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
 class DispatchListenerFactory implements FactoryInterface
 {
@@ -28,17 +27,4 @@ public function __invoke(ContainerInterface $container, $name, array $options =
     {
         return new DispatchListener($container->get('ControllerManager'));
     }
-
-    /**
-     * Create and return DispatchListener instance
-     *
-     * For use with zend-servicemanager v2; proxies to __invoke().
-     *
-     * @param ServiceLocatorInterface $container
-     * @return DispatchListener
-     */
-    public function createService(ServiceLocatorInterface $container)
-    {
-        return $this($container, DispatchListener::class);
-    }
 }

src/Service/EventManagerFactory.php

@@ -10,10 +10,8 @@
 namespace Zend\Mvc\Service;
 
 use Interop\Container\ContainerInterface;
-use ReflectionClass;
 use Zend\EventManager\EventManager;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
 class EventManagerFactory implements FactoryInterface
 {
@@ -30,48 +28,8 @@ class EventManagerFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $name, array $options = null)
     {
-        if ($this->acceptsSharedManagerToConstructor()) {
-            // zend-eventmanager v3
-            return new EventManager(
-                $container->has('SharedEventManager') ? $container->get('SharedEventManager') : null
-            );
-        }
+        $shared = $container->has('SharedEventManager') ? $container->get('SharedEventManager') : null;
 
-        // zend-eventmanager v2
-        $events = new EventManager();
-
-        if ($container->has('SharedEventManager')) {
-            $events->setSharedManager($container->get('SharedEventManager'));
-        }
-
-        return $events;
-    }
-
-    /**
-     * Create and return EventManager instance
-     *
-     * For use with zend-servicemanager v2; proxies to __invoke().
-     *
-     * @param ServiceLocatorInterface $container
-     * @return EventManager
-     */
-    public function createService(ServiceLocatorInterface $container)
-    {
-        return $this($container, EventManager::class);
-    }
-
-    /**
-     * Does the EventManager accept the shared manager to the constructor?
-     *
-     * In zend-eventmanager v3, the EventManager accepts the shared manager
-     * instance to the constructor *only*, while in v2, it must be injected
-     * via the setSharedManager() method.
-     *
-     * @return bool
-     */
-    private function acceptsSharedManagerToConstructor()
-    {
-        $r = new ReflectionClass(EventManager::class);
-        return ! $r->hasMethod('setSharedManager');
+        return new EventManager($shared);
     }
 }

src/Service/HttpDefaultRenderingStrategyFactory.php

@@ -11,8 +11,7 @@
 
 use Interop\Container\ContainerInterface;
 use Zend\Mvc\View\Http\DefaultRenderingStrategy;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 use Zend\View\View;
 
 class HttpDefaultRenderingStrategyFactory implements FactoryInterface
@@ -35,19 +34,6 @@ public function __invoke(ContainerInterface $container, $name, array $options =
         return $strategy;
     }
 
-    /**
-     * Create and return DefaultRendererStrategy instance
-     *
-     * For use with zend-servicemanager v2; proxies to __invoke().
-     *
-     * @param ServiceLocatorInterface $container
-     * @return DefaultRendererStrategy
-     */
-    public function createService(ServiceLocatorInterface $container)
-    {
-        return $this($container, DefaultRendererStrategy::class);
-    }
-
     /**
      * Inject layout template.
      *

src/Service/HttpExceptionStrategyFactory.php

@@ -11,8 +11,7 @@
 
 use Interop\Container\ContainerInterface;
 use Zend\Mvc\View\Http\ExceptionStrategy;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
 class HttpExceptionStrategyFactory implements FactoryInterface
 {
@@ -35,19 +34,6 @@ public function __invoke(ContainerInterface $container, $name, array $options =
         return $strategy;
     }
 
-    /**
-     * Create and return ExceptionStrategy instance
-     *
-     * For use with zend-servicemanager v2; proxies to __invoke().
-     *
-     * @param ServiceLocatorInterface $container
-     * @return ExceptionStrategy
-     */
-    public function createService(ServiceLocatorInterface $container)
-    {
-        return $this($container, ExceptionStrategy::class);
-    }
-
     /**
      * Inject strategy with configured display_exceptions flag.
      *