Merge branch 'feature/forwards-compat' into develop

Close #20

Author: weierophinney

.travis.yml

@@ -11,19 +11,40 @@ cache:
   directories:
     - $HOME/.composer/cache
 
+env:
+  global:
+    - SERVICE_MANAGER_VERSION="^3.0.3"
+    - REMOVE_DEPENDENCIES="zendframework/zend-mvc"
+
 matrix:
   fast_finish: true
   include:
     - php: 5.5
       env:
         - EXECUTE_CS_CHECK=true
+    - php: 5.5
+      env:
+        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - REMOVE_DEPENDENCIES=""
     - php: 5.6
       env:
         - EXECUTE_TEST_COVERALLS=true
+    - php: 5.6
+      env:
+        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - REMOVE_DEPENDENCIES=""
     - php: 7
+    - php: 7
+      env:
+        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - REMOVE_DEPENDENCIES=""
+    - php: hhvm 
     - php: hhvm 
+      env:
+        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - REMOVE_DEPENDENCIES=""
   allow_failures:
-    - php: 7
+    - php: hhvm
 
 notifications:
   irc: "irc.freenode.org#zftalk.dev"
@@ -33,6 +54,8 @@ before_install:
   - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - composer self-update
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
+  - composer require --dev --no-update "zendframework/zend-servicemanager:$SERVICE_MANAGER_VERSION"
+  - if [[ $REMOVE_DEPENDENCIES != '' ]]; then composer remove --dev --no-update $REMOVE_DEPENDENCIES ; fi
 
 install:
   - travis_retry composer install --no-interaction --ignore-platform-reqs

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.0.0 - TBD
+## 2.6.0 - TBD
 
 ### Added
 
@@ -18,5 +18,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- [#5](https://github.com/zendframework/zend-navigation/pull/5) updates the
-  component to the v3 version of zend-servicemanager.
+- [#5](https://github.com/zendframework/zend-navigation/pull/5) and
+  [#20](https://github.com/zendframework/zend-navigation/pull/20) update the
+  code to be forwards compatible with zend-servicemanager v3.

composer.json

@@ -13,21 +13,20 @@
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-stdlib": "dev-develop as 2.8.0"
+        "php": "^5.5 || ^7.0",
+        "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
-        "zendframework/zend-config": "dev-develop as 2.6.0",
-        "zendframework/zend-console": "~2.5",
-        "zendframework/zend-http": "~2.5",
-        "zendframework/zend-i18n": "dev-develop as 2.6.0",
-        "zendframework/zend-log": "~2.5",
-        "zendframework/zend-modulemanager": "dev-develop as 2.7.0",
-        "zendframework/zend-mvc": "dev-develop as 2.7.0",
-        "zendframework/zend-permissions-acl": "~2.5",
-        "zendframework/zend-servicemanager": "dev-develop as 2.7.0",
-        "zendframework/zend-uri": "~2.5",
-        "zendframework/zend-view": "dev-develop as 2.6.0",
+        "zendframework/zend-config": "^2.6",
+        "zendframework/zend-console": "^2.6",
+        "zendframework/zend-http": "^2.5.4",
+        "zendframework/zend-i18n": "^2.6",
+        "zendframework/zend-log": "^2.7.1",
+        "zendframework/zend-mvc": "^2.6.3",
+        "zendframework/zend-permissions-acl": "^2.6",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-uri": "^2.5",
+        "zendframework/zend-view": "^2.6.3",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     },

src/Service/AbstractNavigationFactory.php

@@ -16,7 +16,8 @@
 use Zend\Mvc\Router\RouteStackInterface as Router;
 use Zend\Navigation\Exception;
 use Zend\Navigation\Navigation;
-use Zend\ServiceManager\Factory\FactoryInterface;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Abstract navigation factory
@@ -29,14 +30,31 @@ abstract class AbstractNavigationFactory implements FactoryInterface
     protected $pages;
 
     /**
+     * Create and return a new Navigation instance (v3).
+     *
      * @param ContainerInterface $container
-     * @return \Zend\Navigation\Navigation
+     * @param string $requestedName
+     * @param null|array $options
+     * @return Navigation
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
         return new Navigation($this->getPages($container));
     }
 
+    /**
+     * Create and return a new Navigation instance (v2).
+     *
+     * @param ContainerInterface $container
+     * @param null|string $name
+     * @param null|string $requestedName
+     * @return Navigation
+     */
+    public function createService(ServiceLocatorInterface $container, $name = null, $requestedName = null)
+    {
+        return $this($container, $requestedName);
+    }
+
     /**
      * @abstract
      * @return string

src/Service/NavigationAbstractServiceFactory.php

@@ -11,7 +11,8 @@
 
 use Interop\Container\ContainerInterface;
 use Zend\Navigation\Navigation;
-use Zend\ServiceManager\Factory\AbstractFactoryInterface;
+use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Navigation abstract service factory
@@ -43,13 +44,14 @@ final class NavigationAbstractServiceFactory implements AbstractFactoryInterface
     protected $config;
 
     /**
-     * Can we create a navigation by the requested name?
+     * Can we create a navigation by the requested name? (v3)
      *
      * @param ContainerInterface $container
-     * @param string $requestedName Name by which service was requested, must start with Zend\Navigation\
+     * @param string $requestedName Name by which service was requested, must
+     *     start with Zend\Navigation\
      * @return bool
      */
-    public function canCreateServiceWithName(ContainerInterface $container, $requestedName)
+    public function canCreate(ContainerInterface $container, $requestedName)
     {
         if (0 !== strpos($requestedName, self::SERVICE_PREFIX)) {
             return false;
@@ -59,8 +61,25 @@ public function canCreateServiceWithName(ContainerInterface $container, $request
         return $this->hasNamedConfig($requestedName, $config);
     }
 
+    /**
+     * Can we create a navigation by the requested name? (v2)
+     *
+     * @param ServiceLocatorInterface $container
+     * @param string $name Normalized name by which service was requested;
+     *     ignored.
+     * @param string $requestedName Name by which service was requested, must
+     *     start with Zend\Navigation\
+     * @return bool
+     */
+    public function canCreateServiceWithName(ServiceLocatorInterface $container, $name, $requestedName)
+    {
+        return $this->canCreate($container, $requestedName);
+    }
+
     /**
      * {@inheritDoc}
+     *
+     * @return Navigation
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
@@ -69,6 +88,21 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         return $factory($container, $requestedName);
     }
 
+    /**
+     * Can we create a navigation by the requested name? (v2)
+     *
+     * @param ServiceLocatorInterface $container
+     * @param string $name Normalized name by which service was requested;
+     *     ignored.
+     * @param string $requestedName Name by which service was requested, must
+     *     start with Zend\Navigation\
+     * @return Navigation
+     */
+    public function createServiceWithName(ServiceLocatorInterface $container, $name, $requestedName)
+    {
+        return $this($container, $requestedName);
+    }
+
     /**
      * Get navigation configuration, if any
      *