Ensure Url helper tests correctly against v2 and v3.

Author: weierophinney

.travis.yml

@@ -16,10 +16,11 @@ cache:
 env:
   global:
     - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
-    - SITE_URL: https://zendframework.github.io/zend-view
-    - GH_USER_NAME: "Matthew Weier O'Phinney"
-    - GH_USER_EMAIL: [email protected]
-    - GH_REF: github.com/zendframework/zend-view.git
+    - LATEST_DEPS="zendframework/zend-mvc-plugin-flashmessenger zendframework/zend-mvc-i18n zendframework/zend-mvc-console"
+    - SITE_URL=https://zendframework.github.io/zend-view
+    - GH_USER_NAME="Matthew Weier O'Phinney"
+    - [email protected]
+    - GH_REF=github.com/zendframework/zend-view.git
     - secure: "kF7z5CxnrD/lsX9sP1+SYLKm1HdT/u1F0xovlyT9fDWrz+X4DBe8Oybzk6UX5HKXQvdhVTfAbHoWhFxFrkcRKrtaEOltk68bYFgnSOYhrK5EhZz6CHqN2j1MtT6FRfdlSOi6OECvCE3wd8nYHixxEviIZyB3L5+H39FOiu5Zi+eJT/myp6IuBO6lQfnSgqKdvuQXlfWSn9VGQJztX6ea2U89eM/TAVWEwbhLAJOsOejkvAy2lvYhIZpvSEkFm9jSp3/JOw8MFljG8UEDZUkpj+zba5/vqzM8thTTbybhAIBF7wNeMNrAeFBnrPz5KDPEQYYG8NG4we6F7GvbevvBz+ej5OJPXx/ulhMiEWKN1qEmQHZ3Gl0kG0O+TgXfqLErbCNn4MLP/K0Avar03m9bvXtaTA5Yqde0rIdspjwdxmKi0OI76UnGETMDyWuXbHkRfhs54sUEOBUdM3dz5lXhlSWPCTlQCgzkVqlgTL5b8b1u7YKpkwJAFSXMhhJBycFCNCfqAy10l2wjgvhXhLgPHle7sSwYR6SMVzkjj59P1UKc2yrxkwl/S7cqrbaeGSGjDv/QVMLtBL3OLqXwIaKy3POF2gQJhFXdrmGzDOADyCbEXVUYve5pQOmT1RdVHaHiT7AmZXEQibR1DW2zzU9eX94XpK9LKzlSzUOtYT8LNNA="
 
 matrix:
@@ -78,7 +79,7 @@ before_install:
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
 
 install:
-  - if [[ $DEPS == 'latest' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS zendframework/zend-mvc-plugin-flashmessenger ; fi
+  - if [[ $DEPS == 'latest' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS $LATEST_DEPS ; fi
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
   - travis_retry composer install $COMPOSER_ARGS

test/Helper/FlashMessengerTest.php

@@ -10,8 +10,9 @@
 namespace ZendTest\View\Helper;
 
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\Mvc\Controller\Plugin\FlashMessenger as PluginFlashMessenger;
+use Zend\Mvc\Controller\Plugin\FlashMessenger as V2PluginFlashMessenger;
 use Zend\Mvc\Controller\PluginManager;
+use Zend\Mvc\Plugin\FlashMessenger\FlashMessenger as V3PluginFlashMessenger;
 use Zend\ServiceManager\Config;
 use Zend\ServiceManager\ServiceManager;
 use Zend\View\Helper\FlashMessenger;
@@ -27,14 +28,9 @@ class FlashMessengerTest extends TestCase
 {
     public function setUp()
     {
-        if (! class_exists(PluginFlashMessenger::class)) {
-            $this->markTestSkipped(
-                'Skipping zend-mvc-related tests until that component is updated '
-                . 'to be forwards-compatible with zend-eventmanager, zend-stdlib, '
-                . 'and zend-servicemanager v3.'
-            );
-        }
-
+        $this->mvcPluginClass = class_exists(V2PluginFlashMessenger::class)
+            ? V2PluginFlashMessenger::class
+            : V3PluginFlashMessenger::class;
         $this->helper = new FlashMessenger();
         $this->plugin = $this->helper->getPluginFlashMessenger();
     }
@@ -63,34 +59,32 @@ public function seedCurrentMessages()
 
     public function createServiceManager(array $config = [])
     {
-        $config = new Config(
-            [
-                'services' => [
-                    'config' => $config,
-                ],
-                'factories' => [
-                    'ControllerPluginManager' => function ($services, $name, $options) {
-                        return new PluginManager($services, [
-                            'invokables' => [
-                                'flashmessenger' => PluginFlashMessenger::class,
-                            ],
-                        ]);
-                    },
-                    'ViewHelperManager' => function ($services, $name, $options) {
-                        return new HelperPluginManager($services);
-                    },
-                ],
-            ]
-        );
+        $config = new Config([
+            'services' => [
+                'config' => $config,
+            ],
+            'factories' => [
+                'ControllerPluginManager' => function ($services, $name, $options) {
+                    return new PluginManager($services, [
+                        'invokables' => [
+                            'flashmessenger' => $this->mvcPluginClass,
+                        ],
+                    ]);
+                },
+                'ViewHelperManager' => function ($services, $name, $options) {
+                    return new HelperPluginManager($services);
+                },
+            ],
+        ]);
         $sm = new ServiceManager();
         $config->configureServiceManager($sm);
         return $sm;
     }
 
     public function testCanAssertPluginClass()
     {
-        $this->assertEquals(PluginFlashMessenger::class, get_class($this->plugin));
-        $this->assertEquals(PluginFlashMessenger::class, get_class($this->helper->getPluginFlashMessenger()));
+        $this->assertEquals($this->mvcPluginClass, get_class($this->plugin));
+        $this->assertEquals($this->mvcPluginClass, get_class($this->helper->getPluginFlashMessenger()));
         $this->assertSame($this->plugin, $this->helper->getPluginFlashMessenger());
     }
 
@@ -176,26 +170,26 @@ public function testCanProxyAndRetrieveCurrentMessagesFromPluginController()
     public function testCanDisplayListOfMessages()
     {
         $displayInfoAssertion = '';
-        $displayInfo = $this->helper->render(PluginFlashMessenger::NAMESPACE_INFO);
+        $displayInfo = $this->helper->render('info');
         $this->assertEquals($displayInfoAssertion, $displayInfo);
 
         $this->seedMessages();
 
         $displayInfoAssertion = '<ul class="info"><li>bar-info</li></ul>';
-        $displayInfo = $this->helper->render(PluginFlashMessenger::NAMESPACE_INFO);
+        $displayInfo = $this->helper->render('info');
         $this->assertEquals($displayInfoAssertion, $displayInfo);
     }
 
     public function testCanDisplayListOfCurrentMessages()
     {
         $displayInfoAssertion = '';
-        $displayInfo = $this->helper->renderCurrent(PluginFlashMessenger::NAMESPACE_INFO);
+        $displayInfo = $this->helper->renderCurrent('info');
         $this->assertEquals($displayInfoAssertion, $displayInfo);
 
         $this->seedCurrentMessages();
 
         $displayInfoAssertion = '<ul class="info"><li>bar-info</li></ul>';
-        $displayInfo = $this->helper->renderCurrent(PluginFlashMessenger::NAMESPACE_INFO);
+        $displayInfo = $this->helper->renderCurrent('info');
         $this->assertEquals($displayInfoAssertion, $displayInfo);
     }
 
@@ -225,7 +219,7 @@ public function testCanDisplayListOfMessagesByInvoke()
         $this->seedMessages();
 
         $displayInfoAssertion = '<ul class="info"><li>bar-info</li></ul>';
-        $displayInfo = $helper()->render(PluginFlashMessenger::NAMESPACE_INFO);
+        $displayInfo = $helper()->render('info');
         $this->assertEquals($displayInfoAssertion, $displayInfo);
     }
 
@@ -235,7 +229,7 @@ public function testCanDisplayListOfCurrentMessagesByInvoke()
         $this->seedCurrentMessages();
 
         $displayInfoAssertion = '<ul class="info"><li>bar-info</li></ul>';
-        $displayInfo = $helper()->renderCurrent(PluginFlashMessenger::NAMESPACE_INFO);
+        $displayInfo = $helper()->renderCurrent('info');
         $this->assertEquals($displayInfoAssertion, $displayInfo);
     }
 
@@ -248,7 +242,7 @@ public function testCanDisplayListOfMessagesCustomised()
                 ->setMessageOpenFormat('<div%s><p>')
                 ->setMessageSeparatorString('</p><p>')
                 ->setMessageCloseString('</p></div>')
-                ->render(PluginFlashMessenger::NAMESPACE_INFO, ['foo-baz', 'foo-bar']);
+                ->render('info', ['foo-baz', 'foo-bar']);
         $this->assertEquals($displayInfoAssertion, $displayInfo);
     }
 
@@ -261,7 +255,7 @@ public function testCanDisplayListOfCurrentMessagesCustomised()
                 ->setMessageOpenFormat('<div%s><p>')
                 ->setMessageSeparatorString('</p><p>')
                 ->setMessageCloseString('</p></div>')
-                ->renderCurrent(PluginFlashMessenger::NAMESPACE_INFO, ['foo-baz', 'foo-bar']);
+                ->renderCurrent('info', ['foo-baz', 'foo-bar']);
         $this->assertEquals($displayInfoAssertion, $displayInfo);
     }
 
@@ -274,7 +268,7 @@ public function testCanDisplayListOfMessagesCustomisedSeparator()
                 ->setMessageOpenFormat('<div><p%s>')
                 ->setMessageSeparatorString('</p><p%s>')
                 ->setMessageCloseString('</p></div>')
-                ->render(PluginFlashMessenger::NAMESPACE_DEFAULT, ['foo-baz', 'foo-bar']);
+                ->render('default', ['foo-baz', 'foo-bar']);
         $this->assertEquals($displayInfoAssertion, $displayInfo);
     }
 
@@ -287,7 +281,7 @@ public function testCanDisplayListOfCurrentMessagesCustomisedSeparator()
                 ->setMessageOpenFormat('<div><p%s>')
                 ->setMessageSeparatorString('</p><p%s>')
                 ->setMessageCloseString('</p></div>')
-                ->renderCurrent(PluginFlashMessenger::NAMESPACE_DEFAULT, ['foo-baz', 'foo-bar']);
+                ->renderCurrent('default', ['foo-baz', 'foo-bar']);
         $this->assertEquals($displayInfoAssertion, $displayInfo);
     }
 
@@ -310,7 +304,7 @@ public function testCanDisplayListOfMessagesCustomisedByConfig()
         $helper              = $helperPluginManager->get('flashmessenger');
 
         $displayInfoAssertion = '<div class="info"><ul><li>bar-info</li></ul></div>';
-        $displayInfo = $helper->render(PluginFlashMessenger::NAMESPACE_INFO);
+        $displayInfo = $helper->render('info');
         $this->assertEquals($displayInfoAssertion, $displayInfo);
     }
 
@@ -331,7 +325,7 @@ public function testCanDisplayListOfCurrentMessagesCustomisedByConfig()
         $helper              = $helperPluginManager->get('flashmessenger');
 
         $displayInfoAssertion = '<div class="info"><ul><li>bar-info</li></ul></div>';
-        $displayInfo = $helper->renderCurrent(PluginFlashMessenger::NAMESPACE_INFO);
+        $displayInfo = $helper->renderCurrent('info');
         $this->assertEquals($displayInfoAssertion, $displayInfo);
     }
 
@@ -353,7 +347,7 @@ public function testCanDisplayListOfMessagesCustomisedByConfigSeparator()
         $helper              = $helperPluginManager->get('flashmessenger');
 
         $displayInfoAssertion = '<div><ul><li class="foo-baz foo-bar">foo</li><li class="foo-baz foo-bar">bar</li></ul></div>';
-        $displayInfo = $helper->render(PluginFlashMessenger::NAMESPACE_DEFAULT, ['foo-baz', 'foo-bar']);
+        $displayInfo = $helper->render('default', ['foo-baz', 'foo-bar']);
         $this->assertEquals($displayInfoAssertion, $displayInfo);
     }
 
@@ -375,7 +369,7 @@ public function testCanDisplayListOfCurrentMessagesCustomisedByConfigSeparator()
         $helper              = $helperPluginManager->get('flashmessenger');
 
         $displayInfoAssertion = '<div><ul><li class="foo-baz foo-bar">foo</li><li class="foo-baz foo-bar">bar</li></ul></div>';
-        $displayInfo = $helper->renderCurrent(PluginFlashMessenger::NAMESPACE_DEFAULT, ['foo-baz', 'foo-bar']);
+        $displayInfo = $helper->renderCurrent('default', ['foo-baz', 'foo-bar']);
         $this->assertEquals($displayInfoAssertion, $displayInfo);
     }
 
@@ -392,7 +386,7 @@ public function testCanTranslateMessages()
         $this->seedMessages();
 
         $displayAssertion = '<ul class="info"><li>translated message</li></ul>';
-        $display = $this->helper->render(PluginFlashMessenger::NAMESPACE_INFO);
+        $display = $this->helper->render('info');
         $this->assertEquals($displayAssertion, $display);
     }
 
@@ -409,7 +403,7 @@ public function testCanTranslateCurrentMessages()
         $this->seedCurrentMessages();
 
         $displayAssertion = '<ul class="info"><li>translated message</li></ul>';
-        $display = $this->helper->renderCurrent(PluginFlashMessenger::NAMESPACE_INFO);
+        $display = $this->helper->renderCurrent('info');
         $this->assertEquals($displayAssertion, $display);
     }
 
@@ -437,7 +431,7 @@ public function testMessageIsEscapedByDefault()
         unset($helper);
 
         $displayAssertion = '<ul class="default"><li>Foo&lt;br /&gt;bar</li></ul>';
-        $display = $this->helper->render(PluginFlashMessenger::NAMESPACE_DEFAULT);
+        $display = $this->helper->render('default');
         $this->assertSame($displayAssertion, $display);
     }
 
@@ -452,7 +446,7 @@ public function testMessageIsNotEscapedWhenAutoEscapeIsFalse()
 
         $displayAssertion = '<ul class="default"><li>Foo<br />bar</li></ul>';
         $display = $this->helper->setAutoEscape(false)
-                                ->render(PluginFlashMessenger::NAMESPACE_DEFAULT);
+                                ->render('default');
         $this->assertSame($displayAssertion, $display);
     }
 
@@ -466,7 +460,7 @@ public function testCanSetAutoEscapeOnRender()
         unset($helper);
 
         $displayAssertion = '<ul class="default"><li>Foo<br />bar</li></ul>';
-        $display = $this->helper->render(PluginFlashMessenger::NAMESPACE_DEFAULT, [], false);
+        $display = $this->helper->render('default', [], false);
         $this->assertSame($displayAssertion, $display);
     }
 
@@ -481,7 +475,7 @@ public function testRenderUsesCurrentAutoEscapeByDefault()
 
         $this->helper->setAutoEscape(false);
         $displayAssertion = '<ul class="default"><li>Foo<br />bar</li></ul>';
-        $display = $this->helper->render(PluginFlashMessenger::NAMESPACE_DEFAULT);
+        $display = $this->helper->render('default');
         $this->assertSame($displayAssertion, $display);
 
         $helper = new FlashMessenger;
@@ -490,7 +484,7 @@ public function testRenderUsesCurrentAutoEscapeByDefault()
 
         $this->helper->setAutoEscape(true);
         $displayAssertion = '<ul class="default"><li>Foo&lt;br /&gt;bar</li></ul>';
-        $display = $this->helper->render(PluginFlashMessenger::NAMESPACE_DEFAULT);
+        $display = $this->helper->render('default');
         $this->assertSame($displayAssertion, $display);
     }
 
@@ -502,7 +496,7 @@ public function testCurrentMessageIsEscapedByDefault()
         $this->helper->addMessage('Foo<br />bar');
 
         $displayAssertion = '<ul class="default"><li>Foo&lt;br /&gt;bar</li></ul>';
-        $display = $this->helper->renderCurrent(PluginFlashMessenger::NAMESPACE_DEFAULT);
+        $display = $this->helper->renderCurrent('default');
         $this->assertSame($displayAssertion, $display);
     }
 
@@ -515,7 +509,7 @@ public function testCurrentMessageIsNotEscapedWhenAutoEscapeIsFalse()
 
         $displayAssertion = '<ul class="default"><li>Foo<br />bar</li></ul>';
         $display = $this->helper->setAutoEscape(false)
-                                ->renderCurrent(PluginFlashMessenger::NAMESPACE_DEFAULT);
+                                ->renderCurrent('default');
         $this->assertSame($displayAssertion, $display);
     }
 
@@ -527,7 +521,7 @@ public function testCanSetAutoEscapeOnRenderCurrent()
         $this->helper->addMessage('Foo<br />bar');
 
         $displayAssertion = '<ul class="default"><li>Foo<br />bar</li></ul>';
-        $display = $this->helper->renderCurrent(PluginFlashMessenger::NAMESPACE_DEFAULT, [], false);
+        $display = $this->helper->renderCurrent('default', [], false);
         $this->assertSame($displayAssertion, $display);
     }
 
@@ -540,12 +534,12 @@ public function testRenderCurrentUsesCurrentAutoEscapeByDefault()
 
         $this->helper->setAutoEscape(false);
         $displayAssertion = '<ul class="default"><li>Foo<br />bar</li></ul>';
-        $display = $this->helper->renderCurrent(PluginFlashMessenger::NAMESPACE_DEFAULT);
+        $display = $this->helper->renderCurrent('default');
         $this->assertSame($displayAssertion, $display);
 
         $this->helper->setAutoEscape(true);
         $displayAssertion = '<ul class="default"><li>Foo&lt;br /&gt;bar</li></ul>';
-        $display = $this->helper->renderCurrent(PluginFlashMessenger::NAMESPACE_DEFAULT);
+        $display = $this->helper->renderCurrent('default');
         $this->assertSame($displayAssertion, $display);
     }
 }

test/Helper/UrlIntegrationTest.php

@@ -11,8 +11,13 @@
 
 use Zend\Console\Console;
 use Zend\ServiceManager\ServiceManager;
+use Zend\Mvc\Console\ConfigProvider as MvcConsoleConfigProvider;
+use Zend\Mvc\Router\Http as V2HttpRoute;
 use Zend\Mvc\Service\ServiceManagerConfig;
 use Zend\Mvc\Service\ServiceListenerFactory;
+use Zend\Router\ConfigProvider as RouterConfigProvider;
+use Zend\Router\Http as V3HttpRoute;
+use Zend\ServiceManager\Config;
 
 /**
  * url() helper test -- tests integration with MVC
@@ -24,11 +29,14 @@ class UrlIntegrationTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
+        $this->literalRouteType = class_exists(V2HttpRoute\Literal::class)
+            ? V2HttpRoute\Literal::class
+            : V3HttpRoute\Literal::class;
         $config = [
             'router' => [
                 'routes' => [
                     'test' => [
-                        'type' => 'Literal',
+                        'type' => $this->literalRouteType,
                         'options' => [
                             'route' => '/test',
                             'defaults' => [
@@ -59,6 +67,17 @@ protected function setUp()
 
         $this->serviceManager = new ServiceManager();
         (new ServiceManagerConfig($serviceConfig))->configureServiceManager($this->serviceManager);
+
+        if (class_exists(RouterConfigProvider::class)) {
+            $routerConfig = new Config((new RouterConfigProvider())->getDependencyConfig());
+            $routerConfig->configureServiceManager($this->serviceManager);
+        }
+
+        if (class_exists(MvcConsoleConfigProvider::class)) {
+            $mvcConsoleConfig = new Config((new MvcConsoleConfigProvider())->getDependencyConfig());
+            $mvcConsoleConfig->configureServiceManager($this->serviceManager);
+        }
+
         $this->serviceManager->setAllowOverride(true);
         $this->serviceManager->setService('config', $config);
         $this->serviceManager->setAlias('Configure', 'config');