Update zend-mvc v2 to use zend-servicemanager-di

zend-servicemanager-di contains tests and code to ensure it works against both
v2 and v3 versions of zend-servicemanager, unlike the code currently in
zend-mvc. Updating to use it is backwards compatible, assuming the following:

- zend-servicemanager-di is tested against both v2 and v3 of
  zend-servicemanager, demonstrating that the various classes it contains that
  overlap with zend-servicemanager v2 pose no conflicts.
- each of DiAbstractServiceFactoryFactory, DiFactory,
  DiServiceInitializerFactory, and DiStrictAbstractServiceFactory from zend-mvc
  v2 return artifacts from the `Zend\ServiceManager\Di` namespace, allowing them
  to simply extend the relevant factories that exist in zend-servicemanager-di.
- DiStrictAbstractServiceFactoryFactory can be left intact, ensuring it returns
  the `Zend\Mvc\Service\DiStrictAbstractServiceFactory` instance, and thus
  preserving the inheritance tree.

All of the DI-related factories in zend-mvc are now marked deprecated as well,
with annotations detailing how to upgrade code to work with
zend-servicemanager-di to make it forwards-compatible.

Author: weierophinney

composer.json

@@ -16,6 +16,7 @@
         "php": "^5.5 || ^7.0",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-servicemanager-di": "^1.0.1",
         "zendframework/zend-hydrator": "^1.1 || ^2.1",
         "zendframework/zend-form": "^2.7",
         "zendframework/zend-stdlib": "^2.7.5 || ^3.0",

composer.lock

@@ -9,43 +9,17 @@
 
 namespace Zend\Mvc\Service;
 
-use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Di\DiAbstractServiceFactory;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\ServiceManager\ServiceManager;
+use Zend\ServiceManager\Di\DiAbstractServiceFactoryFactory as OriginalFactory;
 
-class DiAbstractServiceFactoryFactory implements FactoryInterface
+/**
+ * Since 2.7.9, this class now extends the version defined in zend-servicemanager-di,
+ * ensuring backwards compatibility with zend-servicemanger v2 and forwards
+ * compatibility with zend-servicemanager v3.
+ *
+ * @deprecated Since 2.7.9. The factory is now defined in zend-servicemanager-di,
+ *     and removed in 3.0.0. Use Zend\ServiceManager\Di\DiAbstractServiceFactoryFactory
+ *     from zend-servicemanager-di instead if you rely on this feature.
+ */
+class DiAbstractServiceFactoryFactory extends OriginalFactory
 {
-    /**
-     * Class responsible for instantiating a DiAbstractServiceFactory
-     *
-     * @param ContainerInterface $container
-     * @param string $name
-     * @param null|array $options
-     * @return DiAbstractServiceFactory
-     */
-    public function __invoke(ContainerInterface $container, $name, array $options = null)
-    {
-        $factory = new DiAbstractServiceFactory($container->get('Di'), DiAbstractServiceFactory::USE_SL_BEFORE_DI);
-
-        if ($serviceLocator instanceof ServiceManager) {
-            $serviceLocator->addAbstractFactory($factory, false);
-        }
-
-        return $factory;
-    }
-
-    /**
-     * Create and return DiAbstractServiceFactory instance
-     *
-     * For use with zend-servicemanager v2; proxies to __invoke().
-     *
-     * @param ServiceLocatorInterface $container
-     * @return DiAbstractServiceFactory
-     */
-    public function createService(ServiceLocatorInterface $container)
-    {
-        return $this($container, DiAbstractServiceFactory::class);
-    }
 }