From 39ac2efe2625b78c5b6ed77df4fb55842009b664 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Fri, 1 Nov 2019 17:16:56 +0100
Subject: [PATCH] Updated to latest shlink-common with bug fixes

---
 CHANGELOG.md                                             | 1 +
 bin/test/run-api-tests.sh                                | 3 +--
 composer.json                                            | 2 +-
 module/Rest/test-api/Action/CreateShortUrlActionTest.php | 2 +-
 module/Rest/test-api/Action/ListShortUrlsTest.php        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6e2556b..9800cfb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 * [#507](https://github.com/shlinkio/shlink/issues/507) Fixed error with too long original URLs by increasing size to the maximum value (2048) based on [the standard](https://stackoverflow.com/a/417184).
 * [#502](https://github.com/shlinkio/shlink/issues/502) Fixed error when providing the port as part of the domain on short URLs.
 * [#509](https://github.com/shlinkio/shlink/issues/509) Fixed error when trying to generate a QR code for a short URL which uses a custom domain.
+* [#522](https://github.com/shlinkio/shlink/issues/522) Highly mitigated errors thrown when lots of short URLs are created concurrently including new and existing tags.
 
 
 ## 1.19.0 - 2019-10-05
diff --git a/bin/test/run-api-tests.sh b/bin/test/run-api-tests.sh
index 32339c19..5a497716 100755
--- a/bin/test/run-api-tests.sh
+++ b/bin/test/run-api-tests.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env sh
-set -e
-
 export APP_ENV=test
+export DB_DRIVER=mysql
 
 # Try to stop server just in case it hanged in last execution
 vendor/bin/zend-expressive-swoole stop
diff --git a/composer.json b/composer.json
index c3e071bc..54a3ea76 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
         "phly/phly-event-dispatcher": "^1.0",
         "predis/predis": "^1.1",
         "pugx/shortid-php": "^0.5",
-        "shlinkio/shlink-common": "^2.2",
+        "shlinkio/shlink-common": "^2.2.1",
         "shlinkio/shlink-event-dispatcher": "^1.0",
         "shlinkio/shlink-installer": "^2.1",
         "shlinkio/shlink-ip-geolocation": "^1.1",
diff --git a/module/Rest/test-api/Action/CreateShortUrlActionTest.php b/module/Rest/test-api/Action/CreateShortUrlActionTest.php
index 9e691f7f..c733be25 100644
--- a/module/Rest/test-api/Action/CreateShortUrlActionTest.php
+++ b/module/Rest/test-api/Action/CreateShortUrlActionTest.php
@@ -76,7 +76,7 @@ class CreateShortUrlActionTest extends ApiTestCase
 
     public function provideMaxVisits(): array
     {
-        return map(range(1, 20), function (int $i) {
+        return map(range(10, 15), function (int $i) {
             return [$i];
         });
     }
diff --git a/module/Rest/test-api/Action/ListShortUrlsTest.php b/module/Rest/test-api/Action/ListShortUrlsTest.php
index 726f9f4d..d2171b3a 100644
--- a/module/Rest/test-api/Action/ListShortUrlsTest.php
+++ b/module/Rest/test-api/Action/ListShortUrlsTest.php
@@ -40,7 +40,7 @@ class ListShortUrlsTest extends ApiTestCase
                             . '/acmailer-7-0-the-most-important-release-in-a-long-time/',
                         'dateCreated' => '2019-01-01T00:00:00+00:00',
                         'visitsCount' => 2,
-                        'tags' => ['foo', 'bar'],
+                        'tags' => ['bar', 'foo'],
                         'meta' => [
                             'validSince' => '2020-05-01T00:00:00+00:00',
                             'validUntil' => null,