Merge branch 'hotfix/149' into release-2.7

Close #158
Close #149
Close #148

Author: weierophinney

.travis.yml

@@ -4,7 +4,7 @@ language: php
 
 branches:
   except:
-    - /^release-.*$/
+    - /^release-\d+\.\d+\.\d+.*$/
     - /^ghgfk-.*$/
 
 cache:

CHANGELOG.md

@@ -2,6 +2,37 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.7.9 - TBD
+
+### Added
+
+- [#149](https://github.com/zendframework/zend-mvc/pull/149) and
+  [#158](https://github.com/zendframework/zend-mvc/pull/158) add a dependency
+  on zendframework/zend-servicemanager-di in order to provide both backwards and
+  forwards compatibility for the DI/ServiceManager integration.
+
+### Deprecated
+
+- [#158](https://github.com/zendframework/zend-mvc/pull/158) deprecates each of
+  the following classes, which now have equivalents in the
+  zend-servicemanager-di package (which is required by zend-mvc v2, but optional
+  starting with zend-mvc v3):
+  - `Zend\Mvc\Service\DiAbstractServiceFactoryFactory`
+  - `Zend\Mvc\Service\DiFactory`
+  - `Zend\Mvc\Service\DiServiceInitializerFactory`
+  - `Zend\Mvc\Service\DiStrictAbstractServiceFactory`
+  - `Zend\Mvc\Service\DiStrictAbstractServiceFactoryFactory`
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#149](https://github.com/zendframework/zend-mvc/pull/149) and
+  [#158](https://github.com/zendframework/zend-mvc/pull/158) fix an "undefined
+  variable" issue with `Zend\Mvc\Service\DiAbstractServiceFactoryFactory`.
+
 ## 2.7.8 - 2016-05-31
 
 ### Added

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);
-    }
 }