Merge branch 'migrate-to-laminas'

* migrate-to-laminas:
  add php 7.3 and 7.4
  naming
  remove dependency plugin
  normalize composer.json
  retry dep
  try replace
  dependency plugin req
  migrate to laminas

Author: samsonasik

.travis.yml

@@ -14,14 +14,18 @@ matrix:
     - php: 7.2
       env:
         - DEPS=latest
-    - php: nightly
-      env:
-        - DEPS=lowest
-    - php: nightly
-      env:
-        - DEPS=latest
-  allow_failures:
-    - php: nightly
+    - php: 7.3
+        env:
+          - DEPS=lowest
+    - php: 7.3
+        env:
+          - DEPS=latest
+    - php: 7.4
+        env:
+          - DEPS=lowest
+    - php: 7.4
+        env:
+          - DEPS=latest
 
 before_script:
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable --no-interaction ; fi

CONTRIBUTING.md

@@ -3,7 +3,7 @@ CONTRIBUTING
 To contribute, you can send pull requests with :
 
 - Typo fix.
-- Use [Zend Coding Standard](https://github.com/zendframework/zend-coding-standard).
+- Use [Laminas Coding Standard](https://github.com/laminas/laminas-coding-standard).
 - patch(es) need new/updated test(s).
 - new feature(s) need test(s).
 

README.md

@@ -7,9 +7,11 @@ RedirectHandlerModule
 [![Coverage Status](https://coveralls.io/repos/samsonasik/RedirectHandlerModule/badge.svg?branch=master)](https://coveralls.io/r/samsonasik/RedirectHandlerModule)
 [![Downloads](https://poser.pugx.org/samsonasik/redirect-handler-module/downloads)](https://packagist.org/packages/samsonasik/redirect-handler-module)
 
-*RedirectHandlerModule* is a module for handling redirect when the given url to redirect plugin is not registered in your ZF application. It simply override existing ZF redirect plugin, so we can just use it.
+*RedirectHandlerModule* is a module for handling redirect when the given url to redirect plugin is not registered in your Laminas application. It simply override existing Laminas redirect plugin, so we can just use it.
 
-> This is README for version ^2.0 which only support ZF3 with php ^7.1.
+> This is README for version ^3.0 which only support Laminas 3 with php ^7.1.
+
+> For version 2, you can read at [version 2 readme](https://github.com/samsonasik/RedirectHandlerModule/tree/2.x.x) which still support ZF3 with php ^7.1 support.
 
 > For version 1, you can read at [version 1 readme](https://github.com/samsonasik/RedirectHandlerModule/tree/1.x.x) which still support ZF2 with php ^5.6|^7.0 support.
 

composer.json

@@ -1,11 +1,11 @@
 {
     "name": "samsonasik/redirect-handler-module",
     "type": "library",
-    "description": "ZF2 module to for Url Redirect handling",
+    "description": "Laminas module to for Url Redirect handling",
     "keywords": [
         "redirect",
-        "zf2",
-        "zf3",
+        "laminas2",
+        "laminas3",
         "handler"
     ],
     "homepage": "https://github.com/samsonasik/RedirectHandlerModule",
@@ -20,13 +20,13 @@
     ],
     "require": {
         "php": "^7.1",
-        "zendframework/zend-mvc": "^3.0",
-        "zendframework/zend-servicemanager": "^3.3.0"
+        "laminas/laminas-mvc": "^3.0",
+        "laminas/laminas-servicemanager": "^3.3.0"
     },
     "require-dev": {
+        "laminas/laminas-coding-standard": "^1.0",
         "php-coveralls/php-coveralls": "^2.1",
-        "phpunit/phpunit": "^7.0",
-        "zendframework/zend-coding-standard": "^1.0"
+        "phpunit/phpunit": "^7.0"
     },
     "config": {
         "process-timeout": 5000

config/module.config.php

@@ -20,10 +20,10 @@
 return [
     'controller_plugins' => [
         'factories' => [
-            'redirect'                                   => 'RedirectHandlerModule\Controller\Plugin\RedirectFactory',
-            'Redirect'                                   => 'RedirectHandlerModule\Controller\Plugin\RedirectFactory',
-            \Zend\Mvc\Controller\Plugin\Redirect::class  => 'RedirectHandlerModule\Controller\Plugin\RedirectFactory',
-            'zendmvccontrollerpluginredirect'            => 'RedirectHandlerModule\Controller\Plugin\RedirectFactory',
+            'redirect'                                      => 'RedirectHandlerModule\Controller\Plugin\RedirectFactory',
+            'Redirect'                                      => 'RedirectHandlerModule\Controller\Plugin\RedirectFactory',
+            \Laminas\Mvc\Controller\Plugin\Redirect::class  => 'RedirectHandlerModule\Controller\Plugin\RedirectFactory',
+            'laminasmvccontrollerpluginredirect'            => 'RedirectHandlerModule\Controller\Plugin\RedirectFactory',
         ],
     ],
 ];

phpcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<ruleset name="Zend Framework Coding Standard">
-    <rule ref="./vendor/zendframework/zend-coding-standard/ruleset.xml"/>
+<ruleset name="Laminas Coding Standard">
+    <rule ref="./vendor/laminas/laminas-coding-standard/ruleset.xml"/>
 
     <!-- Paths to check -->
     <file>src</file>

src/Controller/Plugin/Redirect.php

@@ -21,11 +21,11 @@
 
 namespace RedirectHandlerModule\Controller\Plugin;
 
-use Zend\EventManager\EventManagerAwareInterface;
-use Zend\EventManager\EventManagerAwareTrait;
-use Zend\Mvc\Controller\ControllerManager;
-use Zend\Mvc\Controller\Plugin\Redirect as BaseRedirect;
-use Zend\Uri\Uri;
+use Laminas\EventManager\EventManagerAwareInterface;
+use Laminas\EventManager\EventManagerAwareTrait;
+use Laminas\Mvc\Controller\ControllerManager;
+use Laminas\Mvc\Controller\Plugin\Redirect as BaseRedirect;
+use Laminas\Uri\Uri;
 
 class Redirect extends BaseRedirect implements EventManagerAwareInterface
 {
@@ -54,7 +54,7 @@ public function __construct(
      *
      * @param string $url
      *
-     * @return \Zend\Http\PhpEnvironment\Response
+     * @return \Laminas\Http\PhpEnvironment\Response
      */
     public function toUrl($url)
     {

test/Controller/Plugin/RedirectFactoryTest.php

@@ -78,7 +78,7 @@ public function testInvoke($config)
     {
         $services = $this->prophesize(ContainerInterface::class);
 
-        $controllerManager = $this->prophesize('Zend\Mvc\Controller\ControllerManager');
+        $controllerManager = $this->prophesize('Laminas\Mvc\Controller\ControllerManager');
         $services->get('ControllerManager')->willReturn($controllerManager)
                                            ->shouldBeCalled();
 

test/Controller/Plugin/RedirectTest.php

@@ -21,15 +21,15 @@
 
 use PHPUnit\Framework\TestCase;
 use RedirectHandlerModule\Controller\Plugin\Redirect;
-use Zend\EventManager\EventManager;
-use Zend\Http\Headers;
-use Zend\Http\PhpEnvironment\Request;
-use Zend\Http\PhpEnvironment\Response;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\Mvc\Controller\ControllerManager;
-use Zend\Mvc\MvcEvent;
-use Zend\Router\Http\TreeRouteStack;
-use Zend\Router\RouteMatch;
+use Laminas\EventManager\EventManager;
+use Laminas\Http\Headers;
+use Laminas\Http\PhpEnvironment\Request;
+use Laminas\Http\PhpEnvironment\Response;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\Mvc\Controller\ControllerManager;
+use Laminas\Mvc\MvcEvent;
+use Laminas\Router\Http\TreeRouteStack;
+use Laminas\Router\RouteMatch;
 
 class RedirectTest extends TestCase
 {