Merge branch 'develop'

Merge pull request #142 from acelaya/develop
Develop
2026-03-04 06:13:12 +08:00 · 2018-04-07 09:06:45 +02:00 · 2018-04-07 09:05:56 +02:00 · 2018-04-07 08:37:41 +02:00 · 2018-04-07 08:32:06 +02:00 · 2018-04-07 08:31:03 +02:00
81 changed files with 1106 additions and 752 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ branches:
    - /.*/

 php:
-  - 7
  - 7.1
  - 7.2

@@ -16,12 +15,10 @@ before_install:
 before_script:
  - composer self-update
  - composer install --no-interaction
-  - if [[ $TRAVIS_PHP_VERSION = 7.1 ]] || [[ $TRAVIS_PHP_VERSION = 7.2 ]]; then composer global require --dev phpstan/phpstan:0.9.*; fi

 script:
  - mkdir build
  - composer check
-  - if [[ $TRAVIS_PHP_VERSION = 7.1 ]] || [[ $TRAVIS_PHP_VERSION = 7.2 ]]; then ~/.composer/vendor/bin/phpstan analyse module/*/src/ --level=6 -c phpstan.neon; fi

 after_script:
  - vendor/bin/phpcov merge build --clover build/clover.xml
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,47 @@
 ## CHANGELOG

+### 1.8.1
+
+**Tasks**
+
+* [141: Remove workaround used in PathVersionMiddleware](https://github.com/shlinkio/shlink/issues/141)
+
+**Bugs:**
+
+* [140: Installation failed. Warning thrown while trying to include doctrine script](https://github.com/shlinkio/shlink/issues/140)
+
+### 1.8.0
+
+**Features**
+
+* [125: Implement a path which returns a 1px image instead of a redirection](https://github.com/shlinkio/shlink/issues/125)
+
+**Enhancements:**
+
+* [130: Update to Expressive 3](https://github.com/shlinkio/shlink/issues/130)
+* [137: Update symfony packages to v4](https://github.com/shlinkio/shlink/issues/137)
+
+**Tasks**
+
+* [131: Drop support for PHP 7](https://github.com/shlinkio/shlink/issues/131)
+* [132: Add infection to improve tests](https://github.com/shlinkio/shlink/issues/132)
+
+### 1.7.2
+
+**Bugs:**
+
+* [135: Fix PathVersionMiddleware being ignored when using expressive 2.2](https://github.com/shlinkio/shlink/issues/135)
+
+### 1.7.1
+
+**Enhancements:**
+
+* [128: Upgrade to expressive 2.2](https://github.com/shlinkio/shlink/issues/128)
+
+**Bugs**
+
+* [126: Expressive 2.2 causes failures by triggering E_USER_DEPRECATED errors](https://github.com/shlinkio/shlink/issues/126)
+
 ### 1.7.0

 **Features**
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,8 @@
        }
    ],
    "require": {
-        "php": "^7.0",
-        "acelaya/ze-content-based-error-handler": "^2.0",
+        "php": "^7.1",
+        "acelaya/ze-content-based-error-handler": "^2.2",
        "cocur/slugify": "^3.0",
        "doctrine/annotations": "^1.4",
        "doctrine/cache": "^1.6",
@@ -22,23 +22,23 @@
        "doctrine/dbal": "^2.5",
        "doctrine/migrations": "^1.4",
        "doctrine/orm": "^2.5",
-        "endroid/qrcode": "^1.7",
+        "endroid/qr-code": "^1.7",
        "firebase/php-jwt": "^4.0",
        "guzzlehttp/guzzle": "^6.2",
-        "http-interop/http-middleware": "^0.4.1",
        "mikehaertl/phpwkhtmltopdf": "^2.2",
        "monolog/monolog": "^1.21",
        "roave/security-advisories": "dev-master",
-        "symfony/console": "^3.4",
-        "symfony/filesystem": "^3.0",
-        "symfony/process": "^3.0",
+        "symfony/console": "^4.0",
+        "symfony/filesystem": "^4.0",
+        "symfony/process": "^4.0",
        "theorchard/monolog-cascade": "^0.4",
        "zendframework/zend-config": "^3.0",
        "zendframework/zend-config-aggregator": "^1.0",
-        "zendframework/zend-expressive": "^2.0",
-        "zendframework/zend-expressive-fastroute": "^2.0",
-        "zendframework/zend-expressive-helpers": "^4.2",
-        "zendframework/zend-expressive-platesrenderer": "^1.3",
+        "zendframework/zend-diactoros": "^1.7",
+        "zendframework/zend-expressive": "^3.0",
+        "zendframework/zend-expressive-fastroute": "^3.0",
+        "zendframework/zend-expressive-helpers": "^5.0",
+        "zendframework/zend-expressive-platesrenderer": "^2.0",
        "zendframework/zend-i18n": "^2.7",
        "zendframework/zend-inputfilter": "^2.8",
        "zendframework/zend-paginator": "^2.6",
@@ -47,14 +47,16 @@
    },
    "require-dev": {
        "filp/whoops": "^2.0",
-        "phpunit/dbunit": "^3.0",
-        "phpunit/phpcov": "^4.0",
-        "phpunit/phpunit": "^6.0",
+        "infection/infection": "^0.8.1",
+        "phpstan/phpstan": "0.9",
+        "phpunit/phpcov": "^5.0",
+        "phpunit/phpunit": "^7.0",
        "slevomat/coding-standard": "^4.0",
        "squizlabs/php_codesniffer": "^3.1 <3.2",
-        "symfony/dotenv": "^3.4",
-        "symfony/var-dumper": "^3.0",
-        "zendframework/zend-expressive-tooling": "^0.4"
+        "symfony/dotenv": "^4.0",
+        "symfony/var-dumper": "^4.0",
+        "zendframework/zend-component-installer": "^2.1",
+        "zendframework/zend-expressive-tooling": "^1.0"
    },
    "autoload": {
        "psr-4": {
@@ -84,8 +86,10 @@
    "scripts": {
        "check": [
            "@cs",
+            "@stan",
            "@test",
-            "@func-test"
+            "@func-test",
+            "@infect"
        ],
        "cs": "phpcs",
        "cs-fix": "phpcbf",
@@ -97,13 +101,17 @@
            "@test",
            "@func-test",
            "phpcov merge build --html build/html"
-        ]
+        ],
+        "stan": "phpstan analyse module/*/src/ --level=6 -c phpstan.neon",
+        "infect": "infection --threads=4 --min-msi=65 --only-covered --log-verbosity=2",
+        "infect-show": "infection --threads=4 --min-msi=65 --only-covered --log-verbosity=2 --show-mutations",
+        "expressive": "expressive"
    },
    "config": {
        "process-timeout": 0,
        "sort-packages": true,
        "platform": {
-            "php": "7.0.8"
+            "php": "7.1.8"
        }
    }
 }
--- a/config/autoload/dependencies.global.php
+++ b/config/autoload/dependencies.global.php
@@ -5,26 +5,24 @@ use Shlinkio\Shlink\Common\Factory\EmptyResponseImplicitOptionsMiddlewareFactory
 use Zend\Expressive;
 use Zend\Expressive\Container;
 use Zend\Expressive\Helper;
-use Zend\Expressive\Middleware;
-use Zend\Expressive\Plates;
-use Zend\Expressive\Router;
-use Zend\Expressive\Template;
+use Zend\Expressive\Router\Middleware\ImplicitOptionsMiddleware;
 use Zend\ServiceManager\Factory\InvokableFactory;
-use Zend\Stratigility\Middleware\ErrorHandler;

 return [

    'dependencies' => [
        'factories' => [
-            Expressive\Application::class => Container\ApplicationFactory::class,
-            Template\TemplateRendererInterface::class => Plates\PlatesRendererFactory::class,
-            Router\RouterInterface::class => Router\FastRouteRouterFactory::class,
-            ErrorHandler::class => Container\ErrorHandlerFactory::class,
-            Middleware\ImplicitOptionsMiddleware::class => EmptyResponseImplicitOptionsMiddlewareFactory::class,
+            ImplicitOptionsMiddleware::class => EmptyResponseImplicitOptionsMiddlewareFactory::class,

            Helper\UrlHelper::class => Helper\UrlHelperFactory::class,
            Helper\ServerUrlHelper::class => InvokableFactory::class,
        ],
+
+        'delegators' => [
+            Expressive\Application::class => [
+                Container\ApplicationConfigInjectionDelegator::class,
+            ],
+        ],
    ],

 ];
--- a/config/autoload/middleware-pipeline.global.php
+++ b/config/autoload/middleware-pipeline.global.php
@@ -2,6 +2,7 @@
 declare(strict_types=1);

 use Shlinkio\Shlink\Common\Middleware\LocaleMiddleware;
+use Shlinkio\Shlink\Core\Response\NotFoundDelegate;
 use Shlinkio\Shlink\Rest\Middleware\BodyParserMiddleware;
 use Shlinkio\Shlink\Rest\Middleware\CheckAuthenticationMiddleware;
 use Shlinkio\Shlink\Rest\Middleware\CrossDomainMiddleware;
@@ -29,7 +30,7 @@ return [

        'routing' => [
            'middleware' => [
-                Expressive\Application::ROUTING_MIDDLEWARE,
+                Expressive\Router\Middleware\RouteMiddleware::class,
            ],
            'priority' => 10,
        ],
@@ -38,7 +39,7 @@ return [
            'path' => '/rest',
            'middleware' => [
                CrossDomainMiddleware::class,
-                Expressive\Middleware\ImplicitOptionsMiddleware::class,
+                Expressive\Router\Middleware\ImplicitOptionsMiddleware::class,
                BodyParserMiddleware::class,
                CheckAuthenticationMiddleware::class,
            ],
@@ -47,7 +48,8 @@ return [

        'post-routing' => [
            'middleware' => [
-                Expressive\Application::DISPATCH_MIDDLEWARE,
+                Expressive\Router\Middleware\DispatchMiddleware::class,
+                NotFoundDelegate::class,
            ],
            'priority' => 1,
        ],
--- a/config/config.php
+++ b/config/config.php
@@ -7,6 +7,7 @@ use Shlinkio\Shlink\Common;
 use Shlinkio\Shlink\Core;
 use Shlinkio\Shlink\Rest;
 use Zend\ConfigAggregator;
+use Zend\Expressive;

 /**
 * Configuration files are loaded in a specific order. First ``global.php``, then ``*.global.php``.
@@ -18,6 +19,11 @@ use Zend\ConfigAggregator;
 */

 return (new ConfigAggregator\ConfigAggregator([
+    Expressive\ConfigProvider::class,
+    Expressive\Router\ConfigProvider::class,
+    Expressive\Router\FastRouteRouter\ConfigProvider::class,
+    Expressive\Plates\ConfigProvider::class,
+    Expressive\Helper\ConfigProvider::class,
    ExpressiveErrorHandler\ConfigProvider::class,
    Common\ConfigProvider::class,
    Core\ConfigProvider::class,
--- a/data/infra/database/.gitignore
+++ b/data/infra/database/.gitignore
--- a/data/infra/nginx/.gitignore
+++ b/data/infra/nginx/.gitignore
--- a/docs/swagger/parameters/Authorization.json
+++ b/docs/swagger/parameters/Authorization.json
@@ -1,7 +0,0 @@
-{
-    "name": "Authorization",
-    "in": "header",
-    "description": "The authorization token with Bearer type",
-    "required": true,
-    "type": "string"
-}
--- a/docs/swagger/paths/v1_authenticate.json
+++ b/docs/swagger/paths/v1_authenticate.json
@@ -5,24 +5,39 @@
        ],
        "summary": "Perform authentication",
        "description": "Performs an authentication",
-        "parameters": [
-            {
-                "name": "apiKey",
-                "in": "formData",
-                "description": "The API key to authenticate with",
-                "required": true,
-                "type": "string"
+        "requestBody": {
+            "description": "Request body.",
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "type": "object",
+                        "required": [
+                            "apiKey"
+                        ],
+                        "properties": {
+                            "apiKey": {
+                                "description": "The API key to authenticate with",
+                                "type": "string"
+                            }
+                        }
+                    }
+                }
            }
-        ],
+        },
        "responses": {
            "200": {
                "description": "The authentication worked.",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "token": {
-                            "type": "string",
-                            "description": "The authentication token that needs to be sent in the Authorization header"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "token": {
+                                    "type": "string",
+                                    "description": "The authentication token that needs to be sent in the Authorization header"
+                                }
+                            }
                        }
                    }
                },
@@ -34,20 +49,32 @@
            },
            "400": {
                "description": "An API key was not provided.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            },
            "401": {
                "description": "The API key is incorrect, is disabled or has expired.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            },
            "500": {
                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            }
        }
--- a/docs/swagger/paths/v1_short-codes.json
+++ b/docs/swagger/paths/v1_short-codes.json
@@ -11,59 +11,73 @@
                "in": "query",
                "description": "The page to be displayed. Defaults to 1",
                "required": false,
-                "type": "integer"
+                "schema": {
+                    "type": "integer"
+                }
            },
            {
                "name": "searchTerm",
                "in": "query",
                "description": "A query used to filter results by searching for it on the longUrl and shortCode fields. (Since v1.3.0)",
                "required": false,
-                "type": "string"
+                "schema": {
+                    "type": "string"
+                }
            },
            {
                "name": "tags",
                "in": "query",
                "description": "A list of tags used to filter the resultset. Only short URLs tagged with at least one of the provided tags will be returned. (Since v1.3.0)",
                "required": false,
-                "type": "array",
-                "items": {
-                    "type": "string"
+                "schema": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
                }
            },
            {
                "name": "orderBy",
                "in": "query",
                "description": "The field from which you want to order the result. (Since v1.3.0)",
-                "enum": [
-                    "originalUrl",
-                    "shortCode",
-                    "dateCreated",
-                    "visits"
-                ],
                "required": false,
-                "type": "string"
-            },
+                "schema": {
+                    "type": "string",
+                    "enum": [
+                        "originalUrl",
+                        "shortCode",
+                        "dateCreated",
+                        "visits"
+                    ]
+                }
+            }
+        ],
+        "security": [
            {
-                "$ref": "../parameters/Authorization.json"
+                "Bearer": []
            }
        ],
        "responses": {
            "200": {
                "description": "The list of short URLs",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "shortUrls": {
+                "content": {
+                    "application/json": {
+                        "schema": {
                            "type": "object",
                            "properties": {
-                                "data": {
-                                    "type": "array",
-                                    "items": {
-                                        "$ref": "../definitions/ShortUrl.json"
+                                "shortUrls": {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "../definitions/ShortUrl.json"
+                                            }
+                                        },
+                                        "pagination": {
+                                            "$ref": "../definitions/Pagination.json"
+                                        }
                                    }
-                                },
-                                "pagination": {
-                                    "$ref": "../definitions/Pagination.json"
                                }
                            }
                        }
@@ -110,8 +124,12 @@
            },
            "500": {
                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            }
        }
@@ -123,87 +141,97 @@
        ],
        "summary": "Create short URL",
        "description": "Creates a new short code",
-        "parameters": [
+        "security": [
            {
-                "name": "longUrl",
-                "in": "formData",
-                "description": "The URL to parse",
-                "required": true,
-                "type": "string"
-            },
-            {
-                "name": "tags",
-                "in": "formData",
-                "description": "The URL to parse",
-                "required": false,
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
-            },
-            {
-                "name": "validSince",
-                "in": "formData",
-                "description": "The date (in ISO-8601 format) from which this short code will be valid",
-                "required": false,
-                "type": "string"
-            },
-            {
-                "name": "validUntil",
-                "in": "formData",
-                "description": "The date (in ISO-8601 format) until which this short code will be valid",
-                "required": false,
-                "type": "string"
-            },
-            {
-                "name": "customSlug",
-                "in": "formData",
-                "description": "A unique custom slug to be used instead of the generated short code",
-                "required": false,
-                "type": "string"
-            },
-            {
-                "name": "maxVisits",
-                "in": "formData",
-                "description": "The maximum number of allowed visits for this short code",
-                "required": false,
-                "type": "number"
-            },
-            {
-                "$ref": "../parameters/Authorization.json"
+                "Bearer": []
            }
        ],
+        "requestBody": {
+            "description": "Request body.",
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "type": "object",
+                        "required": [
+                            "longUrl"
+                        ],
+                        "properties": {
+                            "longUrl": {
+                                "description": "The URL to parse",
+                                "type": "string"
+                            },
+                            "tags": {
+                                "description": "The URL to parse",
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
+                            },
+                            "validSince": {
+                                "description": "The date (in ISO-8601 format) from which this short code will be valid",
+                                "type": "string"
+                            },
+                            "validUntil": {
+                                "description": "The date (in ISO-8601 format) until which this short code will be valid",
+                                "type": "string"
+                            },
+                            "customSlug": {
+                                "description": "A unique custom slug to be used instead of the generated short code",
+                                "type": "string"
+                            },
+                            "maxVisits": {
+                                "description": "The maximum number of allowed visits for this short code",
+                                "type": "number"
+                            }
+                        }
+                    }
+                }
+            }
+        },
        "responses": {
            "200": {
                "description": "The result of parsing the long URL",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "longUrl": {
-                            "type": "string",
-                            "description": "The original long URL that has been parsed"
-                        },
-                        "shortUrl": {
-                            "type": "string",
-                            "description": "The generated short URL"
-                        },
-                        "shortCode": {
-                            "type": "string",
-                            "description": "the short code that is being used in the short URL"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "longUrl": {
+                                    "type": "string",
+                                    "description": "The original long URL that has been parsed"
+                                },
+                                "shortUrl": {
+                                    "type": "string",
+                                    "description": "The generated short URL"
+                                },
+                                "shortCode": {
+                                    "type": "string",
+                                    "description": "the short code that is being used in the short URL"
+                                }
+                            }
                        }
                    }
                }
            },
            "400": {
                "description": "The long URL was not provided or is invalid.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            },
            "500": {
                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            }
        }
--- a/docs/swagger/paths/v1_short-codes_{shortCode}.json
+++ b/docs/swagger/paths/v1_short-codes_{shortCode}.json
@@ -9,23 +9,31 @@
            {
                "name": "shortCode",
                "in": "path",
-                "type": "string",
                "description": "The short code to resolve.",
-                "required": true
-            },
+                "required": true,
+                "schema": {
+                    "type": "string"
+                }
+            }
+        ],
+        "security": [
            {
-                "$ref": "../parameters/Authorization.json"
+                "Bearer": []
            }
        ],
        "responses": {
            "200": {
                "description": "The long URL behind a short code.",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "longUrl": {
-                            "type": "string",
-                            "description": "The original long URL behind the short code."
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "longUrl": {
+                                    "type": "string",
+                                    "description": "The original long URL behind the short code."
+                                }
+                            }
                        }
                    }
                },
@@ -37,20 +45,32 @@
            },
            "400": {
                "description": "Provided shortCode does not match the character set currently used by the app to generate short codes.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            },
            "404": {
                "description": "No URL was found for provided short code.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            },
            "500": {
                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            }
        }
@@ -66,33 +86,41 @@
            {
                "name": "shortCode",
                "in": "path",
-                "type": "string",
                "description": "The short code to edit.",
-                "required": true
-            },
+                "required": true,
+                "schema": {
+                    "type": "string"
+                }
+            }
+        ],
+        "requestBody": {
+            "description": "Request body.",
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "type": "object",
+                        "properties": {
+                            "validSince": {
+                                "description": "The date (in ISO-8601 format) from which this short code will be valid",
+                                "type": "string"
+                            },
+                            "validUntil": {
+                                "description": "The date (in ISO-8601 format) until which this short code will be valid",
+                                "type": "string"
+                            },
+                            "maxVisits": {
+                                "description": "The maximum number of allowed visits for this short code",
+                                "type": "number"
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "security": [
            {
-                "name": "validSince",
-                "in": "formData",
-                "description": "The date (in ISO-8601 format) from which this short code will be valid",
-                "required": false,
-                "type": "string"
-            },
-            {
-                "name": "validUntil",
-                "in": "formData",
-                "description": "The date (in ISO-8601 format) until which this short code will be valid",
-                "required": false,
-                "type": "string"
-            },
-            {
-                "name": "maxVisits",
-                "in": "formData",
-                "description": "The maximum number of allowed visits for this short code",
-                "required": false,
-                "type": "number"
-            },
-            {
-                "$ref": "../parameters/Authorization.json"
+                "Bearer": []
            }
        ],
        "responses": {
@@ -101,20 +129,32 @@
            },
            "400": {
                "description": "Provided meta arguments are invalid.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            },
            "404": {
                "description": "No short URL was found for provided short code.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            },
            "500": {
                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            }
        }
--- a/docs/swagger/paths/v1_short-codes_{shortCode}_tags.json
+++ b/docs/swagger/paths/v1_short-codes_{shortCode}_tags.json
@@ -10,34 +10,55 @@
            {
                "name": "shortCode",
                "in": "path",
-                "type": "string",
                "description": "The shortCode in which we want to edit tags.",
-                "required": true
-            },
-            {
-                "name": "tags",
-                "in": "formData",
-                "type": "array",
-                "items": {
+                "required": true,
+                "schema": {
                    "type": "string"
-                },
-                "description": "The list of tags to set to the short URL.",
-                "required": true
-            },
+                }
+            }
+        ],
+        "requestBody": {
+            "description": "Request body.",
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "type": "object",
+                        "required": [
+                            "tags"
+                        ],
+                        "properties": {
+                            "tags": {
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                },
+                                "description": "The list of tags to set to the short URL."
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "security": [
            {
-                "$ref": "../parameters/Authorization.json"
+                "Bearer": []
            }
        ],
        "responses": {
            "200": {
                "description": "List of tags.",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "tags": {
-                            "type": "array",
-                            "items": {
-                                "type": "string"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "tags": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
+                                }
                            }
                        }
                    }
@@ -53,20 +74,32 @@
            },
            "400": {
                "description": "The request body does not contain a \"tags\" param with array type.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            },
            "404": {
                "description": "No short URL was found for provided short code.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            },
            "500": {
                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            }
        }
--- a/docs/swagger/paths/v1_short-codes_{shortCode}_visits.json
+++ b/docs/swagger/paths/v1_short-codes_{shortCode}_visits.json
@@ -10,27 +10,35 @@
            {
                "name": "shortCode",
                "in": "path",
-                "type": "string",
                "description": "The shortCode from which we want to get the visits.",
-                "required": true
-            },
+                "required": true,
+                "schema": {
+                    "type": "string"
+                }
+            }
+        ],
+        "security": [
            {
-                "$ref": "../parameters/Authorization.json"
+                "Bearer": []
            }
        ],
        "responses": {
            "200": {
                "description": "List of visits.",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "visits": {
+                "content": {
+                    "application/json": {
+                        "schema": {
                            "type": "object",
                            "properties": {
-                                "data": {
-                                    "type": "array",
-                                    "items": {
-                                        "$ref": "../definitions/Visit.json"
+                                "visits": {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "../definitions/Visit.json"
+                                            }
+                                        }
                                    }
                                }
                            }
@@ -66,14 +74,22 @@
            },
            "404": {
                "description": "The short code does not belong to any short URL.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            },
            "500": {
                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            }
        }
--- a/docs/swagger/paths/v1_tags.json
+++ b/docs/swagger/paths/v1_tags.json
@@ -5,24 +5,28 @@
        ],
        "summary": "List existing tags",
        "description": "Returns the list of all tags used in any short URL, ordered by name",
-        "parameters": [
+        "security": [
            {
-                "$ref": "../parameters/Authorization.json"
+                "Bearer": []
            }
        ],
        "responses": {
            "200": {
                "description": "The list of tags",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "tags": {
+                "content": {
+                    "application/json": {
+                        "schema": {
                            "type": "object",
                            "properties": {
-                                "data": {
-                                    "type": "array",
-                                    "items": {
-                                        "type": "string"
+                                "tags": {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "type": "string"
+                                            }
+                                        }
                                    }
                                }
                            }
@@ -44,8 +48,12 @@
            },
            "500": {
                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            }
        }
@@ -57,31 +65,51 @@
        ],
        "summary": "Create tags",
        "description": "Provided a list of tags, creates all that do not yet exist",
-        "parameters": [
+        "security": [
            {
-                "$ref": "../parameters/Authorization.json"
-            },
-            {
-                "name": "tags[]",
-                "in": "formData",
-                "description": "The list of tag names to create",
-                "required": true,
-                "type": "array"
+                "Bearer": []
            }
        ],
+        "requestBody": {
+            "description": "Request body.",
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "type": "object",
+                        "required": [
+                            "tags"
+                        ],
+                        "properties": {
+                            "tags": {
+                                "description": "The list of tag names to create",
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
        "responses": {
            "200": {
                "description": "The list of tags",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "tags": {
+                "content": {
+                    "application/json": {
+                        "schema": {
                            "type": "object",
                            "properties": {
-                                "data": {
-                                    "type": "array",
-                                    "items": {
-                                        "type": "string"
+                                "tags": {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "type": "string"
+                                            }
+                                        }
                                    }
                                }
                            }
@@ -103,8 +131,12 @@
            },
            "500": {
                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            }
        }
@@ -116,45 +148,68 @@
        ],
        "summary": "Rename tag",
        "description": "Renames one existing tag",
-        "parameters": [
+        "security": [
            {
-                "$ref": "../parameters/Authorization.json"
-            },
-            {
-                "name": "oldName",
-                "in": "formData",
-                "description": "Current name of the tag",
-                "required": true,
-                "type": "string"
-            },
-            {
-                "name": "newName",
-                "in": "formData",
-                "description": "New name of the tag",
-                "required": true,
-                "type": "string"
+                "Bearer": []
            }
        ],
+        "requestBody": {
+            "description": "Request body.",
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "type": "object",
+                        "required": [
+                            "oldName",
+                            "newName"
+                        ],
+                        "properties": {
+                            "oldName": {
+                                "description": "Current name of the tag",
+                                "type": "string"
+                            },
+                            "newName": {
+                                "description": "New name of the tag",
+                                "type": "string"
+                            }
+                        }
+                    }
+                }
+            }
+        },
        "responses": {
            "204": {
                "description": "The tag has been properly renamed"
            },
            "400": {
                "description": "You have not provided either the oldName or the newName params.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            },
            "404": {
                "description": "There's no tag found with the name provided in oldName param.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            },
            "500": {
                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            }
        }
@@ -167,15 +222,22 @@
        "summary": "Delete tags",
        "description": "Deletes provided list of tags",
        "parameters": [
-            {
-                "$ref": "../parameters/Authorization.json"
-            },
            {
                "name": "tags[]",
                "in": "query",
                "description": "The names of the tags to delete",
                "required": true,
-                "type": "array"
+                "schema": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            }
+        ],
+        "security": [
+            {
+                "Bearer": []
            }
        ],
        "responses": {
@@ -184,8 +246,12 @@
            },
            "500": {
                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                }
            }
        }
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -1,23 +1,37 @@
 {
-    "swagger": "2.0",
+    "openapi": "3.0.0",
    "info": {
        "title": "Shlink",
        "description": "Shlink, the self-hosted URL shortener",
        "version": "1.0"
    },
-    "schemes": [
-        "http",
-        "https"
-    ],
-    "basePath": "/rest",
-    "produces": [
-        "application/json"
-    ],
-    "consumes": [
-        "application/x-www-form-urlencoded",
-        "application/json"
+
+    "servers": [
+        {
+            "url": "{schema}://{server}/rest",
+            "variables": {
+                "schema": {
+                    "default": "https",
+                    "enum": ["https", "http"]
+                },
+                "server": {
+                    "default": ""
+                }
+            }
+        }
    ],

+    "components": {
+        "securitySchemes": {
+            "Bearer": {
+                "description": "The JWT identifying a previously logged API key",
+                "type": "http",
+                "scheme": "bearer",
+                "bearerFormat": "JWT"
+            }
+        }
+    },
+
    "paths": {
        "/v1/authenticate": {
            "$ref": "paths/v1_authenticate.json"
--- a/infection.json
+++ b/infection.json
@@ -0,0 +1,18 @@
+{
+    "source": {
+        "directories": [
+            "module/*/src"
+        ],
+        "excludes": []
+    },
+    "timeout": 10,
+    "logs": {
+        "text": "build/infection/infection-log.txt",
+        "summary": "build/infection/summary-log.txt",
+        "debug": "build/infection/debug-log.txt"
+    },
+    "tmpDir": "build/infection/temp",
+    "phpUnit": {
+        "configDir": "."
+    }
+}
--- a/module/CLI/src/Command/Install/InstallCommand.php
+++ b/module/CLI/src/Command/Install/InstallCommand.php
@@ -134,7 +134,7 @@ class InstallCommand extends Command
        if (!  $this->isUpdate) {
            $this->io->write('Initializing database...');
            if (! $this->runCommand(
-                'php vendor/bin/doctrine.php orm:schema-tool:create',
+                'php vendor/doctrine/orm/bin/doctrine.php orm:schema-tool:create',
                'Error generating database.',
                $output
            )) {
@@ -145,7 +145,7 @@ class InstallCommand extends Command
        // Run database migrations
        $this->io->write('Updating database...');
        if (! $this->runCommand(
-            'php vendor/bin/doctrine-migrations migrations:migrate',
+            'php vendor/doctrine/migrations/bin/doctrine-migrations.php migrations:migrate',
            'Error updating database.',
            $output
        )) {
@@ -155,7 +155,7 @@ class InstallCommand extends Command
        // Generate proxies
        $this->io->write('Generating proxies...');
        if (! $this->runCommand(
-            'php vendor/bin/doctrine.php orm:generate-proxies',
+            'php vendor/doctrine/orm/bin/doctrine.php orm:generate-proxies',
            'Error generating proxies.',
            $output
        )) {
--- a/module/Common/src/Factory/EmptyResponseImplicitOptionsMiddlewareFactory.php
+++ b/module/Common/src/Factory/EmptyResponseImplicitOptionsMiddlewareFactory.php
@@ -6,7 +6,7 @@ namespace Shlinkio\Shlink\Common\Factory;
 use Interop\Container\ContainerInterface;
 use Interop\Container\Exception\ContainerException;
 use Zend\Diactoros\Response\EmptyResponse;
-use Zend\Expressive\Middleware\ImplicitOptionsMiddleware;
+use Zend\Expressive\Router\Middleware\ImplicitOptionsMiddleware;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 use Zend\ServiceManager\Factory\FactoryInterface;
@@ -27,6 +27,8 @@ class EmptyResponseImplicitOptionsMiddlewareFactory implements FactoryInterface
     */
    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
    {
-        return new ImplicitOptionsMiddleware(new EmptyResponse());
+        return new ImplicitOptionsMiddleware(function () {
+            return new EmptyResponse();
+        });
    }
 }
--- a/module/Common/src/Middleware/LocaleMiddleware.php
+++ b/module/Common/src/Middleware/LocaleMiddleware.php
@@ -3,10 +3,10 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Common\Middleware;

-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface as DelegateInterface;
 use Zend\I18n\Translator\Translator;

 class LocaleMiddleware implements MiddlewareInterface
@@ -32,15 +32,15 @@ class LocaleMiddleware implements MiddlewareInterface
     *
     * @return Response
     */
-    public function process(Request $request, DelegateInterface $delegate)
+    public function process(Request $request, DelegateInterface $delegate): Response
    {
        if (! $request->hasHeader('Accept-Language')) {
-            return $delegate->process($request);
+            return $delegate->handle($request);
        }

        $locale = $request->getHeaderLine('Accept-Language');
        $this->translator->setLocale($this->normalizeLocale($locale));
-        return $delegate->process($request);
+        return $delegate->handle($request);
    }

    /**
--- a/module/Common/src/Response/PixelResponse.php
+++ b/module/Common/src/Response/PixelResponse.php
@@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Common\Response;
+
+use Psr\Http\Message\StreamInterface;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\Stream;
+
+class PixelResponse extends Response
+{
+    private const BASE_64_IMAGE = 'R0lGODlhAQABAJAAAP8AAAAAACH5BAUQAAAALAAAAAABAAEAAAICBAEAOw==';
+    private const CONTENT_TYPE = 'image/gif';
+
+    public function __construct(int $status = 200, array $headers = [])
+    {
+        $headers['content-type'] = self::CONTENT_TYPE;
+        parent::__construct($this->createBody(), $status, $headers);
+    }
+
+    /**
+     * Create the message body.
+     *
+     * @return StreamInterface
+     */
+    private function createBody(): StreamInterface
+    {
+        $body = new Stream('php://temp', 'wb+');
+        $body->write(\base64_decode(self::BASE_64_IMAGE));
+        $body->rewind();
+        return $body;
+    }
+}
--- a/module/Common/test-func/DbUnit/DatabaseTestCase.php
+++ b/module/Common/test-func/DbUnit/DatabaseTestCase.php
@@ -3,40 +3,17 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\Common\DbUnit;

-use Doctrine\DBAL\Driver\PDOConnection;
 use Doctrine\ORM\EntityManagerInterface;
-use PHPUnit\DbUnit\Database\Connection as DbConn;
-use PHPUnit\DbUnit\DataSet\IDataSet as DataSet;
-use PHPUnit\DbUnit\TestCase;
+use PHPUnit\Framework\TestCase;

 abstract class DatabaseTestCase extends TestCase
 {
-    const ENTITIES_TO_EMPTY = [];
+    protected const ENTITIES_TO_EMPTY = [];

    /**
     * @var EntityManagerInterface
     */
    public static $em;
-    /**
-     * @var DbConn
-     */
-    private static $conn;
-
-    public function getConnection(): DbConn
-    {
-        if (isset(self::$conn)) {
-            return self::$conn;
-        }
-
-        /** @var PDOConnection $pdo */
-        $pdo = static::$em->getConnection()->getWrappedConnection();
-        return self::$conn = $this->createDefaultDBConnection($pdo, static::$em->getConnection()->getDatabase());
-    }
-
-    public function getDataSet(): DataSet
-    {
-        return $this->createArrayDataSet([]);
-    }

    protected function getEntityManager(): EntityManagerInterface
    {
--- a/module/Common/test/Factory/EmptyResponseImplicitOptionsMiddlewareFactoryTest.php
+++ b/module/Common/test/Factory/EmptyResponseImplicitOptionsMiddlewareFactoryTest.php
@@ -6,7 +6,7 @@ namespace ShlinkioTest\Shlink\Common\Factory;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Common\Factory\EmptyResponseImplicitOptionsMiddlewareFactory;
 use Zend\Diactoros\Response\EmptyResponse;
-use Zend\Expressive\Middleware\ImplicitOptionsMiddleware;
+use Zend\Expressive\Router\Middleware\ImplicitOptionsMiddleware;
 use Zend\ServiceManager\ServiceManager;

 class EmptyResponseImplicitOptionsMiddlewareFactoryTest extends TestCase
@@ -38,8 +38,8 @@ class EmptyResponseImplicitOptionsMiddlewareFactoryTest extends TestCase
        $instance = $this->factory->__invoke(new ServiceManager(), '');

        $ref = new \ReflectionObject($instance);
-        $prop = $ref->getProperty('response');
+        $prop = $ref->getProperty('responseFactory');
        $prop->setAccessible(true);
-        $this->assertInstanceOf(EmptyResponse::class, $prop->getValue($instance));
+        $this->assertInstanceOf(EmptyResponse::class, $prop->getValue($instance)());
    }
 }
--- a/module/Common/test/Middleware/LocaleMiddlewareTest.php
+++ b/module/Common/test/Middleware/LocaleMiddlewareTest.php
@@ -32,7 +32,7 @@ class LocaleMiddlewareTest extends TestCase
    public function whenNoHeaderIsPresentLocaleIsNotChanged()
    {
        $this->assertEquals('ru', $this->translator->getLocale());
-        $this->middleware->process(ServerRequestFactory::fromGlobals(), TestUtils::createDelegateMock()->reveal());
+        $this->middleware->process(ServerRequestFactory::fromGlobals(), TestUtils::createReqHandlerMock()->reveal());
        $this->assertEquals('ru', $this->translator->getLocale());
    }

@@ -43,7 +43,7 @@ class LocaleMiddlewareTest extends TestCase
    {
        $this->assertEquals('ru', $this->translator->getLocale());
        $request = ServerRequestFactory::fromGlobals()->withHeader('Accept-Language', 'es');
-        $this->middleware->process($request, TestUtils::createDelegateMock()->reveal());
+        $this->middleware->process($request, TestUtils::createReqHandlerMock()->reveal());
        $this->assertEquals('es', $this->translator->getLocale());
    }

@@ -52,7 +52,7 @@ class LocaleMiddlewareTest extends TestCase
     */
    public function localeGetsNormalized()
    {
-        $delegate = TestUtils::createDelegateMock();
+        $delegate = TestUtils::createReqHandlerMock();

        $this->assertEquals('ru', $this->translator->getLocale());

--- a/module/Common/test/Util/TestUtils.php
+++ b/module/Common/test/Util/TestUtils.php
@@ -3,22 +3,22 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\Common\Util;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Prophecy\Argument;
 use Prophecy\Prophet;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response;

 class TestUtils
 {
    private static $prophet;

-    public static function createDelegateMock(ResponseInterface $response = null, RequestInterface $request = null)
+    public static function createReqHandlerMock(ResponseInterface $response = null, RequestInterface $request = null)
    {
        $argument = $request ?: Argument::any();
-        $delegate = static::getProphet()->prophesize(DelegateInterface::class);
-        $delegate->process($argument)->willReturn($response ?: new Response());
+        $delegate = static::getProphet()->prophesize(RequestHandlerInterface::class);
+        $delegate->handle($argument)->willReturn($response ?: new Response());

        return $delegate;
    }
--- a/module/Core/config/dependencies.config.php
+++ b/module/Core/config/dependencies.config.php
@@ -28,6 +28,7 @@ return [

            // Middleware
            Action\RedirectAction::class => ConfigAbstractFactory::class,
+            Action\PixelAction::class => ConfigAbstractFactory::class,
            Action\QrCodeAction::class => ConfigAbstractFactory::class,
            Action\PreviewAction::class => ConfigAbstractFactory::class,
            Middleware\QrCodeCacheMiddleware::class => ConfigAbstractFactory::class,
@@ -60,6 +61,11 @@ return [
            Service\VisitsTracker::class,
            Options\AppOptions::class,
        ],
+        Action\PixelAction::class => [
+            Service\UrlShortener::class,
+            Service\VisitsTracker::class,
+            Options\AppOptions::class,
+        ],
        Action\QrCodeAction::class => [RouterInterface::class, Service\UrlShortener::class, 'Logger_Shlink'],
        Action\PreviewAction::class => [PreviewGenerator::class, Service\UrlShortener::class],
        Middleware\QrCodeCacheMiddleware::class => [Cache::class],
--- a/module/Core/config/routes.config.php
+++ b/module/Core/config/routes.config.php
@@ -13,6 +13,12 @@ return [
            'middleware' => Action\RedirectAction::class,
            'allowed_methods' => ['GET'],
        ],
+        [
+            'name' => 'pixel-tracking',
+            'path' => '/{shortCode}/track',
+            'middleware' => Action\PixelAction::class,
+            'allowed_methods' => ['GET'],
+        ],
        [
            'name' => 'short-url-qr-code',
            'path' => '/{shortCode}/qr-code[/{size:[0-9]+}]',
--- a/module/Core/src/Action/AbstractTrackingAction.php
+++ b/module/Core/src/Action/AbstractTrackingAction.php
@@ -0,0 +1,74 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Action;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Shlinkio\Shlink\Core\Action\Util\ErrorResponseBuilderTrait;
+use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
+use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
+use Shlinkio\Shlink\Core\Options\AppOptions;
+use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
+use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
+
+abstract class AbstractTrackingAction implements MiddlewareInterface
+{
+    use ErrorResponseBuilderTrait;
+
+    /**
+     * @var UrlShortenerInterface
+     */
+    private $urlShortener;
+    /**
+     * @var VisitsTrackerInterface
+     */
+    private $visitTracker;
+    /**
+     * @var AppOptions
+     */
+    private $appOptions;
+
+    public function __construct(
+        UrlShortenerInterface $urlShortener,
+        VisitsTrackerInterface $visitTracker,
+        AppOptions $appOptions
+    ) {
+        $this->urlShortener = $urlShortener;
+        $this->visitTracker = $visitTracker;
+        $this->appOptions = $appOptions;
+    }
+
+    /**
+     * Process an incoming server request and return a response, optionally delegating
+     * to the next middleware component to create the response.
+     *
+     * @param ServerRequestInterface $request
+     * @param RequestHandlerInterface $handler
+     *
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $shortCode = $request->getAttribute('shortCode', '');
+        $query = $request->getQueryParams();
+        $disableTrackParam = $this->appOptions->getDisableTrackParam();
+
+        try {
+            $longUrl = $this->urlShortener->shortCodeToUrl($shortCode);
+
+            // Track visit to this short code
+            if ($disableTrackParam === null || ! \array_key_exists($disableTrackParam, $query)) {
+                $this->visitTracker->track($shortCode, $request);
+            }
+
+            return $this->createResp($longUrl);
+        } catch (InvalidShortCodeException | EntityDoesNotExistException $e) {
+            return $this->buildErrorResponse($request, $handler);
+        }
+    }
+
+    abstract protected function createResp(string $longUrl): ResponseInterface;
+}
--- a/module/Core/src/Action/PixelAction.php
+++ b/module/Core/src/Action/PixelAction.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Action;
+
+use Psr\Http\Message\ResponseInterface;
+use Shlinkio\Shlink\Common\Response\PixelResponse;
+
+class PixelAction extends AbstractTrackingAction
+{
+    protected function createResp(string $longUrl): ResponseInterface
+    {
+        return new PixelResponse();
+    }
+}
--- a/module/Core/src/Action/PreviewAction.php
+++ b/module/Core/src/Action/PreviewAction.php
@@ -3,10 +3,10 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Core\Action;

-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
 use Shlinkio\Shlink\Common\Service\PreviewGeneratorInterface;
 use Shlinkio\Shlink\Common\Util\ResponseUtilsTrait;
@@ -40,11 +40,11 @@ class PreviewAction implements MiddlewareInterface
     * to the next middleware component to create the response.
     *
     * @param Request $request
-     * @param DelegateInterface $delegate
+     * @param RequestHandlerInterface $handler
     *
     * @return Response
     */
-    public function process(Request $request, DelegateInterface $delegate)
+    public function process(Request $request, RequestHandlerInterface $handler): Response
    {
        $shortCode = $request->getAttribute('shortCode');

@@ -52,12 +52,8 @@ class PreviewAction implements MiddlewareInterface
            $url = $this->urlShortener->shortCodeToUrl($shortCode);
            $imagePath = $this->previewGenerator->generatePreview($url);
            return $this->generateImageResponse($imagePath);
-        } catch (InvalidShortCodeException $e) {
-            return $this->buildErrorResponse($request, $delegate);
-        } catch (EntityDoesNotExistException $e) {
-            return $this->buildErrorResponse($request, $delegate);
-        } catch (PreviewGenerationException $e) {
-            return $this->buildErrorResponse($request, $delegate);
+        } catch (InvalidShortCodeException | EntityDoesNotExistException | PreviewGenerationException $e) {
+            return $this->buildErrorResponse($request, $handler);
        }
    }
 }
--- a/module/Core/src/Action/QrCodeAction.php
+++ b/module/Core/src/Action/QrCodeAction.php
@@ -4,10 +4,10 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Action;

 use Endroid\QrCode\QrCode;
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Shlinkio\Shlink\Common\Response\QrCodeResponse;
@@ -49,11 +49,11 @@ class QrCodeAction implements MiddlewareInterface
     * to the next middleware component to create the response.
     *
     * @param Request $request
-     * @param DelegateInterface $delegate
+     * @param RequestHandlerInterface $handler
     *
     * @return Response
     */
-    public function process(Request $request, DelegateInterface $delegate)
+    public function process(Request $request, RequestHandlerInterface $handler): Response
    {
        // Make sure the short URL exists for this short code
        $shortCode = $request->getAttribute('shortCode');
@@ -61,10 +61,10 @@ class QrCodeAction implements MiddlewareInterface
            $this->urlShortener->shortCodeToUrl($shortCode);
        } catch (InvalidShortCodeException $e) {
            $this->logger->warning('Tried to create a QR code with an invalid short code' . PHP_EOL . $e);
-            return $this->buildErrorResponse($request, $delegate);
+            return $this->buildErrorResponse($request, $handler);
        } catch (EntityDoesNotExistException $e) {
            $this->logger->warning('Tried to create a QR code with a not found short code' . PHP_EOL . $e);
-            return $this->buildErrorResponse($request, $delegate);
+            return $this->buildErrorResponse($request, $handler);
        }

        $path = $this->router->generateUri('long-url-redirect', ['shortCode' => $shortCode]);
@@ -80,7 +80,7 @@ class QrCodeAction implements MiddlewareInterface
     * @param Request $request
     * @return int
     */
-    protected function getSizeParam(Request $request)
+    private function getSizeParam(Request $request): int
    {
        $size = (int) $request->getAttribute('size', 300);
        if ($size < 50) {
--- a/module/Core/src/Action/RedirectAction.php
+++ b/module/Core/src/Action/RedirectAction.php
@@ -3,75 +3,15 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Core\Action;

-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface as Response;
-use Psr\Http\Message\ServerRequestInterface as Request;
-use Shlinkio\Shlink\Core\Action\Util\ErrorResponseBuilderTrait;
-use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
-use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
-use Shlinkio\Shlink\Core\Options\AppOptions;
-use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
-use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
 use Zend\Diactoros\Response\RedirectResponse;

-class RedirectAction implements MiddlewareInterface
+class RedirectAction extends AbstractTrackingAction
 {
-    use ErrorResponseBuilderTrait;
-
-    /**
-     * @var UrlShortenerInterface
-     */
-    private $urlShortener;
-    /**
-     * @var VisitsTrackerInterface
-     */
-    private $visitTracker;
-    /**
-     * @var AppOptions
-     */
-    private $appOptions;
-
-    public function __construct(
-        UrlShortenerInterface $urlShortener,
-        VisitsTrackerInterface $visitTracker,
-        AppOptions $appOptions
-    ) {
-        $this->urlShortener = $urlShortener;
-        $this->visitTracker = $visitTracker;
-        $this->appOptions = $appOptions;
-    }
-
-    /**
-     * Process an incoming server request and return a response, optionally delegating
-     * to the next middleware component to create the response.
-     *
-     * @param Request $request
-     * @param DelegateInterface $delegate
-     *
-     * @return Response
-     */
-    public function process(Request $request, DelegateInterface $delegate)
+    protected function createResp(string $longUrl): Response
    {
-        $shortCode = $request->getAttribute('shortCode', '');
-        $query = $request->getQueryParams();
-        $disableTrackParam = $this->appOptions->getDisableTrackParam();
-
-        try {
-            $longUrl = $this->urlShortener->shortCodeToUrl($shortCode);
-
-            // Track visit to this short code
-            if ($disableTrackParam === null || ! \array_key_exists($disableTrackParam, $query)) {
-                $this->visitTracker->track($shortCode, $request);
-            }
-
-            // Return a redirect response to the long URL.
-            // Use a temporary redirect to make sure browsers always hit the server for analytics purposes
-            return new RedirectResponse($longUrl);
-        } catch (InvalidShortCodeException $e) {
-            return $this->buildErrorResponse($request, $delegate);
-        } catch (EntityDoesNotExistException $e) {
-            return $this->buildErrorResponse($request, $delegate);
-        }
+        // Return a redirect response to the long URL.
+        // Use a temporary redirect to make sure browsers always hit the server for analytics purposes
+        return new RedirectResponse($longUrl);
    }
 }
--- a/module/Core/src/Action/Util/ErrorResponseBuilderTrait.php
+++ b/module/Core/src/Action/Util/ErrorResponseBuilderTrait.php
@@ -3,16 +3,18 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Core\Action\Util;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Core\Response\NotFoundDelegate;

 trait ErrorResponseBuilderTrait
 {
-    private function buildErrorResponse(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface
-    {
+    private function buildErrorResponse(
+        ServerRequestInterface $request,
+        RequestHandlerInterface $handler
+    ): ResponseInterface {
        $request = $request->withAttribute(NotFoundDelegate::NOT_FOUND_TEMPLATE, 'ShlinkCore::invalid-short-code');
-        return $delegate->process($request);
+        return $handler->handle($request);
    }
 }
--- a/module/Core/src/Entity/Visit.php
+++ b/module/Core/src/Entity/Visit.php
@@ -57,7 +57,7 @@ class Visit extends AbstractEntity implements \JsonSerializable
    /**
     * @return string
     */
-    public function getReferer()
+    public function getReferer(): string
    {
        return $this->referer;
    }
@@ -66,7 +66,7 @@ class Visit extends AbstractEntity implements \JsonSerializable
     * @param string $referer
     * @return $this
     */
-    public function setReferer($referer)
+    public function setReferer($referer): self
    {
        $this->referer = $referer;
        return $this;
@@ -75,7 +75,7 @@ class Visit extends AbstractEntity implements \JsonSerializable
    /**
     * @return \DateTime
     */
-    public function getDate()
+    public function getDate(): \DateTime
    {
        return $this->date;
    }
@@ -84,7 +84,7 @@ class Visit extends AbstractEntity implements \JsonSerializable
     * @param \DateTime $date
     * @return $this
     */
-    public function setDate($date)
+    public function setDate($date): self
    {
        $this->date = $date;
        return $this;
@@ -93,7 +93,7 @@ class Visit extends AbstractEntity implements \JsonSerializable
    /**
     * @return ShortUrl
     */
-    public function getShortUrl()
+    public function getShortUrl(): ShortUrl
    {
        return $this->shortUrl;
    }
@@ -102,7 +102,7 @@ class Visit extends AbstractEntity implements \JsonSerializable
     * @param ShortUrl $shortUrl
     * @return $this
     */
-    public function setShortUrl($shortUrl)
+    public function setShortUrl($shortUrl): self
    {
        $this->shortUrl = $shortUrl;
        return $this;
@@ -111,7 +111,7 @@ class Visit extends AbstractEntity implements \JsonSerializable
    /**
     * @return string
     */
-    public function getRemoteAddr()
+    public function getRemoteAddr(): string
    {
        return $this->remoteAddr;
    }
@@ -120,7 +120,7 @@ class Visit extends AbstractEntity implements \JsonSerializable
     * @param string $remoteAddr
     * @return $this
     */
-    public function setRemoteAddr($remoteAddr)
+    public function setRemoteAddr($remoteAddr): self
    {
        $this->remoteAddr = $remoteAddr;
        return $this;
@@ -129,7 +129,7 @@ class Visit extends AbstractEntity implements \JsonSerializable
    /**
     * @return string
     */
-    public function getUserAgent()
+    public function getUserAgent(): string
    {
        return $this->userAgent;
    }
@@ -138,7 +138,7 @@ class Visit extends AbstractEntity implements \JsonSerializable
     * @param string $userAgent
     * @return $this
     */
-    public function setUserAgent($userAgent)
+    public function setUserAgent($userAgent): self
    {
        $this->userAgent = $userAgent;
        return $this;
@@ -147,7 +147,7 @@ class Visit extends AbstractEntity implements \JsonSerializable
    /**
     * @return VisitLocation
     */
-    public function getVisitLocation()
+    public function getVisitLocation(): VisitLocation
    {
        return $this->visitLocation;
    }
@@ -156,7 +156,7 @@ class Visit extends AbstractEntity implements \JsonSerializable
     * @param VisitLocation $visitLocation
     * @return $this
     */
-    public function setVisitLocation($visitLocation)
+    public function setVisitLocation($visitLocation): self
    {
        $this->visitLocation = $visitLocation;
        return $this;
@@ -165,11 +165,11 @@ class Visit extends AbstractEntity implements \JsonSerializable
    /**
     * Specify data which should be serialized to JSON
     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
+     * @return array data which can be serialized by <b>json_encode</b>,
     * which is a value of any type other than a resource.
     * @since 5.4.0
     */
-    public function jsonSerialize()
+    public function jsonSerialize(): array
    {
        return [
            'referer' => $this->referer,
--- a/module/Core/src/Middleware/QrCodeCacheMiddleware.php
+++ b/module/Core/src/Middleware/QrCodeCacheMiddleware.php
@@ -4,10 +4,10 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Middleware;

 use Doctrine\Common\Cache\Cache;
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response as DiactResp;

 class QrCodeCacheMiddleware implements MiddlewareInterface
@@ -27,11 +27,11 @@ class QrCodeCacheMiddleware implements MiddlewareInterface
     * to the next middleware component to create the response.
     *
     * @param Request $request
-     * @param DelegateInterface $delegate
+     * @param RequestHandlerInterface $handler
     *
     * @return Response
     */
-    public function process(Request $request, DelegateInterface $delegate)
+    public function process(Request $request, RequestHandlerInterface $handler): Response
    {
        $cacheKey = $request->getUri()->getPath();

@@ -45,7 +45,7 @@ class QrCodeCacheMiddleware implements MiddlewareInterface

        // If not, call the next middleware and cache it
        /** @var Response $resp */
-        $resp = $delegate->process($request);
+        $resp = $handler->handle($request);
        $this->cache->save($cacheKey, [
            'body' => $resp->getBody()->__toString(),
            'content-type' => $resp->getHeaderLine('Content-Type'),
--- a/module/Core/src/Response/NotFoundDelegate.php
+++ b/module/Core/src/Response/NotFoundDelegate.php
@@ -4,9 +4,9 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Response;

 use Fig\Http\Message\StatusCodeInterface;
-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface as DelegateInterface;
 use Zend\Diactoros\Response;
 use Zend\Expressive\Template\TemplateRendererInterface;

@@ -37,14 +37,14 @@ class NotFoundDelegate implements DelegateInterface
     * @return ResponseInterface
     * @throws \InvalidArgumentException
     */
-    public function process(ServerRequestInterface $request): ResponseInterface
+    public function handle(ServerRequestInterface $request): ResponseInterface
    {
-        $accepts = explode(',', $request->getHeaderLine('Accept'));
-        $accept = array_shift($accepts);
+        $accepts = \explode(',', $request->getHeaderLine('Accept'));
+        $accept = \array_shift($accepts);
        $status = StatusCodeInterface::STATUS_NOT_FOUND;

        // If the first accepted type is json, return a json response
-        if (in_array($accept, ['application/json', 'text/json', 'application/x-json'], true)) {
+        if (\in_array($accept, ['application/json', 'text/json', 'application/x-json'], true)) {
            return new Response\JsonResponse([
                'error' => 'NOT_FOUND',
                'message' => 'Not found',
--- a/module/Core/src/Util/TagManagerTrait.php
+++ b/module/Core/src/Util/TagManagerTrait.php
@@ -14,7 +14,7 @@ trait TagManagerTrait
     * @param string[] $tags
     * @return Collections\Collection|Tag[]
     */
-    protected function tagNamesToEntities(EntityManagerInterface $em, array $tags)
+    private function tagNamesToEntities(EntityManagerInterface $em, array $tags)
    {
        $entities = [];
        foreach ($tags as $tagName) {
@@ -33,8 +33,8 @@ trait TagManagerTrait
     * @param string $tagName
     * @return string
     */
-    protected function normalizeTagName($tagName)
+    private function normalizeTagName($tagName): string
    {
-        return str_replace(' ', '-', strtolower(trim($tagName)));
+        return \str_replace(' ', '-', \strtolower(\trim($tagName)));
    }
 }
--- a/module/Core/src/Validation/InputFactoryTrait.php
+++ b/module/Core/src/Validation/InputFactoryTrait.php
@@ -9,7 +9,7 @@ use Zend\InputFilter\Input;

 trait InputFactoryTrait
 {
-    public function createInput($name, $required = true): Input
+    private function createInput($name, $required = true): Input
    {
        $input = new Input($name);
        $input->setRequired($required)
--- a/module/Core/test/Action/PixelActionTest.php
+++ b/module/Core/test/Action/PixelActionTest.php
@@ -0,0 +1,63 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\Core\Action;
+
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\Common\Response\PixelResponse;
+use Shlinkio\Shlink\Core\Action\PixelAction;
+use Shlinkio\Shlink\Core\Action\RedirectAction;
+use Shlinkio\Shlink\Core\Options\AppOptions;
+use Shlinkio\Shlink\Core\Service\UrlShortener;
+use Shlinkio\Shlink\Core\Service\VisitsTracker;
+use ShlinkioTest\Shlink\Common\Util\TestUtils;
+use Zend\Diactoros\ServerRequestFactory;
+
+class PixelActionTest extends TestCase
+{
+    /**
+     * @var RedirectAction
+     */
+    protected $action;
+    /**
+     * @var ObjectProphecy
+     */
+    protected $urlShortener;
+    /**
+     * @var ObjectProphecy
+     */
+    protected $visitTracker;
+
+    public function setUp()
+    {
+        $this->urlShortener = $this->prophesize(UrlShortener::class);
+        $this->visitTracker = $this->prophesize(VisitsTracker::class);
+
+        $this->action = new PixelAction(
+            $this->urlShortener->reveal(),
+            $this->visitTracker->reveal(),
+            new AppOptions()
+        );
+    }
+
+    /**
+     * @test
+     */
+    public function imageIsReturned()
+    {
+        $shortCode = 'abc123';
+        $this->urlShortener->shortCodeToUrl($shortCode)->willReturn('http://domain.com/foo/bar')
+                                                       ->shouldBeCalledTimes(1);
+        $this->visitTracker->track(Argument::cetera())->willReturn(null)
+                                                      ->shouldBeCalledTimes(1);
+
+        $request = ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode);
+        $response = $this->action->process($request, TestUtils::createReqHandlerMock()->reveal());
+
+        $this->assertInstanceOf(PixelResponse::class, $response);
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('image/gif', $response->getHeaderLine('content-type'));
+    }
+}
--- a/module/Core/test/Action/PreviewActionTest.php
+++ b/module/Core/test/Action/PreviewActionTest.php
@@ -3,11 +3,11 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\Core\Action;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Prophecy\ObjectProphecy;
+use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Core\Action\PreviewAction;
 use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
@@ -47,8 +47,8 @@ class PreviewActionTest extends TestCase
        $shortCode = 'abc123';
        $this->urlShortener->shortCodeToUrl($shortCode)->willThrow(EntityDoesNotExistException::class)
                                                       ->shouldBeCalledTimes(1);
-        $delegate = $this->prophesize(DelegateInterface::class);
-        $delegate->process(Argument::cetera())->shouldBeCalledTimes(1)
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
+        $delegate->handle(Argument::cetera())->shouldBeCalledTimes(1)
                                              ->willReturn(new Response());

        $this->action->process(
@@ -70,7 +70,7 @@ class PreviewActionTest extends TestCase

        $resp = $this->action->process(
            ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode),
-            TestUtils::createDelegateMock()->reveal()
+            TestUtils::createReqHandlerMock()->reveal()
        );

        $this->assertEquals(filesize($path), $resp->getHeaderLine('Content-length'));
@@ -85,9 +85,9 @@ class PreviewActionTest extends TestCase
        $shortCode = 'abc123';
        $this->urlShortener->shortCodeToUrl($shortCode)->willThrow(InvalidShortCodeException::class)
                                                       ->shouldBeCalledTimes(1);
-        $delegate = $this->prophesize(DelegateInterface::class);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
        /** @var MethodProphecy $process */
-        $process = $delegate->process(Argument::any())->willReturn(new Response());
+        $process = $delegate->handle(Argument::any())->willReturn(new Response());

        $this->action->process(
            ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode),
--- a/module/Core/test/Action/QrCodeActionTest.php
+++ b/module/Core/test/Action/QrCodeActionTest.php
@@ -3,11 +3,11 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\Core\Action;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Prophecy\ObjectProphecy;
+use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Common\Response\QrCodeResponse;
 use Shlinkio\Shlink\Core\Action\QrCodeAction;
 use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
@@ -46,8 +46,8 @@ class QrCodeActionTest extends TestCase
        $shortCode = 'abc123';
        $this->urlShortener->shortCodeToUrl($shortCode)->willThrow(EntityDoesNotExistException::class)
                                                       ->shouldBeCalledTimes(1);
-        $delegate = $this->prophesize(DelegateInterface::class);
-        $process = $delegate->process(Argument::any())->willReturn(new Response());
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
+        $process = $delegate->handle(Argument::any())->willReturn(new Response());

        $this->action->process(
            ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode),
@@ -65,9 +65,9 @@ class QrCodeActionTest extends TestCase
        $shortCode = 'abc123';
        $this->urlShortener->shortCodeToUrl($shortCode)->willThrow(InvalidShortCodeException::class)
                                                       ->shouldBeCalledTimes(1);
-        $delegate = $this->prophesize(DelegateInterface::class);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
        /** @var MethodProphecy $process */
-        $process = $delegate->process(Argument::any())->willReturn(new Response());
+        $process = $delegate->handle(Argument::any())->willReturn(new Response());

        $this->action->process(
            ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode),
@@ -84,7 +84,7 @@ class QrCodeActionTest extends TestCase
    {
        $shortCode = 'abc123';
        $this->urlShortener->shortCodeToUrl($shortCode)->willReturn('')->shouldBeCalledTimes(1);
-        $delegate = $this->prophesize(DelegateInterface::class);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);

        $resp = $this->action->process(
            ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode),
@@ -93,6 +93,6 @@ class QrCodeActionTest extends TestCase

        $this->assertInstanceOf(QrCodeResponse::class, $resp);
        $this->assertEquals(200, $resp->getStatusCode());
-        $delegate->process(Argument::any())->shouldHaveBeenCalledTimes(0);
+        $delegate->handle(Argument::any())->shouldHaveBeenCalledTimes(0);
    }
 }
--- a/module/Core/test/Action/RedirectActionTest.php
+++ b/module/Core/test/Action/RedirectActionTest.php
@@ -3,11 +3,11 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\Core\Action;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Prophecy\ObjectProphecy;
+use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Core\Action\RedirectAction;
 use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
 use Shlinkio\Shlink\Core\Options\AppOptions;
@@ -57,7 +57,7 @@ class RedirectActionTest extends TestCase
                                                      ->shouldBeCalledTimes(1);

        $request = ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode);
-        $response = $this->action->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->action->process($request, TestUtils::createReqHandlerMock()->reveal());

        $this->assertInstanceOf(Response\RedirectResponse::class, $response);
        $this->assertEquals(302, $response->getStatusCode());
@@ -76,9 +76,9 @@ class RedirectActionTest extends TestCase
        $this->visitTracker->track(Argument::cetera())->willReturn(null)
                                                      ->shouldNotBeCalled();

-        $delegate = $this->prophesize(DelegateInterface::class);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
        /** @var MethodProphecy $process */
-        $process = $delegate->process(Argument::any())->willReturn(new Response());
+        $process = $delegate->handle(Argument::any())->willReturn(new Response());

        $request = ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode);
        $this->action->process($request, $delegate->reveal());
@@ -100,7 +100,7 @@ class RedirectActionTest extends TestCase

        $request = ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode)
                                                      ->withQueryParams(['foobar' => true]);
-        $response = $this->action->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->action->process($request, TestUtils::createReqHandlerMock()->reveal());

        $this->assertInstanceOf(Response\RedirectResponse::class, $response);
        $this->assertEquals(302, $response->getStatusCode());
--- a/module/Core/test/Middleware/QrCodeCacheMiddlewareTest.php
+++ b/module/Core/test/Middleware/QrCodeCacheMiddlewareTest.php
@@ -5,9 +5,9 @@ namespace ShlinkioTest\Shlink\Core\Middleware;

 use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\Common\Cache\Cache;
-use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Core\Middleware\QrCodeCacheMiddleware;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequestFactory;
@@ -35,8 +35,8 @@ class QrCodeCacheMiddlewareTest extends TestCase
     */
    public function noCachedPathFallsBackToNextMiddleware()
    {
-        $delegate = $this->prophesize(DelegateInterface::class);
-        $delegate->process(Argument::any())->willReturn(new Response())->shouldBeCalledTimes(1);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
+        $delegate->handle(Argument::any())->willReturn(new Response())->shouldBeCalledTimes(1);

        $this->middleware->process(ServerRequestFactory::fromGlobals()->withUri(
            new Uri('/foo/bar')
@@ -53,7 +53,7 @@ class QrCodeCacheMiddlewareTest extends TestCase
        $isCalled = false;
        $uri = (new Uri())->withPath('/foo');
        $this->cache->save('/foo', ['body' => 'the body', 'content-type' => 'image/png']);
-        $delegate = $this->prophesize(DelegateInterface::class);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);

        $resp = $this->middleware->process(
            ServerRequestFactory::fromGlobals()->withUri($uri),
@@ -64,6 +64,6 @@ class QrCodeCacheMiddlewareTest extends TestCase
        $resp->getBody()->rewind();
        $this->assertEquals('the body', $resp->getBody()->getContents());
        $this->assertEquals('image/png', $resp->getHeaderLine('Content-Type'));
-        $delegate->process(Argument::any())->shouldHaveBeenCalledTimes(0);
+        $delegate->handle(Argument::any())->shouldHaveBeenCalledTimes(0);
    }
 }
--- a/module/Core/test/Response/NotFoundDelegateTest.php
+++ b/module/Core/test/Response/NotFoundDelegateTest.php
@@ -43,7 +43,7 @@ class NotFoundDelegateTest extends TestCase
        /** @var MethodProphecy $render */
        $render = $this->renderer->render(Argument::cetera())->willReturn('');

-        $resp = $this->delegate->process($request);
+        $resp = $this->delegate->handle($request);

        $this->assertInstanceOf($expectedResponse, $resp);
        $render->shouldHaveBeenCalledTimes($renderCalls);
--- a/module/Rest/src/Action/AbstractRestAction.php
+++ b/module/Rest/src/Action/AbstractRestAction.php
@@ -5,11 +5,11 @@ namespace Shlinkio\Shlink\Rest\Action;

 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;

-abstract class AbstractRestAction implements MiddlewareInterface, RequestMethodInterface, StatusCodeInterface
+abstract class AbstractRestAction implements RequestHandlerInterface, RequestMethodInterface, StatusCodeInterface
 {
    /**
     * @var LoggerInterface
--- a/module/Rest/src/Action/AuthenticateAction.php
+++ b/module/Rest/src/Action/AuthenticateAction.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Rest\Action;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Log\LoggerInterface;
@@ -43,11 +42,10 @@ class AuthenticateAction extends AbstractRestAction

    /**
     * @param Request $request
-     * @param DelegateInterface $delegate
-     * @return null|Response
+     * @return Response
     * @throws \InvalidArgumentException
     */
-    public function process(Request $request, DelegateInterface $delegate)
+    public function handle(Request $request): Response
    {
        $authData = $request->getParsedBody();
        if (! isset($authData['apiKey'])) {
@@ -61,7 +59,7 @@ class AuthenticateAction extends AbstractRestAction

        // Authenticate using provided API key
        $apiKey = $this->apiKeyService->getByKey($authData['apiKey']);
-        if (! isset($apiKey) || ! $apiKey->isValid()) {
+        if ($apiKey === null || ! $apiKey->isValid()) {
            return new JsonResponse([
                'error' => RestUtils::INVALID_API_KEY_ERROR,
                'message' => $this->translator->translate('Provided API key does not exist or is invalid.'),
--- a/module/Rest/src/Action/CreateShortcodeAction.php
+++ b/module/Rest/src/Action/CreateShortcodeAction.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Rest\Action;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Log\LoggerInterface;
@@ -44,11 +43,10 @@ class CreateShortcodeAction extends AbstractRestAction

    /**
     * @param Request $request
-     * @param DelegateInterface $delegate
-     * @return null|Response
+     * @return Response
     * @throws \InvalidArgumentException
     */
-    public function process(Request $request, DelegateInterface $delegate)
+    public function handle(Request $request): Response
    {
        $postData = (array) $request->getParsedBody();
        if (! isset($postData['longUrl'])) {
--- a/module/Rest/src/Action/EditShortCodeAction.php
+++ b/module/Rest/src/Action/EditShortCodeAction.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Rest\Action;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
@@ -41,12 +40,11 @@ class EditShortCodeAction extends AbstractRestAction
     * to the next middleware component to create the response.
     *
     * @param ServerRequestInterface $request
-     * @param DelegateInterface $delegate
     *
     * @return ResponseInterface
     * @throws \InvalidArgumentException
     */
-    public function process(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface
+    public function handle(ServerRequestInterface $request): ResponseInterface
    {
        $postData = (array) $request->getParsedBody();
        $shortCode = $request->getAttribute('shortCode', '');
--- a/module/Rest/src/Action/EditShortcodeTagsAction.php
+++ b/module/Rest/src/Action/EditShortcodeTagsAction.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Rest\Action;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Log\LoggerInterface;
@@ -36,11 +35,10 @@ class EditShortcodeTagsAction extends AbstractRestAction

    /**
     * @param Request $request
-     * @param DelegateInterface $delegate
-     * @return null|Response
+     * @return Response
     * @throws \InvalidArgumentException
     */
-    public function process(Request $request, DelegateInterface $delegate)
+    public function handle(Request $request): Response
    {
        $shortCode = $request->getAttribute('shortCode');
        $bodyParams = $request->getParsedBody();
--- a/module/Rest/src/Action/GetVisitsAction.php
+++ b/module/Rest/src/Action/GetVisitsAction.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Rest\Action;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Log\LoggerInterface;
@@ -37,11 +36,10 @@ class GetVisitsAction extends AbstractRestAction

    /**
     * @param Request $request
-     * @param DelegateInterface $delegate
-     * @return null|Response
+     * @return Response
     * @throws \InvalidArgumentException
     */
-    public function process(Request $request, DelegateInterface $delegate)
+    public function handle(Request $request): Response
    {
        $shortCode = $request->getAttribute('shortCode');
        $startDate = $this->getDateQueryParam($request, 'startDate');
--- a/module/Rest/src/Action/ListShortcodesAction.php
+++ b/module/Rest/src/Action/ListShortcodesAction.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Rest\Action;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Log\LoggerInterface;
@@ -38,11 +37,10 @@ class ListShortcodesAction extends AbstractRestAction

    /**
     * @param Request $request
-     * @param DelegateInterface $delegate
-     * @return null|Response
+     * @return Response
     * @throws \InvalidArgumentException
     */
-    public function process(Request $request, DelegateInterface $delegate)
+    public function handle(Request $request): Response
    {
        try {
            $params = $this->queryToListParams($request->getQueryParams());
@@ -61,13 +59,13 @@ class ListShortcodesAction extends AbstractRestAction
     * @param array $query
     * @return array
     */
-    public function queryToListParams(array $query)
+    private function queryToListParams(array $query): array
    {
        return [
-            isset($query['page']) ? $query['page'] : 1,
-            isset($query['searchTerm']) ? $query['searchTerm'] : null,
-            isset($query['tags']) ? $query['tags'] : [],
-            isset($query['orderBy']) ? $query['orderBy'] : null,
+            $query['page'] ?? 1,
+            $query['searchTerm'] ?? null,
+            $query['tags'] ?? [],
+            $query['orderBy'] ?? null,
        ];
    }
 }
--- a/module/Rest/src/Action/ResolveUrlAction.php
+++ b/module/Rest/src/Action/ResolveUrlAction.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Rest\Action;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Log\LoggerInterface;
@@ -37,11 +36,10 @@ class ResolveUrlAction extends AbstractRestAction

    /**
     * @param Request $request
-     * @param DelegateInterface $delegate
-     * @return null|Response
+     * @return Response
     * @throws \InvalidArgumentException
     */
-    public function process(Request $request, DelegateInterface $delegate)
+    public function handle(Request $request): Response
    {
        $shortCode = $request->getAttribute('shortCode');

--- a/module/Rest/src/Action/Tag/CreateTagsAction.php
+++ b/module/Rest/src/Action/Tag/CreateTagsAction.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Rest\Action\Tag;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
@@ -29,15 +28,14 @@ class CreateTagsAction extends AbstractRestAction
     * to the next middleware component to create the response.
     *
     * @param ServerRequestInterface $request
-     * @param DelegateInterface $delegate
     *
     * @return ResponseInterface
     * @throws \InvalidArgumentException
     */
-    public function process(ServerRequestInterface $request, DelegateInterface $delegate)
+    public function handle(ServerRequestInterface $request): ResponseInterface
    {
        $body = $request->getParsedBody();
-        $tags = isset($body['tags']) ? $body['tags'] : [];
+        $tags = $body['tags'] ?? [];

        return new JsonResponse([
            'tags' => [
--- a/module/Rest/src/Action/Tag/DeleteTagsAction.php
+++ b/module/Rest/src/Action/Tag/DeleteTagsAction.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Rest\Action\Tag;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
@@ -29,14 +28,13 @@ class DeleteTagsAction extends AbstractRestAction
     * to the next middleware component to create the response.
     *
     * @param ServerRequestInterface $request
-     * @param DelegateInterface $delegate
     *
     * @return ResponseInterface
     */
-    public function process(ServerRequestInterface $request, DelegateInterface $delegate)
+    public function handle(ServerRequestInterface $request): ResponseInterface
    {
        $query = $request->getQueryParams();
-        $tags = isset($query['tags']) ? $query['tags'] : [];
+        $tags = $query['tags'] ?? [];

        $this->tagService->deleteTags($tags);
        return new EmptyResponse();
--- a/module/Rest/src/Action/Tag/ListTagsAction.php
+++ b/module/Rest/src/Action/Tag/ListTagsAction.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Rest\Action\Tag;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
@@ -29,12 +28,11 @@ class ListTagsAction extends AbstractRestAction
     * to the next middleware component to create the response.
     *
     * @param ServerRequestInterface $request
-     * @param DelegateInterface $delegate
     *
     * @return ResponseInterface
     * @throws \InvalidArgumentException
     */
-    public function process(ServerRequestInterface $request, DelegateInterface $delegate)
+    public function handle(ServerRequestInterface $request): ResponseInterface
    {
        return new JsonResponse([
            'tags' => [
--- a/module/Rest/src/Action/Tag/UpdateTagAction.php
+++ b/module/Rest/src/Action/Tag/UpdateTagAction.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Rest\Action\Tag;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
@@ -41,12 +40,11 @@ class UpdateTagAction extends AbstractRestAction
     * to the next middleware component to create the response.
     *
     * @param ServerRequestInterface $request
-     * @param DelegateInterface $delegate
     *
     * @return ResponseInterface
     * @throws \InvalidArgumentException
     */
-    public function process(ServerRequestInterface $request, DelegateInterface $delegate)
+    public function handle(ServerRequestInterface $request): ResponseInterface
    {
        $body = $request->getParsedBody();
        if (! isset($body['oldName'], $body['newName'])) {
--- a/module/Rest/src/Authentication/JWTService.php
+++ b/module/Rest/src/Authentication/JWTService.php
@@ -92,7 +92,7 @@ class JWTService implements JWTServiceInterface
     * @param array $data
     * @return string
     */
-    protected function encode(array $data): string
+    private function encode(array $data): string
    {
        return JWT::encode($data, $this->appOptions->getSecretKey(), self::DEFAULT_ENCRYPTION_ALG);
    }
@@ -101,7 +101,7 @@ class JWTService implements JWTServiceInterface
     * @param string $jwt
     * @return array
     */
-    protected function decode(string $jwt): array
+    private function decode(string $jwt): array
    {
        return (array) JWT::decode($jwt, $this->appOptions->getSecretKey(), [self::DEFAULT_ENCRYPTION_ALG]);
    }
--- a/module/Rest/src/Entity/ApiKey.php
+++ b/module/Rest/src/Entity/ApiKey.php
@@ -44,7 +44,7 @@ class ApiKey extends AbstractEntity
    /**
     * @return string
     */
-    public function getKey()
+    public function getKey(): string
    {
        return $this->key;
    }
@@ -53,7 +53,7 @@ class ApiKey extends AbstractEntity
     * @param string $key
     * @return $this
     */
-    public function setKey($key)
+    public function setKey($key): self
    {
        $this->key = $key;
        return $this;
@@ -62,7 +62,7 @@ class ApiKey extends AbstractEntity
    /**
     * @return \DateTime|null
     */
-    public function getExpirationDate()
+    public function getExpirationDate(): ?\DateTime
    {
        return $this->expirationDate;
    }
@@ -71,7 +71,7 @@ class ApiKey extends AbstractEntity
     * @param \DateTime $expirationDate
     * @return $this
     */
-    public function setExpirationDate($expirationDate)
+    public function setExpirationDate($expirationDate): self
    {
        $this->expirationDate = $expirationDate;
        return $this;
@@ -80,9 +80,9 @@ class ApiKey extends AbstractEntity
    /**
     * @return bool
     */
-    public function isExpired()
+    public function isExpired(): bool
    {
-        if (! isset($this->expirationDate)) {
+        if ($this->expirationDate === null) {
            return false;
        }

@@ -92,7 +92,7 @@ class ApiKey extends AbstractEntity
    /**
     * @return boolean
     */
-    public function isEnabled()
+    public function isEnabled(): bool
    {
        return $this->enabled;
    }
@@ -101,7 +101,7 @@ class ApiKey extends AbstractEntity
     * @param boolean $enabled
     * @return $this
     */
-    public function setEnabled($enabled)
+    public function setEnabled($enabled): self
    {
        $this->enabled = $enabled;
        return $this;
@@ -112,7 +112,7 @@ class ApiKey extends AbstractEntity
     *
     * @return $this
     */
-    public function disable()
+    public function disable(): self
    {
        return $this->setEnabled(false);
    }
@@ -122,17 +122,17 @@ class ApiKey extends AbstractEntity
     *
     * @return bool
     */
-    public function isValid()
+    public function isValid(): bool
    {
        return $this->isEnabled() && ! $this->isExpired();
    }

    /**
-     * The string repesentation of an API key is the key itself
+     * The string representation of an API key is the key itself
     *
     * @return string
     */
-    public function __toString()
+    public function __toString(): string
    {
        return $this->getKey();
    }
--- a/module/Rest/src/ErrorHandler/JsonErrorResponseGenerator.php
+++ b/module/Rest/src/ErrorHandler/JsonErrorResponseGenerator.php
@@ -20,7 +20,7 @@ class JsonErrorResponseGenerator implements ErrorResponseGeneratorInterface, Sta
     * @return Response
     * @throws \InvalidArgumentException
     */
-    public function __invoke($e, Request $request, Response $response)
+    public function __invoke(?\Throwable $e, Request $request, Response $response)
    {
        $status = $response->getStatusCode();
        $responsePhrase = $status < 400 ? 'Internal Server Error' : $response->getReasonPhrase();
@@ -32,8 +32,8 @@ class JsonErrorResponseGenerator implements ErrorResponseGeneratorInterface, Sta
        ], $status);
    }

-    protected function responsePhraseToCode(string $responsePhrase): string
+    private function responsePhraseToCode(string $responsePhrase): string
    {
-        return strtoupper(str_replace(' ', '_', $responsePhrase));
+        return \strtoupper(\str_replace(' ', '_', $responsePhrase));
    }
 }
--- a/module/Rest/src/Middleware/BodyParserMiddleware.php
+++ b/module/Rest/src/Middleware/BodyParserMiddleware.php
@@ -4,10 +4,10 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Rest\Middleware;

 use Fig\Http\Message\RequestMethodInterface;
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Rest\Exception\RuntimeException;

 class BodyParserMiddleware implements MiddlewareInterface, RequestMethodInterface
@@ -17,11 +17,11 @@ class BodyParserMiddleware implements MiddlewareInterface, RequestMethodInterfac
     * to the next middleware component to create the response.
     *
     * @param Request $request
-     * @param DelegateInterface $delegate
+     * @param RequestHandlerInterface $handler
     *
     * @return Response
     */
-    public function process(Request $request, DelegateInterface $delegate)
+    public function process(Request $request, RequestHandlerInterface $handler): Response
    {
        $method = $request->getMethod();
        $currentParams = $request->getParsedBody();
@@ -32,16 +32,16 @@ class BodyParserMiddleware implements MiddlewareInterface, RequestMethodInterfac
            self::METHOD_HEAD,
            self::METHOD_OPTIONS,
        ], true)) {
-            return $delegate->process($request);
+            return $handler->handle($request);
        }

        // If the accepted content is JSON, try to parse the body from JSON
        $contentType = $this->getRequestContentType($request);
        if (\in_array($contentType, ['application/json', 'text/json', 'application/x-json'], true)) {
-            return $delegate->process($this->parseFromJson($request));
+            return $handler->handle($this->parseFromJson($request));
        }

-        return $delegate->process($this->parseFromUrlEncoded($request));
+        return $handler->handle($this->parseFromUrlEncoded($request));
    }

    /**
--- a/module/Rest/src/Middleware/CheckAuthenticationMiddleware.php
+++ b/module/Rest/src/Middleware/CheckAuthenticationMiddleware.php
@@ -4,10 +4,10 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Rest\Middleware;

 use Fig\Http\Message\StatusCodeInterface;
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Shlinkio\Shlink\Rest\Action\AuthenticateAction;
@@ -21,7 +21,7 @@ use Zend\Stdlib\ErrorHandler;

 class CheckAuthenticationMiddleware implements MiddlewareInterface, StatusCodeInterface
 {
-    const AUTHORIZATION_HEADER = 'Authorization';
+    public const AUTHORIZATION_HEADER = 'Authorization';

    /**
     * @var TranslatorInterface
@@ -51,13 +51,13 @@ class CheckAuthenticationMiddleware implements MiddlewareInterface, StatusCodeIn
     * to the next middleware component to create the response.
     *
     * @param Request $request
-     * @param DelegateInterface $delegate
+     * @param RequestHandlerInterface $handler
     *
     * @return Response
     * @throws \InvalidArgumentException
     * @throws \ErrorException
     */
-    public function process(Request $request, DelegateInterface $delegate)
+    public function process(Request $request, RequestHandlerInterface $handler): Response
    {
        // If current route is the authenticate route or an OPTIONS request, continue to the next middleware
        /** @var RouteResult|null $routeResult */
@@ -67,7 +67,7 @@ class CheckAuthenticationMiddleware implements MiddlewareInterface, StatusCodeIn
            || $routeResult->getMatchedRouteName() === AuthenticateAction::class
            || $request->getMethod() === 'OPTIONS'
        ) {
-            return $delegate->process($request);
+            return $handler->handle($request);
        }

        // Check that the auth header was provided, and that it belongs to a non-expired token
@@ -77,22 +77,22 @@ class CheckAuthenticationMiddleware implements MiddlewareInterface, StatusCodeIn

        // Get token making sure the an authorization type is provided
        $authToken = $request->getHeaderLine(self::AUTHORIZATION_HEADER);
-        $authTokenParts = explode(' ', $authToken);
-        if (count($authTokenParts) === 1) {
+        $authTokenParts = \explode(' ', $authToken);
+        if (\count($authTokenParts) === 1) {
            return new JsonResponse([
                'error' => RestUtils::INVALID_AUTHORIZATION_ERROR,
-                'message' => sprintf($this->translator->translate(
+                'message' => \sprintf($this->translator->translate(
                    'You need to provide the Bearer type in the %s header.'
                ), self::AUTHORIZATION_HEADER),
            ], self::STATUS_UNAUTHORIZED);
        }

        // Make sure the authorization type is Bearer
-        list($authType, $jwt) = $authTokenParts;
-        if (strtolower($authType) !== 'bearer') {
+        [$authType, $jwt] = $authTokenParts;
+        if (\strtolower($authType) !== 'bearer') {
            return new JsonResponse([
                'error' => RestUtils::INVALID_AUTHORIZATION_ERROR,
-                'message' => sprintf($this->translator->translate(
+                'message' => \sprintf($this->translator->translate(
                    'Provided authorization type %s is not supported. Use Bearer instead.'
                ), $authType),
            ], self::STATUS_UNAUTHORIZED);
@@ -107,7 +107,7 @@ class CheckAuthenticationMiddleware implements MiddlewareInterface, StatusCodeIn

            // Update the token expiration and continue to next middleware
            $jwt = $this->jwtService->refresh($jwt);
-            $response = $delegate->process($request);
+            $response = $handler->handle($request);

            // Return the response with the updated token on it
            return $response->withHeader(self::AUTHORIZATION_HEADER, 'Bearer ' . $jwt);
@@ -119,11 +119,15 @@ class CheckAuthenticationMiddleware implements MiddlewareInterface, StatusCodeIn
        }
    }

-    protected function createTokenErrorResponse()
+    /**
+     * @return JsonResponse
+     * @throws \InvalidArgumentException
+     */
+    private function createTokenErrorResponse(): JsonResponse
    {
        return new JsonResponse([
            'error' => RestUtils::INVALID_AUTH_TOKEN_ERROR,
-            'message' => sprintf(
+            'message' => \sprintf(
                $this->translator->translate(
                    'Missing or invalid auth token provided. Perform a new authentication request and send provided '
                    . 'token on every new request on the "%s" header'
--- a/module/Rest/src/Middleware/CrossDomainMiddleware.php
+++ b/module/Rest/src/Middleware/CrossDomainMiddleware.php
@@ -4,10 +4,10 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Rest\Middleware;

 use Fig\Http\Message\RequestMethodInterface;
-use Interop\Http\ServerMiddleware\DelegateInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;

 class CrossDomainMiddleware implements MiddlewareInterface, RequestMethodInterface
 {
@@ -16,15 +16,15 @@ class CrossDomainMiddleware implements MiddlewareInterface, RequestMethodInterfa
     * to the next middleware component to create the response.
     *
     * @param Request $request
-     * @param DelegateInterface $delegate
+     * @param RequestHandlerInterface $handler
     *
     * @return Response
     * @throws \InvalidArgumentException
     */
-    public function process(Request $request, DelegateInterface $delegate)
+    public function process(Request $request, RequestHandlerInterface $handler): Response
    {
        /** @var Response $response */
-        $response = $delegate->process($request);
+        $response = $handler->handle($request);
        if (! $request->hasHeader('Origin')) {
            return $response;
        }
--- a/module/Rest/src/Middleware/PathVersionMiddleware.php
+++ b/module/Rest/src/Middleware/PathVersionMiddleware.php
@@ -5,51 +5,31 @@ namespace Shlinkio\Shlink\Rest\Middleware;

 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
-use Zend\Stratigility\MiddlewareInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;

 class PathVersionMiddleware implements MiddlewareInterface
 {
    /**
-     * Process an incoming request and/or response.
-     *
-     * Accepts a server-side request and a response instance, and does
-     * something with them.
-     *
-     * If the response is not complete and/or further processing would not
-     * interfere with the work done in the middleware, or if the middleware
-     * wants to delegate to another process, it can use the `$out` callable
-     * if present.
-     *
-     * If the middleware does not return a value, execution of the current
-     * request is considered complete, and the response instance provided will
-     * be considered the response to return.
-     *
-     * Alternately, the middleware may return a response instance.
-     *
-     * Often, middleware will `return $out();`, with the assumption that a
-     * later middleware will return a response.
+     * Process an incoming server request and return a response, optionally delegating
+     * to the next middleware component to create the response.
     *
     * @param Request $request
-     * @param Response $response
-     * @param null|callable $out
-     * @return null|Response
+     * @param RequestHandlerInterface $handler
+     *
+     * @return Response
+     * @throws \InvalidArgumentException
     */
-    public function __invoke(Request $request, Response $response, callable $out = null)
+    public function process(Request $request, RequestHandlerInterface $handler): Response
    {
        $uri = $request->getUri();
        $path = $uri->getPath();

        // If the path does not begin with the version number, prepend v1 by default for BC compatibility purposes
-        if (strpos($path, '/v') !== 0) {
-            $parts = explode('/', $path);
-            // Remove the first empty part and the
-            array_shift($parts);
-            // Prepend the version prefix
-            array_unshift($parts, '/v1');
-
-            $request = $request->withUri($uri->withPath(implode('/', $parts)));
+        if (\strpos($path, '/v') !== 0) {
+            $request = $request->withUri($uri->withPath('/v1' . $uri->getPath()));
        }

-        return $out($request, $response);
+        return $handler->handle($request);
    }
 }
--- a/module/Rest/src/Util/RestUtils.php
+++ b/module/Rest/src/Util/RestUtils.php
@@ -9,16 +9,16 @@ use Shlinkio\Shlink\Rest\Exception as Rest;

 class RestUtils
 {
-    const INVALID_SHORTCODE_ERROR = 'INVALID_SHORTCODE';
-    const INVALID_URL_ERROR = 'INVALID_URL';
-    const INVALID_ARGUMENT_ERROR = 'INVALID_ARGUMENT';
-    const INVALID_SLUG_ERROR = 'INVALID_SLUG';
-    const INVALID_CREDENTIALS_ERROR = 'INVALID_CREDENTIALS';
-    const INVALID_AUTH_TOKEN_ERROR = 'INVALID_AUTH_TOKEN';
-    const INVALID_AUTHORIZATION_ERROR = 'INVALID_AUTHORIZATION';
-    const INVALID_API_KEY_ERROR = 'INVALID_API_KEY';
-    const NOT_FOUND_ERROR = 'NOT_FOUND';
-    const UNKNOWN_ERROR = 'UNKNOWN_ERROR';
+    public const INVALID_SHORTCODE_ERROR = 'INVALID_SHORTCODE';
+    public const INVALID_URL_ERROR = 'INVALID_URL';
+    public const INVALID_ARGUMENT_ERROR = 'INVALID_ARGUMENT';
+    public const INVALID_SLUG_ERROR = 'INVALID_SLUG';
+    public const INVALID_CREDENTIALS_ERROR = 'INVALID_CREDENTIALS';
+    public const INVALID_AUTH_TOKEN_ERROR = 'INVALID_AUTH_TOKEN';
+    public const INVALID_AUTHORIZATION_ERROR = 'INVALID_AUTHORIZATION';
+    public const INVALID_API_KEY_ERROR = 'INVALID_API_KEY';
+    public const NOT_FOUND_ERROR = 'NOT_FOUND';
+    public const UNKNOWN_ERROR = 'UNKNOWN_ERROR';

    public static function getRestErrorCodeFromException(\Throwable $e)
    {
--- a/module/Rest/test/Action/AuthenticateActionTest.php
+++ b/module/Rest/test/Action/AuthenticateActionTest.php
@@ -10,7 +10,6 @@ use Shlinkio\Shlink\Rest\Action\AuthenticateAction;
 use Shlinkio\Shlink\Rest\Authentication\JWTService;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
 use Shlinkio\Shlink\Rest\Service\ApiKeyService;
-use ShlinkioTest\Shlink\Common\Util\TestUtils;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\I18n\Translator\Translator;

@@ -47,7 +46,7 @@ class AuthenticateActionTest extends TestCase
     */
    public function notProvidingAuthDataReturnsError()
    {
-        $resp = $this->action->process(ServerRequestFactory::fromGlobals(), TestUtils::createDelegateMock()->reveal());
+        $resp = $this->action->handle(ServerRequestFactory::fromGlobals());
        $this->assertEquals(400, $resp->getStatusCode());
    }

@@ -62,7 +61,7 @@ class AuthenticateActionTest extends TestCase
        $request = ServerRequestFactory::fromGlobals()->withParsedBody([
            'apiKey' => 'foo',
        ]);
-        $response = $this->action->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->action->handle($request);
        $this->assertEquals(200, $response->getStatusCode());

        $response->getBody()->rewind();
@@ -80,7 +79,7 @@ class AuthenticateActionTest extends TestCase
        $request = ServerRequestFactory::fromGlobals()->withParsedBody([
            'apiKey' => 'foo',
        ]);
-        $response = $this->action->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->action->handle($request);
        $this->assertEquals(401, $response->getStatusCode());
    }
 }
--- a/module/Rest/test/Action/CreateShortcodeActionTest.php
+++ b/module/Rest/test/Action/CreateShortcodeActionTest.php
@@ -11,7 +11,6 @@ use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Shlinkio\Shlink\Rest\Action\CreateShortcodeAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
-use ShlinkioTest\Shlink\Common\Util\TestUtils;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\Uri;
 use Zend\I18n\Translator\Translator;
@@ -41,10 +40,7 @@ class CreateShortcodeActionTest extends TestCase
     */
    public function missingLongUrlParamReturnsError()
    {
-        $response = $this->action->process(
-            ServerRequestFactory::fromGlobals(),
-            TestUtils::createDelegateMock()->reveal()
-        );
+        $response = $this->action->handle(ServerRequestFactory::fromGlobals());
        $this->assertEquals(400, $response->getStatusCode());
    }

@@ -60,7 +56,7 @@ class CreateShortcodeActionTest extends TestCase
        $request = ServerRequestFactory::fromGlobals()->withParsedBody([
            'longUrl' => 'http://www.domain.com/foo/bar',
        ]);
-        $response = $this->action->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->action->handle($request);
        $this->assertEquals(200, $response->getStatusCode());
        $this->assertTrue(strpos($response->getBody()->getContents(), 'http://foo.com/abc123') > 0);
    }
@@ -77,7 +73,7 @@ class CreateShortcodeActionTest extends TestCase
        $request = ServerRequestFactory::fromGlobals()->withParsedBody([
            'longUrl' => 'http://www.domain.com/foo/bar',
        ]);
-        $response = $this->action->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->action->handle($request);
        $this->assertEquals(400, $response->getStatusCode());
        $this->assertTrue(strpos($response->getBody()->getContents(), RestUtils::INVALID_URL_ERROR) > 0);
    }
@@ -100,7 +96,7 @@ class CreateShortcodeActionTest extends TestCase
            'longUrl' => 'http://www.domain.com/foo/bar',
            'customSlug' => 'foo',
        ]);
-        $response = $this->action->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->action->handle($request);
        $this->assertEquals(400, $response->getStatusCode());
        $this->assertContains(RestUtils::INVALID_SLUG_ERROR, (string) $response->getBody());
    }
@@ -117,7 +113,7 @@ class CreateShortcodeActionTest extends TestCase
        $request = ServerRequestFactory::fromGlobals()->withParsedBody([
            'longUrl' => 'http://www.domain.com/foo/bar',
        ]);
-        $response = $this->action->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->action->handle($request);
        $this->assertEquals(500, $response->getStatusCode());
        $this->assertTrue(strpos($response->getBody()->getContents(), RestUtils::UNKNOWN_ERROR) > 0);
    }
--- a/module/Rest/test/Action/EditShortCodeActionTest.php
+++ b/module/Rest/test/Action/EditShortCodeActionTest.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\Rest\Action;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -43,7 +42,7 @@ class EditShortCodeActionTest extends TestCase
        ]);

        /** @var JsonResponse $resp */
-        $resp = $this->action->process($request, $this->prophesize(DelegateInterface::class)->reveal());
+        $resp = $this->action->handle($request);
        $payload = $resp->getPayload();

        $this->assertEquals(400, $resp->getStatusCode());
@@ -65,7 +64,7 @@ class EditShortCodeActionTest extends TestCase
        );

        /** @var JsonResponse $resp */
-        $resp = $this->action->process($request, $this->prophesize(DelegateInterface::class)->reveal());
+        $resp = $this->action->handle($request);
        $payload = $resp->getPayload();

        $this->assertEquals(404, $resp->getStatusCode());
@@ -85,7 +84,7 @@ class EditShortCodeActionTest extends TestCase
                                                      ]);
        $updateMeta = $this->shortUrlService->updateMetadataByShortCode(Argument::cetera())->willReturn(new ShortUrl());

-        $resp = $this->action->process($request, $this->prophesize(DelegateInterface::class)->reveal());
+        $resp = $this->action->handle($request);

        $this->assertEquals(204, $resp->getStatusCode());
        $updateMeta->shouldHaveBeenCalled();
--- a/module/Rest/test/Action/EditShortcodeTagsActionTest.php
+++ b/module/Rest/test/Action/EditShortcodeTagsActionTest.php
@@ -9,7 +9,6 @@ use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Service\ShortUrlService;
 use Shlinkio\Shlink\Rest\Action\EditShortcodeTagsAction;
-use ShlinkioTest\Shlink\Common\Util\TestUtils;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\I18n\Translator\Translator;

@@ -35,10 +34,7 @@ class EditShortcodeTagsActionTest extends TestCase
     */
    public function notProvidingTagsReturnsError()
    {
-        $response = $this->action->process(
-            ServerRequestFactory::fromGlobals()->withAttribute('shortCode', 'abc123'),
-            TestUtils::createDelegateMock()->reveal()
-        );
+        $response = $this->action->handle(ServerRequestFactory::fromGlobals()->withAttribute('shortCode', 'abc123'));
        $this->assertEquals(400, $response->getStatusCode());
    }

@@ -51,10 +47,9 @@ class EditShortcodeTagsActionTest extends TestCase
        $this->shortUrlService->setTagsByShortCode($shortCode, [])->willThrow(InvalidShortCodeException::class)
                                                                  ->shouldBeCalledTimes(1);

-        $response = $this->action->process(
+        $response = $this->action->handle(
            ServerRequestFactory::fromGlobals()->withAttribute('shortCode', 'abc123')
-                                               ->withParsedBody(['tags' => []]),
-            TestUtils::createDelegateMock()->reveal()
+                                               ->withParsedBody(['tags' => []])
        );
        $this->assertEquals(404, $response->getStatusCode());
    }
@@ -68,10 +63,9 @@ class EditShortcodeTagsActionTest extends TestCase
        $this->shortUrlService->setTagsByShortCode($shortCode, [])->willReturn(new ShortUrl())
                                                                  ->shouldBeCalledTimes(1);

-        $response = $this->action->process(
+        $response = $this->action->handle(
            ServerRequestFactory::fromGlobals()->withAttribute('shortCode', 'abc123')
-                ->withParsedBody(['tags' => []]),
-            TestUtils::createDelegateMock()->reveal()
+                                               ->withParsedBody(['tags' => []])
        );
        $this->assertEquals(200, $response->getStatusCode());
    }
--- a/module/Rest/test/Action/GetVisitsActionTest.php
+++ b/module/Rest/test/Action/GetVisitsActionTest.php
@@ -10,7 +10,6 @@ use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Service\VisitsTracker;
 use Shlinkio\Shlink\Rest\Action\GetVisitsAction;
-use ShlinkioTest\Shlink\Common\Util\TestUtils;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\I18n\Translator\Translator;

@@ -40,10 +39,7 @@ class GetVisitsActionTest extends TestCase
        $this->visitsTracker->info($shortCode, Argument::type(DateRange::class))->willReturn([])
                                                                                ->shouldBeCalledTimes(1);

-        $response = $this->action->process(
-            ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode),
-            TestUtils::createDelegateMock()->reveal()
-        );
+        $response = $this->action->handle(ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode));
        $this->assertEquals(200, $response->getStatusCode());
    }

@@ -57,10 +53,7 @@ class GetVisitsActionTest extends TestCase
            InvalidArgumentException::class
        )->shouldBeCalledTimes(1);

-        $response = $this->action->process(
-            ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode),
-            TestUtils::createDelegateMock()->reveal()
-        );
+        $response = $this->action->handle(ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode));
        $this->assertEquals(404, $response->getStatusCode());
    }

@@ -74,10 +67,7 @@ class GetVisitsActionTest extends TestCase
            \Exception::class
        )->shouldBeCalledTimes(1);

-        $response = $this->action->process(
-            ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode),
-            TestUtils::createDelegateMock()->reveal()
-        );
+        $response = $this->action->handle(ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode));
        $this->assertEquals(500, $response->getStatusCode());
    }

@@ -91,10 +81,9 @@ class GetVisitsActionTest extends TestCase
            ->willReturn([])
            ->shouldBeCalledTimes(1);

-        $response = $this->action->process(
+        $response = $this->action->handle(
            ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode)
-                                               ->withQueryParams(['endDate' => '2016-01-01 00:00:00']),
-            TestUtils::createDelegateMock()->reveal()
+                                               ->withQueryParams(['endDate' => '2016-01-01 00:00:00'])
        );
        $this->assertEquals(200, $response->getStatusCode());
    }
--- a/module/Rest/test/Action/ListShortCodesActionTest.php
+++ b/module/Rest/test/Action/ListShortCodesActionTest.php
@@ -7,7 +7,6 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Service\ShortUrlService;
 use Shlinkio\Shlink\Rest\Action\ListShortcodesAction;
-use ShlinkioTest\Shlink\Common\Util\TestUtils;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\I18n\Translator\Translator;
 use Zend\Paginator\Adapter\ArrayAdapter;
@@ -39,12 +38,9 @@ class ListShortCodesActionTest extends TestCase
        $this->service->listShortUrls($page, null, [], null)->willReturn(new Paginator(new ArrayAdapter()))
                                                            ->shouldBeCalledTimes(1);

-        $response = $this->action->process(
-            ServerRequestFactory::fromGlobals()->withQueryParams([
-                'page' => $page,
-            ]),
-            TestUtils::createDelegateMock()->reveal()
-        );
+        $response = $this->action->handle(ServerRequestFactory::fromGlobals()->withQueryParams([
+            'page' => $page,
+        ]));
        $this->assertEquals(200, $response->getStatusCode());
    }

@@ -57,12 +53,9 @@ class ListShortCodesActionTest extends TestCase
        $this->service->listShortUrls($page, null, [], null)->willThrow(\Exception::class)
                                                            ->shouldBeCalledTimes(1);

-        $response = $this->action->process(
-            ServerRequestFactory::fromGlobals()->withQueryParams([
-                'page' => $page,
-            ]),
-            TestUtils::createDelegateMock()->reveal()
-        );
+        $response = $this->action->handle(ServerRequestFactory::fromGlobals()->withQueryParams([
+            'page' => $page,
+        ]));
        $this->assertEquals(500, $response->getStatusCode());
    }
 }
--- a/module/Rest/test/Action/ResolveUrlActionTest.php
+++ b/module/Rest/test/Action/ResolveUrlActionTest.php
@@ -10,7 +10,6 @@ use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Shlinkio\Shlink\Rest\Action\ResolveUrlAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
-use ShlinkioTest\Shlink\Common\Util\TestUtils;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\I18n\Translator\Translator;

@@ -41,7 +40,7 @@ class ResolveUrlActionTest extends TestCase
                                                       ->shouldBeCalledTimes(1);

        $request = ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode);
-        $response = $this->action->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->action->handle($request);
        $this->assertEquals(404, $response->getStatusCode());
        $this->assertTrue(strpos($response->getBody()->getContents(), RestUtils::INVALID_ARGUMENT_ERROR) > 0);
    }
@@ -56,7 +55,7 @@ class ResolveUrlActionTest extends TestCase
                                                       ->shouldBeCalledTimes(1);

        $request = ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode);
-        $response = $this->action->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->action->handle($request);
        $this->assertEquals(200, $response->getStatusCode());
        $this->assertTrue(strpos($response->getBody()->getContents(), 'http://domain.com/foo/bar') > 0);
    }
@@ -71,7 +70,7 @@ class ResolveUrlActionTest extends TestCase
                                                       ->shouldBeCalledTimes(1);

        $request = ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode);
-        $response = $this->action->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->action->handle($request);
        $this->assertEquals(400, $response->getStatusCode());
        $this->assertTrue(strpos($response->getBody()->getContents(), RestUtils::INVALID_SHORTCODE_ERROR) > 0);
    }
@@ -86,7 +85,7 @@ class ResolveUrlActionTest extends TestCase
                                                       ->shouldBeCalledTimes(1);

        $request = ServerRequestFactory::fromGlobals()->withAttribute('shortCode', $shortCode);
-        $response = $this->action->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->action->handle($request);
        $this->assertEquals(500, $response->getStatusCode());
        $this->assertTrue(strpos($response->getBody()->getContents(), RestUtils::UNKNOWN_ERROR) > 0);
    }
--- a/module/Rest/test/Action/Tag/CreateTagsActionTest.php
+++ b/module/Rest/test/Action/Tag/CreateTagsActionTest.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\Rest\Action\Tag;

 use Doctrine\Common\Collections\ArrayCollection;
-use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -40,7 +39,7 @@ class CreateTagsActionTest extends TestCase
        /** @var MethodProphecy $deleteTags */
        $deleteTags = $this->tagService->createTags($tags ?: [])->willReturn(new ArrayCollection());

-        $response = $this->action->process($request, $this->prophesize(DelegateInterface::class)->reveal());
+        $response = $this->action->handle($request);

        $this->assertEquals(200, $response->getStatusCode());
        $deleteTags->shouldHaveBeenCalled();
--- a/module/Rest/test/Action/Tag/DeleteTagsActionTest.php
+++ b/module/Rest/test/Action/Tag/DeleteTagsActionTest.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\Rest\Action\Tag;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -39,7 +38,7 @@ class DeleteTagsActionTest extends TestCase
        /** @var MethodProphecy $deleteTags */
        $deleteTags = $this->tagService->deleteTags($tags ?: []);

-        $response = $this->action->process($request, $this->prophesize(DelegateInterface::class)->reveal());
+        $response = $this->action->handle($request);

        $this->assertEquals(204, $response->getStatusCode());
        $deleteTags->shouldHaveBeenCalled();
--- a/module/Rest/test/Action/Tag/ListTagsActionTest.php
+++ b/module/Rest/test/Action/Tag/ListTagsActionTest.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\Rest\Action\Tag;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -37,10 +36,7 @@ class ListTagsActionTest extends TestCase
        /** @var MethodProphecy $listTags */
        $listTags = $this->tagService->listTags()->willReturn([new Tag('foo'), new Tag('bar')]);

-        $resp = $this->action->process(
-            ServerRequestFactory::fromGlobals(),
-            $this->prophesize(DelegateInterface::class)->reveal()
-        );
+        $resp = $this->action->handle(ServerRequestFactory::fromGlobals());

        $this->assertEquals([
            'tags' => [
--- a/module/Rest/test/Action/Tag/UpdateTagActionTest.php
+++ b/module/Rest/test/Action/Tag/UpdateTagActionTest.php
@@ -3,7 +3,6 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\Rest\Action\Tag;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -39,7 +38,7 @@ class UpdateTagActionTest extends TestCase
    public function whenInvalidParamsAreProvidedAnErrorIsReturned(array $bodyParams)
    {
        $request = ServerRequestFactory::fromGlobals()->withParsedBody($bodyParams);
-        $resp = $this->action->process($request, $this->prophesize(DelegateInterface::class)->reveal());
+        $resp = $this->action->handle($request);

        $this->assertEquals(400, $resp->getStatusCode());
    }
@@ -65,7 +64,7 @@ class UpdateTagActionTest extends TestCase
        /** @var MethodProphecy $rename */
        $rename = $this->tagService->renameTag('foo', 'bar')->willThrow(EntityDoesNotExistException::class);

-        $resp = $this->action->process($request, $this->prophesize(DelegateInterface::class)->reveal());
+        $resp = $this->action->handle($request);

        $this->assertEquals(404, $resp->getStatusCode());
        $rename->shouldHaveBeenCalled();
@@ -83,7 +82,7 @@ class UpdateTagActionTest extends TestCase
        /** @var MethodProphecy $rename */
        $rename = $this->tagService->renameTag('foo', 'bar')->willReturn(new Tag());

-        $resp = $this->action->process($request, $this->prophesize(DelegateInterface::class)->reveal());
+        $resp = $this->action->handle($request);

        $this->assertEquals(204, $resp->getStatusCode());
        $rename->shouldHaveBeenCalled();
--- a/module/Rest/test/Middleware/BodyParserMiddlewareTest.php
+++ b/module/Rest/test/Middleware/BodyParserMiddlewareTest.php
@@ -3,11 +3,11 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\Rest\Middleware;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\MethodProphecy;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Rest\Middleware\BodyParserMiddleware;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequestFactory;
@@ -31,9 +31,9 @@ class BodyParserMiddlewareTest extends TestCase
    public function requestsFromOtherMethodsJustFallbackToNextMiddleware()
    {
        $request = ServerRequestFactory::fromGlobals()->withMethod('GET');
-        $delegate = $this->prophesize(DelegateInterface::class);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
        /** @var MethodProphecy $process */
-        $process = $delegate->process($request)->willReturn(new Response());
+        $process = $delegate->handle($request)->willReturn(new Response());

        $this->middleware->process($request, $delegate->reveal());

@@ -51,9 +51,9 @@ class BodyParserMiddlewareTest extends TestCase
        $request = ServerRequestFactory::fromGlobals()->withMethod('PUT')
                                                      ->withBody($body)
                                                      ->withHeader('content-type', 'application/json');
-        $delegate = $this->prophesize(DelegateInterface::class);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
        /** @var MethodProphecy $process */
-        $process = $delegate->process(Argument::type(ServerRequestInterface::class))->will(
+        $process = $delegate->handle(Argument::type(ServerRequestInterface::class))->will(
            function (array $args) use ($test) {
                /** @var ServerRequestInterface $req */
                $req = array_shift($args);
@@ -82,9 +82,9 @@ class BodyParserMiddlewareTest extends TestCase
        $body->write('foo=bar&bar[]=one&bar[]=5');
        $request = ServerRequestFactory::fromGlobals()->withMethod('PUT')
                                                      ->withBody($body);
-        $delegate = $this->prophesize(DelegateInterface::class);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
        /** @var MethodProphecy $process */
-        $process = $delegate->process(Argument::type(ServerRequestInterface::class))->will(
+        $process = $delegate->handle(Argument::type(ServerRequestInterface::class))->will(
            function (array $args) use ($test) {
                /** @var ServerRequestInterface $req */
                $req = array_shift($args);
--- a/module/Rest/test/Middleware/CheckAuthenticationMiddlewareTest.php
+++ b/module/Rest/test/Middleware/CheckAuthenticationMiddlewareTest.php
@@ -3,10 +3,10 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\Rest\Middleware;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Prophecy\ObjectProphecy;
+use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Rest\Action\AuthenticateAction;
 use Shlinkio\Shlink\Rest\Authentication\JWTService;
 use Shlinkio\Shlink\Rest\Middleware\CheckAuthenticationMiddleware;
@@ -16,6 +16,7 @@ use Zend\Diactoros\ServerRequestFactory;
 use Zend\Expressive\Router\Route;
 use Zend\Expressive\Router\RouteResult;
 use Zend\I18n\Translator\Translator;
+use function Zend\Stratigility\middleware;

 class CheckAuthenticationMiddlewareTest extends TestCase
 {
@@ -28,10 +29,18 @@ class CheckAuthenticationMiddlewareTest extends TestCase
     */
    protected $jwtService;

+    /**
+     * @var callable
+     */
+    protected $dummyMiddleware;
+
    public function setUp()
    {
        $this->jwtService = $this->prophesize(JWTService::class);
        $this->middleware = new CheckAuthenticationMiddleware($this->jwtService->reveal(), Translator::factory([]));
+        $this->dummyMiddleware = middleware(function ($request, $handler) {
+            return new Response\EmptyResponse;
+        });
    }

    /**
@@ -40,9 +49,9 @@ class CheckAuthenticationMiddlewareTest extends TestCase
    public function someWhiteListedSituationsFallbackToNextMiddleware()
    {
        $request = ServerRequestFactory::fromGlobals();
-        $delegate = $this->prophesize(DelegateInterface::class);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
        /** @var MethodProphecy $process */
-        $process = $delegate->process($request)->willReturn(new Response());
+        $process = $delegate->handle($request)->willReturn(new Response());

        $this->middleware->process($request, $delegate->reveal());
        $process->shouldHaveBeenCalledTimes(1);
@@ -51,29 +60,34 @@ class CheckAuthenticationMiddlewareTest extends TestCase
            RouteResult::class,
            RouteResult::fromRouteFailure(['GET'])
        );
-        $delegate = $this->prophesize(DelegateInterface::class);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
        /** @var MethodProphecy $process */
-        $process = $delegate->process($request)->willReturn(new Response());
+        $process = $delegate->handle($request)->willReturn(new Response());
        $this->middleware->process($request, $delegate->reveal());
        $process->shouldHaveBeenCalledTimes(1);

        $request = ServerRequestFactory::fromGlobals()->withAttribute(
            RouteResult::class,
-            RouteResult::fromRoute(new Route('foo', '', Route::HTTP_METHOD_ANY, AuthenticateAction::class))
+            RouteResult::fromRoute(new Route(
+                'foo',
+                $this->dummyMiddleware,
+                Route::HTTP_METHOD_ANY,
+                AuthenticateAction::class
+            ))
        );
-        $delegate = $this->prophesize(DelegateInterface::class);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
        /** @var MethodProphecy $process */
-        $process = $delegate->process($request)->willReturn(new Response());
+        $process = $delegate->handle($request)->willReturn(new Response());
        $this->middleware->process($request, $delegate->reveal());
        $process->shouldHaveBeenCalledTimes(1);

        $request = ServerRequestFactory::fromGlobals()->withAttribute(
            RouteResult::class,
-            RouteResult::fromRoute(new Route('bar', 'foo'), [])
+            RouteResult::fromRoute(new Route('bar', $this->dummyMiddleware), [])
        )->withMethod('OPTIONS');
-        $delegate = $this->prophesize(DelegateInterface::class);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
        /** @var MethodProphecy $process */
-        $process = $delegate->process($request)->willReturn(new Response());
+        $process = $delegate->handle($request)->willReturn(new Response());
        $this->middleware->process($request, $delegate->reveal());
        $process->shouldHaveBeenCalledTimes(1);
    }
@@ -85,9 +99,9 @@ class CheckAuthenticationMiddlewareTest extends TestCase
    {
        $request = ServerRequestFactory::fromGlobals()->withAttribute(
            RouteResult::class,
-            RouteResult::fromRoute(new Route('bar', 'foo'), [])
+            RouteResult::fromRoute(new Route('bar', $this->dummyMiddleware), [])
        );
-        $response = $this->middleware->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->middleware->process($request, TestUtils::createReqHandlerMock()->reveal());
        $this->assertEquals(401, $response->getStatusCode());
    }

@@ -99,10 +113,10 @@ class CheckAuthenticationMiddlewareTest extends TestCase
        $authToken = 'ABC-abc';
        $request = ServerRequestFactory::fromGlobals()->withAttribute(
            RouteResult::class,
-            RouteResult::fromRoute(new Route('bar', 'foo'), [])
+            RouteResult::fromRoute(new Route('bar', $this->dummyMiddleware), [])
        )->withHeader(CheckAuthenticationMiddleware::AUTHORIZATION_HEADER, $authToken);

-        $response = $this->middleware->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->middleware->process($request, TestUtils::createReqHandlerMock()->reveal());

        $this->assertEquals(401, $response->getStatusCode());
        $this->assertTrue(strpos($response->getBody()->getContents(), 'You need to provide the Bearer type') > 0);
@@ -116,10 +130,10 @@ class CheckAuthenticationMiddlewareTest extends TestCase
        $authToken = 'ABC-abc';
        $request = ServerRequestFactory::fromGlobals()->withAttribute(
            RouteResult::class,
-            RouteResult::fromRoute(new Route('bar', 'foo'), [])
+            RouteResult::fromRoute(new Route('bar', $this->dummyMiddleware), [])
        )->withHeader(CheckAuthenticationMiddleware::AUTHORIZATION_HEADER, 'Basic ' . $authToken);

-        $response = $this->middleware->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->middleware->process($request, TestUtils::createReqHandlerMock()->reveal());

        $this->assertEquals(401, $response->getStatusCode());
        $this->assertTrue(
@@ -135,11 +149,11 @@ class CheckAuthenticationMiddlewareTest extends TestCase
        $authToken = 'ABC-abc';
        $request = ServerRequestFactory::fromGlobals()->withAttribute(
            RouteResult::class,
-            RouteResult::fromRoute(new Route('bar', 'foo'), [])
+            RouteResult::fromRoute(new Route('bar', $this->dummyMiddleware), [])
        )->withHeader(CheckAuthenticationMiddleware::AUTHORIZATION_HEADER, 'Bearer ' . $authToken);
        $this->jwtService->verify($authToken)->willReturn(false)->shouldBeCalledTimes(1);

-        $response = $this->middleware->process($request, TestUtils::createDelegateMock()->reveal());
+        $response = $this->middleware->process($request, TestUtils::createReqHandlerMock()->reveal());
        $this->assertEquals(401, $response->getStatusCode());
    }

@@ -151,14 +165,14 @@ class CheckAuthenticationMiddlewareTest extends TestCase
        $authToken = 'ABC-abc';
        $request = ServerRequestFactory::fromGlobals()->withAttribute(
            RouteResult::class,
-            RouteResult::fromRoute(new Route('bar', 'foo'), [])
+            RouteResult::fromRoute(new Route('bar', $this->dummyMiddleware), [])
        )->withHeader(CheckAuthenticationMiddleware::AUTHORIZATION_HEADER, 'bearer ' . $authToken);
        $this->jwtService->verify($authToken)->willReturn(true)->shouldBeCalledTimes(1);
        $this->jwtService->refresh($authToken)->willReturn($authToken)->shouldBeCalledTimes(1);

-        $delegate = $this->prophesize(DelegateInterface::class);
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
        /** @var MethodProphecy $process */
-        $process = $delegate->process($request)->willReturn(new Response());
+        $process = $delegate->handle($request)->willReturn(new Response());
        $resp = $this->middleware->process($request, $delegate->reveal());

        $process->shouldHaveBeenCalledTimes(1);
--- a/module/Rest/test/Middleware/CrossDomainMiddlewareTest.php
+++ b/module/Rest/test/Middleware/CrossDomainMiddlewareTest.php
@@ -3,10 +3,10 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\Rest\Middleware;

-use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
+use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Rest\Middleware\CrossDomainMiddleware;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequestFactory;
@@ -25,7 +25,7 @@ class CrossDomainMiddlewareTest extends TestCase
    public function setUp()
    {
        $this->middleware = new CrossDomainMiddleware();
-        $this->delegate = $this->prophesize(DelegateInterface::class);
+        $this->delegate = $this->prophesize(RequestHandlerInterface::class);
    }

    /**
@@ -34,7 +34,7 @@ class CrossDomainMiddlewareTest extends TestCase
    public function nonCrossDomainRequestsAreNotAffected()
    {
        $originalResponse = new Response();
-        $this->delegate->process(Argument::any())->willReturn($originalResponse)->shouldbeCalledTimes(1);
+        $this->delegate->handle(Argument::any())->willReturn($originalResponse)->shouldbeCalledTimes(1);

        $response = $this->middleware->process(ServerRequestFactory::fromGlobals(), $this->delegate->reveal());
        $this->assertSame($originalResponse, $response);
@@ -50,7 +50,7 @@ class CrossDomainMiddlewareTest extends TestCase
    public function anyRequestIncludesTheAllowAccessHeader()
    {
        $originalResponse = new Response();
-        $this->delegate->process(Argument::any())->willReturn($originalResponse)->shouldbeCalledTimes(1);
+        $this->delegate->handle(Argument::any())->willReturn($originalResponse)->shouldbeCalledTimes(1);

        $response = $this->middleware->process(
            ServerRequestFactory::fromGlobals()->withHeader('Origin', 'local'),
@@ -70,7 +70,7 @@ class CrossDomainMiddlewareTest extends TestCase
    {
        $originalResponse = new Response();
        $request = ServerRequestFactory::fromGlobals()->withMethod('OPTIONS')->withHeader('Origin', 'local');
-        $this->delegate->process(Argument::any())->willReturn($originalResponse)->shouldbeCalledTimes(1);
+        $this->delegate->handle(Argument::any())->willReturn($originalResponse)->shouldbeCalledTimes(1);

        $response = $this->middleware->process($request, $this->delegate->reveal());
        $this->assertNotSame($originalResponse, $response);
--- a/module/Rest/test/Middleware/PathVersionMiddlewareTest.php
+++ b/module/Rest/test/Middleware/PathVersionMiddlewareTest.php
@@ -3,8 +3,11 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\Rest\Middleware;

+use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Rest\Middleware\PathVersionMiddleware;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequestFactory;
@@ -28,10 +31,13 @@ class PathVersionMiddlewareTest extends TestCase
    public function whenVersionIsProvidedRequestRemainsUnchanged()
    {
        $request = ServerRequestFactory::fromGlobals()->withUri(new Uri('/v2/foo'));
-        $test = $this;
-        $this->middleware->__invoke($request, new Response(), function ($req) use ($request, $test) {
-            $test->assertSame($request, $req);
-        });
+
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
+        $process = $delegate->handle($request)->willReturn(new Response());
+
+        $this->middleware->process($request, $delegate->reveal());
+
+        $process->shouldHaveBeenCalled();
    }

    /**
@@ -40,10 +46,17 @@ class PathVersionMiddlewareTest extends TestCase
    public function versionOneIsPrependedWhenNoVersionIsDefined()
    {
        $request = ServerRequestFactory::fromGlobals()->withUri(new Uri('/bar/baz'));
-        $test = $this;
-        $this->middleware->__invoke($request, new Response(), function (Request $req) use ($request, $test) {
-            $test->assertNotSame($request, $req);
-            $this->assertEquals('/v1/bar/baz', $req->getUri()->getPath());
+
+        $delegate = $this->prophesize(RequestHandlerInterface::class);
+        $delegate->handle(Argument::type(Request::class))->will(function (array $args) use ($request) {
+            $req = \array_shift($args);
+
+            Assert::assertNotSame($request, $req);
+            Assert::assertEquals('/v1/bar/baz', $req->getUri()->getPath());
+            return new Response();
        });
+
+
+        $this->middleware->process($request, $delegate->reveal());
    }
 }
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,3 +1,4 @@
 parameters:
 	excludes_analyse:
 		- module/Common/src/Template/Extension/TranslatorExtension.php
+		- module/Rest/src/Util/RestUtils.php
--- a/public/index.php
+++ b/public/index.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);

-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Zend\Expressive\Application;

 /** @var ContainerInterface $container */
 $container = include __DIR__ . '/../config/container.php';
-$app = $container->get(Application::class)->run();
+$container->get(Application::class)->run();
Author	SHA1	Message	Date
Alejandro Celaya	d2a04259f5	Merge branch 'develop'	2018-04-07 09:06:45 +02:00
Alejandro Celaya	e504daa1ba	Merge pull request #142 from acelaya/develop Develop	2018-04-07 09:05:56 +02:00
Alejandro Celaya	8793a67ce9	Reduced the number of includes by pointing to dcotrine scripts with extension	2018-04-07 08:37:41 +02:00
Alejandro Celaya	b4ded374e9	Updated changelog	2018-04-07 08:32:06 +02:00
Alejandro Celaya	91d350b12f	Removed path workaround in PathVersionMiddleware and simplified code	2018-04-07 08:31:03 +02:00
Alejandro Celaya	b3e25f28fd	Added v1.8.1 to changelog	2018-04-07 08:25:01 +02:00
Alejandro Celaya	aca89f9abe	Updated links to doctrine CLI scripts to avoid depending on symlinks	2018-04-07 08:21:34 +02:00
Alejandro Celaya	243075dd78	Merge branch 'develop'	2018-03-29 09:52:00 +02:00
Alejandro Celaya	7130425896	Merge pull request #133 from acelaya/feature/1.8.0 1.8.0	2018-03-29 09:50:58 +02:00
Alejandro Celaya	fe9ab20cbb	Applied some improvements	2018-03-27 23:57:29 +02:00
Alejandro Celaya	6935b2ebe2	Updated system so that NotFoundDelegate is used	2018-03-26 20:37:04 +02:00
Alejandro Celaya	3dcc510da1	Updated to symfony 4	2018-03-26 20:32:12 +02:00
Alejandro Celaya	2f26c82fa6	Removed expressive migration tool from dev dependencies	2018-03-26 20:25:30 +02:00
Alejandro Celaya	9ddb60a882	Updated changelog including v1.8.0	2018-03-26 20:22:57 +02:00
Alejandro Celaya	210b08b61f	Created PixelActionTest	2018-03-26 20:17:38 +02:00
Alejandro Celaya	42fe4bd5ce	Created new action to track visits, which returns an empty pixel	2018-03-26 20:13:03 +02:00
Alejandro Celaya	1b2a0820e5	Updated to phpunit 7 and dropped dbunit dependency	2018-03-26 19:09:10 +02:00
Alejandro Celaya	6cf0155417	Updated minimum required MSI	2018-03-26 19:06:49 +02:00
Alejandro Celaya	9b8be3e5b8	Fixed phpstan errors	2018-03-26 19:05:26 +02:00
Alejandro Celaya	a27b01b895	Fixed tests	2018-03-26 19:02:41 +02:00
Alejandro Celaya	16dd1838aa	Updated to expressive 3	2018-03-26 18:49:28 +02:00
Alejandro Celaya	f788d6872f	Added infection to the build matrix	2018-03-26 18:16:59 +02:00
Alejandro Celaya	d0df007812	Dropped support for PHP 7.0	2018-03-26 18:16:59 +02:00
Alejandro Celaya	f60c217fae	Merge pull request #136 from acelaya/feature/1.7.2 Feature/1.7.2	2018-03-26 18:13:48 +02:00
Alejandro Celaya	d3fc7d543a	Updated changelog	2018-03-26 18:13:08 +02:00
Alejandro Celaya	4d0fc1da07	Fixed PathVersionMiddleware not being properly propagated	2018-03-26 17:53:22 +02:00
Alejandro Celaya	ee2233c6dd	Updated PathVersionMiddleware to single-pass middleware	2018-03-26 17:36:58 +02:00
Alejandro Celaya	ea6e0d7c7f	Merge branch 'develop'	2018-03-21 16:31:27 +01:00
Alejandro Celaya	d9d599eab4	Updated changelog	2018-03-21 16:31:00 +01:00
Alejandro Celaya	d1ba44e1b3	Merge pull request #128 from weirdan/upgrade-to-expressive-2.2 Upgrade to expressive 2.2	2018-03-21 16:27:09 +01:00
Bruce Weirdan	dff2ad3740	define property to please scrutinizer	2018-03-21 12:13:03 +02:00
Bruce Weirdan	f7e63710e4	updated tests to fix deprecations also fixed cs errors in middleware-pipeline	2018-03-21 02:05:55 +02:00
Bruce Weirdan	d3b5cd5c57	fixed middleware deprecations	2018-03-21 01:46:26 +02:00
Alejandro Celaya	86ed83d25e	Merge branch 'develop'	2018-02-03 10:23:18 +01:00
Alejandro Celaya	f96d0fe30a	Merge pull request #124 from acelaya/feature/o-a-s-3 Feature/o a s 3	2018-02-03 10:14:32 +01:00
Alejandro Celaya	be406bd676	Removed no-longer used Authorization parameter	2018-02-03 10:13:10 +01:00
Alejandro Celaya	044278752b	Fixed server	2018-02-03 10:09:42 +01:00
Alejandro Celaya	343d2ab44a	Added domain	2018-02-03 10:07:37 +01:00
Alejandro Celaya	66992f644e	Added default value for server	2018-02-03 10:06:04 +01:00
Alejandro Celaya	cf245524dd	Added missing base path in server	2018-02-03 10:01:16 +01:00
Alejandro Celaya	ad520811a3	Fixed dynamic host	2018-02-03 09:55:53 +01:00
Alejandro Celaya	ee1e1d5688	Updated swagger docs to OAS3	2018-02-03 09:53:40 +01:00