From ce1c70fd7c4d52f2a5d0e04a15b3f28c2803ae26 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Tue, 10 Nov 2020 15:49:05 +0100
Subject: [PATCH 1/3] #891 Fixed wrong return type hint on method inside
 migration when using postgres

---
 data/migrations/Version20201102113208.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/migrations/Version20201102113208.php b/data/migrations/Version20201102113208.php
index 4b169532..1e1237a4 100644
--- a/data/migrations/Version20201102113208.php
+++ b/data/migrations/Version20201102113208.php
@@ -60,7 +60,10 @@ final class Version20201102113208 extends AbstractMigration
            ->execute();
     }
 
-    private function resolveOneApiKeyId(Result $result): ?string
+    /**
+     * @return string|int|null
+     */
+    private function resolveOneApiKeyId(Result $result)
     {
         $results = [];
         while ($row = $result->fetchAssociative()) {

From d60c3a4aa907c43bc3c3af68c5a6201b6459dc5c Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Tue, 10 Nov 2020 15:51:04 +0100
Subject: [PATCH 2/3] #891 Updated changelog

---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 185a9ff3..a9dc1fad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [Unreleased]
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#891](https://github.com/shlinkio/shlink/issues/891) Fixed error when running migrations in postgres due to incorrect return type hint.
+
+
 ## [2.4.0] - 2020-11-08
 ### Added
 * [#829](https://github.com/shlinkio/shlink/issues/829) Added support for QR codes in SVG format, by passing `?format=svg` to the QR code URL.

From 5190a03113e23a2ef1766aa621fd3792ed70d7c8 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Tue, 10 Nov 2020 16:08:22 +0100
Subject: [PATCH 3/3] #846 Fixed base image used for PHP-FPM dev container

---
 CHANGELOG.md              | 1 +
 Dockerfile                | 2 +-
 data/infra/php.Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9dc1fad..3af1a15f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 ### Fixed
 * [#891](https://github.com/shlinkio/shlink/issues/891) Fixed error when running migrations in postgres due to incorrect return type hint.
+* [#846](https://github.com/shlinkio/shlink/issues/846) Fixed base image used for the PHP-FPM dev container.
 
 
 ## [2.4.0] - 2020-11-08
diff --git a/Dockerfile b/Dockerfile
index 04441788..cc7c403d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM php:7.4.11-alpine3.12 as base
 
-ARG SHLINK_VERSION=2.3.0
+ARG SHLINK_VERSION=2.4.0
 ENV SHLINK_VERSION ${SHLINK_VERSION}
 ENV SWOOLE_VERSION 4.5.5
 ENV LC_ALL "C"
diff --git a/data/infra/php.Dockerfile b/data/infra/php.Dockerfile
index e419ba6b..884f2f2e 100644
--- a/data/infra/php.Dockerfile
+++ b/data/infra/php.Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4.11-alpine3.12
+FROM php:7.4.11-fpm-alpine3.12
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV APCU_VERSION 5.1.18