Update dependencies (#9)

Update dependencies
rstgroup · Jun 19, 2019 · 43e5704 · 43e5704
1 parent 4df69ae
commit 43e5704
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 75 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,18 +3,6 @@ language: php
 matrix:
   fast_finish: true
   include:
-    - php: 5.6
-      env:
-        - DEPS=lowest
-    - php: 5.6
-      env:
-        - DEPS=latest
-    - php: 7
-      env:
-        - DEPS=lowest
-    - php: 7
-      env:
-        - DEPS=latest
     - php: 7.1
       env:
         - DEPS=lowest
@@ -27,6 +15,12 @@ matrix:
     - php: 7.2
       env:
         - DEPS=latest
+    - php: 7.3
+      env:
+        - DEPS=lowest
+    - php: 7.3
+      env:
+        - DEPS=latest
 
 install:
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update --no-interaction ; fi

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Change Log
 
-## [Unreleased]
+## [2.0.0] - 2016-02-08
+### Added
+- Support for php 7.3
+- Support for php-middleware/request-id:4.0
+
+### Deleted
+- Support for php <7.1
 
 ## [1.0.2] - 2016-02-08
 ### Fixed

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ In your ZF2 application config add to module list
 ```php
 return [
     'modules' => [
-        'RstGroup\RequestIdModule',
+        \RstGroup\RequestIdModule::class,
     ],
 ];
 ```

diff --git a/composer.json b/composer.json
@@ -1,24 +1,24 @@
 {
   "name": "rstgroup/request-id-module",
   "require": {
-    "php": ">=5.6",
-    "zendframework/zend-eventmanager": "^2.4 || ^3",
+    "php": "^7.1",
+    "zendframework/zend-eventmanager": "^3",
     "zendframework/zend-http": "^2.4",
-    "zendframework/zend-mvc": "^2.4 || ^3",
-    "zendframework/zend-servicemanager": "^2.4 || ^3",
-    "zendframework/zend-stdlib": "^2.4 || ^3",
+    "zendframework/zend-mvc": "^3",
+    "zendframework/zend-servicemanager": "^3.3",
+    "zendframework/zend-stdlib": "^3.2.1",
     "zendframework/zend-psr7bridge": "^1.0",
-    "php-middleware/request-id": "^3.0"
+    "php-middleware/request-id": "^4.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.7.22",
+    "phpunit/phpunit": "^7.5",
     "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": "^2.4 || ^3"
+    "zendframework/zend-test": "^3"
   },
   "autoload": {
     "psr-4": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -6,7 +6,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true">
     <testsuites>
-        <testsuite>
+        <testsuite name="unit">
             <directory>./test/</directory>
         </testsuite>
     </testsuites>

diff --git a/src/Module.php b/src/Module.php
@@ -4,10 +4,7 @@
 
 final class Module
 {
-    /**
-     * @return array
-     */
-    public function getConfig()
+    public function getConfig(): array
     {
         return include __DIR__ . '/../config/module.config.php';
     }

diff --git a/src/RequestIdListener.php b/src/RequestIdListener.php
@@ -17,36 +17,28 @@ final class RequestIdListener extends AbstractListenerAggregate implements Reque
 {
     const DEFAULT_REQUEST_ID_HEADER = 'X-Request-Id';
 
-    /**
-     * @var string
-     */
-    protected $requestId;
-
-    /**
-     * @var string
-     */
-    protected $requestIdHeaderName;
-
-    protected $requestIdProviderFactory;
-
+    private $requestId;
+    private $requestIdHeaderName;
+    private $requestIdProviderFactory;
     private $requestIdGenerator;
 
-    public function __construct(RequestIdProviderFactoryInterface $requestIdProviderFactory,
-                                $requestIdHeaderName = self::DEFAULT_REQUEST_ID_HEADER,
-                                GeneratorInterface $requestIdGenerator = null)
-    {
+    public function __construct(
+        RequestIdProviderFactoryInterface $requestIdProviderFactory,
+        string $requestIdHeaderName = null,
+        GeneratorInterface $requestIdGenerator = null
+    ) {
         $this->requestIdProviderFactory = $requestIdProviderFactory;
-        $this->requestIdHeaderName = $requestIdHeaderName;
+        $this->requestIdHeaderName = $requestIdHeaderName ?? self::DEFAULT_REQUEST_ID_HEADER;
         $this->requestIdGenerator = $requestIdGenerator;
     }
 
-    public function attach(EventManagerInterface $events, $priority = 1)
+    public function attach(EventManagerInterface $events, $priority = 1): void
     {
         $this->listeners[] = $events->attach(MvcEvent::EVENT_BOOTSTRAP, [$this, 'loadRequestId']);
         $this->listeners[] = $events->attach(MvcEvent::EVENT_FINISH, [$this, 'addRequestIdToResponse']);
     }
 
-    public function loadRequestId(MvcEvent $event)
+    public function loadRequestId(MvcEvent $event): ?string
     {
         $request = $event->getRequest();
 
@@ -62,7 +54,7 @@ public function loadRequestId(MvcEvent $event)
         return $this->requestId;
     }
 
-    public function getRequestId()
+    public function getRequestId(): string
     {
         if ($this->requestId === null) {
             throw new MissingRequestId();
@@ -71,7 +63,7 @@ public function getRequestId()
         return $this->requestId;
     }
 
-    public function addRequestIdToResponse(MvcEvent $event)
+    public function addRequestIdToResponse(MvcEvent $event): void
     {
         $response = $event->getResponse();
 

diff --git a/src/RequestIdListenerFactory.php b/src/RequestIdListenerFactory.php
@@ -3,16 +3,17 @@
 
 use PhpMiddleware\RequestId\Generator\GeneratorInterface;
 use PhpMiddleware\RequestId\RequestIdProviderFactoryInterface;
+use Psr\Container\ContainerInterface;
 
-class RequestIdListenerFactory
+final class RequestIdListenerFactory
 {
-    public function __invoke($services)
+    public function __invoke(ContainerInterface $container): RequestIdListener
     {
-        $requestIdGenerator = $services->get(GeneratorInterface::class);
-        $requestIdProviderFactory = $services->get(RequestIdProviderFactoryInterface::class);
+        $requestIdGenerator = $container->get(GeneratorInterface::class);
+        $requestIdProviderFactory = $container->get(RequestIdProviderFactoryInterface::class);
 
-        $config = $services->get('Config');
-        $requestIdHeaderName = $config['rst_group']['request_id_module']['header_name'];
+        $config = $container->get('Config')['rst_group']['request_id_module'];
+        $requestIdHeaderName = $config['header_name'];
 
         return new RequestIdListener($requestIdProviderFactory, $requestIdHeaderName, $requestIdGenerator);
     }

diff --git a/src/RequestIdProviderFactoryFactory.php b/src/RequestIdProviderFactoryFactory.php
@@ -3,17 +3,16 @@
 
 use PhpMiddleware\RequestId\Generator\GeneratorInterface;
 use PhpMiddleware\RequestId\RequestIdProviderFactory;
+use Psr\Container\ContainerInterface;
 
-class RequestIdProviderFactoryFactory
+final class RequestIdProviderFactoryFactory
 {
-    public function __invoke($services)
+    public function __invoke(ContainerInterface $container): RequestIdProviderFactory
     {
-        $generator = $services->get(GeneratorInterface::class);
+        $generator = $container->get(GeneratorInterface::class);
 
-        $config = $services->get('Config');
-        $allowOverride = $config['rst_group']['request_id_module']['allow_override'];
-        $requestIdHeaderName = $config['rst_group']['request_id_module']['header_name'];
+        $config = $container->get('Config')['rst_group']['request_id_module'];
 
-        return new RequestIdProviderFactory($generator, $allowOverride, $requestIdHeaderName);
+        return new RequestIdProviderFactory($generator, $config['allow_override'], $config['header_name']);
     }
-}
+}
diff --git a/test/RequestIdIntegrationTest.php b/test/RequestIdIntegrationTest.php
@@ -152,7 +152,7 @@ protected function mockController($route, $controllerName, callable $controllerC
             ]
         ]);
 
-        $controller = $this->getMock(DispatchableInterface::class);
+        $controller = $this->createMock(DispatchableInterface::class);
         $controller->method('dispatch')->willReturnCallback($controllerCallback);
 
         /** @var ControllerManager $controllerLoader */

diff --git a/test/RequestIdListenerTest.php b/test/RequestIdListenerTest.php
@@ -5,23 +5,24 @@
 use PhpMiddleware\RequestId\Generator\GeneratorInterface;
 use PhpMiddleware\RequestId\RequestIdProviderFactoryInterface;
 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;
 
-class RequestIdListenerTest extends \PHPUnit_Framework_TestCase
+class RequestIdListenerTest extends TestCase
 {
     protected $requestIdProviderFactoryInterface;
 
     protected $requestIdProviderInterface;
 
     public function setUp()
     {
-        $this->requestIdProviderFactoryInterface = $this->getMock(RequestIdProviderFactoryInterface::class);
-        $this->requestIdProviderInterface = $this->getMock(RequestIdProviderInterface::class);
+        $this->requestIdProviderFactoryInterface = $this->createMock(RequestIdProviderFactoryInterface::class);
+        $this->requestIdProviderInterface = $this->createMock(RequestIdProviderInterface::class);
 
         $this->requestIdProviderFactoryInterface->method('create')->willReturn($this->requestIdProviderInterface);
     }
@@ -93,12 +94,13 @@ public function it_not_load_request_id_if_not_http_request_and_generator_is_unde
         $mvcEvent = new MvcEvent();
         $mvcEvent->setRequest(new ConsoleRequest());
 
-        $this->setExpectedException(MissingRequestId::class);
+
 
         $requestIdListener->loadRequestId($mvcEvent);
-        $requestId = $requestIdListener->getRequestId();
 
-        $this->assertNull($requestId);
+        $this->expectException(MissingRequestId::class);
+
+        $requestIdListener->getRequestId();
     }
 
     /**
@@ -107,7 +109,7 @@ public function it_not_load_request_id_if_not_http_request_and_generator_is_unde
     public function it_create_request_id_if_not_http_request()
     {
         $requestId = 'e5dd58f4-b72d-4d7e-b0c9-d99040386a58';
-        $requestIdGenerator = $this->getMock(GeneratorInterface::class);
+        $requestIdGenerator = $this->createMock(GeneratorInterface::class);
         $requestIdGenerator->method('generateRequestId')->willReturn($requestId);
 
         $requestIdListener = new RequestIdListener($this->requestIdProviderFactoryInterface, RequestIdListener::DEFAULT_REQUEST_ID_HEADER, $requestIdGenerator);
@@ -127,12 +129,14 @@ public function it_not_add_request_id_to_response_if_not_http_response()
     {
         $requestIdListener = new RequestIdListener($this->requestIdProviderFactoryInterface);
 
+        $response = new ConsoleResponse();
+        $responseCopy = clone $response;
         $mvcEvent = new MvcEvent();
-        $mvcEvent->setResponse(new ConsoleResponse());
+        $mvcEvent->setResponse($response);
 
-        $result = $requestIdListener->addRequestIdToResponse($mvcEvent);
+        $requestIdListener->addRequestIdToResponse($mvcEvent);
 
-        $this->assertNull($result);
+        $this->assertEquals($responseCopy, $response);
     }
 
     /**
@@ -142,7 +146,7 @@ public function it_throw_excpetion_if_request_id_is_not_set()
     {
         $requestIdListener = new RequestIdListener($this->requestIdProviderFactoryInterface);
 
-        $this->setExpectedException(MissingRequestId::class);
+        $this->expectException(MissingRequestId::class);
 
         $requestIdListener->getRequestId();
     }

diff --git a/test/TestAsset/FakeGenerator.php b/test/TestAsset/FakeGenerator.php
@@ -6,7 +6,7 @@
 
 final class FakeGenerator implements GeneratorInterface
 {
-    public function generateRequestId()
+    public function generateRequestId(): string
     {
         return 'abc123';
     }