From df1de020d17d6605984d6e86eb575da5a6f53bd3 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 28 Sep 2019 09:30:20 +0200
Subject: [PATCH 1/3] Updated to shlink installer 2

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

diff --git a/composer.json b/composer.json
index edcdc965..4a312ec2 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
         "predis/predis": "^1.1",
         "shlinkio/shlink-common": "^2.0",
         "shlinkio/shlink-event-dispatcher": "^1.0",
-        "shlinkio/shlink-installer": "^1.2.1",
+        "shlinkio/shlink-installer": "^2.0",
         "shlinkio/shlink-ip-geolocation": "^1.0",
         "symfony/console": "^4.3",
         "symfony/filesystem": "^4.3",
diff --git a/config/autoload/installer.global.php b/config/autoload/installer.global.php
index e62c9daf..a84661fa 100644
--- a/config/autoload/installer.global.php
+++ b/config/autoload/installer.global.php
@@ -6,8 +6,6 @@ use Shlinkio\Shlink\Installer\Config\Plugin;
 return [
 
     'installer_plugins_expected_config' => [
-        Plugin\LanguageConfigCustomizer::class => [],
-
         Plugin\UrlShortenerConfigCustomizer::class => [
             Plugin\UrlShortenerConfigCustomizer::SCHEMA,
             Plugin\UrlShortenerConfigCustomizer::HOSTNAME,
@@ -22,6 +20,7 @@ return [
             Plugin\ApplicationConfigCustomizer::DISABLE_TRACK_PARAM,
             Plugin\ApplicationConfigCustomizer::CHECK_VISITS_THRESHOLD,
             Plugin\ApplicationConfigCustomizer::VISITS_THRESHOLD,
+            Plugin\ApplicationConfigCustomizer::BASE_PATH,
         ],
 
         Plugin\DatabaseConfigCustomizer::class => [

From a09208582e2f2a2cd75a5c87938ede1758ce386d Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 28 Sep 2019 09:31:41 +0200
Subject: [PATCH 2/3] Updated changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c341e91..a5066055 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 #### Changed
 
-* *Nothing*
+* [#486](https://github.com/shlinkio/shlink/issues/486) Updated to [shlink-installer](https://github.com/shlinkio/shlink-installer) v2, which supports asking for base path in which shlink is served.
 
 #### Deprecated
 

From 1b0e3b686d0c1b39f44f5f7091a07e323c609cf6 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 28 Sep 2019 09:35:59 +0200
Subject: [PATCH 3/3] Ignored false positive in phpstan

---
 phpstan.neon | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpstan.neon b/phpstan.neon
index 90c8b2ee..681fd8a2 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -4,3 +4,4 @@ parameters:
 		- '#ObjectManager::flush()#'
 		- '#\$metadata ClassMetadata#'
 		- '#Undefined variable: \$metadata#'
+		- '#AbstractQuery::setParameters()#'