Merging develop to master in preparation for 2.6.0

Author: weierophinney

.travis.yml

@@ -17,13 +17,28 @@ matrix:
     - php: 5.5
       env:
         - EXECUTE_CS_CHECK=true
+    - php: 5.5
+      env:
+        - ZEND_EVENTMANAGER_VERSION="^2.6.2"
+        - ZEND_SERVICEMANAGER_VERSION="^2.7.5"
     - php: 5.6
       env:
         - EXECUTE_TEST_COVERALLS=true
+    - php: 5.6
+      env:
+        - ZEND_EVENTMANAGER_VERSION="^2.6.2"
+        - ZEND_SERVICEMANAGER_VERSION="^2.7.5"
+    - php: 7
     - php: 7
+      env:
+        - ZEND_EVENTMANAGER_VERSION="^2.6.2"
+        - ZEND_SERVICEMANAGER_VERSION="^2.7.5"
+    - php: hhvm 
     - php: hhvm 
+      env:
+        - ZEND_EVENTMANAGER_VERSION="^2.6.2"
+        - ZEND_SERVICEMANAGER_VERSION="^2.7.5"
   allow_failures:
-    - php: 7
     - php: hhvm
 
 notifications:
@@ -34,6 +49,11 @@ 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
+  - if [[ $ZEND_EVENTMANAGER_VERSION != '' ]]; then composer require --no-update "zendframework/zend-eventmanager:$ZEND_EVENTMANAGER_VERSION" ; fi
+  - if [[ $ZEND_EVENTMANAGER_VERSION == '' ]]; then composer require --no-update "zendframework/zend-eventmanager:^3.0" ; fi
+  - if [[ $ZEND_SERVICEMANAGER_VERSION != '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:$ZEND_SERVICEMANAGER_VERSION" ; fi
+  - if [[ $ZEND_SERVICEMANAGER_VERSION == '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:^3.0.3" ; fi
+  - if [[ $ZEND_SERVICEMANAGER_VERSION == '' ]]; then composer remove --dev --no-update zendframework/zend-mvc zendframework/zend-session ; fi
 
 install:
   - travis_retry composer install --no-interaction --ignore-platform-reqs

CHANGELOG.md

@@ -2,6 +2,36 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.6.0 - TBD
+
+### Added
+
+- [#8](https://github.com/zendframework/zend-view/pull/8) adds a new method to
+  each of the `Breadcrumbs` and `Menu` navigation helpers, 
+  `renderPartialWithParams(array $params = [], $container = null, $partial = null)`.
+  This method allows passing parameters to the navigation partial to render,
+  just as you would when using the `partial()` view helper.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#15](https://github.com/zendframework/zend-view/pull/15),
+  [#17](https://github.com/zendframework/zend-view/pull/17),
+  [#35](https://github.com/zendframework/zend-view/pull/35), and
+  [#42](https://github.com/zendframework/zend-view/pull/42) update the component
+  to be forwards-compatible with the v3 releases of zend-eventmanager,
+  zend-servicemanager, and zend-stdlib. The changes include:
+  - changes to how events are triggered to ensure they continue working correctly.
+  - updates to the plugin manager to be forwards-compatible.
+  - updates to helper factories to be forwards-compatible.
+
 ## 2.5.4 - TBD
 
 ### Added

composer.json

@@ -14,31 +14,30 @@
     },
     "require": {
         "php": "^5.5 || ^7.0",
-        "zendframework/zend-eventmanager": "~2.5",
-        "zendframework/zend-loader": "~2.5",
-        "zendframework/zend-stdlib": "~2.5"
+        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+        "zendframework/zend-loader": "^2.5",
+        "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
-        "zendframework/zend-authentication": "~2.5",
-        "zendframework/zend-cache": "~2.5",
-        "zendframework/zend-config": "~2.5",
-        "zendframework/zend-console": "~2.5",
-        "zendframework/zend-escaper": "~2.5",
-        "zendframework/zend-feed": "~2.5",
-        "zendframework/zend-filter": "~2.5",
-        "zendframework/zend-http": "~2.5",
-        "zendframework/zend-i18n": "~2.5",
-        "zendframework/zend-json": "~2.5",
-        "zendframework/zend-log": "~2.5",
-        "zendframework/zend-modulemanager": "~2.5",
-        "zendframework/zend-mvc": "~2.5",
-        "zendframework/zend-navigation": "~2.5",
-        "zendframework/zend-paginator": "~2.5",
-        "zendframework/zend-permissions-acl": "~2.5",
-        "zendframework/zend-serializer": "~2.5",
-        "zendframework/zend-servicemanager": "~2.5",
-        "zendframework/zend-session": "dev-master",
-        "zendframework/zend-uri": "~2.5",
+        "zendframework/zend-authentication": "^2.5",
+        "zendframework/zend-cache": "^2.6.1",
+        "zendframework/zend-config": "^2.6",
+        "zendframework/zend-console": "^2.6",
+        "zendframework/zend-escaper": "^2.5",
+        "zendframework/zend-feed": "^2.7",
+        "zendframework/zend-filter": "^2.6.1",
+        "zendframework/zend-http": "^2.5.4",
+        "zendframework/zend-i18n": "^2.6",
+        "zendframework/zend-json": "^2.6.1",
+        "zendframework/zend-log": "^2.7",
+        "zendframework/zend-mvc": "^2.6.1",
+        "zendframework/zend-navigation": "^2.5",
+        "zendframework/zend-paginator": "^2.5",
+        "zendframework/zend-permissions-acl": "^2.6",
+        "zendframework/zend-serializer": "^2.6.1",
+        "zendframework/zend-session": "^2.5",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-uri": "^2.5",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     },
@@ -62,7 +61,7 @@
     "extra": {
         "branch-alias": {
             "dev-master": "2.5-dev",
-            "dev-develop": "2.6-dev"
+            "dev-develop": "3.0-dev"
         }
     },
     "autoload-dev": {

src/Helper/FlashMessenger.php

@@ -10,14 +10,12 @@
 namespace Zend\View\Helper;
 
 use Zend\Mvc\Controller\Plugin\FlashMessenger as PluginFlashMessenger;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\I18n\View\Helper\AbstractTranslatorHelper;
 
 /**
  * Helper to proxy the plugin flash messenger
  */
-class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorAwareInterface
+class FlashMessenger extends AbstractTranslatorHelper
 {
     /**
      * Default attributes for the open format tag
@@ -62,13 +60,6 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
      */
     protected $pluginFlashMessenger;
 
-    /**
-     * Service locator
-     *
-     * @var ServiceLocatorInterface
-     */
-    protected $serviceLocator;
-
     /**
      * Returns the flash messenger plugin controller
      *
@@ -309,28 +300,6 @@ public function getPluginFlashMessenger()
         return $this->pluginFlashMessenger;
     }
 
-    /**
-     * Set the service locator.
-     *
-     * @param  ServiceLocatorInterface $serviceLocator
-     * @return AbstractHelper
-     */
-    public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
-    {
-        $this->serviceLocator = $serviceLocator;
-        return $this;
-    }
-
-    /**
-     * Get the service locator.
-     *
-     * @return ServiceLocatorInterface
-     */
-    public function getServiceLocator()
-    {
-        return $this->serviceLocator;
-    }
-
     /**
      * Retrieve the escapeHtml helper
      *

src/Helper/Navigation.php

@@ -10,7 +10,6 @@
 namespace Zend\View\Helper;
 
 use Zend\Navigation\AbstractContainer;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\View\Exception;
 use Zend\View\Helper\Navigation\AbstractHelper as AbstractNavigationHelper;
 use Zend\View\Helper\Navigation\HelperInterface as NavigationHelper;
@@ -112,7 +111,7 @@ public function __call($method, array $arguments = [])
         // check if call should proxy to another helper
         $helper = $this->findHelper($method, false);
         if ($helper) {
-            if ($helper instanceof ServiceLocatorAwareInterface && $this->getServiceLocator()) {
+            if (method_exists($helper, 'setServiceLocator') && $this->getServiceLocator()) {
                 $helper->setServiceLocator($this->getServiceLocator());
             }
             return call_user_func_array($helper, $arguments);

src/Helper/Navigation/AbstractHelper.php

@@ -9,6 +9,7 @@
 
 namespace Zend\View\Helper\Navigation;
 
+use Interop\Container\ContainerInterface;
 use RecursiveIteratorIterator;
 use Zend\EventManager\EventManager;
 use Zend\EventManager\EventManagerAwareInterface;
@@ -18,8 +19,6 @@
 use Zend\Navigation;
 use Zend\Navigation\Page\AbstractPage;
 use Zend\Permissions\Acl;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\View;
 use Zend\View\Exception;
 
@@ -29,19 +28,13 @@
 abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
     EventManagerAwareInterface,
     HelperInterface,
-    ServiceLocatorAwareInterface,
     TranslatorAwareInterface
 {
     /**
      * @var EventManagerInterface
      */
     protected $events;
 
-    /**
-     * @var ServiceLocatorInterface
-     */
-    protected $serviceLocator;
-
     /**
      * AbstractContainer to operate on by default
      *
@@ -91,6 +84,11 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
      */
     protected $role;
 
+    /**
+     * @var ContainerInterface
+     */
+    protected $serviceLocator;
+
     /**
      * Whether ACL should be used for filtering out pages
      *
@@ -260,7 +258,8 @@ protected function parseContainer(&$container = null)
         }
 
         if (is_string($container)) {
-            if (!$this->getServiceLocator()) {
+            $services = $this->getServiceLocator();
+            if (! $services) {
                 throw new Exception\InvalidArgumentException(sprintf(
                     'Attempted to set container with alias "%s" but no ServiceLocator was set',
                     $container
@@ -269,16 +268,8 @@ protected function parseContainer(&$container = null)
 
             /**
              * Load the navigation container from the root service locator
-             *
-             * The navigation container is probably located in Zend\ServiceManager\ServiceManager
-             * and not in the View\HelperPluginManager. If the set service locator is a
-             * HelperPluginManager, access the navigation container via the main service locator.
              */
-            $sl = $this->getServiceLocator();
-            if ($sl instanceof View\HelperPluginManager) {
-                $sl = $sl->getServiceLocator();
-            }
-            $container = $sl->get($container);
+            $container = $services->get($container);
             return;
         }
 
@@ -755,10 +746,12 @@ public function hasRole()
     /**
      * Set the service locator.
      *
-     * @param  ServiceLocatorInterface $serviceLocator
+     * Used internally to pull named navigation containers to render.
+     *
+     * @param  ContainerInterface $serviceLocator
      * @return AbstractHelper
      */
-    public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
+    public function setServiceLocator(ContainerInterface $serviceLocator)
     {
         $this->serviceLocator = $serviceLocator;
         return $this;
@@ -767,7 +760,9 @@ public function setServiceLocator(ServiceLocatorInterface $serviceLocator)
     /**
      * Get the service locator.
      *
-     * @return ServiceLocatorInterface
+     * Used internally to pull named navigation containers to render.
+     *
+     * @return ContainerInterface
      */
     public function getServiceLocator()
     {