Migrate to laminas (#11)

* Migrate to laminas

.travis.yml

@@ -28,7 +28,6 @@ matrix:
       env:
         - DEPS=latest
 
-
 install:
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update --no-interaction ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --no-interaction --prefer-lowest ; fi

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [3.0.0] - 2021-05-31
+### Added
+- Migrate to Laminas
+
 ## [2.0.0] - 2016-02-08
 ### Added
 - Support for php 7.3

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/rstgroup/request-id-module.svg?branch=master)](https://travis-ci.org/rstgroup/request-id-module)
 
-This module provide integration possibility to generate and add `request id` to request/response's header.
+This module provide integration possibility to generate and add `request id` to request/response's header in Laminas applications.
 If you want more information, how `request id` is generating, check dependent project [php-middleware/request-id](https://github.com/php-middleware/request-id).
 
 ## Installation
@@ -12,7 +12,7 @@ composer require rstgroup/request-id-module
 ```
 
 
-In your ZF2 application config add to module list
+In your Laminas application config add to module list
 
 ```php
 return [

composer.json

@@ -1,24 +1,24 @@
 {
   "name": "rstgroup/request-id-module",
   "require": {
-    "php": "^7.1",
-    "zendframework/zend-eventmanager": "^3",
-    "zendframework/zend-http": "^2.4",
-    "zendframework/zend-mvc": "^3",
-    "zendframework/zend-servicemanager": "^3.3",
-    "zendframework/zend-stdlib": "^3.2.1",
-    "zendframework/zend-psr7bridge": "^1.0",
+    "php": "^7.1 || ^8.0",
+    "laminas/laminas-eventmanager": "^3",
+    "laminas/laminas-http": "^2.4",
+    "laminas/laminas-mvc": "^3",
+    "laminas/laminas-servicemanager": "^3.3",
+    "laminas/laminas-stdlib": "^3.2.1",
+    "laminas/laminas-psr7bridge": "^1.0",
     "php-middleware/request-id": "^4.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.5.20",
-    "zendframework/zend-modulemanager": "^2.4",
-    "zendframework/zend-config": "^2.4 | ^3.0",
-    "zendframework/zend-i18n": "^2.4",
-    "zendframework/zend-log": "^2.4",
-    "zendframework/zend-serializer": "^2.4",
-    "zendframework/zend-session": "^2.4",
-    "zendframework/zend-test": "^3"
+    "phpunit/phpunit": "^7.5.20 || ^8.5.15",
+    "laminas/laminas-modulemanager": "^2.9.0",
+    "laminas/laminas-config": "^3.3",
+    "laminas/laminas-i18n": "^2.4",
+    "laminas/laminas-log": "^2.4",
+    "laminas/laminas-serializer": "^2.4",
+    "laminas/laminas-session": "^2.4",
+    "laminas/laminas-test": "^3"
   },
   "autoload": {
     "psr-4": {

src/RequestIdListener.php

@@ -4,14 +4,14 @@
 use PhpMiddleware\RequestId\Exception\MissingRequestId;
 use PhpMiddleware\RequestId\Generator\GeneratorInterface;
 use PhpMiddleware\RequestId\RequestIdProviderInterface;
-use Zend\EventManager\AbstractListenerAggregate;
-use Zend\EventManager\EventManagerInterface;
-use Zend\Http\Request as HttpRequest;
-use Zend\Mvc\MvcEvent;
+use Laminas\EventManager\AbstractListenerAggregate;
+use Laminas\EventManager\EventManagerInterface;
+use Laminas\Http\Request as HttpRequest;
+use Laminas\Mvc\MvcEvent;
 use PhpMiddleware\RequestId\RequestIdProviderFactoryInterface;
-use Zend\Http\Header\GenericHeader;
-use Zend\Http\Response as HttpResponse;
-use Zend\Psr7Bridge\Psr7ServerRequest;
+use Laminas\Http\Header\GenericHeader;
+use Laminas\Http\Response as HttpResponse;
+use Laminas\Psr7Bridge\Psr7ServerRequest;
 
 final class RequestIdListener extends AbstractListenerAggregate implements RequestIdProviderInterface
 {
@@ -43,7 +43,7 @@ public function loadRequestId(MvcEvent $event): ?string
         $request = $event->getRequest();
 
         if ($request instanceof HttpRequest) {
-            $psr7Request = Psr7ServerRequest::fromZend($request);
+            $psr7Request = Psr7ServerRequest::fromLaminas($request);
             $requestIdProvider = $this->requestIdProviderFactory->create($psr7Request);
             $this->requestId = $requestIdProvider->getRequestId();
 

test/RequestIdIntegrationTest.php

@@ -1,20 +1,20 @@
 <?php
 namespace RstGroup\RequestIdModule\Test;
 
-use Zend\Http\Response;
-use Zend\Mvc\Controller\ControllerManager;
-use Zend\Mvc\Router\RouteStackInterface;
-use Zend\Stdlib\ArrayUtils;
-use Zend\Stdlib\DispatchableInterface;
-use Zend\Stdlib\RequestInterface;
-use Zend\Stdlib\ResponseInterface;
-use Zend\Test\PHPUnit\Controller\AbstractHttpControllerTestCase;
+use Laminas\Http\Response;
+use Laminas\Mvc\Controller\ControllerManager;
+use Laminas\Mvc\Router\RouteStackInterface;
+use Laminas\Stdlib\ArrayUtils;
+use Laminas\Stdlib\DispatchableInterface;
+use Laminas\Stdlib\RequestInterface;
+use Laminas\Stdlib\ResponseInterface;
+use Laminas\Test\PHPUnit\Controller\AbstractHttpControllerTestCase;
 
 class RequestIdIntegrationTest extends AbstractHttpControllerTestCase
 {
     protected $traceError = false;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -31,11 +31,11 @@ protected function setUp()
         ]);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         unset($_SERVER['HTTP_X_REQUEST_ID']);
 
-        return parent::tearDown();
+        parent::tearDown();
     }
 
     /**
@@ -194,7 +194,7 @@ protected function assertHasRequestHeader($header)
      * Get response header by key
      *
      * @param  string $header
-     * @return \Zend\Http\Header\HeaderInterface|false
+     * @return \Laminas\Http\Header\HeaderInterface|false
      */
     protected function getRegeustHeader($header)
     {

test/RequestIdListenerTest.php

@@ -7,19 +7,19 @@
 use PhpMiddleware\RequestId\RequestIdProviderInterface;
 use PHPUnit\Framework\TestCase;
 use RstGroup\RequestIdModule\RequestIdListener;
-use Zend\Console\Response as ConsoleResponse;
-use Zend\Console\Request as ConsoleRequest;
-use Zend\Http\Request as HttpRequest;
-use Zend\Http\Response as HttpResponse;
-use Zend\Mvc\MvcEvent;
+use Laminas\Console\Response as ConsoleResponse;
+use Laminas\Console\Request as ConsoleRequest;
+use Laminas\Http\Request as HttpRequest;
+use Laminas\Http\Response as HttpResponse;
+use Laminas\Mvc\MvcEvent;
 
 class RequestIdListenerTest extends TestCase
 {
     protected $requestIdProviderFactoryInterface;
 
     protected $requestIdProviderInterface;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->requestIdProviderFactoryInterface = $this->createMock(RequestIdProviderFactoryInterface::class);
         $this->requestIdProviderInterface = $this->createMock(RequestIdProviderInterface::class);

test/TestAsset/application.config.php

@@ -31,8 +31,8 @@
     ],
 ];
 
-if (class_exists(\Zend\Router\Module::class)) {
-    $config['modules'][] = 'Zend\Router';
+if (class_exists(\Laminas\Router\Module::class)) {
+    $config['modules'][] = \Laminas\Router\Module::class;
 }
 
 return $config;