Merge pull request #476 from acelaya-forks/feature/fix-log-fields-error

Feature/fix log fields error

.dockerignore

@@ -0,0 +1,24 @@
+config/autoload/*local*
+data/infra
+data/cache/*
+data/log/*
+data/locks/*
+data/proxies/*
+data/migrations_template.txt
+data/GeoLite2-City.*
+data/database.sqlite
+data/shlink-tests.db
+**/.gitignore
+CHANGELOG.md
+composer.lock
+vendor
+docs
+indocker
+docker-*
+php*
+infection.json
+phpstan.neon
+**/test*
+build*
+.github
+hooks

.gitattributes

@@ -3,10 +3,10 @@
 /docs export-ignore
 /module/CLI/test export-ignore
 /module/CLI/test-resources export-ignore
-/module/Common/test export-ignore
-/module/Common/test-db export-ignore
 /module/Core/test export-ignore
 /module/Core/test-db export-ignore
+/module/PreviewGenerator/test export-ignore
+/module/PreviewGenerator/test-db export-ignore
 /module/Rest/test export-ignore
 /module/Rest/test-api export-ignore
 .env.dist export-ignore

.gitignore

@@ -1,5 +1,6 @@
 .idea
 build
+!hooks/build
 composer.lock
 composer.phar
 vendor/

.travis.yml

@@ -5,12 +5,18 @@ branches:
     - /.*/
 
 php:
-  - 7.2
-  - 7.3
+  - '7.2'
+  - '7.3'
+  - '7.4snapshot'
+
+matrix:
+  allow_failures:
+    - php: '7.4snapshot'
 
 services:
   - mysql
   - postgresql
+  - docker
 
 before_install:
   - echo 'extension = apcu.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
@@ -25,9 +31,11 @@ before_script:
   - mysql -e 'CREATE DATABASE shlink_test;'
   - psql -c 'create database shlink_test;' -U postgres
   - mkdir build
+  - export DOCKERFILE_CHANGED=$(git diff ${TRAVIS_COMMIT_RANGE:-origin/master} --name-only | grep Dockerfile)
 
 script:
   - composer ci
+  - if [[ ! -z "$DOCKERFILE_CHANGED" && "${TRAVIS_PHP_VERSION}" == "7.2" ]]; then docker build -t shlink-docker-image:temp . ; fi
 
 after_success:
   - rm -f build/clover.xml
@@ -48,10 +56,4 @@ deploy:
     skip_cleanup: true
     on:
       tags: true
-      php: 7.2
-  - provider: script
-    script: bash data/travis/trigger_docker_build.sh
-    skip_cleanup: true
-    on:
-      tags: true
-      php: 7.2
+      php: '7.2'

CHANGELOG.md

@@ -4,6 +4,32 @@ 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).
 
+## 1.18.1 - 2019-08-24
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#450](https://github.com/shlinkio/shlink/issues/450) Added PHP 7.4 to the build matrix, as an allowed-to-fail env.
+* [#441](https://github.com/shlinkio/shlink/issues/441) and [#443](https://github.com/shlinkio/shlink/issues/443) Split some logic into independent modules.
+* [#451](https://github.com/shlinkio/shlink/issues/451) Updated to infection 0.13.
+* [#467](https://github.com/shlinkio/shlink/issues/467) Moved docker image config to main Shlink repo.
+
+#### Deprecated
+
+* [#428](https://github.com/shlinkio/shlink/issues/428) Deprecated preview-generation feature. It will keep working but it will be removed in Shlink v2.0.0
+
+#### Removed
+
+* [#468](https://github.com/shlinkio/shlink/issues/468) Removed APCu extension from docker image.
+
+#### Fixed
+
+* [#449](https://github.com/shlinkio/shlink/issues/449) Fixed error when trying to save too big referrers on PostgreSQL.
+
+
 ## 1.18.0 - 2019-08-08
 
 #### Added
@@ -55,7 +81,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 * [#305](https://github.com/shlinkio/shlink/issues/305) Implemented changes which will allow Shlink to be truly clusterizable.
 * [#262](https://github.com/shlinkio/shlink/issues/262) Increased mutation score to 75%.
 
-### Deprecated
+#### Deprecated
 
 * *Nothing*
 
@@ -86,7 +112,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 * [#56](https://github.com/shlinkio/shlink/issues/56) Simplified supported cache, requiring APCu always.
 
-### Deprecated
+#### Deprecated
 
 * [#406](https://github.com/shlinkio/shlink/issues/406) Deprecated `PUT /short-urls/{shortCode}` REST endpoint in favor of `PATCH /short-urls/{shortCode}`.
 

Dockerfile

@@ -0,0 +1,56 @@
+FROM php:7.3.8-cli-alpine3.10
+LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
+
+ARG SHLINK_VERSION=1.18.1
+ENV SHLINK_VERSION ${SHLINK_VERSION}
+ENV SWOOLE_VERSION 4.3.3
+ENV COMPOSER_VERSION 1.9.0
+
+WORKDIR /etc/shlink
+
+RUN \
+    # Install mysl and calendar
+    docker-php-ext-install -j"$(nproc)" pdo_mysql calendar && \
+    # Install sqlite
+    apk add --no-cache sqlite-libs sqlite-dev && \
+    docker-php-ext-install -j"$(nproc)" pdo_sqlite && \
+    # Install postgres
+    apk add --no-cache postgresql-dev && \
+    docker-php-ext-install -j"$(nproc)" pdo_pgsql && \
+    # [Deprecated] Install intl
+    apk add --no-cache icu-dev && \
+    docker-php-ext-install -j"$(nproc)" intl && \
+    # Install zip and gd
+    apk add --no-cache libzip-dev zlib-dev libpng-dev && \
+    docker-php-ext-install -j"$(nproc)" zip gd
+
+# Install swoole
+# First line fixes an error when installing pecl extensions. Found in https://github.com/docker-library/php/issues/233
+RUN apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} && \
+    pecl install swoole-${SWOOLE_VERSION} && \
+    docker-php-ext-enable swoole && \
+    apk del .phpize-deps
+
+# Install shlink
+COPY . .
+RUN rm -rf ./docker && \
+    wget https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar && \
+    php composer.phar install --no-dev --optimize-autoloader --prefer-dist --no-progress --no-interaction && \
+    php composer.phar clear-cache && \
+    rm composer.*
+
+# Add shlink to the path to ease running it after container is created
+RUN ln -s /etc/shlink/bin/cli /usr/local/bin/shlink
+RUN sed -i "s/%SHLINK_VERSION%/${SHLINK_VERSION}/g" config/autoload/app_options.global.php
+
+# Expose swoole port
+EXPOSE 8080
+
+# Expose params config dir, since the user is expected to provide custom config from there
+VOLUME /etc/shlink/config/params
+
+# Copy config specific for the image
+COPY docker/docker-entrypoint.sh docker-entrypoint.sh
+COPY docker/config/shlink_in_docker.local.php config/autoload/shlink_in_docker.local.php
+
+ENTRYPOINT ["/bin/sh", "./docker-entrypoint.sh"]

README.md

@@ -196,6 +196,8 @@ Those tasks can be performed using shlink's CLI, so it should be easy to schedul
 
     Running this will improve the performance of the `doma.in/abc123/preview` URLs, which return a preview of the site.
 
+    > **Important!** Generating previews is considered deprecated and the feature will be removed in Shlink v2.
+
 * **For shlink older than v1.17.0**: Update IP geolocation database: `/path/to/shlink/bin/cli visit:update-db`
 
     When shlink is installed it downloads a fresh [GeoLite2](https://dev.maxmind.com/geoip/geoip2/geolite2/) db file. Running this command will update this file.
@@ -223,7 +225,7 @@ Right now, it does not import cached info (like website previews), but it will.
 
 ## Using a docker image
 
-Starting with version 1.15.0, an official docker image is provided. You can find the docs on how to use it [here](https://hub.docker.com/r/shlinkio/shlink/).
+Starting with version 1.15.0, an official docker image is provided. You can learn how to use it by reading [the docs](docker/README.md).
 
 The idea is that you can just generate a container using the image and provide custom config via env vars.
 
@@ -276,7 +278,7 @@ Available commands:
   short-url:generate          [shortcode:generate|short-code:generate] Generates a short URL for provided long URL and returns it
   short-url:list              [shortcode:list|short-code:list] List all short URLs
   short-url:parse             [shortcode:parse|short-code:parse] Returns the long URL behind a short code
-  short-url:process-previews  [shortcode:process-previews|short-code:process-previews] Processes and generates the previews for every URL, improving performance for later web requests.
+  short-url:process-previews  [shortcode:process-previews|short-code:process-previews] [DEPRECATED] Processes and generates the previews for every URL, improving performance for later web requests.
   short-url:visits            [shortcode:visits|short-code:visits] Returns the detailed visits information for provided short code
  tag
   tag:create                  Creates one or more tags.

bin/cli

@@ -2,7 +2,7 @@
 <?php
 declare(strict_types=1);
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Application as CliApp;
 
 /** @var ContainerInterface $container */

bin/test/run-api-tests.sh

@@ -10,5 +10,5 @@ echo 'Starting server...'
 vendor/bin/zend-expressive-swoole start -d
 sleep 2
 
-vendor/bin/phpunit --order-by=random -c phpunit-api.xml --testdox
+vendor/bin/phpunit --order-by=random -c phpunit-api.xml --testdox --colors=always
 vendor/bin/zend-expressive-swoole stop

build.sh

@@ -17,38 +17,15 @@ echo 'Copying project files...'
 rm -rf "${builtcontent}"
 mkdir -p "${builtcontent}"
 rsync -av * "${builtcontent}" \
-    --exclude=bin/test \
-    --exclude=data/infra \
-    --exclude=data/travis \
-    --exclude=data/cache/* \
-    --exclude=data/log/* \
-    --exclude=data/locks/* \
-    --exclude=data/proxies/* \
-    --exclude=data/migrations_template.txt \
-    --exclude=data/GeoLite2-City.* \
-    --exclude=data/database.sqlite \
-    --exclude=data/shlink-tests.db \
-    --exclude=**/.gitignore \
-    --exclude=CHANGELOG.md \
-    --exclude=composer.lock \
-    --exclude=vendor \
-    --exclude=docs \
-    --exclude=indocker \
-    --exclude=docker* \
-    --exclude=php* \
-    --exclude=infection.json \
-    --exclude=phpstan.neon \
-    --exclude=config/autoload/*local* \
-    --exclude=config/test \
-    --exclude=**/test* \
-    --exclude=build* \
-    --exclude=.github
+    --exclude=*docker* \
+    --exclude=Dockerfile \
+    --exclude-from=./.dockerignore
 cd "${builtcontent}"
 
 # Install dependencies
 echo "Installing dependencies with $composerBin..."
 ${composerBin} self-update
-${composerBin} install --no-dev --optimize-autoloader --apcu-autoloader --no-progress --no-interaction
+${composerBin} install --no-dev --optimize-autoloader --no-progress --no-interaction
 
 # Delete development files
 echo 'Deleting dev files...'

composer.json

@@ -15,29 +15,33 @@
         "php": "^7.2",
         "ext-json": "*",
         "ext-pdo": "*",
-        "acelaya/ze-content-based-error-handler": "^2.2",
+        "acelaya/ze-content-based-error-handler": "^3.0",
         "akrabat/ip-address-middleware": "^1.0",
         "cakephp/chronos": "^1.2",
         "cocur/slugify": "^3.0",
         "doctrine/cache": "^1.6",
+        "doctrine/dbal": "^2.9",
         "doctrine/migrations": "^2.0",
         "doctrine/orm": "^2.5",
         "endroid/qr-code": "^1.7",
         "firebase/php-jwt": "^4.0",
         "geoip2/geoip2": "^2.9",
-        "guzzlehttp/guzzle": "^6.2",
-        "lstrojny/functional-php": "^1.8",
+        "guzzlehttp/guzzle": "^6.3",
+        "lstrojny/functional-php": "^1.9",
         "mikehaertl/phpwkhtmltopdf": "^2.2",
-        "monolog/monolog": "^1.21",
+        "monolog/monolog": "^1.24",
         "ocramius/proxy-manager": "~2.2.2",
         "phly/phly-event-dispatcher": "^1.0",
         "predis/predis": "^1.1",
+        "shlinkio/shlink-common": "^1.0",
+        "shlinkio/shlink-event-dispatcher": "^1.0",
         "shlinkio/shlink-installer": "^1.2.1",
+        "shlinkio/shlink-ip-geolocation": "^1.0",
         "symfony/console": "^4.3",
         "symfony/filesystem": "^4.3",
         "symfony/lock": "^4.3",
         "symfony/process": "^4.3",
-        "theorchard/monolog-cascade": "^0.4",
+        "theorchard/monolog-cascade": "^0.5",
         "zendframework/zend-config": "^3.3",
         "zendframework/zend-config-aggregator": "^1.1",
         "zendframework/zend-diactoros": "^2.1.3",
@@ -54,15 +58,15 @@
     },
     "require-dev": {
         "devster/ubench": "^2.0",
-        "doctrine/data-fixtures": "^1.3",
         "eaglewu/swoole-ide-helper": "dev-master",
         "filp/whoops": "^2.4",
-        "infection/infection": "^0.12.2",
+        "infection/infection": "^0.13.4",
         "phpstan/phpstan": "^0.11.2",
         "phpunit/phpcov": "^6.0",
         "phpunit/phpunit": "^8.3",
         "roave/security-advisories": "dev-master",
         "shlinkio/php-coding-standard": "~1.2.2",
+        "shlinkio/shlink-test-utils": "^1.0",
         "symfony/dotenv": "^4.3",
         "symfony/var-dumper": "^4.3",
         "zendframework/zend-component-installer": "^2.1",
@@ -73,13 +77,8 @@
             "Shlinkio\\Shlink\\CLI\\": "module/CLI/src",
             "Shlinkio\\Shlink\\Rest\\": "module/Rest/src",
             "Shlinkio\\Shlink\\Core\\": "module/Core/src",
-            "Shlinkio\\Shlink\\Common\\": "module/Common/src",
-            "Shlinkio\\Shlink\\EventDispatcher\\": "module/EventDispatcher/src"
-        },
-        "files": [
-            "module/Common/functions/functions.php",
-            "module/EventDispatcher/functions/functions.php"
-        ]
+            "Shlinkio\\Shlink\\PreviewGenerator\\": "module/PreviewGenerator/src/"
+        }
     },
     "autoload-dev": {
         "psr-4": {
@@ -90,11 +89,7 @@
                 "module/Core/test",
                 "module/Core/test-db"
             ],
-            "ShlinkioTest\\Shlink\\Common\\": [
-                "module/Common/test",
-                "module/Common/test-db"
-            ],
-            "ShlinkioTest\\Shlink\\EventDispatcher\\": "module/EventDispatcher/test"
+            "ShlinkioTest\\Shlink\\PreviewGenerator\\": "module/PreviewGenerator/test"
         }
     },
     "scripts": {
@@ -107,7 +102,7 @@
 
         "cs": "phpcs",
         "cs:fix": "phpcbf",
-        "stan": "phpstan analyse module/*/src/ --level=5 -c phpstan.neon",
+        "stan": "phpstan analyse module/*/src/ module/*/config config docker/config --level=5 -c phpstan.neon",
 
         "test": [
             "@test:unit",
@@ -119,14 +114,14 @@
             "@test:db",
             "@test:api"
         ],
-        "test:unit": "phpdbg -qrr vendor/bin/phpunit --order-by=random --coverage-php build/coverage-unit.cov --testdox",
-        "test:unit:ci": "phpdbg -qrr vendor/bin/phpunit --order-by=random --coverage-php build/coverage-unit.cov --coverage-clover=build/clover.xml --coverage-xml=build/coverage-xml --log-junit=build/phpunit.junit.xml --testdox",
+        "test:unit": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-unit.cov --testdox",
+        "test:unit:ci": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-unit.cov --coverage-clover=build/clover.xml --coverage-xml=build/coverage-xml --log-junit=build/phpunit.junit.xml --testdox",
         "test:db": [
             "@test:db:sqlite",
             "@test:db:mysql",
             "@test:db:postgres"
         ],
-        "test:db:sqlite": "APP_ENV=test phpdbg -qrr vendor/bin/phpunit --order-by=random -c phpunit-db.xml --coverage-php build/coverage-db.cov --testdox",
+        "test:db:sqlite": "APP_ENV=test phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always -c phpunit-db.xml --coverage-php build/coverage-db.cov --testdox",
         "test:db:mysql": "DB_DRIVER=mysql composer test:db:sqlite",
         "test:db:postgres": "DB_DRIVER=postgres composer test:db:sqlite",
         "test:api": "bin/test/run-api-tests.sh",
@@ -135,7 +130,7 @@
             "@test",
             "phpdbg -qrr vendor/bin/phpcov merge build --html build/html"
         ],
-        "test:unit:pretty": "phpdbg -qrr vendor/bin/phpunit --coverage-html build/coverage --order-by=random",
+        "test:unit:pretty": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-html build/coverage",
 
         "infect": "infection --threads=4 --min-msi=75 --log-verbosity=default --only-covered",
         "infect:ci": "infection --threads=4 --min-msi=75 --log-verbosity=default --only-covered --coverage=build",

config/autoload/dependencies.global.php

@@ -1,18 +1,12 @@
 <?php
 declare(strict_types=1);
 
-use Shlinkio\Shlink\Common\Factory\EmptyResponseImplicitOptionsMiddlewareFactory;
 use Zend\Expressive;
 use Zend\Expressive\Container;
-use Zend\Expressive\Router\Middleware\ImplicitOptionsMiddleware;
 
 return [
 
     'dependencies' => [
-        'factories' => [
-            ImplicitOptionsMiddleware::class => EmptyResponseImplicitOptionsMiddlewareFactory::class,
-        ],
-
         'delegators' => [
             Expressive\Application::class => [
                 Container\ApplicationConfigInjectionDelegator::class,

config/autoload/preview-generation.global.php

@@ -1,6 +1,7 @@
 <?php
 declare(strict_types=1);
 
+/** @deprecated */
 return [
 
     'preview_generation' => [

config/cli-config.php

@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Zend\ServiceManager\ServiceManager;
 
 /** @var ContainerInterface|ServiceManager $container */

config/config.php

@@ -17,10 +17,12 @@ return (new ConfigAggregator\ConfigAggregator([
     Expressive\Swoole\ConfigProvider::class,
     ExpressiveErrorHandler\ConfigProvider::class,
     Common\ConfigProvider::class,
+    IpGeolocation\ConfigProvider::class,
     Core\ConfigProvider::class,
     CLI\ConfigProvider::class,
     Rest\ConfigProvider::class,
     EventDispatcher\ConfigProvider::class,
+    PreviewGenerator\ConfigProvider::class,
     new ConfigAggregator\PhpFileProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
     env('APP_ENV') === 'test'
         ? new ConfigAggregator\PhpFileProvider('config/test/*.global.php')

config/test/bootstrap_api_tests.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common;
+namespace Shlinkio\Shlink\TestUtils;
 
 use Doctrine\ORM\EntityManager;
 use Psr\Container\ContainerInterface;
@@ -16,7 +16,7 @@ if (! file_exists('.env')) {
 
 /** @var ContainerInterface $container */
 $container = require __DIR__ . '/../container.php';
-$testHelper = $container->get(TestHelper::class);
+$testHelper = $container->get(Helper\TestHelper::class);
 $config = $container->get('config');
 $em = $container->get(EntityManager::class);
 

config/test/bootstrap_db_tests.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common;
+namespace Shlinkio\Shlink\TestUtils;
 
 use Psr\Container\ContainerInterface;
 
@@ -15,5 +15,5 @@ if (! file_exists('.env')) {
 
 /** @var ContainerInterface $container */
 $container = require __DIR__ . '/../container.php';
-$container->get(TestHelper::class)->createTestDb();
+$container->get(Helper\TestHelper::class)->createTestDb();
 DbTest\DatabaseTestCase::setEntityManager($container->get('em'));

config/test/test_config.global.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink;
+namespace Shlinkio\Shlink;
 
 use GuzzleHttp\Client;
 use PDO;
@@ -84,7 +84,7 @@ return [
             ]),
         ],
         'factories' => [
-            Common\TestHelper::class => InvokableFactory::class,
+            TestUtils\Helper\TestHelper::class => InvokableFactory::class,
         ],
     ],
 

data/migrations/Version20180913205455.php

@@ -7,7 +7,7 @@ use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 use PDO;
-use Shlinkio\Shlink\Common\Exception\WrongIpException;
+use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
 use Shlinkio\Shlink\Common\Util\IpAddress;
 
 /**
@@ -60,7 +60,7 @@ final class Version20180913205455 extends AbstractMigration
 
         try {
             return (string) IpAddress::fromString($addr)->getObfuscatedCopy();
-        } catch (WrongIpException $e) {
+        } catch (InvalidArgumentException $e) {
             return null;
         }
     }

data/migrations/Version20190824075137.php

@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20190824075137 extends AbstractMigration
+{
+    /**
+     * @throws SchemaException
+     */
+    public function up(Schema $schema): void
+    {
+        $this->getRefererColumn($schema)->setLength(1024);
+    }
+
+    /**
+     * @throws SchemaException
+     */
+    public function down(Schema $schema): void
+    {
+        $this->getRefererColumn($schema)->setLength(256);
+    }
+
+    /**
+     * @throws SchemaException
+     */
+    private function getRefererColumn(Schema $schema): Column
+    {
+        return $schema->getTable('visits')->getColumn('referer');
+    }
+}

data/travis/trigger_docker_build.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-
-# Get latest commit in master, in plain text
-LATEST_MASTER_COMMIT=$(curl -H "Accept: application/vnd.github.sha" -X GET https://api.github.com/repos/shlinkio/shlink-docker-image/commits/master)
-
-# Create new tag and a ref to the tag, which will trigger image build on it
-curl -u acelaya:${GITHUB_OAUTH_KEY} \
-    -H "Content-Type: application/json" \
-    --data "{ \"tag\": \"${TRAVIS_TAG}\", \"message\": \"${TRAVIS_TAG}\", \"object\": \"${LATEST_MASTER_COMMIT}\", \"type\": \"commit\" }" \
-    -X POST https://api.github.com/repos/shlinkio/shlink-docker-image/git/tags
-curl -u acelaya:${GITHUB_OAUTH_KEY} \
-    -H "Content-Type: application/json" \
-    --data "{ \"ref\": \"refs/tags/${TRAVIS_TAG}\", \"sha\": \"${LATEST_MASTER_COMMIT}\" }" \
-    -X POST https://api.github.com/repos/shlinkio/shlink-docker-image/git/refs
-
-# Trigger image build for "latest
-curl -H "Content-Type: application/json" \
-    --data '{ "docker_tag": "latest" }' \
-    -X POST https://registry.hub.docker.com/u/shlinkio/shlink/trigger/${DOCKER_TRIGGER_TOKEN}/

docker/README.md

@@ -0,0 +1,204 @@
+# Shlink Docker image
+
+[![Docker build status](https://img.shields.io/docker/cloud/build/shlinkio/shlink.svg?style=flat-square)](https://hub.docker.com/r/shlinkio/shlink/)
+[![Docker pulls](https://img.shields.io/docker/pulls/shlinkio/shlink.svg?style=flat-square)](https://hub.docker.com/r/shlinkio/shlink/)
+
+This image provides an easy way to set up [shlink](https://shlink.io) on a container-based runtime.
+
+It exposes a shlink instance served with [swoole](https://www.swoole.co.uk/), which persists data in a local [sqlite](https://www.sqlite.org/index.html) database.
+
+## Usage
+
+Shlink docker image exposes port `8080` in order to interact with its HTTP interface.
+
+It also expects these two env vars to be provided, in order to properly generate short URLs at runtime.
+
+* `SHORT_DOMAIN_HOST`: The custom short domain used for this shlink instance. For example **doma.in**.
+* `SHORT_DOMAIN_SCHEMA`: Either **http** or **https**.
+
+So based on this, to run shlink on a local docker service, you should run a command like this:
+
+```bash
+docker run --name shlink -p 8080:8080 -e SHORT_DOMAIN_HOST=doma.in -e SHORT_DOMAIN_SCHEMA=https shlinkio/shlink
+```
+
+### Interact with shlink's CLI on a running container.
+
+Once the shlink container is running, you can interact with the CLI tool by running `shlink` with any of the supported commands.
+
+For example, if the container is called `shlink_container`, you can generate a new API key with:
+
+```bash
+docker exec -it shlink_container shlink api-key:generate
+```
+
+Or you can list all tags with:
+
+```bash
+docker exec -it shlink_container shlink tag:list
+```
+
+Or process remaining visits with:
+
+```bash
+docker exec -it shlink_container shlink visit:process
+```
+
+All shlink commands will work the same way.
+
+You can also list all available commands just by running this:
+
+```bash
+docker exec -it shlink_container shlink
+```
+
+## Use an external DB
+
+The image comes with a working sqlite database, but in production you will probably want to usa a distributed database.
+
+It is possible to use a set of env vars to make this shlink instance interact with an external MySQL or PostgreSQL database.
+
+* `DB_DRIVER`: **[Mandatory]**. Use the value **mysql** or **postgres** to prevent the sqlite database to be used.
+* `DB_NAME`: [Optional]. The database name to be used. Defaults to **shlink**.
+* `DB_USER`: **[Mandatory]**. The username credential for the database server.
+* `DB_PASSWORD`: **[Mandatory]**. The password credential for the database server.
+* `DB_HOST`: **[Mandatory]**. The host name of the server running the database engine.
+* `DB_PORT`: [Optional]. The port in which the database service is running.
+    * Default value is based on the driver:
+        * **mysql** -> `3306`
+        * **postgres** -> `5432`
+
+> PostgreSQL is supported since v1.16.1 of this image. Do not try to use it with previous versions.
+
+Taking this into account, you could run shlink on a local docker service like this:
+
+```bash
+docker run --name shlink -p 8080:8080 -e SHORT_DOMAIN_HOST=doma.in -e SHORT_DOMAIN_SCHEMA=https -e DB_DRIVER=mysql -e DB_USER=root -e DB_PASSWORD=123abc -e DB_HOST=something.rds.amazonaws.com shlinkio/shlink
+```
+
+You could even link to a local database running on a different container:
+
+```bash
+docker run --name shlink -p 8080:8080 [...] -e DB_HOST=some_mysql_container --link some_mysql_container shlinkio/shlink
+```
+
+> If you have considered using SQLite but sharing the database file with a volume, read [this issue](https://github.com/shlinkio/shlink-docker-image/issues/40) first.
+
+## Supported env vars
+
+A few env vars have been already used in previous examples, but this image supports others that can be used to customize its behavior.
+
+This is the complete list of supported env vars:
+
+* `SHORT_DOMAIN_HOST`: The custom short domain used for this shlink instance. For example **doma.in**.
+* `SHORT_DOMAIN_SCHEMA`: Either **http** or **https**.
+* `SHORTCODE_CHARS`: A charset to use when building short codes. Only needed when using more than one shlink instance ([Multi instance considerations](#multi-instance-considerations)).
+* `DB_DRIVER`: **sqlite** (which is the default value), **mysql** or **postgres**.
+* `DB_NAME`: The database name to be used when using an external database driver. Defaults to **shlink**.
+* `DB_USER`: The username credential to be used when using an external database driver.
+* `DB_PASSWORD`: The password credential to be used when using an external database driver.
+* `DB_HOST`: The host name of the database server  when using an external database driver.
+* `DB_PORT`: The port in which the database service is running when using an external database driver. Defaults to **3306**.
+* `DISABLE_TRACK_PARAM`: The name of a query param that can be used to visit short URLs avoiding the visit to be tracked. This feature won't be available if not value is provided.
+* `DELETE_SHORT_URL_THRESHOLD`: The amount of visits on short URLs which will not allow them to be deleted. Defaults to `15`.
+* `LOCALE`: Defines the default language for error pages when a user accesses a short URL which does not exist. Supported values are **es** and **en**. Defaults to **en**.
+* `VALIDATE_URLS`: Boolean which tells if shlink should validate a status 20x (after following redirects) is returned when trying to shorten a URL. Defaults to `true`.
+* `NOT_FOUND_REDIRECT_TO`: If a URL is provided here, when a user tries to access an invalid short URL, he/she will be redirected to this value. If this env var is not provided, the user will see a generic `404 - not found` page.
+* `REDIS_SERVERS`: A comma-separated list of redis servers where Shlink locks are stored (locks are used to prevent some operations to be run more than once in parallel).
+
+    This is important when running more than one Shlink instance ([Multi instance considerations](#multi-instance-considerations)). If not provided, Shlink stores locks on every instance separately.
+
+    If more than one server is provided, Shlink will expect them to be configured as a [redis cluster](https://redis.io/topics/cluster-tutorial).
+
+    In the future, these redis servers could be used for other caching operations performed by shlink.
+
+An example using all env vars could look like this:
+
+```bash
+docker run \
+    --name shlink \
+    -p 8080:8080 \
+    -e SHORT_DOMAIN_HOST=doma.in \
+    -e SHORT_DOMAIN_SCHEMA=https \
+    -e DB_DRIVER=mysql \
+    -e DB_NAME=shlink \
+    -e DB_USER=root \
+    -e DB_PASSWORD=123abc \
+    -e DB_HOST=something.rds.amazonaws.com \
+    -e DB_PORT=3306 \
+    -e DISABLE_TRACK_PARAM="no-track" \
+    -e DELETE_SHORT_URL_THRESHOLD=30 \
+    -e LOCALE=es \
+    -e VALIDATE_URLS=false \
+    -e "NOT_FOUND_REDIRECT_TO=https://www.google.com" \
+    -e "REDIS_SERVERS=tcp://172.20.0.1:6379,tcp://172.20.0.2:6379" \
+    shlinkio/shlink
+```
+
+## Provide config via volumes
+
+Rather than providing custom configuration via env vars, it is also possible ot provide config files in json format.
+
+Mounting a volume at `config/params` you will make shlink load all the files on it with the `.config.json` suffix.
+
+The whole configuration should have this format, but it can be split into multiple files that will be merged:
+
+```json
+{
+    "disable_track_param": "my_param",
+    "delete_short_url_threshold": 30,
+    "locale": "es",
+    "short_domain_schema": "https",
+    "short_domain_host": "doma.in",
+    "validate_url": false,
+    "not_found_redirect_to": "https://my-landing-page.com",
+    "redis_servers": [
+        "tcp://172.20.0.1:6379",
+        "tcp://172.20.0.2:6379"
+    ],
+    "db_config": {
+        "driver": "pdo_mysql",
+        "dbname": "shlink",
+        "user": "root",
+        "password": "123abc",
+        "host": "something.rds.amazonaws.com",
+        "port": "3306"
+    }
+}
+```
+
+> This is internally parsed to how shlink expects the config. If you are using a version previous to 1.17.0, this parser is not present and you need to provide a config structure like the one [documented previously](https://github.com/shlinkio/shlink-docker-image/tree/v1.16.3#provide-config-via-volumes).
+
+Once created just run shlink with the volume:
+
+```bash
+docker run --name shlink -p 8080:8080 -v ${PWD}/my/config/dir:/etc/shlink/config/params shlinkio/shlink
+```
+
+## Multi instance considerations
+
+These are some considerations to take into account when running multiple instances of shlink.
+
+* The first time shlink is run, it generates a charset used to generate short codes, which is a shuffled base62 charset.
+
+    If you are using several shlink instances, you will probably want all of them to use the same charset.
+
+    You can get a shuffled base62 charset by going to [https://shlink.io/short-code-chars](https://shlink.io/short-code-chars), and then you just need to pass it to all shlink instances using the `SHORTCODE_CHARS` env var.
+
+    If you don't do this, each shlink instance will use a different charset. However this shouldn't be a problem in practice, since the chances to get a collision will be very low.
+
+* Some operations performed by Shlink should never be run more than once at the same time (like creating the database for the first time, or downloading the GeoLite2 database). For this reason, Shlink uses a locking system.
+
+    However, these locks are locally scoped to each Shlink instance by default.
+
+    You can (and should) make the locks to be shared by all Shlink instances by using a redis server/cluster. Just define the `REDIS_SERVERS` env var with the list of servers.
+
+## Versions
+
+Versions of this image match the shlink version it contains.
+
+For example, installing `shlinkio/shlink:1.15.0`, you will get an image containing shlink v1.15.0.
+
+The `latest` docker tag always holds the latest contents in master, and it's considered unestable and not suitable for production.
+
+> There are no official shlink images previous to v1.15.0.

docker/config/shlink_in_docker.local.php

@@ -0,0 +1,175 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink;
+
+use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
+
+use function explode;
+use function file_exists;
+use function file_get_contents;
+use function file_put_contents;
+use function implode;
+use function Shlinkio\Shlink\Common\env;
+use function sprintf;
+use function str_shuffle;
+use function substr;
+use function sys_get_temp_dir;
+
+$helper = new class {
+    private const BASE62 = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    private const DB_DRIVERS_MAP = [
+        'mysql' => 'pdo_mysql',
+        'postgres' => 'pdo_pgsql',
+    ];
+    private const DB_PORTS_MAP = [
+        'mysql' => '3306',
+        'postgres' => '5432',
+    ];
+
+    /** @var string */
+    private $charset;
+    /** @var string */
+    private $secretKey;
+
+    public function __construct()
+    {
+        [$this->charset, $this->secretKey] = $this->initShlinkKeys();
+    }
+
+    private function initShlinkKeys(): array
+    {
+        $keysFile = sprintf('%s/shlink.keys', sys_get_temp_dir());
+        if (file_exists($keysFile)) {
+            return explode(',', file_get_contents($keysFile));
+        }
+
+        $keys = [
+            env('SHORTCODE_CHARS', $this->generateShortcodeChars()),
+            env('SECRET_KEY', $this->generateSecretKey()),
+        ];
+
+        file_put_contents($keysFile, implode(',', $keys));
+        return $keys;
+    }
+
+    private function generateShortcodeChars(): string
+    {
+        return str_shuffle(self::BASE62);
+    }
+
+    private function generateSecretKey(): string
+    {
+        return substr(str_shuffle(self::BASE62), 0, 32);
+    }
+
+    public function getShortcodeChars(): string
+    {
+        return $this->charset;
+    }
+
+    public function getSecretKey(): string
+    {
+        return $this->secretKey;
+    }
+
+    public function getDbConfig(): array
+    {
+        $driver = env('DB_DRIVER');
+        if ($driver === null || $driver === 'sqlite') {
+            return [
+                'driver' => 'pdo_sqlite',
+                'path' => 'data/database.sqlite',
+            ];
+        }
+
+        $driverOptions = $driver !== 'mysql' ? [] : [
+            // PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
+            1002 => 'SET NAMES utf8',
+        ];
+        return [
+            'driver' => self::DB_DRIVERS_MAP[$driver],
+            'dbname' => env('DB_NAME', 'shlink'),
+            'user' => env('DB_USER'),
+            'password' => env('DB_PASSWORD'),
+            'host' => env('DB_HOST'),
+            'port' => env('DB_PORT', self::DB_PORTS_MAP[$driver]),
+            'driverOptions' => $driverOptions,
+        ];
+    }
+
+    public function getNotFoundConfig(): array
+    {
+        $notFoundRedirectTo = env('NOT_FOUND_REDIRECT_TO');
+
+        return [
+            'enable_redirection' => $notFoundRedirectTo !== null,
+            'redirect_to' => $notFoundRedirectTo,
+        ];
+    }
+};
+
+return [
+
+    'config_cache_enabled' => false,
+
+    'app_options' => [
+        'secret_key' => $helper->getSecretKey(),
+        'disable_track_param' => env('DISABLE_TRACK_PARAM'),
+    ],
+
+    'delete_short_urls' => [
+        'check_visits_threshold' => true,
+        'visits_threshold' => (int) env('DELETE_SHORT_URL_THRESHOLD', 15),
+    ],
+
+    'translator' => [
+        'locale' => env('LOCALE', 'en'),
+    ],
+
+    'entity_manager' => [
+        'connection' => $helper->getDbConfig(),
+    ],
+
+    'url_shortener' => [
+        'domain' => [
+            'schema' => env('SHORT_DOMAIN_SCHEMA', 'http'),
+            'hostname' => env('SHORT_DOMAIN_HOST', ''),
+        ],
+        'shortcode_chars' => $helper->getShortcodeChars(),
+        'validate_url' => (bool) env('VALIDATE_URLS', true),
+        'not_found_short_url' => $helper->getNotFoundConfig(),
+    ],
+
+    'logger' => [
+        'handlers' => [
+            'shlink_rotating_handler' => [
+                'level' => Logger::EMERGENCY, // This basically disables regular file logs
+            ],
+            'shlink_stdout_handler' => [
+                'class' => StreamHandler::class,
+                'level' => Logger::INFO,
+                'stream' => 'php://stdout',
+                'formatter' => 'dashed',
+            ],
+        ],
+
+        'loggers' => [
+            'Shlink' => [
+                'handlers' => ['shlink_stdout_handler'],
+            ],
+        ],
+    ],
+
+    'dependencies' => [
+        'aliases' => env('REDIS_SERVERS') === null ? [] : [
+            'lock_store' => 'redis_lock_store',
+        ],
+    ],
+
+    'redis' => [
+        'servers' => env('REDIS_SERVERS'),
+    ],
+
+];

docker/docker-entrypoint.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env sh
+set -e
+
+cd /etc/shlink
+
+echo "Creating fresh database if needed..."
+php bin/cli db:create -n -q
+
+echo "Updating database..."
+php bin/cli db:migrate -n -q
+
+echo "Generating proxies..."
+php vendor/doctrine/orm/bin/doctrine.php orm:generate-proxies -n -q
+
+# When restarting the container, swoole might think it is already in execution
+# This forces the app to be started every second until the exit code is 0
+until php vendor/zendframework/zend-expressive-swoole/bin/zend-expressive-swoole start; do sleep 1 ; done

docs/swagger/paths/{shortCode}_preview.json

@@ -1,5 +1,6 @@
 {
     "get": {
+        "deprecated": true,
         "operationId": "shortUrlPreview",
         "tags": [
             "URL Shortener"

hooks/build

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -ex
+
+if [[ ${SOURCE_BRANCH} == 'master' ]]; then
+    SHLINK_RELEASE='latest'
+else
+    SHLINK_RELEASE=${SOURCE_BRANCH#?}
+fi
+
+docker build --build-arg SHLINK_VERSION=${SHLINK_RELEASE} -t ${IMAGE_NAME} .

module/CLI/config/dependencies.config.php

@@ -7,10 +7,11 @@ use Doctrine\DBAL\Connection;
 use GeoIp2\Database\Reader;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdater;
 use Shlinkio\Shlink\Common\Doctrine\NoDbNameConnectionFactory;
-use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\DbUpdater;
-use Shlinkio\Shlink\Common\IpGeolocation\IpLocationResolverInterface;
-use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Core\Service;
+use Shlinkio\Shlink\Installer\Factory\ProcessHelperFactory;
+use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdater;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
+use Shlinkio\Shlink\PreviewGenerator\Service\PreviewGenerator;
 use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Symfony\Component\Console as SymfonyCli;
 use Symfony\Component\Lock\Factory as Locker;
@@ -23,7 +24,7 @@ return [
     'dependencies' => [
         'factories' => [
             SymfonyCli\Application::class => Factory\ApplicationFactory::class,
-            SymfonyCli\Helper\ProcessHelper::class => Factory\ProcessHelperFactory::class,
+            SymfonyCli\Helper\ProcessHelper::class => ProcessHelperFactory::class,
             PhpExecutableFinder::class => InvokableFactory::class,
 
             GeolocationDbUpdater::class => ConfigAbstractFactory::class,

module/CLI/src/Command/Api/ListKeysCommand.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\CLI\Command\Api;
 
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
-use Shlinkio\Shlink\Common\Console\ShlinkTable;
+use Shlinkio\Shlink\CLI\Util\ShlinkTable;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use Symfony\Component\Console\Command\Command;

module/CLI/src/Command/ShortUrl/GeneratePreviewCommand.php

@@ -4,9 +4,9 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
-use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
-use Shlinkio\Shlink\Common\Service\PreviewGeneratorInterface;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
+use Shlinkio\Shlink\PreviewGenerator\Exception\PreviewGenerationException;
+use Shlinkio\Shlink\PreviewGenerator\Service\PreviewGeneratorInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -14,6 +14,7 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 use function sprintf;
 
+/** @deprecated */
 class GeneratePreviewCommand extends Command
 {
     public const NAME = 'short-url:process-previews';
@@ -37,7 +38,8 @@ class GeneratePreviewCommand extends Command
             ->setName(self::NAME)
             ->setAliases(self::ALIASES)
             ->setDescription(
-                'Processes and generates the previews for every URL, improving performance for later web requests.'
+                '[DEPRECATED] Processes and generates the previews for every URL, improving performance for later web '
+                . 'requests.'
             );
     }
 

module/CLI/src/Command/ShortUrl/GetVisitsCommand.php

@@ -5,7 +5,7 @@ namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
 use Cake\Chronos\Chronos;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
-use Shlinkio\Shlink\Common\Console\ShlinkTable;
+use Shlinkio\Shlink\CLI\Util\ShlinkTable;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Model\VisitsParams;

module/CLI/src/Command/ShortUrl/ListShortUrlsCommand.php

@@ -4,10 +4,10 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
-use Shlinkio\Shlink\Common\Console\ShlinkTable;
-use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;
+use Shlinkio\Shlink\CLI\Util\ShlinkTable;
 use Shlinkio\Shlink\Common\Paginator\Util\PaginatorUtilsTrait;
 use Shlinkio\Shlink\Common\Rest\DataTransformerInterface;
+use Shlinkio\Shlink\Core\Paginator\Adapter\ShortUrlRepositoryAdapter;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
 use Shlinkio\Shlink\Core\Transformer\ShortUrlDataTransformer;
 use Symfony\Component\Console\Command\Command;
@@ -62,7 +62,7 @@ class ListShortUrlsCommand extends Command
                 'page',
                 'p',
                 InputOption::VALUE_OPTIONAL,
-                sprintf('The first page to list (%s items per page)', PaginableRepositoryAdapter::ITEMS_PER_PAGE),
+                sprintf('The first page to list (%s items per page)', ShortUrlRepositoryAdapter::ITEMS_PER_PAGE),
                 '1'
             )
             ->addOption(

module/CLI/src/Command/Tag/ListTagsCommand.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\CLI\Command\Tag;
 
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
-use Shlinkio\Shlink\Common\Console\ShlinkTable;
+use Shlinkio\Shlink\CLI\Util\ShlinkTable;
 use Shlinkio\Shlink\Core\Entity\Tag;
 use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
 use Symfony\Component\Console\Command\Command;

module/CLI/src/Command/Visit/LocateVisitsCommand.php

@@ -9,14 +9,14 @@ use Shlinkio\Shlink\CLI\Command\Util\LockedCommandConfig;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdaterInterface;
-use Shlinkio\Shlink\Common\Exception\WrongIpException;
-use Shlinkio\Shlink\Common\IpGeolocation\IpLocationResolverInterface;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Common\Util\IpAddress;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
 use Shlinkio\Shlink\Core\Exception\IpCannotBeLocatedException;
 use Shlinkio\Shlink\Core\Service\VisitServiceInterface;
+use Shlinkio\Shlink\IpGeolocation\Exception\WrongIpException;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

module/CLI/src/Command/Visit/UpdateDbCommand.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\CLI\Command\Visit;
 
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
-use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\DbUpdaterInterface;
+use Shlinkio\Shlink\IpGeolocation\Exception\RuntimeException;
+use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;

module/CLI/src/ConfigProvider.php

@@ -3,13 +3,12 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI;
 
-use Zend\Config\Factory;
-use Zend\Stdlib\Glob;
+use function Shlinkio\Shlink\Common\loadConfigFromGlob;
 
 class ConfigProvider
 {
     public function __invoke()
     {
-        return Factory::fromFiles(Glob::glob(__DIR__ . '/../config/{,*.}config.php', Glob::GLOB_BRACE));
+        return loadConfigFromGlob(__DIR__ . '/../config/{,*.}config.php');
     }
 }

module/CLI/src/Factory/ApplicationFactory.php

@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Factory;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Shlinkio\Shlink\Core\Options\AppOptions;
 use Symfony\Component\Console\Application as CliApp;
 use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;

module/CLI/src/Factory/ProcessHelperFactory.php

@@ -1,20 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Factory;
-
-use Symfony\Component\Console\Helper;
-
-class ProcessHelperFactory
-{
-    public function __invoke(): Helper\ProcessHelper
-    {
-        $processHelper = new Helper\ProcessHelper();
-        $processHelper->setHelperSet(new Helper\HelperSet([
-            new Helper\FormatterHelper(),
-            new Helper\DebugFormatterHelper(),
-        ]));
-
-        return $processHelper;
-    }
-}

module/CLI/src/Util/GeolocationDbUpdater.php

@@ -6,8 +6,8 @@ namespace Shlinkio\Shlink\CLI\Util;
 use Cake\Chronos\Chronos;
 use GeoIp2\Database\Reader;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
-use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\DbUpdaterInterface;
+use Shlinkio\Shlink\IpGeolocation\Exception\RuntimeException;
+use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
 use Symfony\Component\Lock\Factory as Locker;
 use Throwable;
 

module/CLI/src/Util/ShlinkTable.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Console;
+namespace Shlinkio\Shlink\CLI\Util;
 
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Output\OutputInterface;

module/CLI/test/Command/ShortUrl/GeneratePreviewCommandTest.php

@@ -7,10 +7,10 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\GeneratePreviewCommand;
-use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
-use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Service\ShortUrlService;
+use Shlinkio\Shlink\PreviewGenerator\Exception\PreviewGenerationException;
+use Shlinkio\Shlink\PreviewGenerator\Service\PreviewGenerator;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Zend\Paginator\Adapter\ArrayAdapter;

module/CLI/test/Command/ShortUrl/GetVisitsCommandTest.php

@@ -8,7 +8,6 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\GetVisitsCommand;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Entity\Visit;
@@ -16,6 +15,7 @@ use Shlinkio\Shlink\Core\Entity\VisitLocation;
 use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Model\VisitsParams;
 use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Zend\Paginator\Adapter\ArrayAdapter;

module/CLI/test/Command/Visit/LocateVisitsCommandTest.php

@@ -9,15 +9,15 @@ use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Visit\LocateVisitsCommand;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdaterInterface;
-use Shlinkio\Shlink\Common\Exception\WrongIpException;
-use Shlinkio\Shlink\Common\IpGeolocation\IpApiLocationResolver;
-use Shlinkio\Shlink\Common\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\Common\Util\IpAddress;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
 use Shlinkio\Shlink\Core\Model\Visitor;
 use Shlinkio\Shlink\Core\Service\VisitService;
+use Shlinkio\Shlink\IpGeolocation\Exception\WrongIpException;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use Shlinkio\Shlink\IpGeolocation\Resolver\IpApiLocationResolver;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Tester\CommandTester;

module/CLI/test/Command/Visit/UpdateDbCommandTest.php

@@ -8,8 +8,8 @@ use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Visit\UpdateDbCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
-use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\DbUpdaterInterface;
+use Shlinkio\Shlink\IpGeolocation\Exception\RuntimeException;
+use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 

module/CLI/test/Factory/ProcessHelperFactoryTest.php

@@ -1,29 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ShlinkioTest\Shlink\CLI\Factory;
-
-use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Installer\Factory\ProcessHelperFactory;
-
-class ProcessHelperFactoryTest extends TestCase
-{
-    /** @var ProcessHelperFactory */
-    private $factory;
-
-    public function setUp(): void
-    {
-        $this->factory = new ProcessHelperFactory();
-    }
-
-    /** @test */
-    public function createsTheServiceWithTheProperSetOfHelpers(): void
-    {
-        $processHelper = ($this->factory)();
-        $helperSet = $processHelper->getHelperSet();
-
-        $this->assertCount(2, $helperSet);
-        $this->assertTrue($helperSet->has('formatter'));
-        $this->assertTrue($helperSet->has('debug_formatter'));
-    }
-}

module/CLI/test/Util/GeolocationDbUpdaterTest.php

@@ -11,8 +11,8 @@ use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdater;
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
-use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\DbUpdaterInterface;
+use Shlinkio\Shlink\IpGeolocation\Exception\RuntimeException;
+use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
 use Symfony\Component\Lock;
 use Throwable;
 

module/CLI/test/Util/ShlinkTableTest.php

@@ -1,13 +1,13 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common\Console;
+namespace ShlinkioTest\Shlink\CLI\Util;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use ReflectionObject;
-use Shlinkio\Shlink\Common\Console\ShlinkTable;
+use Shlinkio\Shlink\CLI\Util\ShlinkTable;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Helper\TableStyle;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -26,7 +26,7 @@ class ShlinkTableTest extends TestCase
     }
 
     /** @test */
-    public function renderMakesTableToBeRenderedWithProvidedInfo()
+    public function renderMakesTableToBeRenderedWithProvidedInfo(): void
     {
         $headers = [];
         $rows = [[]];
@@ -53,7 +53,7 @@ class ShlinkTableTest extends TestCase
     }
 
     /** @test */
-    public function newTableIsCreatedForFactoryMethod()
+    public function newTableIsCreatedForFactoryMethod(): void
     {
         $instance = ShlinkTable::fromOutput($this->prophesize(OutputInterface::class)->reveal());
 

module/Common/config/cache.config.php

@@ -1,17 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common;
-
-use Doctrine\Common\Cache as DoctrineCache;
-
-return [
-
-    'dependencies' => [
-        'factories' => [
-            DoctrineCache\Cache::class => Cache\CacheFactory::class,
-            Cache\RedisFactory::SERVICE_NAME => Cache\RedisFactory::class,
-        ],
-    ],
-
-];

module/Common/config/dependencies.config.php

@@ -1,99 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common;
-
-use GeoIp2\Database\Reader;
-use GuzzleHttp\Client as GuzzleClient;
-use Monolog\Logger;
-use Psr\Log\LoggerInterface;
-use RKA\Middleware\IpAddress;
-use Symfony\Component\Filesystem\Filesystem;
-use Zend\I18n\Translator\Translator;
-use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Zend\ServiceManager\Factory\InvokableFactory;
-use Zend\ServiceManager\Proxy\LazyServiceFactory;
-
-return [
-
-    'dependencies' => [
-        'factories' => [
-            GuzzleClient::class => InvokableFactory::class,
-            Filesystem::class => InvokableFactory::class,
-            Reader::class => ConfigAbstractFactory::class,
-
-            Translator::class => Factory\TranslatorFactory::class,
-            Template\Extension\TranslatorExtension::class => ConfigAbstractFactory::class,
-
-            Middleware\LocaleMiddleware::class => ConfigAbstractFactory::class,
-            Middleware\CloseDbConnectionMiddleware::class => ConfigAbstractFactory::class,
-            IpAddress::class => Middleware\IpAddressMiddlewareFactory::class,
-
-            Image\ImageBuilder::class => Image\ImageBuilderFactory::class,
-
-            IpGeolocation\IpApiLocationResolver::class => ConfigAbstractFactory::class,
-            IpGeolocation\GeoLite2LocationResolver::class => ConfigAbstractFactory::class,
-            IpGeolocation\EmptyIpLocationResolver::class => InvokableFactory::class,
-            IpGeolocation\ChainIpLocationResolver::class => ConfigAbstractFactory::class,
-            IpGeolocation\GeoLite2\GeoLite2Options::class => ConfigAbstractFactory::class,
-            IpGeolocation\GeoLite2\DbUpdater::class => ConfigAbstractFactory::class,
-
-            Service\PreviewGenerator::class => ConfigAbstractFactory::class,
-        ],
-        'aliases' => [
-            'httpClient' => GuzzleClient::class,
-            'translator' => Translator::class,
-
-            'logger' => LoggerInterface::class,
-            Logger::class => 'Logger_Shlink',
-            LoggerInterface::class => 'Logger_Shlink',
-
-            IpGeolocation\IpLocationResolverInterface::class => IpGeolocation\ChainIpLocationResolver::class,
-        ],
-        'abstract_factories' => [
-            Factory\DottedAccessConfigAbstractFactory::class,
-        ],
-        'delegators' => [
-            // The GeoLite2 db reader has to be lazy so that it does not try to load the DB file at app bootstrapping.
-            // By doing so, it would fail the first time shlink tries to download it.
-            Reader::class => [
-                LazyServiceFactory::class,
-            ],
-        ],
-
-        'lazy_services' => [
-            'class_map' => [
-                Reader::class => Reader::class,
-            ],
-        ],
-    ],
-
-    ConfigAbstractFactory::class => [
-        Reader::class => ['config.geolite2.db_location'],
-
-        Template\Extension\TranslatorExtension::class => ['translator'],
-        Middleware\LocaleMiddleware::class => ['translator'],
-        Middleware\CloseDbConnectionMiddleware::class => ['em'],
-
-        IpGeolocation\IpApiLocationResolver::class => ['httpClient'],
-        IpGeolocation\GeoLite2LocationResolver::class => [Reader::class],
-        IpGeolocation\ChainIpLocationResolver::class => [
-            IpGeolocation\GeoLite2LocationResolver::class,
-            IpGeolocation\IpApiLocationResolver::class,
-            IpGeolocation\EmptyIpLocationResolver::class,
-        ],
-        IpGeolocation\GeoLite2\GeoLite2Options::class => ['config.geolite2'],
-        IpGeolocation\GeoLite2\DbUpdater::class => [
-            GuzzleClient::class,
-            Filesystem::class,
-            IpGeolocation\GeoLite2\GeoLite2Options::class,
-        ],
-
-        Service\PreviewGenerator::class => [
-            Image\ImageBuilder::class,
-            Filesystem::class,
-            'config.preview_generation.files_location',
-        ],
-    ],
-
-];

module/Common/config/doctrine.config.php

@@ -1,35 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common;
-
-use Doctrine\DBAL\Connection;
-use Doctrine\ORM\EntityManager;
-
-return [
-
-    'entity_manager' => [
-        'orm' => [
-            'types' => [
-                Type\ChronosDateTimeType::CHRONOS_DATETIME => Type\ChronosDateTimeType::class,
-            ],
-        ],
-    ],
-
-    'dependencies' => [
-        'factories' => [
-            EntityManager::class => Doctrine\EntityManagerFactory::class,
-            Connection::class => Doctrine\ConnectionFactory::class,
-            Doctrine\NoDbNameConnectionFactory::SERVICE_NAME => Doctrine\NoDbNameConnectionFactory::class,
-        ],
-        'aliases' => [
-            'em' => EntityManager::class,
-        ],
-        'delegators' => [
-            EntityManager::class => [
-                Doctrine\ReopeningEntityManagerDelegator::class,
-            ],
-        ],
-    ],
-
-];

module/Common/config/templates.config.php

@@ -1,14 +0,0 @@
-<?php
-declare(strict_types=1);
-
-use Shlinkio\Shlink\Common\Template\Extension\TranslatorExtension;
-
-return [
-
-    'plates' => [
-        'extensions' => [
-            TranslatorExtension::class,
-        ],
-    ],
-
-];

module/Common/functions/functions.php

@@ -1,61 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common;
-
-use function getenv;
-use function json_decode as spl_json_decode;
-use function json_last_error;
-use function json_last_error_msg;
-use function sprintf;
-use function strtolower;
-use function trim;
-
-use const JSON_ERROR_NONE;
-
-/**
- * Gets the value of an environment variable. Supports boolean, empty and null.
- * This is basically Laravel's env helper
- *
- * @param string $key
- * @param mixed $default
- * @return mixed
- * @link https://github.com/laravel/framework/blob/5.2/src/Illuminate/Foundation/helpers.php#L369
- */
-function env($key, $default = null)
-{
-    $value = getenv($key);
-    if ($value === false) {
-        return $default;
-    }
-
-    switch (strtolower($value)) {
-        case 'true':
-        case '(true)':
-            return true;
-        case 'false':
-        case '(false)':
-            return false;
-        case 'empty':
-        case '(empty)':
-            return '';
-        case 'null':
-        case '(null)':
-            return null;
-    }
-
-    return trim($value);
-}
-
-/**
- * @throws Exception\InvalidArgumentException
- */
-function json_decode(string $json, int $depth = 512, int $options = 0): array
-{
-    $data = spl_json_decode($json, true, $depth, $options);
-    if (JSON_ERROR_NONE !== json_last_error()) {
-        throw new Exception\InvalidArgumentException(sprintf('Error decoding JSON: %s', json_last_error_msg()));
-    }
-
-    return $data;
-}

module/Common/src/Cache/CacheFactory.php

@@ -1,25 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Cache;
-
-use Doctrine\Common\Cache;
-use Interop\Container\ContainerInterface;
-use Shlinkio\Shlink\Core\Options\AppOptions;
-use Zend\ServiceManager\Factory\FactoryInterface;
-
-use function Shlinkio\Shlink\Common\env;
-
-class CacheFactory implements FactoryInterface
-{
-    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): Cache\Cache
-    {
-        // TODO Make use of the redis cache via RedisFactory when possible
-
-        $appOptions = $container->get(AppOptions::class);
-        $adapter = env('APP_ENV', 'pro') === 'pro' ? new Cache\ApcuCache() : new Cache\ArrayCache();
-        $adapter->setNamespace((string) $appOptions);
-
-        return $adapter;
-    }
-}

module/Common/src/Cache/RedisFactory.php

@@ -1,27 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Cache;
-
-use Predis\Client as PredisClient;
-use Psr\Container\ContainerInterface;
-
-use function count;
-use function explode;
-use function is_string;
-
-class RedisFactory
-{
-    public const SERVICE_NAME = 'Shlinkio\Shlink\Common\Cache\Redis';
-
-    public function __invoke(ContainerInterface $container): PredisClient
-    {
-        $redisConfig = $container->get('config')['redis'] ?? [];
-
-        $servers = $redisConfig['servers'] ?? [];
-        $servers = is_string($servers) ? explode(',', $servers) : $servers;
-        $options = count($servers) <= 1 ? null : ['cluster' => 'redis'];
-
-        return new PredisClient($servers, $options);
-    }
-}

module/Common/src/ConfigProvider.php

@@ -1,15 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common;
-
-use Zend\Config\Factory;
-use Zend\Stdlib\Glob;
-
-class ConfigProvider
-{
-    public function __invoke()
-    {
-        return Factory::fromFiles(Glob::glob(__DIR__ . '/../config/{,*.}config.php', Glob::GLOB_BRACE));
-    }
-}

module/Common/src/Doctrine/ConnectionFactory.php

@@ -1,17 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Doctrine;
-
-use Doctrine\DBAL\Connection;
-use Doctrine\ORM\EntityManager;
-use Psr\Container\ContainerInterface;
-
-class ConnectionFactory
-{
-    public function __invoke(ContainerInterface $container): Connection
-    {
-        $em = $container->get(EntityManager::class);
-        return $em->getConnection();
-    }
-}

module/Common/src/Doctrine/EntityManagerFactory.php

@@ -1,52 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Doctrine;
-
-use Doctrine\Common\Cache\ArrayCache;
-use Doctrine\Common\Cache\Cache;
-use Doctrine\Common\Persistence\Mapping\Driver\PHPDriver;
-use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Types\Type;
-use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\ORMException;
-use Doctrine\ORM\Tools\Setup;
-use Psr\Container\ContainerInterface;
-
-class EntityManagerFactory
-{
-    /**
-     * @throws ORMException
-     * @throws DBALException
-     */
-    public function __invoke(ContainerInterface $container): EntityManager
-    {
-        $globalConfig = $container->get('config');
-        $isDevMode = (bool) ($globalConfig['debug'] ?? false);
-        $cache = $container->has(Cache::class) ? $container->get(Cache::class) : new ArrayCache();
-        $emConfig = $globalConfig['entity_manager'] ?? [];
-        $connectionConfig = $emConfig['connection'] ?? [];
-        $ormConfig = $emConfig['orm'] ?? [];
-
-        $this->registerTypes($ormConfig);
-
-        $config = Setup::createConfiguration($isDevMode, $ormConfig['proxies_dir'] ?? null, $cache);
-        $config->setMetadataDriverImpl(new PHPDriver($ormConfig['entities_mappings'] ?? []));
-
-        return EntityManager::create($connectionConfig, $config);
-    }
-
-    /**
-     * @throws DBALException
-     */
-    private function registerTypes(array $ormConfig): void
-    {
-        $types = $ormConfig['types'] ?? [];
-
-        foreach ($types as $name => $className) {
-            if (! Type::hasType($name)) {
-                Type::addType($name, $className);
-            }
-        }
-    }
-}

module/Common/src/Doctrine/NoDbNameConnectionFactory.php

@@ -1,21 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Doctrine;
-
-use Doctrine\DBAL\Connection;
-use Psr\Container\ContainerInterface;
-
-class NoDbNameConnectionFactory
-{
-    public const SERVICE_NAME = 'Shlinkio\Shlink\Common\Doctrine\NoDbNameConnection';
-
-    public function __invoke(ContainerInterface $container): Connection
-    {
-        $conn = $container->get(Connection::class);
-        $params = $conn->getParams();
-        unset($params['dbname']);
-
-        return new Connection($params, $conn->getDriver(), $conn->getConfiguration(), $conn->getEventManager());
-    }
-}

module/Common/src/Doctrine/ReopeningEntityManager.php

@@ -1,57 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Doctrine;
-
-use Doctrine\ORM\Decorator\EntityManagerDecorator;
-use Doctrine\ORM\EntityManagerInterface;
-
-class ReopeningEntityManager extends EntityManagerDecorator
-{
-    /** @var callable */
-    private $emFactory;
-
-    public function __construct(EntityManagerInterface $wrapped, callable $emFactory)
-    {
-        parent::__construct($wrapped);
-        $this->emFactory = $emFactory;
-    }
-
-    protected function getWrappedEntityManager(): EntityManagerInterface
-    {
-        if (! $this->wrapped->isOpen()) {
-            $this->wrapped = ($this->emFactory)(
-                $this->wrapped->getConnection(),
-                $this->wrapped->getConfiguration(),
-                $this->wrapped->getEventManager()
-            );
-        }
-
-        return $this->wrapped;
-    }
-
-    public function flush($entity = null): void
-    {
-        $this->getWrappedEntityManager()->flush($entity);
-    }
-
-    public function persist($object): void
-    {
-        $this->getWrappedEntityManager()->persist($object);
-    }
-
-    public function remove($object): void
-    {
-        $this->getWrappedEntityManager()->remove($object);
-    }
-
-    public function refresh($object): void
-    {
-        $this->getWrappedEntityManager()->refresh($object);
-    }
-
-    public function merge($object)
-    {
-        return $this->getWrappedEntityManager()->merge($object);
-    }
-}

module/Common/src/Doctrine/ReopeningEntityManagerDelegator.php

@@ -1,15 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Doctrine;
-
-use Doctrine\ORM\EntityManager;
-use Psr\Container\ContainerInterface;
-
-class ReopeningEntityManagerDelegator
-{
-    public function __invoke(ContainerInterface $container, string $name, callable $callback): ReopeningEntityManager
-    {
-        return new ReopeningEntityManager($callback(), [EntityManager::class, 'create']);
-    }
-}

module/Common/src/Entity/AbstractEntity.php

@@ -1,31 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-abstract class AbstractEntity
-{
-    /**
-     * @var string
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     * @ORM\Column(name="id", type="bigint", options={"unsigned"=true})
-     */
-    protected $id;
-
-    public function getId(): string
-    {
-        return $this->id;
-    }
-
-    /**
-     * @internal
-     */
-    public function setId(string $id): self
-    {
-        $this->id = $id;
-        return $this;
-    }
-}

module/Common/src/Exception/ExceptionInterface.php

@@ -1,10 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Exception;
-
-use Throwable;
-
-interface ExceptionInterface extends Throwable
-{
-}

module/Common/src/Exception/InvalidArgumentException.php

@@ -1,10 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Exception;
-
-use InvalidArgumentException as SplInvalidArgumentException;
-
-class InvalidArgumentException extends SplInvalidArgumentException implements ExceptionInterface
-{
-}

module/Common/src/Exception/RuntimeException.php

@@ -1,10 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Exception;
-
-use RuntimeException as SplRuntimeException;
-
-class RuntimeException extends SplRuntimeException implements ExceptionInterface
-{
-}

module/Common/src/Exception/WrongIpException.php

@@ -1,16 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Exception;
-
-use Throwable;
-
-use function sprintf;
-
-class WrongIpException extends RuntimeException
-{
-    public static function fromIpAddress($ipAddress, ?Throwable $prev = null): self
-    {
-        return new self(sprintf('Provided IP "%s" is invalid', $ipAddress), 0, $prev);
-    }
-}

module/Common/src/Factory/DottedAccessConfigAbstractFactory.php

@@ -1,88 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Factory;
-
-use ArrayAccess;
-use Interop\Container\ContainerInterface;
-use Interop\Container\Exception\ContainerException;
-use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
-use Zend\ServiceManager\Exception\ServiceNotCreatedException;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\ServiceManager\Factory\AbstractFactoryInterface;
-
-use function array_shift;
-use function explode;
-use function is_array;
-use function sprintf;
-use function substr_count;
-
-class DottedAccessConfigAbstractFactory implements AbstractFactoryInterface
-{
-    /**
-     * Can the factory create an instance for the service?
-     *
-     * @param  ContainerInterface $container
-     * @param  string $requestedName
-     * @return bool
-     */
-    public function canCreate(ContainerInterface $container, $requestedName)
-    {
-        return substr_count($requestedName, '.') > 0;
-    }
-
-    /**
-     * Create an object
-     *
-     * @param  ContainerInterface $container
-     * @param  string $requestedName
-     * @param  null|array $options
-     * @return object
-     * @throws InvalidArgumentException
-     * @throws ServiceNotFoundException if unable to resolve the service.
-     * @throws ServiceNotCreatedException if an exception is raised when
-     *     creating a service.
-     * @throws ContainerException if any other error occurs
-     */
-    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
-    {
-        $parts = explode('.', $requestedName);
-        $serviceName = array_shift($parts);
-        if (! $container->has($serviceName)) {
-            throw new ServiceNotCreatedException(sprintf(
-                'Defined service "%s" could not be found in container after resolving dotted expression "%s".',
-                $serviceName,
-                $requestedName
-            ));
-        }
-
-        $array = $container->get($serviceName);
-        return $this->readKeysFromArray($parts, $array);
-    }
-
-    /**
-     * @param array $keys
-     * @param array|\ArrayAccess $array
-     * @return mixed|null
-     * @throws  InvalidArgumentException
-     */
-    private function readKeysFromArray(array $keys, $array)
-    {
-        $key = array_shift($keys);
-
-        // When one of the provided keys is not found, throw an exception
-        if (! isset($array[$key])) {
-            throw new InvalidArgumentException(sprintf(
-                'The key "%s" provided in the dotted notation could not be found in the array service',
-                $key
-            ));
-        }
-
-        $value = $array[$key];
-        if (! empty($keys) && (is_array($value) || $value instanceof ArrayAccess)) {
-            $value = $this->readKeysFromArray($keys, $value);
-        }
-
-        return $value;
-    }
-}

module/Common/src/Factory/EmptyResponseImplicitOptionsMiddlewareFactory.php

@@ -1,34 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Factory;
-
-use Interop\Container\ContainerInterface;
-use Interop\Container\Exception\ContainerException;
-use Zend\Diactoros\Response\EmptyResponse;
-use Zend\Expressive\Router\Middleware\ImplicitOptionsMiddleware;
-use Zend\ServiceManager\Exception\ServiceNotCreatedException;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\ServiceManager\Factory\FactoryInterface;
-
-class EmptyResponseImplicitOptionsMiddlewareFactory implements FactoryInterface
-{
-    /**
-     * Create an object
-     *
-     * @param  ContainerInterface $container
-     * @param  string $requestedName
-     * @param  null|array $options
-     * @return object
-     * @throws ServiceNotFoundException if unable to resolve the service.
-     * @throws ServiceNotCreatedException if an exception is raised when
-     *     creating a service.
-     * @throws ContainerException if any other error occurs
-     */
-    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
-    {
-        return new ImplicitOptionsMiddleware(function () {
-            return new EmptyResponse();
-        });
-    }
-}

module/Common/src/Factory/TranslatorFactory.php

@@ -1,32 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Factory;
-
-use Interop\Container\ContainerInterface;
-use Interop\Container\Exception\ContainerException;
-use Zend\I18n\Translator\Translator;
-use Zend\ServiceManager\Exception\ServiceNotCreatedException;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\ServiceManager\Factory\FactoryInterface;
-
-class TranslatorFactory implements FactoryInterface
-{
-    /**
-     * Create an object
-     *
-     * @param  ContainerInterface $container
-     * @param  string $requestedName
-     * @param  null|array $options
-     * @return object
-     * @throws ServiceNotFoundException if unable to resolve the service.
-     * @throws ServiceNotCreatedException if an exception is raised when
-     *     creating a service.
-     * @throws ContainerException if any other error occurs
-     */
-    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
-    {
-        $config = $container->get('config');
-        return Translator::factory($config['translator'] ?? []);
-    }
-}

module/Common/src/Image/ImageBuilderFactory.php

@@ -1,33 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Image;
-
-use Interop\Container\ContainerInterface;
-use Interop\Container\Exception\ContainerException;
-use mikehaertl\wkhtmlto\Image;
-use Zend\ServiceManager\Exception\ServiceNotCreatedException;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\ServiceManager\Factory\FactoryInterface;
-
-class ImageBuilderFactory implements FactoryInterface
-{
-    /**
-     * Create an object
-     *
-     * @param  ContainerInterface $container
-     * @param  string $requestedName
-     * @param  null|array $options
-     * @return object
-     * @throws ServiceNotFoundException if unable to resolve the service.
-     * @throws ServiceNotCreatedException if an exception is raised when
-     *     creating a service.
-     * @throws ContainerException if any other error occurs
-     */
-    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
-    {
-        return new ImageBuilder($container, ['factories' => [
-            Image::class => ImageFactory::class,
-        ]]);
-    }
-}

module/Common/src/Image/ImageFactory.php

@@ -1,38 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Image;
-
-use Interop\Container\ContainerInterface;
-use Interop\Container\Exception\ContainerException;
-use mikehaertl\wkhtmlto\Image;
-use Zend\ServiceManager\Exception\ServiceNotCreatedException;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\ServiceManager\Factory\FactoryInterface;
-
-class ImageFactory implements FactoryInterface
-{
-    /**
-     * Create an object
-     *
-     * @param  ContainerInterface $container
-     * @param  string $requestedName
-     * @param  null|array $options
-     * @return object
-     * @throws ServiceNotFoundException if unable to resolve the service.
-     * @throws ServiceNotCreatedException if an exception is raised when
-     *     creating a service.
-     * @throws ContainerException if any other error occurs
-     */
-    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
-    {
-        $config = $container->get('config')['wkhtmltopdf'];
-        $image = new Image($config['images'] ?? null);
-
-        if ($options['url'] ?? null) {
-            $image->setPage($options['url']);
-        }
-
-        return $image;
-    }
-}

module/Common/src/IpGeolocation/ChainIpLocationResolver.php

@@ -1,36 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\IpGeolocation;
-
-use Shlinkio\Shlink\Common\Exception\WrongIpException;
-
-class ChainIpLocationResolver implements IpLocationResolverInterface
-{
-    /** @var IpLocationResolverInterface[] */
-    private $resolvers;
-
-    public function __construct(IpLocationResolverInterface ...$resolvers)
-    {
-        $this->resolvers = $resolvers;
-    }
-
-    /**
-     * @throws WrongIpException
-     */
-    public function resolveIpLocation(string $ipAddress): Model\Location
-    {
-        $error = null;
-
-        foreach ($this->resolvers as $resolver) {
-            try {
-                return $resolver->resolveIpLocation($ipAddress);
-            } catch (WrongIpException $e) {
-                $error = $e;
-            }
-        }
-
-        // If this instruction is reached, it means no resolver was capable of resolving the address
-        throw WrongIpException::fromIpAddress($ipAddress, $error);
-    }
-}

module/Common/src/IpGeolocation/EmptyIpLocationResolver.php

@@ -1,17 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\IpGeolocation;
-
-use Shlinkio\Shlink\Common\Exception\WrongIpException;
-
-class EmptyIpLocationResolver implements IpLocationResolverInterface
-{
-    /**
-     * @throws WrongIpException
-     */
-    public function resolveIpLocation(string $ipAddress): Model\Location
-    {
-        return Model\Location::emptyInstance();
-    }
-}

module/Common/src/IpGeolocation/GeoLite2/DbUpdater.php

@@ -1,106 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\IpGeolocation\GeoLite2;
-
-use Fig\Http\Message\RequestMethodInterface as RequestMethod;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\RequestOptions;
-use PharData;
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
-use Symfony\Component\Filesystem\Exception as FilesystemException;
-use Symfony\Component\Filesystem\Filesystem;
-use Throwable;
-
-use function sprintf;
-
-class DbUpdater implements DbUpdaterInterface
-{
-    private const DB_COMPRESSED_FILE = 'GeoLite2-City.tar.gz';
-    private const DB_DECOMPRESSED_FILE = 'GeoLite2-City.mmdb';
-
-    /** @var ClientInterface */
-    private $httpClient;
-    /** @var Filesystem */
-    private $filesystem;
-    /** @var GeoLite2Options */
-    private $options;
-
-    public function __construct(ClientInterface $httpClient, Filesystem $filesystem, GeoLite2Options $options)
-    {
-        $this->httpClient = $httpClient;
-        $this->filesystem = $filesystem;
-        $this->options = $options;
-    }
-
-    /**
-     * @throws RuntimeException
-     */
-    public function downloadFreshCopy(?callable $handleProgress = null): void
-    {
-        $tempDir = $this->options->getTempDir();
-        $compressedFile = sprintf('%s/%s', $tempDir, self::DB_COMPRESSED_FILE);
-
-        $this->downloadDbFile($compressedFile, $handleProgress);
-        $tempFullPath = $this->extractDbFile($compressedFile, $tempDir);
-        $this->copyNewDbFile($tempFullPath);
-        $this->deleteTempFiles([$compressedFile, $tempFullPath]);
-    }
-
-    private function downloadDbFile(string $dest, ?callable $handleProgress = null): void
-    {
-        try {
-            $this->httpClient->request(RequestMethod::METHOD_GET, $this->options->getDownloadFrom(), [
-                RequestOptions::SINK => $dest,
-                RequestOptions::PROGRESS => $handleProgress,
-            ]);
-        } catch (Throwable | GuzzleException $e) {
-            throw new RuntimeException(
-                'An error occurred while trying to download a fresh copy of the GeoLite2 database',
-                0,
-                $e
-            );
-        }
-    }
-
-    private function extractDbFile(string $compressedFile, string $tempDir): string
-    {
-        try {
-            $phar = new PharData($compressedFile);
-            $internalPathToDb = sprintf('%s/%s', $phar->getBasename(), self::DB_DECOMPRESSED_FILE);
-            $phar->extractTo($tempDir, $internalPathToDb, true);
-
-            return sprintf('%s/%s', $tempDir, $internalPathToDb);
-        } catch (Throwable $e) {
-            throw new RuntimeException(
-                sprintf('An error occurred while trying to extract the GeoLite2 database from %s', $compressedFile),
-                0,
-                $e
-            );
-        }
-    }
-
-    private function copyNewDbFile(string $from): void
-    {
-        try {
-            $this->filesystem->copy($from, $this->options->getDbLocation(), true);
-        } catch (FilesystemException\FileNotFoundException | FilesystemException\IOException $e) {
-            throw new RuntimeException('An error occurred while trying to copy GeoLite2 db file to destination', 0, $e);
-        }
-    }
-
-    private function deleteTempFiles(array $files): void
-    {
-        try {
-            $this->filesystem->remove($files);
-        } catch (FilesystemException\IOException $e) {
-            // Ignore any error produced when trying to delete temp files
-        }
-    }
-
-    public function databaseFileExists(): bool
-    {
-        return $this->filesystem->exists($this->options->getDbLocation());
-    }
-}

module/Common/src/IpGeolocation/GeoLite2/DbUpdaterInterface.php

@@ -1,16 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\IpGeolocation\GeoLite2;
-
-use Shlinkio\Shlink\Common\Exception\RuntimeException;
-
-interface DbUpdaterInterface
-{
-    public function databaseFileExists(): bool;
-
-    /**
-     * @throws RuntimeException
-     */
-    public function downloadFreshCopy(?callable $handleProgress = null): void;
-}

module/Common/src/IpGeolocation/GeoLite2/GeoLite2Options.php

@@ -1,46 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\IpGeolocation\GeoLite2;
-
-use Zend\Stdlib\AbstractOptions;
-
-class GeoLite2Options extends AbstractOptions
-{
-    private $dbLocation = '';
-    private $tempDir = '';
-    private $downloadFrom = 'http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz';
-
-    public function getDbLocation(): string
-    {
-        return $this->dbLocation;
-    }
-
-    protected function setDbLocation(string $dbLocation): self
-    {
-        $this->dbLocation = $dbLocation;
-        return $this;
-    }
-
-    public function getTempDir(): string
-    {
-        return $this->tempDir;
-    }
-
-    protected function setTempDir(string $tempDir): self
-    {
-        $this->tempDir = $tempDir;
-        return $this;
-    }
-
-    public function getDownloadFrom(): string
-    {
-        return $this->downloadFrom;
-    }
-
-    protected function setDownloadFrom(string $downloadFrom): self
-    {
-        $this->downloadFrom = $downloadFrom;
-        return $this;
-    }
-}

module/Common/src/IpGeolocation/GeoLite2LocationResolver.php

@@ -1,55 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\IpGeolocation;
-
-use GeoIp2\Database\Reader;
-use GeoIp2\Exception\AddressNotFoundException;
-use GeoIp2\Model\City;
-use GeoIp2\Record\Subdivision;
-use MaxMind\Db\Reader\InvalidDatabaseException;
-use Shlinkio\Shlink\Common\Exception\WrongIpException;
-
-use function Functional\first;
-
-class GeoLite2LocationResolver implements IpLocationResolverInterface
-{
-    /** @var Reader */
-    private $geoLiteDbReader;
-
-    public function __construct(Reader $geoLiteDbReader)
-    {
-        $this->geoLiteDbReader = $geoLiteDbReader;
-    }
-
-    /**
-     * @throws WrongIpException
-     */
-    public function resolveIpLocation(string $ipAddress): Model\Location
-    {
-        try {
-            $city = $this->geoLiteDbReader->city($ipAddress);
-            return $this->mapFields($city);
-        } catch (AddressNotFoundException $e) {
-            throw WrongIpException::fromIpAddress($ipAddress, $e);
-        } catch (InvalidDatabaseException $e) {
-            throw new WrongIpException('Provided GeoLite2 db file is invalid', 0, $e);
-        }
-    }
-
-    private function mapFields(City $city): Model\Location
-    {
-        /** @var Subdivision $region */
-        $region = first($city->subdivisions);
-
-        return new Model\Location(
-            $city->country->isoCode ?? '',
-            $city->country->name ?? '',
-            $region->name ?? '',
-            $city->city->name ?? '',
-            (float) ($city->location->latitude ?? ''),
-            (float) ($city->location->longitude ?? ''),
-            $city->location->timeZone ?? ''
-        );
-    }
-}

module/Common/src/IpGeolocation/IpApiLocationResolver.php

@@ -1,53 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\IpGeolocation;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
-use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
-use Shlinkio\Shlink\Common\Exception\WrongIpException;
-
-use function Shlinkio\Shlink\Common\json_decode;
-use function sprintf;
-
-class IpApiLocationResolver implements IpLocationResolverInterface
-{
-    private const SERVICE_PATTERN = 'http://ip-api.com/json/%s';
-
-    /** @var Client */
-    private $httpClient;
-
-    public function __construct(Client $httpClient)
-    {
-        $this->httpClient = $httpClient;
-    }
-
-    /**
-     * @throws WrongIpException
-     */
-    public function resolveIpLocation(string $ipAddress): Model\Location
-    {
-        try {
-            $response = $this->httpClient->get(sprintf(self::SERVICE_PATTERN, $ipAddress));
-            return $this->mapFields(json_decode((string) $response->getBody()));
-        } catch (GuzzleException $e) {
-            throw WrongIpException::fromIpAddress($ipAddress, $e);
-        } catch (InvalidArgumentException $e) {
-            throw new WrongIpException('IP-API returned invalid body while locating IP address', 0, $e);
-        }
-    }
-
-    private function mapFields(array $entry): Model\Location
-    {
-        return new Model\Location(
-            (string) ($entry['countryCode'] ?? ''),
-            (string) ($entry['country'] ?? ''),
-            (string) ($entry['regionName'] ?? ''),
-            (string) ($entry['city'] ?? ''),
-            (float) ($entry['lat'] ?? 0.0),
-            (float) ($entry['lon'] ?? 0.0),
-            (string) ($entry['timezone'] ?? '')
-        );
-    }
-}

module/Common/src/IpGeolocation/IpLocationResolverInterface.php

@@ -1,14 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\IpGeolocation;
-
-use Shlinkio\Shlink\Common\Exception\WrongIpException;
-
-interface IpLocationResolverInterface
-{
-    /**
-     * @throws WrongIpException
-     */
-    public function resolveIpLocation(string $ipAddress): Model\Location;
-}

module/Common/src/IpGeolocation/Model/Location.php

@@ -1,80 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\IpGeolocation\Model;
-
-final class Location
-{
-    /** @var string */
-    private $countryCode;
-    /** @var string */
-    private $countryName;
-    /** @var string */
-    private $regionName;
-    /** @var string */
-    private $city;
-    /** @var float */
-    private $latitude;
-    /** @var float */
-    private $longitude;
-    /** @var string */
-    private $timeZone;
-
-    public function __construct(
-        string $countryCode,
-        string $countryName,
-        string $regionName,
-        string $city,
-        float $latitude,
-        float $longitude,
-        string $timeZone
-    ) {
-        $this->countryCode = $countryCode;
-        $this->countryName = $countryName;
-        $this->regionName = $regionName;
-        $this->city = $city;
-        $this->latitude = $latitude;
-        $this->longitude = $longitude;
-        $this->timeZone = $timeZone;
-    }
-
-    public static function emptyInstance(): self
-    {
-        return new self('', '', '', '', 0.0, 0.0, '');
-    }
-
-    public function countryCode(): string
-    {
-        return $this->countryCode;
-    }
-
-    public function countryName(): string
-    {
-        return $this->countryName;
-    }
-
-    public function regionName(): string
-    {
-        return $this->regionName;
-    }
-
-    public function city(): string
-    {
-        return $this->city;
-    }
-
-    public function latitude(): float
-    {
-        return $this->latitude;
-    }
-
-    public function longitude(): float
-    {
-        return $this->longitude;
-    }
-
-    public function timeZone(): string
-    {
-        return $this->timeZone;
-    }
-}

module/Common/src/Lock/RetryLockStoreDelegatorFactory.php

@@ -1,18 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Lock;
-
-use Interop\Container\ContainerInterface;
-use Symfony\Component\Lock\Store\RetryTillSaveStore;
-use Symfony\Component\Lock\StoreInterface;
-
-class RetryLockStoreDelegatorFactory
-{
-    public function __invoke(ContainerInterface $container, $name, callable $callback): RetryTillSaveStore
-    {
-        /** @var StoreInterface $originalStore */
-        $originalStore = $callback();
-        return new RetryTillSaveStore($originalStore);
-    }
-}

module/Common/src/Logger/LoggerAwareDelegatorFactory.php

@@ -1,20 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Logger;
-
-use Psr\Container\ContainerInterface;
-use Psr\Log;
-
-class LoggerAwareDelegatorFactory
-{
-    public function __invoke(ContainerInterface $container, $name, callable $callback)
-    {
-        $instance = $callback();
-        if ($instance instanceof Log\LoggerAwareInterface) {
-            $instance->setLogger($container->get(Log\LoggerInterface::class));
-        }
-
-        return $instance;
-    }
-}

module/Common/src/Logger/LoggerFactory.php

@@ -1,44 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Logger;
-
-use Cascade\Cascade;
-use Interop\Container\ContainerInterface;
-use Interop\Container\Exception\ContainerException;
-use Zend\ServiceManager\Exception\ServiceNotCreatedException;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\ServiceManager\Factory\FactoryInterface;
-
-use function count;
-use function explode;
-
-class LoggerFactory implements FactoryInterface
-{
-    /**
-     * Create an object
-     *
-     * @param  ContainerInterface $container
-     * @param  string $requestedName
-     * @param  null|array $options
-     * @return object
-     * @throws ServiceNotFoundException if unable to resolve the service.
-     * @throws ServiceNotCreatedException if an exception is raised when
-     *     creating a service.
-     * @throws ContainerException if any other error occurs
-     */
-    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
-    {
-        $config = $container->has('config') ? $container->get('config') : [];
-        Cascade::fileConfig($config['logger'] ?? ['loggers' => []]);
-
-        // Compose requested logger name
-        $loggerName = $options['logger_name'] ?? 'Logger';
-        $nameParts = explode('_', $requestedName);
-        if (count($nameParts) > 1) {
-            $loggerName = $nameParts[1];
-        }
-
-        return Cascade::getLogger($loggerName);
-    }
-}

module/Common/src/Logger/Processor/ExceptionWithNewLineProcessor.php

@@ -1,30 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Logger\Processor;
-
-use function str_replace;
-use function strpos;
-
-use const PHP_EOL;
-
-final class ExceptionWithNewLineProcessor
-{
-    private const EXCEPTION_PLACEHOLDER = '{e}';
-
-    public function __invoke(array $record)
-    {
-        $message = $record['message'];
-        $messageHasExceptionPlaceholder = strpos($message, self::EXCEPTION_PLACEHOLDER) !== false;
-
-        if ($messageHasExceptionPlaceholder) {
-            $record['message'] = str_replace(
-                self::EXCEPTION_PLACEHOLDER,
-                PHP_EOL . self::EXCEPTION_PLACEHOLDER,
-                $message
-            );
-        }
-
-        return $record;
-    }
-}

module/Common/src/Middleware/CloseDbConnectionMiddleware.php

@@ -1,31 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Middleware;
-
-use Doctrine\ORM\EntityManagerInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-class CloseDbConnectionMiddleware implements MiddlewareInterface
-{
-    /** @var EntityManagerInterface */
-    private $em;
-
-    public function __construct(EntityManagerInterface $em)
-    {
-        $this->em = $em;
-    }
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        try {
-            return $handler->handle($request);
-        } finally {
-            $this->em->getConnection()->close();
-            $this->em->clear();
-        }
-    }
-}

module/Common/src/Middleware/IpAddressMiddlewareFactory.php

@@ -1,30 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Middleware;
-
-use Interop\Container\ContainerInterface;
-use RKA\Middleware\IpAddress;
-use Shlinkio\Shlink\Core\Model\Visitor;
-use Zend\ServiceManager\Exception\ServiceNotCreatedException;
-use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\ServiceManager\Factory\FactoryInterface;
-
-class IpAddressMiddlewareFactory implements FactoryInterface
-{
-    /**
-     * Create an object
-     *
-     * @param  ContainerInterface $container
-     * @param  string $requestedName
-     * @param  null|array $options
-     * @throws ServiceNotFoundException if unable to resolve the service.
-     * @throws ServiceNotCreatedException if an exception is raised when creating a service.
-     */
-    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null): IpAddress
-    {
-        $config = $container->get('config');
-        $headersToInspect = $config['ip_address_resolution']['headers_to_inspect'] ?? [];
-        return new IpAddress(true, [], Visitor::REMOTE_ADDRESS_ATTR, $headersToInspect);
-    }
-}

module/Common/src/Middleware/LocaleMiddleware.php

@@ -1,63 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Middleware;
-
-use Psr\Http\Message\ResponseInterface as Response;
-use Psr\Http\Message\ServerRequestInterface as Request;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface as DelegateInterface;
-use Zend\I18n\Translator\Translator;
-
-use function count;
-use function explode;
-
-class LocaleMiddleware implements MiddlewareInterface
-{
-    private const ACCEPT_LANGUAGE = 'Accept-Language';
-
-    /** @var Translator */
-    private $translator;
-
-    public function __construct(Translator $translator)
-    {
-        $this->translator = $translator;
-    }
-
-
-
-    /**
-     * Process an incoming server request and return a response, optionally delegating
-     * to the next middleware component to create the response.
-     *
-     * @param Request $request
-     * @param DelegateInterface $delegate
-     *
-     * @return Response
-     */
-    public function process(Request $request, DelegateInterface $delegate): Response
-    {
-        if (! $request->hasHeader(self::ACCEPT_LANGUAGE)) {
-            return $delegate->handle($request);
-        }
-
-        $locale = $request->getHeaderLine(self::ACCEPT_LANGUAGE);
-        $this->translator->setLocale($this->normalizeLocale($locale));
-        return $delegate->handle($request);
-    }
-
-    private function normalizeLocale(string $locale): string
-    {
-        $parts = explode('_', $locale);
-        if (count($parts) > 1) {
-            return $parts[0];
-        }
-
-        $parts = explode('-', $locale);
-        if (count($parts) > 1) {
-            return $parts[0];
-        }
-
-        return $locale;
-    }
-}

module/Common/src/Paginator/Util/PaginatorUtilsTrait.php

@@ -1,49 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Paginator\Util;
-
-use Shlinkio\Shlink\Common\Rest\DataTransformerInterface;
-use Zend\Paginator\Paginator;
-use Zend\Stdlib\ArrayUtils;
-
-use function array_map;
-use function sprintf;
-
-trait PaginatorUtilsTrait
-{
-    private function serializePaginator(Paginator $paginator, ?DataTransformerInterface $transformer = null): array
-    {
-        return [
-            'data' => $this->serializeItems(ArrayUtils::iteratorToArray($paginator->getCurrentItems()), $transformer),
-            'pagination' => [
-                'currentPage' => $paginator->getCurrentPageNumber(),
-                'pagesCount' => $paginator->count(),
-                'itemsPerPage' => $paginator->getItemCountPerPage(),
-                'itemsInCurrentPage' => $paginator->getCurrentItemCount(),
-                'totalItems' => $paginator->getTotalItemCount(),
-            ],
-        ];
-    }
-
-    private function serializeItems(array $items, ?DataTransformerInterface $transformer = null): array
-    {
-        return $transformer === null ? $items : array_map([$transformer, 'transform'], $items);
-    }
-
-    /**
-     * Checks if provided paginator is in last page
-     *
-     * @param Paginator $paginator
-     * @return bool
-     */
-    private function isLastPage(Paginator $paginator): bool
-    {
-        return $paginator->getCurrentPageNumber() >= $paginator->count();
-    }
-
-    private function formatCurrentPageMessage(Paginator $paginator, string $pattern): string
-    {
-        return sprintf($pattern, $paginator->getCurrentPageNumber(), $paginator->count());
-    }
-}

module/Common/src/Repository/PaginableRepositoryInterface.php

@@ -1,34 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Repository;
-
-interface PaginableRepositoryInterface
-{
-    /**
-     * Gets a list of elements using provided filtering data
-     *
-     * @param int|null $limit
-     * @param int|null $offset
-     * @param string|null $searchTerm
-     * @param array $tags
-     * @param string|array|null $orderBy
-     * @return array
-     */
-    public function findList(
-        ?int $limit = null,
-        ?int $offset = null,
-        ?string $searchTerm = null,
-        array $tags = [],
-        $orderBy = null
-    ): array;
-
-    /**
-     * Counts the number of elements in a list using provided filtering data
-     *
-     * @param string|null $searchTerm
-     * @param array $tags
-     * @return int
-     */
-    public function countList(?string $searchTerm = null, array $tags = []): int;
-}

module/Common/src/Response/PixelResponse.php

@@ -1,36 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Response;
-
-use Fig\Http\Message\StatusCodeInterface as StatusCode;
-use Psr\Http\Message\StreamInterface;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
-
-use function base64_decode;
-
-class PixelResponse extends Response
-{
-    private const BASE_64_IMAGE = 'R0lGODlhAQABAJAAAP8AAAAAACH5BAUQAAAALAAAAAABAAEAAAICBAEAOw==';
-    private const CONTENT_TYPE = 'image/gif';
-
-    public function __construct(int $status = StatusCode::STATUS_OK, array $headers = [])
-    {
-        $headers['content-type'] = self::CONTENT_TYPE;
-        parent::__construct($this->createBody(), $status, $headers);
-    }
-
-    /**
-     * Create the message body.
-     *
-     * @return StreamInterface
-     */
-    private function createBody(): StreamInterface
-    {
-        $body = new Stream('php://temp', 'wb+');
-        $body->write(base64_decode(self::BASE_64_IMAGE));
-        $body->rewind();
-        return $body;
-    }
-}

module/Common/src/Response/QrCodeResponse.php

@@ -1,32 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Response;
-
-use Endroid\QrCode\QrCode;
-use Fig\Http\Message\StatusCodeInterface as StatusCode;
-use Psr\Http\Message\StreamInterface;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
-
-class QrCodeResponse extends Response
-{
-    use Response\InjectContentTypeTrait;
-
-    public function __construct(QrCode $qrCode, int $status = StatusCode::STATUS_OK, array $headers = [])
-    {
-        parent::__construct(
-            $this->createBody($qrCode),
-            $status,
-            $this->injectContentType($qrCode->getContentType(), $headers)
-        );
-    }
-
-    private function createBody(QrCode $qrCode): StreamInterface
-    {
-        $body = new Stream('php://temp', 'wb+');
-        $body->write($qrCode->get());
-        $body->rewind();
-        return $body;
-    }
-}

module/Common/src/Rest/DataTransformerInterface.php

@@ -1,9 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Rest;
-
-interface DataTransformerInterface
-{
-    public function transform($value): array;
-}

module/Common/src/Template/Extension/TranslatorExtension.php

@@ -1,25 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Template\Extension;
-
-use League\Plates\Engine;
-use League\Plates\Extension\ExtensionInterface;
-use Zend\I18n\Translator\TranslatorInterface;
-
-class TranslatorExtension implements ExtensionInterface
-{
-    /** @var TranslatorInterface */
-    private $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
-
-    public function register(Engine $engine): void
-    {
-        $engine->registerFunction('translate', [$this->translator, 'translate']);
-        $engine->registerFunction('locale', [$this->translator, 'getLocale']);
-    }
-}

module/Common/src/Type/ChronosDateTimeType.php

@@ -1,53 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Type;
-
-use Cake\Chronos\Chronos;
-use DateTimeInterface;
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\ConversionException;
-use Doctrine\DBAL\Types\DateTimeImmutableType;
-
-class ChronosDateTimeType extends DateTimeImmutableType
-{
-    public const CHRONOS_DATETIME = 'chronos_datetime';
-
-    public function getName(): string
-    {
-        return self::CHRONOS_DATETIME;
-    }
-
-    /**
-     * @throws ConversionException
-     */
-    public function convertToPHPValue($value, AbstractPlatform $platform): ?Chronos
-    {
-        if ($value === null) {
-            return null;
-        }
-
-        $dateTime = parent::convertToPHPValue($value, $platform);
-        return Chronos::instance($dateTime);
-    }
-
-    /**
-     * @throws ConversionException
-     */
-    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
-    {
-        if (null === $value) {
-            return $value;
-        }
-
-        if ($value instanceof DateTimeInterface) {
-            return $value->format($platform->getDateTimeFormatString());
-        }
-
-        throw ConversionException::conversionFailedInvalidType(
-            $value,
-            $this->getName(),
-            ['null', DateTimeInterface::class]
-        );
-    }
-}

module/Common/src/Util/DateRange.php

@@ -1,35 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Util;
-
-use Cake\Chronos\Chronos;
-
-final class DateRange
-{
-    /** @var Chronos|null */
-    private $startDate;
-    /** @var Chronos|null */
-    private $endDate;
-
-    public function __construct(?Chronos $startDate = null, ?Chronos $endDate = null)
-    {
-        $this->startDate = $startDate;
-        $this->endDate = $endDate;
-    }
-
-    public function getStartDate(): ?Chronos
-    {
-        return $this->startDate;
-    }
-
-    public function getEndDate(): ?Chronos
-    {
-        return $this->endDate;
-    }
-
-    public function isEmpty(): bool
-    {
-        return $this->startDate === null && $this->endDate === null;
-    }
-}

module/Common/src/Util/IpAddress.php

@@ -1,71 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Util;
-
-use Shlinkio\Shlink\Common\Exception\WrongIpException;
-
-use function count;
-use function explode;
-use function implode;
-use function trim;
-
-final class IpAddress
-{
-    private const IPV4_PARTS_COUNT = 4;
-    private const OBFUSCATED_OCTET = '0';
-    public const LOCALHOST = '127.0.0.1';
-
-    /** @var string */
-    private $firstOctet;
-    /** @var string */
-    private $secondOctet;
-    /** @var string */
-    private $thirdOctet;
-    /** @var string */
-    private $fourthOctet;
-
-    private function __construct(string $firstOctet, string $secondOctet, string $thirdOctet, string $fourthOctet)
-    {
-        $this->firstOctet = $firstOctet;
-        $this->secondOctet = $secondOctet;
-        $this->thirdOctet = $thirdOctet;
-        $this->fourthOctet = $fourthOctet;
-    }
-
-    /**
-     * @param string $address
-     * @return IpAddress
-     * @throws WrongIpException
-     */
-    public static function fromString(string $address): self
-    {
-        $address = trim($address);
-        $parts = explode('.', $address);
-        if (count($parts) !== self::IPV4_PARTS_COUNT) {
-            throw WrongIpException::fromIpAddress($address);
-        }
-
-        return new self(...$parts);
-    }
-
-    public function getObfuscatedCopy(): self
-    {
-        return new self(
-            $this->firstOctet,
-            $this->secondOctet,
-            $this->thirdOctet,
-            self::OBFUSCATED_OCTET
-        );
-    }
-
-    public function __toString(): string
-    {
-        return implode('.', [
-            $this->firstOctet,
-            $this->secondOctet,
-            $this->thirdOctet,
-            $this->fourthOctet,
-        ]);
-    }
-}

module/Common/src/Util/ResponseUtilsTrait.php

@@ -1,30 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Util;
-
-use Fig\Http\Message\StatusCodeInterface as StatusCode;
-use finfo;
-use Psr\Http\Message\ResponseInterface;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
-use Zend\Stdlib\ArrayUtils;
-
-use const FILEINFO_MIME;
-
-trait ResponseUtilsTrait
-{
-    private function generateImageResponse(string $imagePath): ResponseInterface
-    {
-        return $this->generateBinaryResponse($imagePath);
-    }
-
-    private function generateBinaryResponse(string $path, array $extraHeaders = []): ResponseInterface
-    {
-        $body = new Stream($path);
-        return new Response($body, StatusCode::STATUS_OK, ArrayUtils::merge([
-            'Content-Type' => (new finfo(FILEINFO_MIME))->file($path),
-            'Content-Length' => (string) $body->getSize(),
-        ], $extraHeaders));
-    }
-}

module/Common/src/Util/StringUtilsTrait.php

@@ -1,46 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Util;
-
-use function random_int;
-use function sprintf;
-use function strlen;
-
-trait StringUtilsTrait
-{
-    private function generateRandomString(int $length = 10): string
-    {
-        $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-        $charactersLength = strlen($characters);
-        $randomString = '';
-        for ($i = 0; $i < $length; $i++) {
-            $randomString .= $characters[random_int(0, $charactersLength - 1)];
-        }
-
-        return $randomString;
-    }
-
-    private function generateV4Uuid(): string
-    {
-        return sprintf(
-            '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-            // 32 bits for "time_low"
-            random_int(0, 0xffff),
-            random_int(0, 0xffff),
-            // 16 bits for "time_mid"
-            random_int(0, 0xffff),
-            // 16 bits for "time_hi_and_version",
-            // four most significant bits holds version number 4
-            random_int(0, 0x0fff) | 0x4000,
-            // 16 bits, 8 bits for "clk_seq_hi_res",
-            // 8 bits for "clk_seq_low",
-            // two most significant bits holds zero and one for variant DCE1.1
-            random_int(0, 0x3fff) | 0x8000,
-            // 48 bits for "node"
-            random_int(0, 0xffff),
-            random_int(0, 0xffff),
-            random_int(0, 0xffff)
-        );
-    }
-}

module/Common/src/Validation/InputFactoryTrait.php

@@ -1,35 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Validation;
-
-use Zend\Filter;
-use Zend\InputFilter\Input;
-use Zend\Validator;
-
-trait InputFactoryTrait
-{
-    private function createInput($name, $required = true): Input
-    {
-        $input = new Input($name);
-        $input->setRequired($required)
-              ->getFilterChain()->attach(new Filter\StripTags())
-                                ->attach(new Filter\StringTrim());
-        return $input;
-    }
-
-    private function createBooleanInput(string $name, bool $required = true): Input
-    {
-        $input = $this->createInput($name, $required);
-        $input->getFilterChain()->attach(new Filter\Boolean());
-        $input->getValidatorChain()->attach(new Validator\NotEmpty(['type' => [
-            Validator\NotEmpty::OBJECT,
-            Validator\NotEmpty::SPACE,
-            Validator\NotEmpty::NULL,
-            Validator\NotEmpty::EMPTY_ARRAY,
-            Validator\NotEmpty::STRING,
-        ]]));
-
-        return $input;
-    }
-}

module/Common/src/Validation/SluggerFilter.php

@@ -1,31 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Common\Validation;
-
-use Cocur\Slugify;
-use Zend\Filter\Exception;
-use Zend\Filter\FilterInterface;
-
-class SluggerFilter implements FilterInterface
-{
-    /** @var Slugify\SlugifyInterface */
-    private $slugger;
-
-    public function __construct(?Slugify\SlugifyInterface $slugger = null)
-    {
-        $this->slugger = $slugger ?: new Slugify\Slugify(['lowercase' => false]);
-    }
-
-    /**
-     * Returns the result of filtering $value
-     *
-     * @param  mixed $value
-     * @throws Exception\RuntimeException If filtering $value is impossible
-     * @return mixed
-     */
-    public function filter($value)
-    {
-        return ! empty($value) ? $this->slugger->slugify($value) : null;
-    }
-}

module/Common/test-db/ApiTest/ApiTestCase.php

@@ -1,68 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ShlinkioTest\Shlink\Common\ApiTest;
-
-use Fig\Http\Message\RequestMethodInterface;
-use Fig\Http\Message\StatusCodeInterface;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\RequestOptions;
-use PHPUnit\Framework\TestCase;
-use Psr\Http\Message\ResponseInterface;
-use Shlinkio\Shlink\Rest\Authentication\Plugin\ApiKeyHeaderPlugin;
-
-use function Shlinkio\Shlink\Common\json_decode;
-use function sprintf;
-
-abstract class ApiTestCase extends TestCase implements StatusCodeInterface, RequestMethodInterface
-{
-    private const REST_PATH_PREFIX = '/rest/v1';
-
-    /** @var ClientInterface */
-    private static $client;
-    /** @var callable */
-    private static $seedFixtures;
-
-    public static function setApiClient(ClientInterface $client): void
-    {
-        self::$client = $client;
-    }
-
-    public static function setSeedFixturesCallback(callable $seedFixtures): void
-    {
-        self::$seedFixtures = $seedFixtures;
-    }
-
-    public function setUp(): void
-    {
-        if (self::$seedFixtures) {
-            (self::$seedFixtures)();
-        }
-    }
-
-    protected function callApi(string $method, string $uri, array $options = []): ResponseInterface
-    {
-        return self::$client->request($method, sprintf('%s%s', self::REST_PATH_PREFIX, $uri), $options);
-    }
-
-    protected function callApiWithKey(string $method, string $uri, array $options = []): ResponseInterface
-    {
-        $headers = $options[RequestOptions::HEADERS] ?? [];
-        $headers[ApiKeyHeaderPlugin::HEADER_NAME] = 'valid_api_key';
-        $options[RequestOptions::HEADERS] = $headers;
-
-        return $this->callApi($method, $uri, $options);
-    }
-
-    protected function getJsonResponsePayload(ResponseInterface $resp): array
-    {
-        return json_decode((string) $resp->getBody());
-    }
-
-    protected function callShortUrl(string $shortCode): ResponseInterface
-    {
-        return self::$client->request(self::METHOD_GET, sprintf('/%s', $shortCode), [
-            RequestOptions::ALLOW_REDIRECTS => false,
-        ]);
-    }
-}

module/Common/test-db/DbTest/DatabaseTestCase.php

@@ -1,36 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ShlinkioTest\Shlink\Common\DbTest;
-
-use Doctrine\ORM\EntityManagerInterface;
-use PHPUnit\Framework\TestCase;
-
-abstract class DatabaseTestCase extends TestCase
-{
-    protected const ENTITIES_TO_EMPTY = [];
-
-    /** @var EntityManagerInterface */
-    private static $em;
-
-    public static function setEntityManager(EntityManagerInterface $em): void
-    {
-        self::$em = $em;
-    }
-
-    protected function getEntityManager(): EntityManagerInterface
-    {
-        return self::$em;
-    }
-
-    public function tearDown(): void
-    {
-        foreach (static::ENTITIES_TO_EMPTY as $entityClass) {
-            $qb = $this->getEntityManager()->createQueryBuilder();
-            $qb->delete($entityClass, 'x');
-            $qb->getQuery()->execute();
-        }
-
-        $this->getEntityManager()->clear();
-    }
-}