Fixed merge conflicts

CHANGELOG.md

@@ -34,6 +34,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 * *Nothing*
 
 
+## [2.7.2] - 2021-07-30
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1128](https://github.com/shlinkio/shlink/issues/1128) Increased memory limit reserved for the docker image, preventing it from crashing on GeoLite db download.
+
+
 ## [2.7.1] - 2021-05-30
 ### Added
 * *Nothing*

composer.json

@@ -24,6 +24,7 @@
         "endroid/qr-code": "^4.0",
         "geoip2/geoip2": "^2.9",
         "guzzlehttp/guzzle": "^7.0",
+        "guzzlehttp/psr7": "^1.7",
         "happyr/doctrine-specification": "^2.0",
         "jaybizzle/crawler-detect": "^1.2",
         "laminas/laminas-config": "^3.3",

docker/config/php.ini

@@ -1,3 +1,4 @@
 log_errors_max_len=0
 zend.assertions=1
 assert.exception=1
+memory_limit=256M

module/Rest/src/Middleware/EmptyResponseImplicitOptionsMiddlewareFactory.php

@@ -6,11 +6,18 @@ namespace Shlinkio\Shlink\Rest\Middleware;
 
 use Laminas\Diactoros\Response\EmptyResponse;
 use Mezzio\Router\Middleware\ImplicitOptionsMiddleware;
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
 
 class EmptyResponseImplicitOptionsMiddlewareFactory
 {
     public function __invoke(): ImplicitOptionsMiddleware
     {
-        return new ImplicitOptionsMiddleware(fn () => new EmptyResponse());
+        return new ImplicitOptionsMiddleware(new class implements ResponseFactoryInterface {
+            public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface
+            {
+                return new EmptyResponse();
+            }
+        });
     }
 }

module/Rest/test/Middleware/EmptyResponseImplicitOptionsMiddlewareFactoryTest.php

@@ -7,6 +7,7 @@ namespace ShlinkioTest\Shlink\Rest\Middleware;
 use Laminas\Diactoros\Response\EmptyResponse;
 use Mezzio\Router\Middleware\ImplicitOptionsMiddleware;
 use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\ResponseFactoryInterface;
 use ReflectionObject;
 use Shlinkio\Shlink\Rest\Middleware\EmptyResponseImplicitOptionsMiddlewareFactory;
 
@@ -34,6 +35,10 @@ class EmptyResponseImplicitOptionsMiddlewareFactoryTest extends TestCase
         $ref = new ReflectionObject($instance);
         $prop = $ref->getProperty('responseFactory');
         $prop->setAccessible(true);
-        self::assertInstanceOf(EmptyResponse::class, $prop->getValue($instance)());
+
+        /** @var ResponseFactoryInterface $value */
+        $value = $prop->getValue($instance);
+
+        self::assertInstanceOf(EmptyResponse::class, $value->createResponse());
     }
 }