From de4e677f18a0a6bb804b332607cda709ae66bfc8 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Fri, 5 Feb 2021 18:33:36 +0100
Subject: [PATCH] Fixed database started for API tests in GitHub workflow

---
 .github/workflows/ci.yml                        | 2 +-
 config/autoload/url-shortener.global.php        | 2 +-
 docker/config/shlink_in_docker.local.php        | 2 +-
 module/Core/src/Options/UrlShortenerOptions.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b591afbd..0674cd2b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -189,7 +189,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Start database server
-        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db
+        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_postgres
       - name: Use PHP
         uses: shivammathur/setup-php@v2
         with:
diff --git a/config/autoload/url-shortener.global.php b/config/autoload/url-shortener.global.php
index f4a7966a..015d459e 100644
--- a/config/autoload/url-shortener.global.php
+++ b/config/autoload/url-shortener.global.php
@@ -19,7 +19,7 @@ return [
         'default_short_codes_length' => DEFAULT_SHORT_CODES_LENGTH,
         'redirect_status_code' => DEFAULT_REDIRECT_STATUS_CODE,
         'redirect_cache_lifetime' => DEFAULT_REDIRECT_CACHE_LIFETIME,
-        'auto_resolve_titles' => false, // Deprecated value. Default to true with Shlink 3.0.0
+        'auto_resolve_titles' => false,
     ],
 
 ];
diff --git a/docker/config/shlink_in_docker.local.php b/docker/config/shlink_in_docker.local.php
index 070f0974..40173d69 100644
--- a/docker/config/shlink_in_docker.local.php
+++ b/docker/config/shlink_in_docker.local.php
@@ -125,7 +125,7 @@ return [
         'default_short_codes_length' => $helper->getDefaultShortCodesLength(),
         'redirect_status_code' => (int) env('REDIRECT_STATUS_CODE', DEFAULT_REDIRECT_STATUS_CODE),
         'redirect_cache_lifetime' => (int) env('REDIRECT_CACHE_LIFETIME', DEFAULT_REDIRECT_CACHE_LIFETIME),
-        'auto_resolve_titles' => (bool) env('AUTO_RESOLVE_TITLES', false), // Deprecated value. Default to true
+        'auto_resolve_titles' => (bool) env('AUTO_RESOLVE_TITLES', false),
     ],
 
     'not_found_redirects' => $helper->getNotFoundRedirectsConfig(),
diff --git a/module/Core/src/Options/UrlShortenerOptions.php b/module/Core/src/Options/UrlShortenerOptions.php
index 553a160f..ebedbf97 100644
--- a/module/Core/src/Options/UrlShortenerOptions.php
+++ b/module/Core/src/Options/UrlShortenerOptions.php
@@ -18,7 +18,7 @@ class UrlShortenerOptions extends AbstractOptions
     private bool $validateUrl = true;
     private int $redirectStatusCode = DEFAULT_REDIRECT_STATUS_CODE;
     private int $redirectCacheLifetime = DEFAULT_REDIRECT_CACHE_LIFETIME;
-    private bool $autoResolveTitles = false; // Deprecated value. Default to true with Shlink 3.0.0
+    private bool $autoResolveTitles = false;
 
     public function isUrlValidationEnabled(): bool
     {