From 9c48e6578dafef5728c308b666f9ea8a2f483fa7 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Fri, 12 Feb 2021 09:24:13 +0100
Subject: [PATCH] Removed mezzio-helpers and used ContentLengthMiddleware from
 shlink-common

---
 composer.json                                  | 3 +--
 config/autoload/middleware-pipeline.global.php | 8 ++------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index f4eedb4a..d03790a8 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,6 @@
         "lstrojny/functional-php": "^1.15",
         "mezzio/mezzio": "^3.3",
         "mezzio/mezzio-fastroute": "^3.1",
-        "mezzio/mezzio-helpers": "^5.3",
         "mezzio/mezzio-problem-details": "^1.3",
         "mezzio/mezzio-swoole": "^3.1",
         "monolog/monolog": "^2.0",
@@ -47,7 +46,7 @@
         "predis/predis": "^1.1",
         "pugx/shortid-php": "^0.7",
         "ramsey/uuid": "^3.9",
-        "shlinkio/shlink-common": "dev-main#62d4b84 as 3.5",
+        "shlinkio/shlink-common": "dev-main#2cf5e45 as 3.5",
         "shlinkio/shlink-config": "^1.0",
         "shlinkio/shlink-event-dispatcher": "^2.0",
         "shlinkio/shlink-importer": "^2.2",
diff --git a/config/autoload/middleware-pipeline.global.php b/config/autoload/middleware-pipeline.global.php
index c879205f..c60e1ba7 100644
--- a/config/autoload/middleware-pipeline.global.php
+++ b/config/autoload/middleware-pipeline.global.php
@@ -5,22 +5,18 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink;
 
 use Laminas\Stratigility\Middleware\ErrorHandler;
-use Mezzio\Helper;
 use Mezzio\ProblemDetails;
 use Mezzio\Router;
 use PhpMiddleware\RequestId\RequestIdMiddleware;
 use RKA\Middleware\IpAddress;
-
-use function extension_loaded;
+use Shlinkio\Shlink\Common\Middleware\ContentLengthMiddleware;
 
 return [
 
     'middleware_pipeline' => [
         'error-handler' => [
             'middleware' => [
-                // For some reason, with swoole 4.6.3, piping this middleware makes requests to have incomplete body or
-                // never finish loading. Disabling it for swoole fixes it as it already calculates the header on itself
-                ...extension_loaded('swoole') ? [] : [Helper\ContentLengthMiddleware::class],
+                ContentLengthMiddleware::class,
                 ErrorHandler::class,
             ],
         ],