Merge pull request #619 from acelaya-forks/feature/1.21.2

Feature/1.21.2

.dockerignore

@@ -5,20 +5,20 @@ data/log/*
 data/locks/*
 data/proxies/*
 data/migrations_template.txt
-data/GeoLite2-City*
+data/GeoLite2-City.*
 data/database.sqlite
 data/shlink-tests.db
+**/.gitignore
 CHANGELOG.md
-UPGRADE.md
 composer.lock
 vendor
 docs
 indocker
 docker-*
+php*
+infection.json
 phpstan.neon
-php*xml*
-infection*
 **/test*
 build*
-**/.*
-bin/helper
+.github
+hooks

.gitattributes

@@ -5,11 +5,14 @@
 /module/CLI/test-resources 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
 .gitattributes export-ignore
 .gitignore export-ignore
 .phpstorm.meta.php export-ignore
+.scrutinizer.yml export-ignore
 .travis.yml export-ignore
 build.sh export-ignore
 CHANGELOG.md export-ignore

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,6 @@
 <!--
-Before opening an issue, just take into account that this is a completely free of charge and open source project.
-I'm always happy to help and provide support, but some understanding will be expected.
+Before opening an issue, just take into account that this is a completely free of charge open source project.
+I'm always happy to help and provide support, but some understanding will be required.
 I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personal if an issue gets eventually closed.
-You may also be asked to provide tests or ways to reproduce reported bugs.
 Try to be polite, and understand it is impossible for an OSS project to cover all use cases.
 -->

.github/ISSUE_TEMPLATE/Bug.md

@@ -5,10 +5,9 @@ labels: bug
 ---
 
 <!--
-Before opening an issue, just take into account that this is a completely free of charge and open source project.
-I'm always happy to help and provide support, but some understanding will be expected.
+Before opening an issue, just take into account that this is a completely free of charge open source project.
+I'm always happy to help and provide support, but some understanding will be required.
 I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personal if an issue gets eventually closed.
-You may also be asked to provide tests or ways to reproduce reported bugs.
 Try to be polite, and understand it is impossible for an OSS project to cover all use cases.
 
 With that said, please fill in the information requested next. More information might be requested next (like logs or system configs).
@@ -19,7 +18,7 @@ With that said, please fill in the information requested next. More information
 * Shlink Version: x.y.z
 * PHP Version: x.y.z
 * How do you serve Shlink: Self-hosted Apache|Self-hosted nginx|Self-hosted swoole|Docker image
-* Database engine used: MySQL|MariaDB|PostgreSQL|MicrosoftSQL|SQLite (x.y.z)
+* Database engine used: MySQL|MariaDB|PostgreSQL|SQLite (x.y.z)
 
 #### Summary
 

.github/ISSUE_TEMPLATE/Feature_Request.md

@@ -5,10 +5,9 @@ labels: feature
 ---
 
 <!--
-Before opening an issue, just take into account that this is a completely free of charge and open source project.
-I'm always happy to help and provide support, but some understanding will be expected.
+Before opening an issue, just take into account that this is a completely free of charge open source project.
+I'm always happy to help and provide support, but some understanding will be required.
 I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personal if an issue gets eventually closed.
-You may also be asked to provide tests or ways to reproduce reported bugs.
 Try to be polite, and understand it is impossible for an OSS project to cover all use cases.
 
 With that said, please fill in the information requested next. More information might be requested next (like logs or system configs).

.github/ISSUE_TEMPLATE/Question_Support.md

@@ -5,10 +5,9 @@ labels: question
 ---
 
 <!--
-Before opening an issue, just take into account that this is a completely free of charge and open source project.
-I'm always happy to help and provide support, but some understanding will be expected.
+Before opening an issue, just take into account that this is a completely free of charge open source project.
+I'm always happy to help and provide support, but some understanding will be required.
 I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personal if an issue gets eventually closed.
-You may also be asked to provide tests or ways to reproduce reported bugs.
 Try to be polite, and understand it is impossible for an OSS project to cover all use cases.
 
 With that said, please fill in the information requested next. More information might be requested next (like logs or system configs).
@@ -19,7 +18,7 @@ With that said, please fill in the information requested next. More information
 * Shlink Version: x.y.z
 * PHP Version: x.y.z
 * How do you serve Shlink: Self-hosted Apache|Self-hosted nginx|Self-hosted swoole|Docker image
-* Database engine used: MySQL|MariaDB|PostgreSQL|MicrosoftSQL|SQLite (x.y.z)
+* Database engine used: MySQL|MariaDB|PostgreSQL|SQLite (x.y.z)
 
 #### Summary
 

.github/workflows/ci.yml

@@ -1,188 +0,0 @@
-name: Continuous integration
-
-on:
-  pull_request: null
-  push:
-    branches:
-      - main
-      - develop
-
-jobs:
-  static-analysis:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['8.0']
-        command: ['cs', 'stan', 'swagger:validate']
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: openswoole-4.8.1
-          coverage: none
-      - run: composer install --no-interaction --prefer-dist
-      - run: composer ${{ matrix.command }}
-
-  tests:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['8.0', '8.1']
-        test-group: ['unit', 'api']
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Start database server
-        if: ${{ matrix.test-group == 'api' }}
-        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_postgres
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: openswoole-4.8.1
-          coverage: pcov
-          ini-values: pcov.directory=module
-      - run: composer install --no-interaction --prefer-dist
-      - run: composer test:${{ matrix.test-group }}:ci
-      - uses: actions/upload-artifact@v2
-        if: ${{ matrix.php-version == '8.0' }}
-        with:
-          name: coverage-${{ matrix.test-group }}
-          path: |
-            build/coverage-${{ matrix.test-group }}
-            build/coverage-${{ matrix.test-group }}.cov
-
-  db-tests:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['8.0', '8.1']
-        platform: ['sqlite:ci', 'mysql', 'maria', 'postgres', 'ms']
-    env:
-      LC_ALL: C
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Install MSSQL ODBC
-        if: ${{ matrix.platform == 'ms' }}
-        run: sudo ./data/infra/ci/install-ms-odbc.sh
-      - name: Start database server
-        if: ${{ matrix.platform != 'sqlite:ci' }}
-        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_${{ matrix.platform }}
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: openswoole-4.8.1, pdo_sqlsrv-5.10.0beta2
-          coverage: pcov
-          ini-values: pcov.directory=module
-      - run: composer install --no-interaction --prefer-dist
-      - name: Create test database
-        if: ${{ matrix.platform == 'ms' }}
-        run: docker-compose exec -T shlink_db_ms /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Passw0rd!' -Q "CREATE DATABASE shlink_test;"
-      - name: Run tests
-        run: composer test:db:${{ matrix.platform }}
-      - name: Upload code coverage
-        uses: actions/upload-artifact@v2
-        if: ${{ matrix.php-version == '8.0' && matrix.platform == 'sqlite:ci' }}
-        with:
-          name: coverage-db
-          path: |
-            build/coverage-db
-            build/coverage-db.cov
-
-  mutation-tests:
-    needs:
-      - tests
-      - db-tests
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['8.0', '8.1']
-        test-group: ['unit', 'db', 'api']
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: openswoole-4.8.1
-          coverage: pcov
-          ini-values: pcov.directory=module
-      - run: composer install --no-interaction --prefer-dist
-      - uses: actions/download-artifact@v2
-        with:
-          path: build
-      - if: ${{ matrix.test-group == 'unit' }}
-        run: composer infect:ci:unit
-        env:
-          INFECTION_BADGE_API_KEY: ${{ secrets.INFECTION_BADGE_API_KEY }}
-      - if: ${{ matrix.test-group != 'unit' }}
-        run: composer infect:ci:${{ matrix.test-group }}
-
-  upload-coverage:
-    needs:
-      - tests
-      - db-tests
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['8.0']
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          coverage: pcov
-          ini-values: pcov.directory=module
-      - uses: actions/download-artifact@v2
-        with:
-          path: build
-      - run: mv build/coverage-unit/coverage-unit.cov build/coverage-unit.cov
-      - run: mv build/coverage-db/coverage-db.cov build/coverage-db.cov
-      - run: mv build/coverage-api/coverage-api.cov build/coverage-api.cov
-      - run: wget https://phar.phpunit.de/phpcov-8.2.0.phar
-      - run: php phpcov-8.2.0.phar merge build --clover build/clover.xml
-      - name: Publish coverage
-        uses: codecov/codecov-action@v1
-        with:
-          file: ./build/clover.xml
-
-  delete-artifacts:
-    needs:
-      - mutation-tests
-      - upload-coverage
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: geekyeggo/delete-artifact@v1
-        with:
-          name: |
-            coverage-unit
-            coverage-db
-            coverage-api
-
-  build-docker-image:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 100
-      - uses: marceloprado/has-changed-path@v1
-        id: changed-dockerfile
-        with:
-          paths: ./Dockerfile
-      - if: ${{ steps.changed-dockerfile.outputs.changed == 'true' }}
-        run: docker build -t shlink-docker-image:temp .
-      - if: ${{ steps.changed-dockerfile.outputs.changed != 'true' }}
-        run: echo "Dockerfile didn't change. Skipped"

.github/workflows/docker-image-build.yml

@@ -1,28 +0,0 @@
-name: Build docker image
-
-on:
-  push:
-    branches:
-      - develop
-    tags:
-      - 'v*'
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-        with:
-          version: latest
-      - name: Login to docker hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build the image
-        run: bash ./docker/build

.github/workflows/publish-release.yml

@@ -1,61 +0,0 @@
-name: Publish release
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['8.0', '8.1']
-        swoole: ['yes', 'no']
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: openswoole-4.8.1
-      - if: ${{ matrix.swoole == 'yes' }}
-        run: ./build.sh ${GITHUB_REF#refs/tags/v}
-      - if: ${{ matrix.swoole == 'no' }}
-        run: ./build.sh ${GITHUB_REF#refs/tags/v} --no-swoole
-      - uses: actions/upload-artifact@v2
-        with:
-          name: dist-files-${{ matrix.php-version }}-${{ matrix.swoole }}
-          path: build
-
-  publish:
-    needs: ['build']
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
-        with:
-          path: build
-      - name: Publish release with assets
-        uses: docker://antonyurchenko/git-release:latest
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ALLOW_EMPTY_CHANGELOG: "true"
-        with:
-          args: |
-            build/*/shlink*_dist.zip
-
-  delete-artifacts:
-    needs: ['publish']
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: [ '8.0', '8.1' ]
-        swoole: [ 'yes', 'no' ]
-    steps:
-      - uses: geekyeggo/delete-artifact@v1
-        with:
-          name: dist-files-${{ matrix.php-version }}-${{ matrix.swoole }}

.github/workflows/publish-swagger-spec.yml

@@ -1,40 +0,0 @@
-name: Publish swagger spec
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['8.0']
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Determine version
-        id: determine_version
-        run: echo "::set-output name=version::${GITHUB_REF#refs/tags/}"
-        shell: bash
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: openswoole-4.8.1
-          coverage: none
-      - run: composer install --no-interaction --prefer-dist
-      - run: composer swagger:inline
-      - run: mkdir ${{ steps.determine_version.outputs.version }}
-      - run: mv docs/swagger/swagger-inlined.json ${{ steps.determine_version.outputs.version }}/oas.json
-      - name: Publish spec
-        uses: JamesIves/github-pages-deploy-action@4.1.7
-        with:
-          token: ${{ secrets.OAS_PUBLISH_TOKEN }}
-          repository-name: 'shlinkio/shlink-open-api-specs'
-          branch: main
-          folder: ${{ steps.determine_version.outputs.version }}
-          target-folder: specs/${{ steps.determine_version.outputs.version }}
-          clean: false

.gitignore

@@ -1,14 +1,13 @@
 .idea
 build
-!docker/build
+!hooks/build
 composer.lock
 composer.phar
 vendor/
 data/database.sqlite
 data/shlink-tests.db
-data/GeoLite2-City.*
+data/GeoLite2-City.mmdb
+data/GeoLite2-City.mmdb.*
 docs/swagger-ui*
-docs/mercure.html
 docker-compose.override.yml
 .phpunit.result.cache
-docs/swagger/swagger-inlined.json

.phpstorm.meta.php

@@ -2,7 +2,7 @@
 namespace PHPSTORM_META;
 
 use Psr\Container\ContainerInterface;
-use Laminas\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
  * PhpStorm Container Interop code completion

.scrutinizer.yml

@@ -0,0 +1,13 @@
+tools:
+  external_code_coverage:
+    timeout: 600
+checks:
+  php:
+    code_rating: true
+    duplication: true
+build:
+  nodes:
+    analysis:
+      tests:
+        override:
+          - php-scrutinizer-run

.travis.yml

@@ -0,0 +1,59 @@
+language: php
+
+branches:
+  only:
+    - /.*/
+
+php:
+  - '7.2'
+  - '7.3'
+
+services:
+  - mysql
+  - postgresql
+  - docker
+
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+
+before_install:
+  - echo 'extension = apcu.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - yes | pecl install swoole
+  - phpenv config-rm xdebug.ini || return 0
+
+install:
+  - composer self-update
+  - composer install --no-interaction --prefer-dist
+
+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
+  - wget https://phar.phpunit.de/phpcov-6.0.1.phar
+  - phpdbg -qrr phpcov-6.0.1.phar merge build --clover build/clover.xml
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover build/clover.xml
+
+# Before deploying, build dist file for current travis tag
+before_deploy:
+  - rm -f ocular.phar
+  - ./build.sh ${TRAVIS_TAG#?}
+
+deploy:
+  - provider: releases
+    api_key:
+      secure: a9dbZchocqeuOViwUeNH54bQR5Sz7rEYXx5b9WPFtnFn9LGKKUaLbA2U91UQ9QKPrcTpsALubUYbw2CnNmvCwzaY+R8lCD3gkU4ohsEnbpnw3deOeixI74sqBHJAuCH9FSaRDGILoBMtUKx2xlzIymFxkIsgIukkGbdkWHDlRWY3oTUUuw1SQ2Xk9KDsbJQtjIc1+G/O6gHaV4qv/R9W8NPmJExKTNDrAZbC1vIUnxqp4UpVo1hst8qPd1at94CndDYM5rG+7imGbdtxTxzamt819qdTO1OfvtctKawNAm7YXZrrWft6c7gI6j6SI4hxd+ZrrPBqbaRFHkZHjnNssO/yn4SaOHFFzccmu0MzvpPCf0qWZwd3sGHVYer1MnR2mHYqU84QPlW3nrHwJjkrpq3+q0JcBY6GsJs+RskHNtkMTKV05Iz6QUI5YZGwTpuXaRm036SmavjGc4IDlMaYCk/NmbB9BKpthJxLdUpczOHpnjXXHziotWD6cfEnbjU3byfD8HY5WrxSjsNT7SKmXN3hRof7bk985ewQVjGT42O3NbnfnqjQQWr/B7/zFTpLR4f526Bkq12CdCyf5lvrbq+POkLVdJ+uFfR7ds248Ue/jBQy6kM1tWmKF9QiwisFlA84eQ4CW3I93Rp97URv+AQa9zmbD0Ve3Udp+g6nF5I=
+    file: "./build/shlink_${TRAVIS_TAG#?}_dist.zip"
+    skip_cleanup: true
+    on:
+      tags: true
+      php: '7.2'

CONTRIBUTING.md

@@ -1,150 +0,0 @@
-# Contributing
-
-This file will guide you through the process of getting to project up and running, in case you want to provide coding contributions.
-
-You will also see how to ensure the code fulfills the expected code checks, and how to create a pull request.
-
-## System dependencies
-
-The project provides all its dependencies as docker containers through a docker-compose configuration.
-
-Because of this, the only actual dependencies are [docker](https://docs.docker.com/get-docker/) and [docker-compose](https://docs.docker.com/compose/install/).
-
-## Setting up the project
-
-The first thing you need to do is fork the repository, and clone it in your local machine.
-
-Then you will have to follow these steps:
-
-* Copy all files with `.local.php.dist` extension from `config/autoload` by removing the dist extension.
-
-    For example the `common.local.php.dist` file should be copied as `common.local.php`.
-
-* Copy the file `docker-compose.override.yml.dist` by also removing the `dist` extension.
-* Start-up the project by running `docker-compose up`.
-
-    The first time this command is run, it will create several containers that are used during development, so it may take some time.
-
-    It will also create some empty databases and install the project dependencies with composer.
-
-* Run `./indocker bin/cli db:create` to create the initial database.
-* Run `./indocker bin/cli db:migrate` to get database migrations up to date.
-* Run `./indocker bin/cli api-key:generate` to get your first API key generated.
-
-Once you finish this, you will have the project exposed in ports `8000` through nginx+php-fpm and `8080` through swoole.
-
-> Note: The `indocker` shell script is a helper tool used to run commands inside the main docker container.
-
-## Project structure
-
-This project is structured as a modular application, using [laminas/laminas-config-aggregator](https://github.com/laminas/laminas-config-aggregator) to merge the configuration provided by every module.
-
-All modules are inside the `module` folder, and each one has its own `src`, `test` and `config` folders, with the source code, tests and configuration. They also have their own `ConfigProvider` class, which is consumed by the config aggregator.
-
-This is a simplified version of the project structure:
-
-```
-shlink
-├── bin
-│   ├── cli
-│   ├── install
-│   └── update
-├── config
-│   ├── autoload
-│   ├── params
-│   ├── config.php
-│   └── container.php
-├── data
-│   ├── cache
-│   ├── locks
-│   ├── log
-│   ├── migrations
-│   └── proxies
-├── docs
-│   ├── adr
-│   ├── async-api
-│   └── swagger
-├── module
-│   ├── CLI
-│   ├── Core
-│   └── Rest
-├── public
-├── composer.json
-└── README.md
-```
-
-The purposes of every folder are:
-
-* `bin`: It contains the CLI tools. The `cli` one is the main entry point to run shlink from the command line, while `install` and `update` are helper tools used to install and update shlink when not using the docker image.
-* `config`: Contains application-wide configurations, which are later merged with the ones provided by every module.
-* `data`: Common runtime-generated git-ignored assets, like logs, caches, etc.
-* `docs`: Any project documentation is stored here, like API spec definitions or architectural decision records.
-* `module`: Contains a subfolder for every module in the project. Modules contain the source code, tests and configurations for every context in the project.
-* `public`: Few assets (like `favicon.ico` or `robots.txt`) and the web entry point are stored here. This web entry point is not used when serving the app with swoole.
-
-## Project tests
-
-In order to ensure stability and no regressions are introduced while developing new features, this project has different types of tests.
-
-* **Unit tests**: These are the simplest to run, and usually test individual pieces of code, replacing any external dependency by mocks.
-
-    The code coverage of unit tests is pretty high, and only components which work closer to the database, like entity repositories, are excluded because of their nature.
-
-* **Database tests**: These are integration tests that run against a real database, and only cover components which work closer to the database.
-
-    Its purpose is to verify all the database queries behave as expected and return what's expected.
-
-    The project provides some tooling to run them against any of the supported database engines.
-
-* **API tests**: These are E2E tests that spin up an instance of the app with swoole, and test it from the outside by interacting with the REST API.
-
-    These are the best tests to catch regressions, and to verify everything behaves as expected.
-
-    They use Postgres as the database engine, and include some fixtures that ensure the same data exists at the beginning of the execution.
-
-    Since the app instance is run on a process different from the one running the tests, when a test fails it might not be obvious why. To help debugging that, the app will dump all its logs inside `data/log/api-tests`, where you will find the `shlink.log` and `access.log` files.
-
-* **CLI tests**: *TBD. Once included, its purpose will be the same as API tests, but running through the command line*
-
-Depending on the kind of contribution, maybe not all kinds of tests are needed, but the more you provide, the better.
-
-## Running code checks
-
-* Run `./indocker composer cs` to check coding styles are fulfilled.
-* Run `./indocker composer cs:fix` to fix coding styles (some may not be fixable from the CLI)
-* Run `./indocker composer stan` to statically analyze the code with [phpstan](https://phpstan.org/). This tool is the closest to "compile" PHP and verify everything would work as expected.
-* Run `./indocker composer test:unit` to run the unit tests.
-* Run `./indocker composer test:db` to run the database integration tests.
-
-    This command runs the same test suite against all supported database engines in parallel. If you just want to run one of them, you can add one of `:sqlite`, `:mysql`, `:maria`, `:postgres`, `:mssql` at the end of the command.
-    
-    For example, `test:db:postgres`.
-
-* Run `./indocker composer test:api` to run API E2E tests. For these, the Postgres database engine is used.
-* Run `./indocker composer infect:test` to run both unit and database tests (over sqlite) and then apply mutations to them with [infection](https://infection.github.io/).
-* Run `./indocker composer ci` to run all previous commands together. This command is run during the project's continuous integration.
-* Run `./indocker composer ci:parallel` to do the same as in previous case, but parallelizing non-conflicting tasks as much as possible.
-
-> Note: Due to some limitations in the tooling used by shlink, the testing databases need to exist beforehand, both for db and api tests (except sqlite).
->
-> However, they just need to be created empty, with no tables. Also, once created, they are automatically reset before every new execution.
->
-> The testing database is always called `shlink_test`. You can create it using the database client of your choice. [DBeaver](https://dbeaver.io/) is a good multi-platform desktop database client which supports all the engines supported by shlink.
-
-## Pull request process
-
-**Important!**: Before starting to work on a pull request, make sure you always [open an issue](https://github.com/shlinkio/shlink/issues/new/choose) first.
-
-This is important because any contribution needs to be discussed first. Maybe there's someone else already working on something similar, or there are other considerations to have in mind.
-
-Once everything is clear, to provide a pull request to this project, you should always start by creating a new branch, where you will make all desired changes.
-
-The base branch should always be `develop`, and the target branch for the pull request should also be `develop`.
-
-Before your branch can be merged, all the checks described in [Running code checks](#running-code-checks) have to be passing. You can verify that manually by running `./indocker composer ci:parallel`, or wait for the build to be run automatically after the pull request is created.
-
-## Architectural Decision Records
-
-The project includes logs for some architectural decisions, using the [adr](https://adr.github.io/) proposal.
-
-If you are curious or want to understand why something has been built in some specific way, [take a look at them](docs/adr).

Dockerfile

@@ -1,18 +1,16 @@
-FROM php:8.1.0-alpine3.15 as base
+FROM php:7.3.11-alpine3.10
+LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
 
-ARG SHLINK_VERSION=latest
+ARG SHLINK_VERSION=1.20.2
 ENV SHLINK_VERSION ${SHLINK_VERSION}
-ENV OPENSWOOLE_VERSION 4.8.1
-ENV PDO_SQLSRV_VERSION 5.10.0beta2
-ENV MS_ODBC_SQL_VERSION 17.5.2.2
-ENV LC_ALL "C"
+ENV SWOOLE_VERSION 4.4.12
+ENV COMPOSER_VERSION 1.9.1
 
 WORKDIR /etc/shlink
 
-# Install required PHP extensions
 RUN \
-    # Install extensions with no extra dependencies
-    docker-php-ext-install -j"$(nproc)" pdo_mysql calendar sockets bcmath && \
+    # 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 && \
@@ -24,63 +22,36 @@ RUN \
     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 gmp
-    apk add --no-cache gmp-dev && \
-    docker-php-ext-install -j"$(nproc)" gmp
+    docker-php-ext-install -j"$(nproc)" zip gd
 
-# Install sqlsrv driver
-RUN if [ $(uname -m) == "x86_64" ]; then \
-      wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
-      apk add --allow-untrusted msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
-      apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} unixodbc-dev && \
-      pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} && \
-      docker-php-ext-enable pdo_sqlsrv && \
-      apk del .phpize-deps && \
-      rm msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk ; \
-    fi
-
-# Install openswoole
+# 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 openswoole-${OPENSWOOLE_VERSION} && \
-    docker-php-ext-enable openswoole && \
+    pecl install swoole-${SWOOLE_VERSION} && \
+    docker-php-ext-enable swoole && \
     apk del .phpize-deps
 
-
 # Install shlink
-FROM base as builder
 COPY . .
-COPY --from=composer:2 /usr/bin/composer ./composer.phar
-RUN apk add --no-cache git && \
+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 -r docker composer.* && \
-    sed -i "s/%SHLINK_VERSION%/${SHLINK_VERSION}/g" config/autoload/app_options.global.php
+    rm composer.*
 
-
-# Prepare final image
-FROM base
-LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
-
-COPY --from=builder /etc/shlink .
+# 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 default openswoole port
+# 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
 COPY docker/config/php.ini ${PHP_INI_DIR}/conf.d/
 
-# Change the ownership of /etc/shlink/data to be writable, then change the user to non-root
-# FIXME Disabled for now, as it conflicts with ENABLE_PERIODIC_VISIT_LOCATE, which is used to configure a cron as root.
-#       Ref: https://github.com/shlinkio/shlink/issues/1132
-#RUN chown 1001 /etc/shlink/data
-#RUN chown 1001 /etc/shlink/data/locks
-#RUN chown 1001 /etc/shlink/data/proxies
-#RUN chown 1001 /etc/shlink/data/cache
-#RUN chown 1001 /etc/shlink/data/log
-#USER 1001
-
 ENTRYPOINT ["/bin/sh", "./docker-entrypoint.sh"]

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2021 Alejandro Celaya
+Copyright (c) 2016-2019 Alejandro Celaya
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,45 +1,36 @@
-![Shlink](https://raw.githubusercontent.com/shlinkio/shlink.io/main/public/images/shlink-hero.png)
+![Shlink](https://raw.githubusercontent.com/shlinkio/shlink.io/master/public/images/shlink-hero.png)
 
-[![Build Status](https://img.shields.io/github/workflow/status/shlinkio/shlink/Continuous%20integration/develop?logo=github&style=flat-square)](https://github.com/shlinkio/shlink/actions?query=workflow%3A%22Continuous+integration%22)
-[![Code Coverage](https://img.shields.io/codecov/c/gh/shlinkio/shlink/develop?style=flat-square)](https://app.codecov.io/gh/shlinkio/shlink)
-[![Infection MSI](https://img.shields.io/endpoint?style=flat-square&url=https%3A%2F%2Fbadge-api.stryker-mutator.io%2Fgithub.com%2Fshlinkio%2Fshlink%2Fdevelop)](https://dashboard.stryker-mutator.io/reports/github.com/shlinkio/shlink/develop)
+[![Build Status](https://img.shields.io/travis/shlinkio/shlink.svg?style=flat-square)](https://travis-ci.org/shlinkio/shlink)
+[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/shlinkio/shlink.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink/?branch=master)
+[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/shlinkio/shlink.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink/?branch=master)
 [![Latest Stable Version](https://img.shields.io/github/release/shlinkio/shlink.svg?style=flat-square)](https://packagist.org/packages/shlinkio/shlink)
-[![Docker pulls](https://img.shields.io/docker/pulls/shlinkio/shlink.svg?logo=docker&style=flat-square)](https://hub.docker.com/r/shlinkio/shlink/)
-[![License](https://img.shields.io/github/license/shlinkio/shlink.svg?style=flat-square)](https://github.com/shlinkio/shlink/blob/main/LICENSE)
-[![Paypal donate](https://img.shields.io/badge/Donate-paypal-blue.svg?style=flat-square&logo=paypal&colorA=aaaaaa)](https://slnk.to/donate)
+[![License](https://img.shields.io/github/license/shlinkio/shlink.svg?style=flat-square)](https://github.com/shlinkio/shlink/blob/master/LICENSE)
+[![Paypal donate](https://img.shields.io/badge/Donate-paypal-blue.svg?style=flat-square&logo=paypal&colorA=aaaaaa)](https://acel.me/donate)
 
 A PHP-based self-hosted URL shortener that can be used to serve shortened URLs under your own custom domain.
 
 ## Table of Contents
 
-- [Full documentation](#full-documentation)
-- [Docker image](#docker-image)
-- [Self hosted](#self-hosted)
+- [Installation](#installation)
     - [Download](#download)
     - [Configure](#configure)
+    - [Serve](#serve)
+    - [Bonus](#bonus)
+- [Update to new version](#update-to-new-version)
+- [Using a docker image](#using-a-docker-image)
 - [Using shlink](#using-shlink)
-- [Contributing](#contributing)
+    - [Shlink CLI Help](#shlink-cli-help)
 
-## Full documentation
+## Installation
 
-This document contains the very basics to get started with Shlink. If you want to learn everything you can do with it, visit the [full searchable documentation](https://shlink.io/documentation/).
-
-## Docker image
-
-Starting with version 1.15.0, an official docker image is provided. You can learn how to use it by reading [the docs](https://shlink.io/documentation/install-docker-image/).
-
-The idea is that you can just generate a container using the image and provide the custom config via env vars.
-
-## Self hosted
+> These are the steps needed to install Shlink if you plan to manually host it. 
+>
+> Alternatively, you can use the official docker image. If that's your intention, jump directly to [Using a docker image](#using-a-docker-image)
 
 First, make sure the host where you are going to run shlink fulfills these requirements:
 
-* PHP 8.0 or 8.1
-* The next PHP extensions: json, curl, pdo, intl, gd and gmp.
-    * apcu extension is recommended if you don't plan to use swoole or openswoole.
-    * xml extension is required if you want to generate QR codes in svg format.
-    * sockets and bcmath extensions are required if you want to integrate with a RabbitMQ instance.
-* MySQL, MariaDB, PostgreSQL, Microsoft SQL Server or SQLite.
+* PHP 7.2 or greater with JSON, APCu, intl, curl, PDO and gd extensions enabled.
+* MySQL, MariaDB, PostgreSQL or SQLite.
 * The web server of your choice with PHP integration (Apache or Nginx recommended).
 
 ### Download
@@ -50,7 +41,7 @@ In order to run Shlink, you will need a built version of the project. There are
 
     The easiest way to install shlink is by using one of the pre-bundled distributable packages.
 
-    Go to the [latest version](https://github.com/shlinkio/shlink/releases/latest) and download the `shlink*_dist.zip` file that suits your needs. You will find one for every supported PHP version and with/without swoole/openswoole integration.
+    Go to the [latest version](https://github.com/shlinkio/shlink/releases/latest) and download the `shlink_x.x.x_dist.zip` file you will find there.
 
     Finally, decompress the file in the location of your choice.
 
@@ -60,21 +51,197 @@ In order to run Shlink, you will need a built version of the project. There are
 
     * Clone the project with git (`git clone https://github.com/shlinkio/shlink.git`), or download it by clicking the **Clone or download** green button.
     * Download the [Composer](https://getcomposer.org/download/) PHP package manager inside the project folder.
-    * Run `./build.sh 1.0.0`, replacing the version with the version number you are going to build (the version number is used as part of the generated dist file name, and to set the value returned when running `shlink -V` from the command line).
+    * Run `./build.sh 1.0.0`, replacing the version with the version number you are going to build (the version number is only used for the generated dist file).
 
-    After that, you will have a dist file inside the `build` directory, that you need to decompress in the location of your choice.
+    After that, you will have a `shlink_x.x.x_dist.zip` dist file inside the `build` directory, that you need to decompress in the location fo your choice.
 
-    > This is the process used when releasing new shlink versions. After tagging the new version with git, the Github release is automatically created by a [GitHub workflow](https://github.com/shlinkio/shlink/actions?query=workflow%3A%22Publish+release%22), attaching the generated dist file to it.
+    > This is the process used when releasing new shlink versions. After tagging the new version with git, the Github release is automatically created by [travis](https://travis-ci.org/shlinkio/shlink), attaching the generated dist file to it.
 
 ### Configure
 
 Despite how you built the project, you now need to configure it, by following these steps:
 
-* If you are going to use MySQL, MariaDB, PostgreSQL or Microsoft SQL Server, create an empty database with the name of your choice.
+* If you are going to use MySQL, MariaDB or PostgreSQL, create an empty database with the name of your choice.
 * Recursively grant write permissions to the `data` directory. Shlink uses it to cache some information.
 * Setup the application by running the `bin/install` script. It is a command line tool that will guide you through the installation process. **Take into account that this tool has to be run directly on the server where you plan to host Shlink. Do not run it before uploading/moving it there.**
 * Generate your first API key by running `bin/cli api-key:generate`. You will need the key in order to interact with shlink's API.
 
+### Serve
+
+Once Shlink is configured, you need to expose it to the web, either by using a traditional web server + fast CGI approach, or by using a [swoole](https://www.swoole.co.uk/) non-blocking server.
+
+* **Using a web server:**
+
+    For example, assuming your domain is doma.in and shlink is in the `/path/to/shlink` folder, these would be the basic configurations for Nginx and Apache.
+
+    *Nginx:*
+
+    ```nginx
+    server {
+        server_name doma.in;
+        listen 80;
+        root /path/to/shlink/public;
+        index index.php;
+        charset utf-8;
+
+        location / {
+            try_files $uri $uri/ /index.php$is_args$args;
+        }
+
+        location ~ \.php$ {
+            fastcgi_split_path_info ^(.+\.php)(/.+)$;
+            fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
+            fastcgi_index index.php;
+            include fastcgi.conf;
+        }
+
+        location ~ /\.ht {
+            deny all;
+        }
+    }
+    ```
+
+    *Apache:*
+
+    ```apache
+    <VirtualHost *:80>
+        ServerName doma.in
+        DocumentRoot "/path/to/shlink/public"
+
+        <Directory "/path/to/shlink/public">
+            Options FollowSymLinks Includes ExecCGI
+            AllowOverride all
+            Order allow,deny
+            Allow from all
+        </Directory>
+    </VirtualHost>
+    ```
+
+* **Using swoole:**
+
+    First you need to install the swoole PHP extension with [pecl](https://pecl.php.net/package/swoole), `pecl install swoole`.
+
+    Once installed, it's actually pretty easy to get shlink up and running with swoole. Run `./vendor/bin/zend-expressive-swoole start -d` and you will get shlink running on port 8080.
+
+    However, by doing it this way, you are loosing all the access logs, and the service won't be automatically run if the server has to be restarted.
+
+    For that reason, you should create a daemon script, in `/etc/init.d/shlink_swoole`, like this one, replacing `/path/to/shlink` by the path to your shlink installation:
+
+    ```bash
+    #!/bin/bash
+    ### BEGIN INIT INFO
+    # Provides:          shlink_swoole
+    # Required-Start:    $local_fs $network $named $time $syslog
+    # Required-Stop:     $local_fs $network $named $time $syslog
+    # Default-Start:     2 3 4 5
+    # Default-Stop:      0 1 6
+    # Description:       Shlink non-blocking server with swoole
+    ### END INIT INFO
+
+    SCRIPT=/path/to/shlink/vendor/bin/zend-expressive-swoole\ start
+    RUNAS=root
+
+    PIDFILE=/var/run/shlink_swoole.pid
+    LOGDIR=/var/log/shlink
+    LOGFILE=${LOGDIR}/shlink_swoole.log
+
+    start() {
+      if [[ -f "$PIDFILE" ]] && kill -0 $(cat "$PIDFILE"); then
+        echo 'Shlink with swoole already running' >&2
+        return 1
+      fi
+      echo 'Starting shlink with swoole' >&2
+      mkdir -p "$LOGDIR"
+      touch "$LOGFILE"
+      local CMD="$SCRIPT &> \"$LOGFILE\" & echo \$!"
+      su -c "$CMD" $RUNAS > "$PIDFILE"
+      echo 'Shlink started' >&2
+    }
+
+    stop() {
+      if [[ ! -f "$PIDFILE" ]] || ! kill -0 $(cat "$PIDFILE"); then
+        echo 'Shlink with swoole not running' >&2
+        return 1
+      fi
+      echo 'Stopping shlink with swoole' >&2
+      kill -15 $(cat "$PIDFILE") && rm -f "$PIDFILE"
+      echo 'Shlink stopped' >&2
+    }
+
+    case "$1" in
+      start)
+        start
+        ;;
+      stop)
+        stop
+        ;;
+      restart)
+        stop
+        start
+        ;;
+      *)
+        echo "Usage: $0 {start|stop|restart}"
+    esac
+    ```
+
+    Then run these commands to enable the service and start it:
+
+    * `sudo chmod +x /etc/init.d/shlink_swoole`
+    * `sudo update-rc.d shlink_swoole defaults`
+    * `sudo update-rc.d shlink_swoole enable`
+    * `/etc/init.d/shlink_swoole start`
+
+    Now again, you can access shlink on port 8080, but this time the service will be automatically run at system start-up, and all access logs will be written in `/var/log/shlink/shlink_swoole.log` (you will probably want to [rotate those logs](https://www.digitalocean.com/community/tutorials/how-to-manage-logfiles-with-logrotate-on-ubuntu-16-04). You can find an example logrotate config file [here](data/infra/examples/shlink-daemon-logrotate.conf)).
+
+Finally access to [https://app.shlink.io](https://app.shlink.io) and configure your server to start creating short URLs.
+
+### Bonus
+
+Depending on the shlink version you installed and how you serve it, there are a couple of time-consuming tasks that shlink expects you to do manually, or at least it is recommended, since it will improve runtime performance.
+
+Those tasks can be performed using shlink's CLI tool, so it should be easy to schedule them to be run in the background (for example, using cron jobs):
+
+* **For shlink older than 1.18.0 or not using swoole to serve it**: Resolve IP address locations: `/path/to/shlink/bin/cli visit:locate`
+
+    If you don't run this command regularly, the stats will say all visits come from *unknown* locations.
+
+    > If you serve Shlink with swoole and use v1.18.0 at least, visit location is automatically scheduled by Shlink just after the visit occurs, using swoole's task system.
+
+* **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.
+
+    The file is updated the first Tuesday of every month, so it should be enough running this command the first Wednesday.
+
+    > You don't need this if you use Shlink v1.17.0 or newer, since now it downloads/updates the geolocation database automatically just before trying to use it.
+
+* Generate website previews: `/path/to/shlink/bin/cli short-url:process-previews`
+
+    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.
+
+*Any of these commands accept the `-q` flag, which makes it not display any output. This is recommended when configuring the commands as cron jobs.*
+
+## Update to new version
+
+When a new Shlink version is available, you don't need to repeat the entire process. Instead, follow these steps:
+
+1. Rename your existing Shlink directory to something else (ie. `shlink` ---> `shlink-old`).
+2. Download and extract the new version of Shlink, and set the directory name to that of the old version (ie. `shlink`).
+3. Run the `bin/update` script in the new version's directory to migrate your configuration over. You will be asked to provide the path to the old instance (ie. `shlink-old`).
+4. If you are using shlink with swoole, restart the service by running `/etc/init.d/shlink_swoole restart`.
+
+The `bin/update` will use the location from previous shlink version to import the configuration. It will then update the database and generate some assets shlink needs to work.
+
+**Important!** It is recommended that you don't skip any version when using this process. The update tool gets better on every version, but older versions might make assumptions.
+
+## Using a docker image
+
+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.
+
 ## Using shlink
 
 Once shlink is installed, there are two main ways to interact with it:
@@ -85,16 +252,55 @@ Once shlink is installed, there are two main ways to interact with it:
 
     It is probably a good idea to symlink the CLI entry point (`bin/cli`) to somewhere in your path, so that you can run shlink from any directory.
 
-* **The REST API**. The complete docs on how to use the API can be found [here](https://shlink.io/documentation/api-docs), and a sandbox which also documents every endpoint can be found in the [API Spec](https://api-spec.shlink.io/) portal.
+* **The REST API**. The complete docs on how to use the API can be found [here](https://shlink.io/api-docs), and a sandbox which also documents every endpoint can be found in the [API Spec](https://api-spec.shlink.io/) portal.
 
-    However, you probably don't want to consume the raw API yourself. That's why a nice [web client](https://github.com/shlinkio/shlink-web-client) is provided that can be directly used from [https://app.shlink.io](https://app.shlink.io), or hosted by yourself.
+    However, you probably don't want to consume the raw API yourself. That's why a nice [web client](https://github.com/shlinkio/shlink-web-client) is provided that can be directly used from [https://app.shlink.io](https://app.shlink.io), or you can host it yourself too.
 
 Both the API and CLI allow you to do the same operations, except for API key management, which can be done from the command line interface only.
 
-## Contributing
+### Shlink CLI Help
 
-If you are trying to find out how to run the project in development mode or how to provide contributions, read the [CONTRIBUTING](CONTRIBUTING.md) doc.
+```
+Usage:
+  command [options] [arguments]
 
----
+Options:
+  -h, --help            Display this help message
+  -q, --quiet           Do not output any message
+  -V, --version         Display this application version
+      --ansi            Force ANSI output
+      --no-ansi         Disable ANSI output
+  -n, --no-interaction  Do not ask any interactive question
+  -v|vv|vvv, --verbose  Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+Available commands:
+  help                        Displays help for a command
+  list                        Lists commands
+ api-key
+  api-key:disable             Disables an API key.
+  api-key:generate            Generates a new valid API key.
+  api-key:list                Lists all the available API keys.
+ config
+  config:generate-charset     [DEPRECATED] Generates a character set sample just by shuffling the default one, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ". Then it can be set in the SHORTCODE_CHARS environment variable
+  config:generate-secret      [DEPRECATED] Generates a random secret string that can be used for JWT token encryption
+ db
+  db:create                   Creates the database needed for shlink to work. It will do nothing if the database already exists
+  db:migrate                  Runs database migrations, which will ensure the shlink database is up to date.
+ short-url
+  short-url:delete            [short-code:delete] Deletes a short URL
+  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] [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.
+  tag:delete                  Deletes one or more tags.
+  tag:list                    Lists existing tags.
+  tag:rename                  Renames one existing tag.
+ visit
+  visit:locate                [visit:process] Resolves visits origin locations.
+  visit:update-db             [DEPRECATED] Updates the GeoLite2 database file used to geolocate IP addresses
+```
 
 > This product includes GeoLite2 data created by MaxMind, available from [https://www.maxmind.com](https://www.maxmind.com)

UPGRADE.md

@@ -1,88 +0,0 @@
-# Upgrading
-
-## From v1.x to v2.x
-
-### PHP 7.4 required
-
-This new version takes advantage of several new features introduced in PHP 7.4.
-
-Thanks to that, the code is more reliable and robust, and easier to maintain and improve.
-
-However, that means that any previous PHP version is no longer supported.
-
-### Preview generation
-
-The ability to generate website previews has been completely removed and has no replacement.
-
-The feature never properly worked, and it wasn't really useful. Because of that, the feature is no longer available on Shlink 2.x
-
-Removing this feature has these implications:
-
-* The `short-url:process-previews` CLI command no longer exists, and an error will be thrown if executed.
-* The `/{shortCode}/preview` path is no longer valid, and will return a 404 status.
-
-### Removed paths
-
-These routes have been removed, but have a direct replacement:
-
-* `/qr/{shortCode}[/{size}]` -> `/{shortCode}/qr-code[/{size}]`
-* `PUT /rest/v{version}/short-urls/{shortCode}` -> `PATCH /rest/v{version}/short-urls/{shortCode}`
-
-When using the old ones, a 404 status will me returned now.
-
-### Removed command and route aliases
-
-All the aliases for the CLI commands in the `short-urls` namespace have been removed. If you were using any of those commands with the `shortcode` or `short-code` prefixes, make sure to update them to use the `short-urls` prefix instead.
-
-The same happens for all REST endpoints starting with `/short-code`. They were previously aliased to `/short-urls` ones, but they will return a 404 now. Make sure to update them accordingly.
-
-### JWT authentication removed
-
-Shlink's REST API no longer accepts authentication using a JWT token. The API key has to be passed now in the `x-api-key` header.
-
-Removing this feature has these implications:
-
-* Shlink will no longer introspect the `Authorization` header for Bearer tokens.
-* The `POST /rest/v{version}/authenticate` endpoint no longer exists and will return a 404.
-
-### API version is now required
-
-Endpoints need to provide a version in the path now. Previously, not providing a version used to fall back to v1. Now, it will return a 404 status, as no route will match.
-
-The only exception is the `/rest/health` endpoint, which will continue working without the version.
-
-### API errors
-
-Shlink v1.21.0 introduced support for API errors using the Problem Details format, as well as the v2 of the API.
-
-For backwards compatibility reasons, requests performed to v1 continued to return the old `error` and `message` properties.
-
-Starting with Shlink v2.0.0, both versions of the API will no longer return those two properties.
-
-As a replacement, use `type` instead of `error`, and `detail` instead of `message`.
-
-### Changes in models
-
-The next REST API models have changed:
-
-* **ShortUrl**: The `originalUrl` property was deprecated and has been removed. Use `longUrl` instead.
-* **Visit**: The `remoteAddr` property was deprecated and has been removed. It has no replacement.
-* **VisitLocation**: The `latitude` and `longitude` properties are no longer strings, but float.
-
-### URL validation
-
-Shlink can verify provided long URLs are valid before trying to shorten them. Starting with v2, it no longer does it by default and needs to be explicitly enabled instead of explicitly disabled.
-
-### Removed config options
-
-The `not_found_redirect_to` config option and the `NOT_FOUND_REDIRECT_TO` env var are no longer taken into consideration for the docker image.
-
-Instead, use `invalid_short_url_redirect_to` and `INVALID_SHORT_URL_REDIRECT_TO` respectively.
-
-### Migrated to Laminas
-
-The project has been using Zend Framework components since the beginning. Since it has been re-branded as [Laminas](https://getlaminas.org/), this version updates to the new set of components.
-
-Updating to Laminas components has these implications:
-
-* If you were manually serving Shlink with swoole, the entry script has to be changed from `/path/to/shlink/vendor/bin/zend-expressive-swoole` to `/path/to/shlink/vendor/bin/mezzio-swoole`

bin/cli

@@ -3,8 +3,5 @@
 
 declare(strict_types=1);
 
-use Symfony\Component\Console\Application;
-
-/** @var Application $app */
-$app = require __DIR__ . '/../config/cli-app.php';
-$app->run();
+$run = require __DIR__ . '/../config/run.php';
+$run(true);

bin/helper/mezzio-swoole

@@ -1,51 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/**
- * @deprecated To be removed with Shlink 3.0.0
- * This script is provided to keep backwards compatibility on how to run shlink with swoole while being still able to
- * update to mezzio/mezzio-swoole 3.x
- */
-
-declare(strict_types=1);
-
-namespace Mezzio\Swoole\Command;
-
-use Laminas\ServiceManager\ServiceManager;
-use PackageVersions\Versions;
-use Symfony\Component\Console\Application as CommandLine;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
-
-use function explode;
-use function Functional\filter;
-use function str_starts_with;
-use function strstr;
-
-/** @var ServiceManager $container */
-$container = require __DIR__ . '/../../config/container.php';
-$version = strstr(Versions::getVersion('mezzio/mezzio-swoole'), '@', true);
-$commandsPrefix = 'mezzio:swoole:';
-$commands = filter(
-    $container->get('config')['laminas-cli']['commands'] ?? [],
-    fn ($c, string $command) => str_starts_with($command, $commandsPrefix),
-);
-$registeredCommands = [];
-
-foreach ($commands as $newName => $commandServiceName) {
-    [, $oldName] = explode($commandsPrefix, $newName);
-    $registeredCommands[$oldName] = $commandServiceName;
-
-    $container->addDelegator($commandServiceName, static function ($c, $n, callable $factory) use ($oldName) {
-        /** @var Command $command */
-        $command = $factory();
-        $command->setAliases([$oldName]);
-
-        return $command;
-    });
-}
-
-$commandLine = new CommandLine('Mezzio web server', $version);
-$commandLine->setAutoExit(true);
-$commandLine->setCommandLoader(new ContainerCommandLoader($container, $registeredCommands));
-$commandLine->run();

bin/install

@@ -8,5 +8,5 @@ use function chdir;
 use function dirname;
 
 chdir(dirname(__DIR__));
-[$install] = require __DIR__ . '/../vendor/shlinkio/shlink-installer/bin/run.php';
-$install();
+$run = require __DIR__ . '/../vendor/shlinkio/shlink-installer/bin/run.php';
+$run(false);

bin/set-option

@@ -1,14 +0,0 @@
-#!/usr/bin/env php
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink;
-
-use Shlinkio\Shlink\Installer\Command\SetOptionCommand;
-
-use function chdir;
-use function dirname;
-
-chdir(dirname(__DIR__));
-[,, $installer] = require __DIR__ . '/../vendor/shlinkio/shlink-installer/bin/run.php';
-$installer(SetOptionCommand::NAME);

bin/test/run-api-tests.sh

@@ -1,22 +1,18 @@
 #!/usr/bin/env sh
 export APP_ENV=test
-export DB_DRIVER=postgres
-export TEST_ENV=api
-export GENERATE_COVERAGE=${GENERATE_COVERAGE:-"no"}
-
-rm -rf data/log/api-tests
+export DB_DRIVER=mysql
 
 # Try to stop server just in case it hanged in last execution
-vendor/bin/laminas mezzio:swoole:stop
+vendor/bin/zend-expressive-swoole stop
 
 echo 'Starting server...'
-vendor/bin/laminas mezzio:swoole:start -d
+vendor/bin/zend-expressive-swoole start -d
 sleep 2
 
-vendor/bin/phpunit --order-by=random -c phpunit-api.xml --testdox --colors=always --log-junit=build/coverage-api/junit.xml $*
+vendor/bin/phpunit --order-by=random -c phpunit-api.xml --testdox --colors=always $*
 testsExitCode=$?
 
-vendor/bin/laminas mezzio:swoole:stop
+vendor/bin/zend-expressive-swoole stop
 
 # Exit this script with the same code as the tests. If tests failed, this script has to fail
 exit $testsExitCode

bin/update

@@ -8,5 +8,5 @@ use function chdir;
 use function dirname;
 
 chdir(dirname(__DIR__));
-[, $update] = require __DIR__ . '/../vendor/shlinkio/shlink-installer/bin/run.php';
-$update();
+$run = require __DIR__ . '/../vendor/shlinkio/shlink-installer/bin/run.php';
+$run(true);

build.sh

@@ -1,45 +1,31 @@
 #!/usr/bin/env bash
 set -e
 
-if [ "$#" -lt 1 ] || [ "$#" -gt 2 ] || ([ "$#" == 2 ] && [ "$2" != "--no-swoole" ]); then
+if [[ "$#" -ne 1 ]]; then
   echo "Usage:" >&2
-  echo "   $0 {version} [--no-swoole]" >&2
+  echo "   $0 {version}" >&2
   exit 1
 fi
 
 version=$1
-noSwoole=$2
-phpVersion=$(php -r 'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION;')
-[[ $noSwoole ]] && swooleSuffix="" || swooleSuffix="_swoole"
-distId="shlink${version}_php${phpVersion}${swooleSuffix}_dist"
-builtContent="./build/${distId}"
+builtcontent="./build/shlink_${version}_dist"
 projectdir=$(pwd)
 [[ -f ./composer.phar ]] && composerBin='./composer.phar' || composerBin='composer'
 
 # Copy project content to temp dir
 echo 'Copying project files...'
-rm -rf "${builtContent}"
-mkdir -p "${builtContent}"
-rsync -av * "${builtContent}" \
+rm -rf "${builtcontent}"
+mkdir -p "${builtcontent}"
+rsync -av * "${builtcontent}" \
     --exclude=*docker* \
     --exclude=Dockerfile \
-    --include=.htaccess \
     --exclude-from=./.dockerignore
-cd "${builtContent}"
+cd "${builtcontent}"
 
 # Install dependencies
 echo "Installing dependencies with $composerBin..."
-composerFlags="--optimize-autoloader --no-progress --no-interaction"
 ${composerBin} self-update
-${composerBin} install --no-dev --prefer-dist $composerFlags
-
-if [[ $noSwoole ]]; then
-  # If generating a dist not for swoole, uninstall mezzio-swoole
-  ${composerBin} remove mezzio/mezzio-swoole --with-all-dependencies --update-no-dev $composerFlags
-else
-  # Copy mezzio helper script to vendor (deprecated - Remove with Shlink 3.0.0)
-  cp "${projectdir}/bin/helper/mezzio-swoole" "./vendor/bin"
-fi
+${composerBin} install --no-dev --optimize-autoloader --no-progress --no-interaction
 
 # Delete development files
 echo 'Deleting dev files...'
@@ -51,9 +37,9 @@ sed -i "s/%SHLINK_VERSION%/${version}/g" config/autoload/app_options.global.php
 # Compressing file
 echo 'Compressing files...'
 cd "${projectdir}"/build
-rm -f ./${distId}.zip
-zip -ry ./${distId}.zip ./${distId}
+rm -f ./shlink_${version}_dist.zip
+zip -ry ./shlink_${version}_dist.zip ./shlink_${version}_dist
 cd "${projectdir}"
-rm -rf "${builtContent}"
+rm -rf "${builtcontent}"
 
 echo 'Done!'

composer.json

@@ -12,81 +12,69 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^7.2",
         "ext-json": "*",
         "ext-pdo": "*",
-        "akrabat/ip-address-middleware": "^2.1",
-        "cakephp/chronos": "^2.3",
-        "cocur/slugify": "^4.0",
-        "doctrine/migrations": "^3.3",
-        "doctrine/orm": "^2.10",
-        "endroid/qr-code": "^4.4",
-        "geoip2/geoip2": "^2.12",
-        "guzzlehttp/guzzle": "^7.4",
-        "happyr/doctrine-specification": "^2.0",
-        "jaybizzle/crawler-detect": "^1.2.110",
-        "laminas/laminas-config": "^3.7",
-        "laminas/laminas-config-aggregator": "^1.7",
-        "laminas/laminas-diactoros": "^2.8",
-        "laminas/laminas-inputfilter": "^2.13",
-        "laminas/laminas-servicemanager": "^3.10",
-        "laminas/laminas-stdlib": "^3.6",
-        "lcobucci/jwt": "^4.1",
-        "league/uri": "^6.4",
-        "lstrojny/functional-php": "^1.17",
-        "mezzio/mezzio": "^3.7",
-        "mezzio/mezzio-fastroute": "^3.3",
-        "mezzio/mezzio-problem-details": "^1.5",
-        "mezzio/mezzio-swoole": "^3.5",
-        "mlocati/ip-lib": "^1.17",
-        "monolog/monolog": "^2.3",
-        "nikolaposa/monolog-factory": "^3.1",
-        "ocramius/proxy-manager": "^2.11",
-        "pagerfanta/core": "^3.5",
-        "php-amqplib/php-amqplib": "^3.1",
-        "php-middleware/request-id": "^4.1",
+        "akrabat/ip-address-middleware": "^1.0",
+        "cakephp/chronos": "^1.2",
+        "cocur/slugify": "^3.0",
+        "doctrine/cache": "^1.9",
+        "doctrine/dbal": "^2.10",
+        "doctrine/migrations": "^2.2",
+        "doctrine/orm": "^2.7",
+        "endroid/qr-code": "^3.6",
+        "firebase/php-jwt": "^4.0",
+        "geoip2/geoip2": "^2.9",
+        "guzzlehttp/guzzle": "^6.5.1",
+        "lstrojny/functional-php": "^1.9",
+        "mikehaertl/phpwkhtmltopdf": "^2.2",
+        "monolog/monolog": "^2.0",
+        "nikolaposa/monolog-factory": "^3.0",
+        "ocramius/proxy-manager": "~2.2.2",
+        "phly/phly-event-dispatcher": "^1.0",
         "predis/predis": "^1.1",
-        "pugx/shortid-php": "^1.0",
-        "ramsey/uuid": "^4.2",
-        "shlinkio/shlink-common": "^4.3",
-        "shlinkio/shlink-config": "^1.4",
-        "shlinkio/shlink-event-dispatcher": "^2.3",
-        "shlinkio/shlink-importer": "^2.5",
-        "shlinkio/shlink-installer": "^6.3",
-        "shlinkio/shlink-ip-geolocation": "^2.2",
-        "symfony/console": "^5.4",
-        "symfony/filesystem": "^6.0 || ^5.4",
-        "symfony/lock": "^6.0 || ^5.4",
-        "symfony/mercure": "^0.6",
-        "symfony/process": "^6.0 || ^5.4",
-        "symfony/string": "^6.0 || ^5.4"
+        "pugx/shortid-php": "^0.5",
+        "shlinkio/shlink-common": "^2.4",
+        "shlinkio/shlink-event-dispatcher": "^1.1",
+        "shlinkio/shlink-installer": "^3.3",
+        "shlinkio/shlink-ip-geolocation": "^1.2",
+        "symfony/console": "^5.0",
+        "symfony/filesystem": "^5.0",
+        "symfony/lock": "^5.0",
+        "symfony/process": "^5.0",
+        "zendframework/zend-config": "^3.3",
+        "zendframework/zend-config-aggregator": "^1.1",
+        "zendframework/zend-diactoros": "^2.1.3",
+        "zendframework/zend-expressive": "^3.2",
+        "zendframework/zend-expressive-fastroute": "^3.0",
+        "zendframework/zend-expressive-helpers": "^5.3",
+        "zendframework/zend-expressive-platesrenderer": "^2.1",
+        "zendframework/zend-expressive-swoole": "^2.4",
+        "zendframework/zend-inputfilter": "^2.10",
+        "zendframework/zend-paginator": "^2.8",
+        "zendframework/zend-problem-details": "^1.0",
+        "zendframework/zend-servicemanager": "^3.4",
+        "zendframework/zend-stdlib": "^3.2"
     },
     "require-dev": {
-        "cebe/php-openapi": "^1.5",
-        "devster/ubench": "^2.1",
-        "dms/phpunit-arraysubset-asserts": "^0.3.0",
+        "devster/ubench": "^2.0",
         "eaglewu/swoole-ide-helper": "dev-master",
-        "infection/infection": "^0.25.4",
-        "phpspec/prophecy-phpunit": "^2.0",
-        "phpstan/phpstan": "^1.2",
-        "phpstan/phpstan-doctrine": "^1.0",
-        "phpstan/phpstan-symfony": "^1.0",
-        "phpunit/php-code-coverage": "^9.2",
-        "phpunit/phpunit": "^9.5",
+        "infection/infection": "^0.15.0",
+        "phpstan/phpstan-shim": "^0.11.16",
+        "phpunit/phpunit": "^8.3",
         "roave/security-advisories": "dev-master",
-        "shlinkio/php-coding-standard": "~2.2.0",
-        "shlinkio/shlink-test-utils": "^2.5",
-        "symfony/var-dumper": "^6.0",
-        "veewee/composer-run-parallel": "^1.1"
+        "shlinkio/php-coding-standard": "~2.0.0",
+        "shlinkio/shlink-test-utils": "^1.2",
+        "symfony/var-dumper": "^5.0"
     },
     "autoload": {
         "psr-4": {
             "Shlinkio\\Shlink\\CLI\\": "module/CLI/src",
             "Shlinkio\\Shlink\\Rest\\": "module/Rest/src",
-            "Shlinkio\\Shlink\\Core\\": "module/Core/src"
+            "Shlinkio\\Shlink\\Core\\": "module/Core/src",
+            "Shlinkio\\Shlink\\PreviewGenerator\\": "module/PreviewGenerator/src/"
         },
         "files": [
-            "config/constants.php",
             "module/Core/functions/functions.php"
         ]
     },
@@ -98,27 +86,20 @@
             "ShlinkioTest\\Shlink\\Core\\": [
                 "module/Core/test",
                 "module/Core/test-db"
-            ]
-        },
-        "files": [
-            "config/test/constants.php"
-        ]
+            ],
+            "ShlinkioTest\\Shlink\\PreviewGenerator\\": "module/PreviewGenerator/test"
+        }
     },
     "scripts": {
         "ci": [
             "@cs",
             "@stan",
-            "@swagger:validate",
             "@test:ci",
             "@infect:ci"
         ],
-        "ci:parallel": [
-            "@parallel cs stan swagger:validate test:unit:ci test:db:sqlite:ci test:db:mysql test:db:maria test:db:postgres test:db:ms",
-            "@parallel infect:test:api infect:ci:unit infect:ci:db"
-        ],
         "cs": "phpcs",
         "cs:fix": "phpcbf",
-        "stan": "APP_ENV=test php vendor/bin/phpstan analyse module/*/src module/*/config config docker/config data/migrations --level=8",
+        "stan": "phpstan analyse module/*/src/ module/*/config config docker/config --level=5 -c phpstan.neon",
         "test": [
             "@test:unit",
             "@test:db",
@@ -126,45 +107,39 @@
         ],
         "test:ci": [
             "@test:unit:ci",
-            "@test:db",
-            "@test:api:ci"
+            "@test:db:ci",
+            "@test:api"
         ],
-        "test:unit": "@php vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-unit.cov --testdox",
-        "test:unit:ci": "@test:unit --coverage-xml=build/coverage-unit/coverage-xml --log-junit=build/coverage-unit/junit.xml",
-        "test:unit:pretty": "@php vendor/bin/phpunit --order-by=random --colors=always --coverage-html build/coverage-unit/coverage-html",
-        "test:db": "@parallel test:db:sqlite:ci test:db:mysql test:db:maria test:db:postgres test:db:ms",
-        "test:db:sqlite": "APP_ENV=test php vendor/bin/phpunit --order-by=random --colors=always --testdox -c phpunit-db.xml",
-        "test:db:sqlite:ci": "@test:db:sqlite --coverage-php build/coverage-db.cov --coverage-xml=build/coverage-db/coverage-xml --log-junit=build/coverage-db/junit.xml",
+        "test:unit": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-unit.cov --testdox",
+        "test:unit:ci": "@test:unit --coverage-clover=build/clover.xml --coverage-xml=build/coverage-xml --log-junit=build/junit.xml",
+        "test:db": [
+            "@test:db:sqlite",
+            "@test:db:mysql",
+            "@test:db:maria",
+            "@test:db:postgres"
+        ],
+        "test:db:ci": [
+            "@test:db:sqlite",
+            "@test:db:mysql",
+            "@test:db:postgres"
+        ],
+        "test:db:sqlite": "APP_ENV=test phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-db.cov --testdox -c phpunit-db.xml",
         "test:db:mysql": "DB_DRIVER=mysql composer test:db:sqlite",
         "test:db:maria": "DB_DRIVER=maria composer test:db:sqlite",
         "test:db:postgres": "DB_DRIVER=postgres composer test:db:sqlite",
-        "test:db:ms": "DB_DRIVER=mssql composer test:db:sqlite",
         "test:api": "bin/test/run-api-tests.sh",
-        "test:api:ci": "GENERATE_COVERAGE=yes composer test:api",
-        "infect:ci:base": "infection --threads=4 --log-verbosity=default --only-covered --only-covering-test-cases --skip-initial-tests",
-        "infect:ci:unit": "@infect:ci:base --coverage=build/coverage-unit --min-msi=80",
-        "infect:ci:db": "@infect:ci:base --coverage=build/coverage-db --min-msi=95 --configuration=infection-db.json",
-        "infect:ci:api": "@infect:ci:base --coverage=build/coverage-api --min-msi=80 --configuration=infection-api.json",
-        "infect:ci": "@parallel infect:ci:unit infect:ci:db infect:ci:api",
+        "test:unit:pretty": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-html build/coverage",
+        "infect": "infection --threads=4 --min-msi=80 --log-verbosity=default --only-covered",
+        "infect:ci": "@infect --coverage=build",
+        "infect:show": "@infect --show-mutations",
         "infect:test": [
-            "@parallel test:unit:ci test:db:sqlite:ci test:api:ci",
+            "@test:unit:ci",
             "@infect:ci"
         ],
-        "infect:test:unit": [
-            "@test:unit:ci",
-            "@infect:ci:unit"
-        ],
-        "infect:test:api": [
-            "@test:api:ci",
-            "@infect:ci:api"
-        ],
-        "swagger:validate": "php-openapi validate docs/swagger/swagger.json",
-        "swagger:inline": "php-openapi inline docs/swagger/swagger.json docs/swagger/swagger-inlined.json",
         "clean:dev": "rm -f data/database.sqlite && rm -f config/params/generated_config.php"
     },
     "scripts-descriptions": {
-        "ci": "<fg=blue;options=bold>Alias for \"cs\", \"stan\", \"swagger:validate\", \"test:ci\" and \"infect:ci\"</>",
-        "ci:parallel": "<fg=blue;options=bold>Same as \"ci\", but parallelizing tasks as much as possible</>",
+        "ci": "<fg=blue;options=bold>Alias for \"cs\", \"stan\", \"test:ci\" and \"infect:ci\"</>",
         "cs": "<fg=blue;options=bold>Checks coding styles</>",
         "cs:fix": "<fg=blue;options=bold>Fixes coding styles, when possible</>",
         "stan": "<fg=blue;options=bold>Inspects code with phpstan</>",
@@ -172,32 +147,21 @@
         "test:ci": "<fg=blue;options=bold>Runs all test suites, generating all needed reports and logs for CI envs</>",
         "test:unit": "<fg=blue;options=bold>Runs unit test suites</>",
         "test:unit:ci": "<fg=blue;options=bold>Runs unit test suites, generating all needed reports and logs for CI envs</>",
-        "test:unit:pretty": "<fg=blue;options=bold>Runs unit test suites and generates an HTML code coverage report</>",
-        "test:db": "<fg=blue;options=bold>Runs database test suites on a SQLite, MySQL, MariaDB, PostgreSQL and MsSQL</>",
+        "test:db": "<fg=blue;options=bold>Runs database test suites on a SQLite, MySQL, MariaDB and PostgreSQL</>",
+        "test:db:ci": "<fg=blue;options=bold>Runs database test suites on a SQLite, MySQL and PostgreSQL</>",
         "test:db:sqlite": "<fg=blue;options=bold>Runs database test suites on a SQLite database</>",
-        "test:db:sqlite:ci": "<fg=blue;options=bold>Runs database test suites on a SQLite database, generating all needed reports and logs for CI envs</>",
         "test:db:mysql": "<fg=blue;options=bold>Runs database test suites on a MySQL database</>",
         "test:db:maria": "<fg=blue;options=bold>Runs database test suites on a MariaDB database</>",
         "test:db:postgres": "<fg=blue;options=bold>Runs database test suites on a PostgreSQL database</>",
-        "test:db:ms": "<fg=blue;options=bold>Runs database test suites on a Miscrosoft SQL Server database</>",
         "test:api": "<fg=blue;options=bold>Runs API test suites</>",
-        "test:api:ci": "<fg=blue;options=bold>Runs API test suites, and generates code coverage reports</>",
-        "infect:ci": "<fg=blue;options=bold>Checks unit and db tests quality applying mutation testing with existing reports and logs</>",
-        "infect:ci:unit": "<fg=blue;options=bold>Checks unit tests quality applying mutation testing with existing reports and logs</>",
-        "infect:ci:db": "<fg=blue;options=bold>Checks db tests quality applying mutation testing with existing reports and logs</>",
-        "infect:test": "<fg=blue;options=bold>Runs unit and db tests, then checks tests quality applying mutation testing</>",
-        "swagger:validate": "<fg=blue;options=bold>Validates the swagger docs, making sure they fulfil the spec</>",
-        "swagger:inline": "<fg=blue;options=bold>Inlines swagger docs in a single file</>",
+        "test:unit:pretty": "<fg=blue;options=bold>Runs unit test suites and generates an HTML code coverage report</>",
+        "infect": "<fg=blue;options=bold>Checks unit tests quality applying mutation testing</>",
+        "infect:ci": "<fg=blue;options=bold>Checks unit tests quality applying mutation testing with existing reports and logs</>",
+        "infect:show": "<fg=blue;options=bold>Checks unit tests quality applying mutation testing and shows applied mutators</>",
+        "infect:test": "<fg=blue;options=bold>Checks unit tests quality applying mutation testing</>",
         "clean:dev": "<fg=blue;options=bold>Deletes artifacts which are gitignored and could affect dev env</>"
     },
     "config": {
-        "sort-packages": true,
-        "platform-check": false,
-        "allow-plugins": {
-            "composer/package-versions-deprecated": true,
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "infection/extension-installer": true,
-            "veewee/composer-run-parallel": true
-        }
+        "sort-packages": true
     }
 }

config/autoload/app_options.global.php

@@ -2,11 +2,15 @@
 
 declare(strict_types=1);
 
+use function Shlinkio\Shlink\Common\env;
+
 return [
 
     'app_options' => [
         'name' => 'Shlink',
         'version' => '%SHLINK_VERSION%',
+        'secret_key' => env('SECRET_KEY', ''),
+        'disable_track_param' => null,
     ],
 
 ];

config/autoload/client-detection.global.php

@@ -7,11 +7,11 @@ return [
     'ip_address_resolution' => [
         'headers_to_inspect' => [
             'CF-Connecting-IP',
-            'X-Forwarded-For',
-            'X-Forwarded',
-            'Forwarded',
             'True-Client-IP',
             'X-Real-IP',
+            'Forwarded',
+            'X-Forwarded-For',
+            'X-Forwarded',
             'X-Cluster-Client-Ip',
             'Client-Ip',
         ],

config/autoload/common.global.php

@@ -2,14 +2,11 @@
 
 declare(strict_types=1);
 
-use Laminas\ConfigAggregator\ConfigAggregator;
+use Zend\ConfigAggregator\ConfigAggregator;
 
 return [
 
     'debug' => false,
-
-    // Disabling config cache for cli, ensures it's never used for swoole and also that console commands don't generate
-    // a cache file that's then used by non-swoole web executions
-    ConfigAggregator::ENABLE_CACHE => PHP_SAPI !== 'cli',
+    ConfigAggregator::ENABLE_CACHE => true,
 
 ];

config/autoload/common.local.php.dist

@@ -1,8 +1,7 @@
 <?php
-
 declare(strict_types=1);
 
-use Laminas\ConfigAggregator\ConfigAggregator;
+use Zend\ConfigAggregator\ConfigAggregator;
 
 return [
 

config/autoload/cors.global.php

@@ -1,11 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-
-    'cors' => [
-        'max_age' => 3600,
-    ],
-
-];

config/autoload/delete_short_urls.global.php

@@ -4,15 +4,11 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
 
-use function Shlinkio\Shlink\Common\env;
-
-use const Shlinkio\Shlink\DEFAULT_DELETE_SHORT_URL_THRESHOLD;
-
 return [
 
     'delete_short_urls' => [
+        'visits_threshold' => 15,
         'check_visits_threshold' => true,
-        'visits_threshold' => (int) env('DELETE_SHORT_URL_THRESHOLD', DEFAULT_DELETE_SHORT_URL_THRESHOLD),
     ],
 
 ];

config/autoload/dependencies.global.php

@@ -2,23 +2,18 @@
 
 declare(strict_types=1);
 
-use GuzzleHttp\Client;
-use Mezzio\Container;
-use Psr\Http\Client\ClientInterface;
+use Zend\Expressive;
+use Zend\Expressive\Container;
 
 return [
 
     'dependencies' => [
         'delegators' => [
-            Mezzio\Application::class => [
+            Expressive\Application::class => [
                 Container\ApplicationConfigInjectionDelegator::class,
             ],
         ],
 
-        'aliases' => [
-            ClientInterface::class => Client::class,
-        ],
-
         'lazy_services' => [
             'proxies_target_dir' => 'data/proxies',
             'proxies_namespace' => 'ShlinkProxy',

config/autoload/dependencies.local.php.dist

@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 use Psr\Container\ContainerInterface;
@@ -13,7 +12,7 @@ return [
         ],
 
         'initializers' => [
-            function (ContainerInterface $container, $instance): void {
+            function (ContainerInterface $container, $instance) {
                 if ($instance instanceof Log\LoggerAwareInterface) {
                     $instance->setLogger($container->get(Log\LoggerInterface::class));
                 }

config/autoload/entity-manager.global.php

@@ -2,52 +2,20 @@
 
 declare(strict_types=1);
 
-use Happyr\DoctrineSpecification\Repository\EntitySpecificationRepository;
+namespace Shlinkio\Shlink\Common;
 
-use function Functional\contains;
-use function Shlinkio\Shlink\Common\env;
+return [
 
-return (static function (): array {
-    $driver = env('DB_DRIVER');
-    $isMysqlCompatible = contains(['maria', 'mysql'], $driver);
-
-    $resolveDriver = static fn () => match ($driver) {
-        'postgres' => 'pdo_pgsql',
-        'mssql' => 'pdo_sqlsrv',
-        default => 'pdo_mysql',
-    };
-    $resolveDefaultPort = static fn () => match ($driver) {
-        'postgres' => '5432',
-        'mssql' => '1433',
-        default => '3306',
-    };
-    $resolveConnection = static fn () => match (true) {
-        $driver === null || $driver === 'sqlite' => [
-            'driver' => 'pdo_sqlite',
-            'path' => 'data/database.sqlite',
+    'entity_manager' => [
+        'orm' => [
+            'proxies_dir' => 'data/proxies',
         ],
-        default => [
-            'driver' => $resolveDriver(),
-            'dbname' => env('DB_NAME', 'shlink'),
-            'user' => env('DB_USER'),
-            'password' => env('DB_PASSWORD'),
-            'host' => env('DB_HOST', $driver === 'postgres' ? env('DB_UNIX_SOCKET') : null),
-            'port' => env('DB_PORT', $resolveDefaultPort()),
-            'unix_socket' => $isMysqlCompatible ? env('DB_UNIX_SOCKET') : null,
+        'connection' => [
+            'user' => '',
+            'password' => '',
+            'dbname' => 'shlink',
             'charset' => 'utf8',
         ],
-    };
+    ],
 
-    return [
-
-        'entity_manager' => [
-            'orm' => [
-                'proxies_dir' => 'data/proxies',
-                'load_mappings_using_functional_style' => true,
-                'default_repository_classname' => EntitySpecificationRepository::class,
-            ],
-            'connection' => $resolveConnection(),
-        ],
-
-    ];
-})();
+];

config/autoload/entity-manager.local.php.dist

@@ -9,8 +9,10 @@ return [
             'user' => 'root',
             'password' => 'root',
             'driver' => 'pdo_mysql',
-            'host' => 'shlink_db_mysql',
-            'dbname' => 'shlink',
+            'host' => 'shlink_db',
+            'driverOptions' => [
+                PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
+            ],
         ],
     ],
 

config/autoload/error-handler.global.php

@@ -2,17 +2,18 @@
 
 declare(strict_types=1);
 
-use Laminas\Stratigility\Middleware\ErrorHandler;
-use Mezzio\ProblemDetails\ProblemDetailsMiddleware;
 use Shlinkio\Shlink\Common\Logger;
+use Zend\ProblemDetails\ProblemDetailsMiddleware;
+use Zend\Stratigility\Middleware\ErrorHandler;
 
 return [
 
-    'problem-details' => [
-        'default_types_map' => [
+    'backwards_compatible_problem_details' => [
+        'default_type_fallbacks' => [
             404 => 'NOT_FOUND',
             500 => 'INTERNAL_SERVER_ERROR',
         ],
+        'json_flags' => JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRESERVE_ZERO_FRACTION,
     ],
 
     'error_handler' => [

config/autoload/geolite2.global.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
-
 return [
 
     'geolite2' => [
         'db_location' => __DIR__ . '/../../data/GeoLite2-City.mmdb',
-        'temp_dir' => __DIR__ . '/../../data',
-        'license_key' => env('GEOLITE_LICENSE_KEY', 'G4Lm0C60yJsnkdPi'), // Deprecated. Remove hardcoded license on v3
+        'temp_dir' => sys_get_temp_dir(),
+        'download_from' =>
+            'https://download.maxmind.com/app/geoip_download'
+            . '?edition_id=GeoLite2-City&license_key=G4Lm0C60yJsnkdPi&suffix=tar.gz',
     ],
 
 ];

config/autoload/installer.global.php

@@ -2,79 +2,51 @@
 
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI;
-
-use Shlinkio\Shlink\Installer\Config\Option;
-use Shlinkio\Shlink\Installer\Util\InstallationCommand;
+use Shlinkio\Shlink\Installer\Config\Plugin;
 
 return [
 
-    'installer' => [
-        'enabled_options' => [
-            Option\Database\DatabaseDriverConfigOption::class,
-            Option\Database\DatabaseNameConfigOption::class,
-            Option\Database\DatabaseHostConfigOption::class,
-            Option\Database\DatabasePortConfigOption::class,
-            Option\Database\DatabaseUserConfigOption::class,
-            Option\Database\DatabasePasswordConfigOption::class,
-            Option\Database\DatabaseUnixSocketConfigOption::class,
-            Option\Database\DatabaseSqlitePathConfigOption::class,
-            Option\Database\DatabaseMySqlOptionsConfigOption::class,
-            Option\UrlShortener\ShortDomainHostConfigOption::class,
-            Option\UrlShortener\ShortDomainSchemaConfigOption::class,
-            Option\UrlShortener\ValidateUrlConfigOption::class,
-            Option\Visit\VisitsWebhooksConfigOption::class,
-            Option\Visit\OrphanVisitsWebhooksConfigOption::class,
-            Option\Redirect\BaseUrlRedirectConfigOption::class,
-            Option\Redirect\InvalidShortUrlRedirectConfigOption::class,
-            Option\Redirect\Regular404RedirectConfigOption::class,
-            Option\Visit\CheckVisitsThresholdConfigOption::class,
-            Option\Visit\VisitsThresholdConfigOption::class,
-            Option\BasePathConfigOption::class,
-            Option\Worker\TaskWorkerNumConfigOption::class,
-            Option\Worker\WebWorkerNumConfigOption::class,
-            Option\RedisServersConfigOption::class,
-            Option\UrlShortener\ShortCodeLengthOption::class,
-            Option\Mercure\EnableMercureConfigOption::class,
-            Option\Mercure\MercurePublicUrlConfigOption::class,
-            Option\Mercure\MercureInternalUrlConfigOption::class,
-            Option\Mercure\MercureJwtSecretConfigOption::class,
-            Option\UrlShortener\GeoLiteLicenseKeyConfigOption::class,
-            Option\UrlShortener\RedirectStatusCodeConfigOption::class,
-            Option\UrlShortener\RedirectCacheLifeTimeConfigOption::class,
-            Option\UrlShortener\AutoResolveTitlesConfigOption::class,
-            Option\UrlShortener\AppendExtraPathConfigOption::class,
-            Option\Tracking\IpAnonymizationConfigOption::class,
-            Option\Tracking\OrphanVisitsTrackingConfigOption::class,
-            Option\Tracking\DisableTrackParamConfigOption::class,
-            Option\Tracking\DisableTrackingFromConfigOption::class,
-            Option\Tracking\DisableTrackingConfigOption::class,
-            Option\Tracking\DisableIpTrackingConfigOption::class,
-            Option\Tracking\DisableReferrerTrackingConfigOption::class,
-            Option\Tracking\DisableUaTrackingConfigOption::class,
-            Option\QrCode\DefaultSizeConfigOption::class,
-            Option\QrCode\DefaultMarginConfigOption::class,
-            Option\QrCode\DefaultFormatConfigOption::class,
-            Option\QrCode\DefaultErrorCorrectionConfigOption::class,
-            Option\QrCode\DefaultRoundBlockSizeConfigOption::class,
-            Option\RabbitMq\RabbitMqEnabledConfigOption::class,
-            Option\RabbitMq\RabbitMqHostConfigOption::class,
-            Option\RabbitMq\RabbitMqPortConfigOption::class,
-            Option\RabbitMq\RabbitMqUserConfigOption::class,
-            Option\RabbitMq\RabbitMqPasswordConfigOption::class,
-            Option\RabbitMq\RabbitMqVhostConfigOption::class,
+    'installer_plugins_expected_config' => [
+        Plugin\UrlShortenerConfigCustomizer::class => [
+            Plugin\UrlShortenerConfigCustomizer::SCHEMA,
+            Plugin\UrlShortenerConfigCustomizer::HOSTNAME,
+            Plugin\UrlShortenerConfigCustomizer::VALIDATE_URL,
+            Plugin\UrlShortenerConfigCustomizer::NOTIFY_VISITS_WEBHOOKS,
+            Plugin\UrlShortenerConfigCustomizer::VISITS_WEBHOOKS,
         ],
 
-        'installation_commands' => [
-            InstallationCommand::DB_CREATE_SCHEMA => [
-                'command' => 'bin/cli ' . Command\Db\CreateDatabaseCommand::NAME,
-            ],
-            InstallationCommand::DB_MIGRATE => [
-                'command' => 'bin/cli ' . Command\Db\MigrateDatabaseCommand::NAME,
-            ],
-            InstallationCommand::GEOLITE_DOWNLOAD_DB => [
-                'command' => 'bin/cli ' . Command\Visit\DownloadGeoLiteDbCommand::NAME,
-            ],
+        Plugin\ApplicationConfigCustomizer::class => [
+            Plugin\ApplicationConfigCustomizer::SECRET,
+            Plugin\ApplicationConfigCustomizer::DISABLE_TRACK_PARAM,
+            Plugin\ApplicationConfigCustomizer::CHECK_VISITS_THRESHOLD,
+            Plugin\ApplicationConfigCustomizer::VISITS_THRESHOLD,
+            Plugin\ApplicationConfigCustomizer::BASE_PATH,
+            Plugin\ApplicationConfigCustomizer::WEB_WORKER_NUM,
+            Plugin\ApplicationConfigCustomizer::TASK_WORKER_NUM,
+        ],
+
+        Plugin\DatabaseConfigCustomizer::class => [
+            Plugin\DatabaseConfigCustomizer::DRIVER,
+            Plugin\DatabaseConfigCustomizer::NAME,
+            Plugin\DatabaseConfigCustomizer::USER,
+            Plugin\DatabaseConfigCustomizer::PASSWORD,
+            Plugin\DatabaseConfigCustomizer::HOST,
+            Plugin\DatabaseConfigCustomizer::PORT,
+        ],
+
+        Plugin\RedirectsConfigCustomizer::class => [
+            Plugin\RedirectsConfigCustomizer::INVALID_SHORT_URL_REDIRECT_TO,
+            Plugin\RedirectsConfigCustomizer::REGULAR_404_REDIRECT_TO,
+            Plugin\RedirectsConfigCustomizer::BASE_URL_REDIRECT_TO,
+        ],
+    ],
+
+    'installation_commands' => [
+        'db_create_schema' => [
+            'command' => 'bin/cli db:create',
+        ],
+        'db_migrate' => [
+            'command' => 'bin/cli db:migrate',
         ],
     ],
 

config/autoload/locks.global.php

@@ -2,14 +2,13 @@
 
 declare(strict_types=1);
 
-use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Predis\ClientInterface as PredisClient;
+use Shlinkio\Shlink\Common\Cache\RedisFactory;
+use Shlinkio\Shlink\Common\Lock\RetryLockStoreDelegatorFactory;
 use Shlinkio\Shlink\Common\Logger\LoggerAwareDelegatorFactory;
 use Symfony\Component\Lock;
+use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 
-use function Shlinkio\Shlink\Common\env;
-
-use const Shlinkio\Shlink\LOCAL_LOCK_FACTORY;
+$localLockFactory = 'Shlinkio\Shlink\LocalLockFactory';
 
 return [
 
@@ -22,15 +21,19 @@ return [
             Lock\Store\FlockStore::class => ConfigAbstractFactory::class,
             Lock\Store\RedisStore::class => ConfigAbstractFactory::class,
             Lock\LockFactory::class => ConfigAbstractFactory::class,
-            LOCAL_LOCK_FACTORY => ConfigAbstractFactory::class,
+            $localLockFactory => ConfigAbstractFactory::class,
         ],
         'aliases' => [
-            'lock_store' => env('REDIS_SERVERS') === null ? 'local_lock_store' : 'redis_lock_store',
+            // With this config, a user could alias 'lock_store' => 'redis_lock_store' to override the default
+            'lock_store' => 'local_lock_store',
 
             'redis_lock_store' => Lock\Store\RedisStore::class,
             'local_lock_store' => Lock\Store\FlockStore::class,
         ],
         'delegators' => [
+            Lock\Store\RedisStore::class => [
+                RetryLockStoreDelegatorFactory::class,
+            ],
             Lock\LockFactory::class => [
                 LoggerAwareDelegatorFactory::class,
             ],
@@ -39,9 +42,9 @@ return [
 
     ConfigAbstractFactory::class => [
         Lock\Store\FlockStore::class => ['config.locks.locks_dir'],
-        Lock\Store\RedisStore::class => [PredisClient::class],
+        Lock\Store\RedisStore::class => [RedisFactory::SERVICE_NAME],
         Lock\LockFactory::class => ['lock_store'],
-        LOCAL_LOCK_FACTORY => ['local_lock_store'],
+        $localLockFactory => ['local_lock_store'],
     ],
 
 ];

config/autoload/logger.global.php

@@ -9,7 +9,6 @@ use Monolog\Handler;
 use Monolog\Logger;
 use Monolog\Processor;
 use MonologFactory\DiContainerLoggerFactory;
-use PhpMiddleware\RequestId;
 use Psr\Log\LoggerInterface;
 
 use const PHP_EOL;
@@ -21,12 +20,11 @@ $processors = [
     'psr3' => [
         'name' => Processor\PsrLogMessageProcessor::class,
     ],
-    'request_id' => RequestId\MonologProcessor::class,
 ];
 $formatter = [
     'name' => Formatter\LineFormatter::class,
     'params' => [
-        'format' => '[%datetime%] [%extra.request_id%] %channel%.%level_name% - %message%' . PHP_EOL,
+        'format' => '[%datetime%] %channel%.%level_name% - %message%' . PHP_EOL,
         'allow_inline_line_breaks' => true,
     ],
 ];
@@ -43,7 +41,6 @@ return [
                         'level' => Logger::INFO,
                         'filename' => 'data/log/shlink_log.log',
                         'max_files' => 30,
-                        'file_permission' => 0666,
                     ],
                     'formatter' => $formatter,
                 ],
@@ -78,11 +75,10 @@ return [
         ],
     ],
 
-    'mezzio-swoole' => [
+    'zend-expressive-swoole' => [
         'swoole-http-server' => [
             'logger' => [
                 'logger-name' => 'Logger_Access',
-                'format' => '%u "%r" %>s %B',
             ],
         ],
     ],

config/autoload/logger.local.php.dist

@@ -5,7 +5,7 @@ declare(strict_types=1);
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 
-$isSwoole = extension_loaded('openswoole');
+$isSwoole = extension_loaded('swoole');
 
 // For swoole, send logs to standard output
 $handler = $isSwoole

config/autoload/mercure.global.php

@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Laminas\ServiceManager\Proxy\LazyServiceFactory;
-use Shlinkio\Shlink\Common\Mercure\LcobucciJwtProvider;
-use Symfony\Component\Mercure\Hub;
-use Symfony\Component\Mercure\HubInterface;
-
-use function Shlinkio\Shlink\Common\env;
-
-return (static function (): array {
-    $publicUrl = env('MERCURE_PUBLIC_HUB_URL');
-
-    return [
-
-        'mercure' => [
-            'public_hub_url' => $publicUrl,
-            'internal_hub_url' => env('MERCURE_INTERNAL_HUB_URL', $publicUrl),
-            'jwt_secret' => env('MERCURE_JWT_SECRET'),
-            'jwt_issuer' => 'Shlink',
-        ],
-
-        'dependencies' => [
-            'delegators' => [
-                LcobucciJwtProvider::class => [
-                    LazyServiceFactory::class,
-                ],
-                Hub::class => [
-                    LazyServiceFactory::class,
-                ],
-            ],
-            'lazy_services' => [
-                'class_map' => [
-                    LcobucciJwtProvider::class => LcobucciJwtProvider::class,
-                    Hub::class => HubInterface::class,
-                ],
-            ],
-        ],
-
-    ];
-})();

config/autoload/mercure.local.php.dist

@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-
-    'mercure' => [
-        'public_hub_url' => 'http://localhost:8001',
-        'internal_hub_url' => 'http://shlink_mercure_proxy',
-        'jwt_secret' => 'mercure_jwt_key',
-    ],
-
-];

config/autoload/middleware-pipeline.global.php

@@ -4,27 +4,24 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
 
-use Laminas\Stratigility\Middleware\ErrorHandler;
-use Mezzio\ProblemDetails;
-use Mezzio\Router;
-use PhpMiddleware\RequestId\RequestIdMiddleware;
-use RKA\Middleware\IpAddress;
-use Shlinkio\Shlink\Common\Middleware\ContentLengthMiddleware;
+use Zend\Expressive;
+use Zend\ProblemDetails;
+use Zend\Stratigility\Middleware\ErrorHandler;
 
 return [
 
     'middleware_pipeline' => [
         'error-handler' => [
             'middleware' => [
-                ContentLengthMiddleware::class,
-                RequestIdMiddleware::class,
+                Expressive\Helper\ContentLengthMiddleware::class,
                 ErrorHandler::class,
-                Rest\Middleware\CrossDomainMiddleware::class,
             ],
         ],
         'error-handler-rest' => [
             'path' => '/rest',
             'middleware' => [
+                Rest\Middleware\CrossDomainMiddleware::class,
+                Rest\Middleware\BackwardsCompatibleProblemDetailsMiddleware::class,
                 ProblemDetails\ProblemDetailsMiddleware::class,
             ],
         ],
@@ -34,18 +31,24 @@ return [
                 Common\Middleware\CloseDbConnectionMiddleware::class,
             ],
         ],
+        'pre-routing-rest' => [
+            'path' => '/rest',
+            'middleware' => [
+                Rest\Middleware\PathVersionMiddleware::class,
+                Rest\Middleware\ShortUrl\ShortCodePathMiddleware::class,
+            ],
+        ],
 
         'routing' => [
             'middleware' => [
-                Router\Middleware\RouteMiddleware::class,
-                Router\Middleware\ImplicitHeadMiddleware::class,
+                Expressive\Router\Middleware\RouteMiddleware::class,
             ],
         ],
 
         'rest' => [
             'path' => '/rest',
             'middleware' => [
-                Router\Middleware\ImplicitOptionsMiddleware::class,
+                Expressive\Router\Middleware\ImplicitOptionsMiddleware::class,
                 Rest\Middleware\BodyParserMiddleware::class,
                 Rest\Middleware\AuthenticationMiddleware::class,
             ],
@@ -53,7 +56,7 @@ return [
 
         'dispatch' => [
             'middleware' => [
-                Router\Middleware\DispatchMiddleware::class,
+                Expressive\Router\Middleware\DispatchMiddleware::class,
             ],
         ],
 
@@ -65,15 +68,9 @@ return [
         ],
         'not-found' => [
             'middleware' => [
-                // This middleware is in front of tracking actions explicitly. Putting here for orphan visits tracking
-                IpAddress::class,
-                Core\ErrorHandler\NotFoundTypeResolverMiddleware::class,
-                Core\ShortUrl\Middleware\ExtraPathRedirectMiddleware::class,
-                Core\ErrorHandler\NotFoundTrackerMiddleware::class,
                 Core\ErrorHandler\NotFoundRedirectHandler::class,
                 Core\ErrorHandler\NotFoundTemplateHandler::class,
             ],
         ],
     ],
-
 ];

config/autoload/preview-generation.global.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+/* @deprecated */
+return [
+
+    'preview_generation' => [
+        'files_location' => 'data/cache',
+    ],
+
+];

config/autoload/qr-codes.global.php

@@ -1,23 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use function Shlinkio\Shlink\Common\env;
-
-use const Shlinkio\Shlink\DEFAULT_QR_CODE_ERROR_CORRECTION;
-use const Shlinkio\Shlink\DEFAULT_QR_CODE_FORMAT;
-use const Shlinkio\Shlink\DEFAULT_QR_CODE_MARGIN;
-use const Shlinkio\Shlink\DEFAULT_QR_CODE_ROUND_BLOCK_SIZE;
-use const Shlinkio\Shlink\DEFAULT_QR_CODE_SIZE;
-
-return [
-
-    'qr_codes' => [
-        'size' => (int) env('DEFAULT_QR_CODE_SIZE', DEFAULT_QR_CODE_SIZE),
-        'margin' => (int) env('DEFAULT_QR_CODE_MARGIN', DEFAULT_QR_CODE_MARGIN),
-        'format' => env('DEFAULT_QR_CODE_FORMAT', DEFAULT_QR_CODE_FORMAT),
-        'error_correction' => env('DEFAULT_QR_CODE_ERROR_CORRECTION', DEFAULT_QR_CODE_ERROR_CORRECTION),
-        'round_block_size' => (bool) env('DEFAULT_QR_CODE_ROUND_BLOCK_SIZE', DEFAULT_QR_CODE_ROUND_BLOCK_SIZE),
-    ],
-
-];

config/autoload/rabbit.global.php

@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Laminas\ServiceManager\Proxy\LazyServiceFactory;
-use PhpAmqpLib\Connection\AMQPStreamConnection;
-
-use function Shlinkio\Shlink\Common\env;
-
-return [
-
-    'rabbitmq' => [
-        'enabled' => (bool) env('RABBITMQ_ENABLED', false),
-        'host' => env('RABBITMQ_HOST'),
-        'port' => (int) env('RABBITMQ_PORT', '5672'),
-        'user' => env('RABBITMQ_USER'),
-        'password' => env('RABBITMQ_PASSWORD'),
-        'vhost' => env('RABBITMQ_VHOST', '/'),
-    ],
-
-    'dependencies' => [
-        'factories' => [
-            AMQPStreamConnection::class => ConfigAbstractFactory::class,
-        ],
-        'delegators' => [
-            AMQPStreamConnection::class => [
-                LazyServiceFactory::class,
-            ],
-        ],
-        'lazy_services' => [
-            'class_map' => [
-                AMQPStreamConnection::class => AMQPStreamConnection::class,
-            ],
-        ],
-    ],
-
-    ConfigAbstractFactory::class => [
-        AMQPStreamConnection::class => [
-            'config.rabbitmq.host',
-            'config.rabbitmq.port',
-            'config.rabbitmq.user',
-            'config.rabbitmq.password',
-            'config.rabbitmq.vhost',
-        ],
-    ],
-
-];

config/autoload/rabbit.local.php.dist

@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-
-    'rabbitmq' => [
-        'enabled' => true,
-        'host' => 'shlink_rabbitmq',
-        'user' => 'rabbit',
-        'password' => 'rabbit',
-    ],
-
-];

config/autoload/redirects.global.php

@@ -2,24 +2,12 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
-
-use const Shlinkio\Shlink\DEFAULT_REDIRECT_CACHE_LIFETIME;
-use const Shlinkio\Shlink\DEFAULT_REDIRECT_STATUS_CODE;
-
 return [
 
     'not_found_redirects' => [
-        // Deprecated env vars
-        'invalid_short_url' => env('DEFAULT_INVALID_SHORT_URL_REDIRECT', env('INVALID_SHORT_URL_REDIRECT_TO')),
-        'regular_404' => env('DEFAULT_REGULAR_404_REDIRECT', env('REGULAR_404_REDIRECT_TO')),
-        'base_url' => env('DEFAULT_BASE_URL_REDIRECT', env('BASE_URL_REDIRECT_TO')),
-    ],
-
-    'url_shortener' => [
-        // TODO Move these options to their own config namespace. Maybe "redirects".
-        'redirect_status_code' => (int) env('REDIRECT_STATUS_CODE', DEFAULT_REDIRECT_STATUS_CODE),
-        'redirect_cache_lifetime' => (int) env('REDIRECT_CACHE_LIFETIME', DEFAULT_REDIRECT_CACHE_LIFETIME),
+        'invalid_short_url' => null, // Formerly url_shortener.not_found_short_url.redirect_to
+        'regular_404' => null,
+        'base_url' => null,
     ],
 
 ];

config/autoload/redis.global.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use function Shlinkio\Shlink\Common\env;
-
-return (static function (): array {
-    $redisServers = env('REDIS_SERVERS');
-
-    return match (true) {
-        $redisServers === null => [],
-        default => [
-            'cache' => [
-                'default_lifetime' => 86400, // 24h
-                'redis' => [
-                    'servers' => $redisServers,
-                    'sentinel_service' => env('REDIS_SENTINEL_SERVICE'),
-                ],
-            ],
-        ],
-    };
-})();

config/autoload/redis.local.php.local

@@ -1,16 +1,13 @@
 <?php
-
 declare(strict_types=1);
 
 return [
 
-    'cache' => [
-        'redis' => [
-            'servers' => 'tcp://shlink_redis:6379',
-//            'servers' => [
-//                'tcp://shlink_redis:6379',
-//            ],
-        ],
+    'redis' => [
+        'servers' => 'tcp://shlink_redis:6379',
+//        'servers' => [
+//            'tcp://shlink_redis:6379',
+//        ],
     ],
 
     'dependencies' => [

config/autoload/request_id.global.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Laminas\ServiceManager\Factory\InvokableFactory;
-use PhpMiddleware\RequestId;
-
-return [
-
-    'request_id' => [
-        'allow_override' => true,
-        'header_name' => 'X-Request-Id',
-    ],
-
-    'dependencies' => [
-        'factories' => [
-            RequestId\Generator\RamseyUuid4StaticGenerator::class => InvokableFactory::class,
-            RequestId\RequestIdProviderFactory::class => ConfigAbstractFactory::class,
-            RequestId\RequestIdMiddleware::class => ConfigAbstractFactory::class,
-            RequestId\MonologProcessor::class => ConfigAbstractFactory::class,
-        ],
-    ],
-
-    ConfigAbstractFactory::class => [
-        RequestId\RequestIdProviderFactory::class => [
-            RequestId\Generator\RamseyUuid4StaticGenerator::class,
-            'config.request_id.allow_override',
-            'config.request_id.header_name',
-        ],
-        RequestId\RequestIdMiddleware::class => [
-            RequestId\RequestIdProviderFactory::class,
-            'config.request_id.header_name',
-        ],
-        RequestId\MonologProcessor::class => [RequestId\RequestIdMiddleware::class],
-    ],
-
-];

config/autoload/router.global.php

@@ -2,14 +2,12 @@
 
 declare(strict_types=1);
 
-use Mezzio\Router\FastRouteRouter;
-
-use function Shlinkio\Shlink\Common\env;
+use Zend\Expressive\Router\FastRouteRouter;
 
 return [
 
     'router' => [
-        'base_path' => env('BASE_PATH', ''),
+        'base_path' => '',
 
         'fastroute' => [
             FastRouteRouter::CONFIG_CACHE_ENABLED => true,

config/autoload/router.local.php.dist

@@ -1,13 +1,9 @@
 <?php
-
-declare(strict_types=1);
-
-use Mezzio\Router\FastRouteRouter;
+use Zend\Expressive\Router\FastRouteRouter;
 
 return [
 
     'router' => [
-//        'base_path' => '',
         'fastroute' => [
             FastRouteRouter::CONFIG_CACHE_ENABLED => false,
         ],

config/autoload/swoole.global.php

@@ -2,30 +2,20 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+return [
 
-use const Shlinkio\Shlink\MIN_TASK_WORKERS;
+    'zend-expressive-swoole' => [
+        'enable_coroutine' => true,
 
-return (static function () {
-    $taskWorkers = (int) env('TASK_WORKER_NUM', 16);
+        'swoole-http-server' => [
+            'host' => '0.0.0.0',
+            'process-name' => 'shlink',
 
-    return [
-
-        'mezzio-swoole' => [
-            // Setting this to true can have unexpected behaviors when running several concurrent slow DB queries
-            'enable_coroutine' => false,
-
-            'swoole-http-server' => [
-                'host' => '0.0.0.0',
-                'port' => (int) env('PORT', 8080),
-                'process-name' => 'shlink',
-
-                'options' => [
-                    'worker_num' => (int) env('WEB_WORKER_NUM', 16),
-                    'task_worker_num' => max($taskWorkers, MIN_TASK_WORKERS),
-                ],
+            'options' => [
+                'worker_num' => 16,
+                'task_worker_num' => 16,
             ],
         ],
+    ],
 
-    ];
-})();
+];

config/autoload/swoole.local.php.dist

@@ -1,13 +1,21 @@
 <?php
-
 declare(strict_types=1);
 
+use Zend\Expressive\Swoole\HotCodeReload\FileWatcher\InotifyFileWatcher;
+use Zend\ServiceManager\Factory\InvokableFactory;
+
 return [
 
-    'mezzio-swoole' => [
+    'zend-expressive-swoole' => [
         'hot-code-reload' => [
             'enable' => true,
         ],
     ],
 
+    'dependencies' => [
+        'factories' => [
+            InotifyFileWatcher::class => InvokableFactory::class,
+        ],
+    ],
+
 ];

config/autoload/templates.global.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    'templates' => [
+        'extension' => 'phtml',
+    ],
+
+    'plates' => [
+        'extensions' => [
+            // extension service names or instances
+        ],
+    ],
+
+];

config/autoload/tracking.global.php

@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use function Shlinkio\Shlink\Common\env;
-
-return [
-
-    'tracking' => [
-        // Tells if IP addresses should be anonymized before persisting, to fulfil data protection regulations
-        // This applies only if IP address tracking is enabled
-        'anonymize_remote_addr' => (bool) env('ANONYMIZE_REMOTE_ADDR', true),
-
-        // Tells if visits to not-found URLs should be tracked. The disable_tracking option takes precedence
-        'track_orphan_visits' => (bool) env('TRACK_ORPHAN_VISITS', true),
-
-        // A query param that, if provided, will disable tracking of one particular visit. Always takes precedence
-        'disable_track_param' => env('DISABLE_TRACK_PARAM'),
-
-        // If true, visits will not be tracked at all
-        'disable_tracking' => (bool) env('DISABLE_TRACKING', false),
-
-        // If true, visits will be tracked, but neither the IP address, nor the location will be resolved
-        'disable_ip_tracking' => (bool) env('DISABLE_IP_TRACKING', false),
-
-        // If true, the referrer will not be tracked
-        'disable_referrer_tracking' => (bool) env('DISABLE_REFERRER_TRACKING', false),
-
-        // If true, the user agent will not be tracked
-        'disable_ua_tracking' => (bool) env('DISABLE_UA_TRACKING', false),
-
-        // A list of IP addresses, patterns or CIDR blocks from which tracking is disabled by default
-        'disable_tracking_from' => env('DISABLE_TRACKING_FROM'),
-    ],
-
-];

config/autoload/url-shortener.global.php

@@ -2,41 +2,15 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+return [
 
-use const Shlinkio\Shlink\DEFAULT_SHORT_CODES_LENGTH;
-use const Shlinkio\Shlink\MIN_SHORT_CODES_LENGTH;
-
-return (static function (): array {
-    $shortCodesLength = max(
-        (int) env('DEFAULT_SHORT_CODES_LENGTH', DEFAULT_SHORT_CODES_LENGTH),
-        MIN_SHORT_CODES_LENGTH,
-    );
-    $resolveSchema = static function (): string {
-        // Deprecated. For v3, IS_HTTPS_ENABLED should be true by default, instead of null
-//        return ((bool) env('IS_HTTPS_ENABLED', true)) ? 'https' : 'http';
-        $isHttpsEnabled = env('IS_HTTPS_ENABLED', env('USE_HTTPS'));
-        if ($isHttpsEnabled !== null) {
-            $boolIsHttpsEnabled = (bool) $isHttpsEnabled;
-            return $boolIsHttpsEnabled ? 'https' : 'http';
-        }
-
-        return env('SHORT_DOMAIN_SCHEMA', 'http');
-    };
-
-    return [
-
-        'url_shortener' => [
-            'domain' => [
-                // Deprecated SHORT_DOMAIN_* env vars
-                'schema' => $resolveSchema(),
-                'hostname' => env('DEFAULT_DOMAIN', env('SHORT_DOMAIN_HOST', '')),
-            ],
-            'validate_url' => (bool) env('VALIDATE_URLS', false), // Deprecated
-            'default_short_codes_length' => $shortCodesLength,
-            'auto_resolve_titles' => (bool) env('AUTO_RESOLVE_TITLES', false),
-            'append_extra_path' => (bool) env('REDIRECT_APPEND_EXTRA_PATH', false),
+    'url_shortener' => [
+        'domain' => [
+            'schema' => 'https',
+            'hostname' => '',
         ],
+        'validate_url' => true,
+        'visits_webhooks' => [],
+    ],
 
-    ];
-})();
+];

config/autoload/url-shortener.local.php.dist

@@ -2,16 +2,13 @@
 
 declare(strict_types=1);
 
-$isSwoole = extension_loaded('openswoole');
-
 return [
 
     'url_shortener' => [
         'domain' => [
             'schema' => 'http',
-            'hostname' => sprintf('localhost:%s', $isSwoole ? '8080' : '8000'),
+            'hostname' => 'localhost:8080',
         ],
-        'auto_resolve_titles' => true,
     ],
 
 ];

config/autoload/webhooks.global.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use function Shlinkio\Shlink\Common\env;
-
-return (static function (): array {
-    $webhooks = env('VISITS_WEBHOOKS');
-
-    return [
-
-        'url_shortener' => [
-            // TODO Move these options to their own config namespace
-            'visits_webhooks' => $webhooks === null ? [] : explode(',', $webhooks),
-            'notify_orphan_visits_to_webhooks' => (bool) env('NOTIFY_ORPHAN_VISITS_TO_WEBHOOKS', false),
-        ],
-
-    ];
-})();

config/autoload/wkhtmltopdf.global.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    'wkhtmltopdf' => [
+        'images' => [
+            'binary' => __DIR__ . '/../../bin/wkhtmltoimage',
+            'type' => 'jpg',
+        ],
+    ],
+
+];

config/cli-app.php

@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Psr\Container\ContainerInterface;
-use Symfony\Component\Console\Application as CliApp;
-
-return (static function () {
-    /** @var ContainerInterface $container */
-    $container = include __DIR__ . '/container.php';
-    return $container->get(CliApp::class);
-})();

config/cli-config.php

@@ -4,9 +4,13 @@ declare(strict_types=1);
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
+use Psr\Container\ContainerInterface;
+use Zend\ServiceManager\ServiceManager;
+
+return (function () {
+    /** @var ContainerInterface|ServiceManager $container */
+    $container = include __DIR__ . '/container.php';
+    $em = $container->get(EntityManager::class);
 
-return (static function () {
-    /** @var EntityManager $em */
-    $em = include __DIR__ . '/entity-manager.php';
     return ConsoleRunner::createHelperSet($em);
 })();

config/config.php

@@ -4,41 +4,30 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
 
-use Laminas\ConfigAggregator;
-use Laminas\Diactoros;
-use Mezzio;
-use Mezzio\ProblemDetails;
-use Mezzio\Swoole;
+use Zend\ConfigAggregator;
+use Zend\Expressive;
+use Zend\ProblemDetails;
 
-use function class_exists;
 use function Shlinkio\Shlink\Common\env;
 
-use const PHP_SAPI;
-
-$isCli = PHP_SAPI === 'cli';
-
 return (new ConfigAggregator\ConfigAggregator([
-    Mezzio\ConfigProvider::class,
-    Mezzio\Router\ConfigProvider::class,
-    Mezzio\Router\FastRouteRouter\ConfigProvider::class,
-    $isCli && class_exists(Swoole\ConfigProvider::class)
-        ? Swoole\ConfigProvider::class
-        : new ConfigAggregator\ArrayProvider([]),
+    Expressive\ConfigProvider::class,
+    Expressive\Router\ConfigProvider::class,
+    Expressive\Router\FastRouteRouter\ConfigProvider::class,
+    Expressive\Plates\ConfigProvider::class,
+    Expressive\Swoole\ConfigProvider::class,
     ProblemDetails\ConfigProvider::class,
-    Diactoros\ConfigProvider::class,
     Common\ConfigProvider::class,
-    Config\ConfigProvider::class,
-    Importer\ConfigProvider::class,
     IpGeolocation\ConfigProvider::class,
-    EventDispatcher\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')
-        // Deprecated. When the SimplifiedConfigParser is removed, load only generated_config.php here
-        : new ConfigAggregator\LaminasConfigProvider('config/params/{generated_config.php,*.config.{php,json}}'),
+        : new ConfigAggregator\ZendConfigProvider('config/params/{generated_config.php,*.config.{php,json}}'),
 ], 'data/cache/app_config.php', [
     Core\Config\SimplifiedConfigParser::class,
     Core\Config\BasePathPrefixer::class,

config/constants.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink;
-
-use Fig\Http\Message\StatusCodeInterface;
-
-const DEFAULT_DELETE_SHORT_URL_THRESHOLD = 15;
-const DEFAULT_SHORT_CODES_LENGTH = 5;
-const MIN_SHORT_CODES_LENGTH = 4;
-const DEFAULT_REDIRECT_STATUS_CODE = StatusCodeInterface::STATUS_FOUND;
-const DEFAULT_REDIRECT_CACHE_LIFETIME = 30;
-const LOCAL_LOCK_FACTORY = 'Shlinkio\Shlink\LocalLockFactory';
-const CUSTOM_SLUGS_REGEXP = '/[^\pL\pN._~]/u'; // Any unicode letter or number, plus ".", "_" and "~" chars
-const TITLE_TAG_VALUE = '/<title[^>]*>(.*?)<\/title>/i'; // Matches the value inside an html title tag
-const DEFAULT_QR_CODE_SIZE = 300;
-const DEFAULT_QR_CODE_MARGIN = 0;
-const DEFAULT_QR_CODE_FORMAT = 'png';
-const DEFAULT_QR_CODE_ERROR_CORRECTION = 'l';
-const DEFAULT_QR_CODE_ROUND_BLOCK_SIZE = true;
-const MIN_TASK_WORKERS = 4;

config/container.php

@@ -2,19 +2,16 @@
 
 declare(strict_types=1);
 
-use Laminas\ServiceManager\ServiceManager;
 use Symfony\Component\Lock;
-
-use const Shlinkio\Shlink\LOCAL_LOCK_FACTORY;
+use Zend\ServiceManager\ServiceManager;
 
 chdir(dirname(__DIR__));
 
 require 'vendor/autoload.php';
 
 // This class alias tricks the ConfigAbstractFactory to return Lock\Factory instances even with a different service name
-// It needs to be placed here as individual config files will not be loaded once config is cached
-if (! class_exists(LOCAL_LOCK_FACTORY)) {
-    class_alias(Lock\LockFactory::class, LOCAL_LOCK_FACTORY);
+if (! class_exists('Shlinkio\Shlink\LocalLockFactory')) {
+    class_alias(Lock\LockFactory::class, 'Shlinkio\Shlink\LocalLockFactory');
 }
 
 // Build container

config/entity-manager.php

@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Doctrine\ORM\EntityManager;
-use Psr\Container\ContainerInterface;
-
-return (static function () {
-    /** @var ContainerInterface $container */
-    $container = include __DIR__ . '/container.php';
-    return $container->get(EntityManager::class);
-})();

config/run.php

@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-use Mezzio\Application;
 use Psr\Container\ContainerInterface;
+use Symfony\Component\Console\Application as CliApp;
+use Zend\Expressive\Application;
 
-return static function (): void {
+return function (bool $isCli = false): void {
     /** @var ContainerInterface $container */
     $container = include __DIR__ . '/container.php';
-    $app = $container->get(Application::class);
+    $app = $container->get($isCli ? CliApp::class : Application::class);
 
     $app->run();
 };

config/test/bootstrap_api_tests.php

@@ -7,27 +7,14 @@ namespace Shlinkio\Shlink\TestUtils;
 use Doctrine\ORM\EntityManager;
 use Psr\Container\ContainerInterface;
 
-use function register_shutdown_function;
-use function sprintf;
-
-use const ShlinkioTest\Shlink\SWOOLE_TESTING_HOST;
-use const ShlinkioTest\Shlink\SWOOLE_TESTING_PORT;
-
 /** @var ContainerInterface $container */
 $container = require __DIR__ . '/../container.php';
 $testHelper = $container->get(Helper\TestHelper::class);
 $config = $container->get('config');
 $em = $container->get(EntityManager::class);
-$httpClient = $container->get('shlink_test_api_client');
 
-// Dump code coverage when process shuts down
-register_shutdown_function(function () use ($httpClient): void {
-    $httpClient->request(
-        'GET',
-        sprintf('http://%s:%s/api-tests/stop-coverage', SWOOLE_TESTING_HOST, SWOOLE_TESTING_PORT),
-    );
+$testHelper->createTestDb();
+ApiTest\ApiTestCase::setApiClient($container->get('shlink_test_api_client'));
+ApiTest\ApiTestCase::setSeedFixturesCallback(function () use ($testHelper, $em, $config) {
+    $testHelper->seedFixtures($em, $config['data_fixtures'] ?? []);
 });
-
-$testHelper->createTestDb(['bin/cli', 'db:create'], ['bin/cli', 'db:migrate']);
-ApiTest\ApiTestCase::setApiClient($httpClient);
-ApiTest\ApiTestCase::setSeedFixturesCallback(fn () => $testHelper->seedFixtures($em, $config['data_fixtures'] ?? []));

config/test/constants.php

@@ -1,8 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ShlinkioTest\Shlink;
-
-const SWOOLE_TESTING_HOST = '127.0.0.1';
-const SWOOLE_TESTING_PORT = 9999;

config/test/test_config.global.php

@@ -5,86 +5,53 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink;
 
 use GuzzleHttp\Client;
-use Laminas\ConfigAggregator\ConfigAggregator;
-use Laminas\Diactoros\Response\EmptyResponse;
-use Laminas\ServiceManager\Factory\InvokableFactory;
-use Monolog\Handler\StreamHandler;
-use Monolog\Logger;
-use PHPUnit\Runner\Version;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use SebastianBergmann\CodeCoverage\CodeCoverage;
-use SebastianBergmann\CodeCoverage\Driver\Selector;
-use SebastianBergmann\CodeCoverage\Filter;
-use SebastianBergmann\CodeCoverage\Report\Html\Facade as Html;
-use SebastianBergmann\CodeCoverage\Report\PHP;
-use SebastianBergmann\CodeCoverage\Report\Xml\Facade as Xml;
+use PDO;
+use Zend\ConfigAggregator\ConfigAggregator;
+use Zend\ServiceManager\Factory\InvokableFactory;
 
-use function Laminas\Stratigility\middleware;
 use function Shlinkio\Shlink\Common\env;
 use function sprintf;
 use function sys_get_temp_dir;
 
-use const ShlinkioTest\Shlink\SWOOLE_TESTING_HOST;
-use const ShlinkioTest\Shlink\SWOOLE_TESTING_PORT;
+$swooleTestingHost = '127.0.0.1';
+$swooleTestingPort = 9999;
 
-$isApiTest = env('TEST_ENV') === 'api';
-$generateCoverage = env('GENERATE_COVERAGE') === 'yes';
-if ($isApiTest && $generateCoverage) {
-    $filter = new Filter();
-    $filter->includeDirectory(__DIR__ . '/../../module/Core/src');
-    $filter->includeDirectory(__DIR__ . '/../../module/Rest/src');
-    $coverage = new CodeCoverage((new Selector())->forLineCoverage($filter), $filter);
-}
-
-$buildDbConnection = static function (): array {
+$buildDbConnection = function (): array {
     $driver = env('DB_DRIVER', 'sqlite');
-    $isCi = env('CI', false);
-    $getCiMysqlPort = static fn (string $driver) => $driver === 'mysql' ? '3307' : '3308';
+    $isCi = env('TRAVIS', false);
+    $getMysqlHost = function (string $driver) {
+        return sprintf('shlink_db%s', $driver === 'mysql' ? '' : '_maria');
+    };
 
-    return match ($driver) {
+    $driverConfigMap = [
         'sqlite' => [
             'driver' => 'pdo_sqlite',
             'path' => sys_get_temp_dir() . '/shlink-tests.db',
         ],
+        'mysql' => [
+            'driver' => 'pdo_mysql',
+            'host' => $isCi ? '127.0.0.1' : $getMysqlHost($driver),
+            'user' => 'root',
+            'password' => $isCi ? '' : 'root',
+            'dbname' => 'shlink_test',
+            'charset' => 'utf8',
+            'driverOptions' => [
+                PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
+            ],
+        ],
         'postgres' => [
             'driver' => 'pdo_pgsql',
             'host' => $isCi ? '127.0.0.1' : 'shlink_db_postgres',
-            'port' => $isCi ? '5433' : '5432',
             'user' => 'postgres',
-            'password' => 'root',
+            'password' => $isCi ? '' : 'root',
             'dbname' => 'shlink_test',
+            'charset' => 'utf8',
         ],
-        'mssql' => [
-            'driver' => 'pdo_sqlsrv',
-            'host' => $isCi ? '127.0.0.1' : 'shlink_db_ms',
-            'user' => 'sa',
-            'password' => 'Passw0rd!',
-            'dbname' => 'shlink_test',
-        ],
-        default => [ // mysql and maria
-            'driver' => 'pdo_mysql',
-            'host' => $isCi ? '127.0.0.1' : sprintf('shlink_db_%s', $driver),
-            'port' => $isCi ? $getCiMysqlPort($driver) : '3306',
-            'user' => 'root',
-            'password' => 'root',
-            'dbname' => 'shlink_test',
-        ],
-    };
-};
+    ];
+    $driverConfigMap['maria'] = $driverConfigMap['mysql'];
 
-$buildTestLoggerConfig = fn (string $handlerName, string $filename) => [
-    'handlers' => [
-        $handlerName => [
-            'name' => StreamHandler::class,
-            'params' => [
-                'level' => Logger::DEBUG,
-                'stream' => sprintf('data/log/api-tests/%s', $filename),
-            ],
-        ],
-    ],
-];
+    return $driverConfigMap[$driver] ?? [];
+};
 
 return [
 
@@ -96,71 +63,27 @@ return [
             'schema' => 'http',
             'hostname' => 'doma.in',
         ],
-        'validate_url' => true,
     ],
 
-    'mezzio-swoole' => [
+    'zend-expressive-swoole' => [
         'enable_coroutine' => false,
         'swoole-http-server' => [
-            'host' => SWOOLE_TESTING_HOST,
-            'port' => SWOOLE_TESTING_PORT,
+            'host' => $swooleTestingHost,
+            'port' => $swooleTestingPort,
             'process-name' => 'shlink_test',
             'options' => [
                 'pid_file' => sys_get_temp_dir() . '/shlink-test-swoole.pid',
+                'worker_num' => 1,
+                'task_worker_num' => 1,
                 'enable_coroutine' => false,
             ],
         ],
     ],
 
-    'routes' => !$isApiTest ? [] : [
-        [
-            'name' => 'dump_coverage',
-            'path' => '/api-tests/stop-coverage',
-            'middleware' => middleware(static function () use (&$coverage) {
-                // TODO I have tried moving this block to a listener so that it's invoked automatically,
-                //      but then the coverage is generated empty ¯\_(ツ)_/¯
-                if ($coverage) { // @phpstan-ignore-line
-                    $basePath = __DIR__ . '/../../build/coverage-api';
-
-                    (new PHP())->process($coverage, $basePath . '.cov');
-                    (new Xml(Version::getVersionString()))->process($coverage, $basePath . '/coverage-xml');
-                    (new Html())->process($coverage, $basePath . '/coverage-html');
-                }
-
-                return new EmptyResponse();
-            }),
-            'allowed_methods' => ['GET'],
-        ],
-    ],
-
-    'middleware_pipeline' => !$isApiTest ? [] : [
-        'capture_code_coverage' => [
-            'middleware' => middleware(static function (
-                ServerRequestInterface $req,
-                RequestHandlerInterface $handler,
-            ) use (&$coverage): ResponseInterface {
-                $coverage?->start($req->getHeaderLine('x-coverage-id'));
-
-                try {
-                    return $handler->handle($req);
-                } finally {
-                    $coverage?->stop();
-                }
-            }),
-            'priority' => 9999,
-        ],
-    ],
-
-    'mercure' => [
-        'public_hub_url' => null,
-        'internal_hub_url' => null,
-        'jwt_secret' => null,
-    ],
-
     'dependencies' => [
         'services' => [
             'shlink_test_api_client' => new Client([
-                'base_uri' => sprintf('http://%s:%s/', SWOOLE_TESTING_HOST, SWOOLE_TESTING_PORT),
+                'base_uri' => sprintf('http://%s:%s/', $swooleTestingHost, $swooleTestingPort),
                 'http_errors' => false,
             ]),
         ],
@@ -179,9 +102,4 @@ return [
         ],
     ],
 
-    'logger' => [
-        'Shlink' => $buildTestLoggerConfig('shlink_handler', 'shlink.log'),
-        'Access' => $buildTestLoggerConfig('access_handler', 'access.log'),
-    ],
-
 ];

data/infra/ci/install-ms-odbc.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
-curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list > /etc/apt/sources.list.d/mssql-release.list
-apt-get update
-ACCEPT_EULA=Y apt-get install msodbcsql17
-apt-get install unixodbc-dev

data/infra/examples/nginx-vhost.conf

@@ -11,7 +11,7 @@ server {
 
     location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass unix:/var/run/php/php8.0-fpm.sock;
+        fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
         fastcgi_index index.php;
         include fastcgi.conf;
     }

data/infra/examples/shlink-daemon.sh

@@ -8,7 +8,7 @@
 # Description:       Shlink non-blocking server with swoole
 ### END INIT INFO
 
-SCRIPT=/path/to/shlink/vendor/bin/laminas\ mezzio:swoole:start
+SCRIPT=/path/to/shlink/vendor/bin/zend-expressive-swoole\ start
 RUNAS=root
 
 PIDFILE=/var/run/shlink_swoole.pid

data/infra/mercure_proxy_vhost.conf

@@ -1,17 +0,0 @@
-server {
-    listen 80 default_server;
-
-    error_log /home/shlink/www/data/infra/nginx/mercure_proxy.error.log;
-
-    location / {
-        proxy_pass http://shlink_mercure;
-        proxy_read_timeout 24h;
-        proxy_http_version 1.1;
-        proxy_set_header Connection "";
-
-        ## Be sure to set USE_FORWARDED_HEADERS=1 to allow the hub to use those headers ##
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Host $host;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-}

data/infra/php.Dockerfile

@@ -1,19 +1,17 @@
-FROM php:8.1.0-fpm-alpine3.15
+FROM php:7.3.11-fpm-alpine3.10
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
-ENV APCU_VERSION 5.1.21
-ENV PDO_SQLSRV_VERSION 5.10.0beta2
-ENV MS_ODBC_SQL_VERSION 17.5.2.2
+ENV APCU_VERSION 5.1.18
+ENV APCU_BC_VERSION 1.0.5
+ENV XDEBUG_VERSION 2.8.0
 
 RUN apk update
 
 # Install common php extensions
 RUN docker-php-ext-install pdo_mysql
 RUN docker-php-ext-install iconv
-RUN docker-php-ext-install calendar
-
-RUN apk add --no-cache oniguruma-dev
 RUN docker-php-ext-install mbstring
+RUN docker-php-ext-install calendar
 
 RUN apk add --no-cache sqlite-libs
 RUN apk add --no-cache sqlite-dev
@@ -31,33 +29,44 @@ RUN docker-php-ext-install gd
 RUN apk add --no-cache postgresql-dev
 RUN docker-php-ext-install pdo_pgsql
 
-RUN apk add --no-cache gmp-dev
-RUN docker-php-ext-install gmp
-
-RUN docker-php-ext-install sockets
-RUN docker-php-ext-install bcmath
-
 # Install APCu extension
 ADD https://pecl.php.net/get/apcu-$APCU_VERSION.tgz /tmp/apcu.tar.gz
-RUN mkdir -p /usr/src/php/ext/apcu \
-  && tar xf /tmp/apcu.tar.gz -C /usr/src/php/ext/apcu --strip-components=1 \
-  && docker-php-ext-configure apcu \
-  && docker-php-ext-install apcu \
-  && rm /tmp/apcu.tar.gz \
-  && rm /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini \
-  && echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini
+RUN mkdir -p /usr/src/php/ext/apcu\
+  && tar xf /tmp/apcu.tar.gz -C /usr/src/php/ext/apcu --strip-components=1
+# configure and install
+RUN docker-php-ext-configure apcu\
+  && docker-php-ext-install apcu
+# cleanup
+RUN rm /tmp/apcu.tar.gz
 
-# Install pcov and sqlsrv driver
-RUN wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
-    apk add --allow-untrusted msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
-    apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \
-    pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} pcov && \
-    docker-php-ext-enable pdo_sqlsrv pcov && \
-    apk del .phpize-deps && \
-    rm msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk
+# Install APCu-BC extension
+ADD https://pecl.php.net/get/apcu_bc-$APCU_BC_VERSION.tgz /tmp/apcu_bc.tar.gz
+RUN mkdir -p /usr/src/php/ext/apcu-bc\
+  && tar xf /tmp/apcu_bc.tar.gz -C /usr/src/php/ext/apcu-bc --strip-components=1
+# configure and install
+RUN docker-php-ext-configure apcu-bc\
+  && docker-php-ext-install apcu-bc
+# cleanup
+RUN rm /tmp/apcu_bc.tar.gz
+
+# Load APCU.ini before APC.ini
+RUN rm /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
+RUN echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini
+
+# Install xdebug
+ADD https://pecl.php.net/get/xdebug-$XDEBUG_VERSION /tmp/xdebug.tar.gz
+RUN mkdir -p /usr/src/php/ext/xdebug\
+  && tar xf /tmp/xdebug.tar.gz -C /usr/src/php/ext/xdebug --strip-components=1
+# configure and install
+RUN docker-php-ext-configure xdebug\
+  && docker-php-ext-install xdebug
+# cleanup
+RUN rm /tmp/xdebug.tar.gz
 
 # Install composer
-COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
+RUN php -r "readfile('https://getcomposer.org/installer');" | php
+RUN chmod +x composer.phar
+RUN mv composer.phar /usr/local/bin/composer
 
 # Make home directory writable by anyone
 RUN chmod 777 /home

data/infra/php.ini

@@ -4,5 +4,3 @@ memory_limit=-1
 log_errors_max_len=0
 zend.assertions=1
 assert.exception=1
-pcov.enabled=1
-pcov.directory=module

data/infra/swoole.Dockerfile

@@ -1,21 +1,18 @@
-FROM php:8.1.0-alpine3.15
+FROM php:7.3.11-alpine3.10
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
-ENV APCU_VERSION 5.1.21
-ENV INOTIFY_VERSION 3.0.0
-ENV OPENSWOOLE_VERSION 4.8.1
-ENV PDO_SQLSRV_VERSION 5.10.0beta2
-ENV MS_ODBC_SQL_VERSION 17.5.2.2
+ENV APCU_VERSION 5.1.18
+ENV APCU_BC_VERSION 1.0.5
+ENV INOTIFY_VERSION 2.0.0
+ENV SWOOLE_VERSION 4.4.12
 
 RUN apk update
 
 # Install common php extensions
 RUN docker-php-ext-install pdo_mysql
 RUN docker-php-ext-install iconv
-RUN docker-php-ext-install calendar
-
-RUN apk add --no-cache oniguruma-dev
 RUN docker-php-ext-install mbstring
+RUN docker-php-ext-install calendar
 
 RUN apk add --no-cache sqlite-libs
 RUN apk add --no-cache sqlite-dev
@@ -33,41 +30,51 @@ RUN docker-php-ext-install gd
 RUN apk add --no-cache postgresql-dev
 RUN docker-php-ext-install pdo_pgsql
 
-RUN apk add --no-cache gmp-dev
-RUN docker-php-ext-install gmp
-
-RUN docker-php-ext-install sockets
-RUN docker-php-ext-install bcmath
-
 # Install APCu extension
 ADD https://pecl.php.net/get/apcu-$APCU_VERSION.tgz /tmp/apcu.tar.gz
-RUN mkdir -p /usr/src/php/ext/apcu \
-  && tar xf /tmp/apcu.tar.gz -C /usr/src/php/ext/apcu --strip-components=1 \
-  && docker-php-ext-configure apcu \
-  && docker-php-ext-install apcu \
-  && rm /tmp/apcu.tar.gz \
-  && rm /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini \
-  && echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini
+RUN mkdir -p /usr/src/php/ext/apcu\
+  && tar xf /tmp/apcu.tar.gz -C /usr/src/php/ext/apcu --strip-components=1
+# configure and install
+RUN docker-php-ext-configure apcu\
+  && docker-php-ext-install apcu
+# cleanup
+RUN rm /tmp/apcu.tar.gz
+
+# Install APCu-BC extension
+ADD https://pecl.php.net/get/apcu_bc-$APCU_BC_VERSION.tgz /tmp/apcu_bc.tar.gz
+RUN mkdir -p /usr/src/php/ext/apcu-bc\
+  && tar xf /tmp/apcu_bc.tar.gz -C /usr/src/php/ext/apcu-bc --strip-components=1
+# configure and install
+RUN docker-php-ext-configure apcu-bc\
+  && docker-php-ext-install apcu-bc
+# cleanup
+RUN rm /tmp/apcu_bc.tar.gz
+
+# Load APCU.ini before APC.ini
+RUN rm /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
+RUN echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini
 
 # Install inotify extension
 ADD https://pecl.php.net/get/inotify-$INOTIFY_VERSION.tgz /tmp/inotify.tar.gz
-RUN mkdir -p /usr/src/php/ext/inotify \
-  && tar xf /tmp/inotify.tar.gz -C /usr/src/php/ext/inotify --strip-components=1 \
-  && docker-php-ext-configure inotify \
-  && docker-php-ext-install inotify \
-  && rm /tmp/inotify.tar.gz
+RUN mkdir -p /usr/src/php/ext/inotify\
+  && tar xf /tmp/inotify.tar.gz -C /usr/src/php/ext/inotify --strip-components=1
+# configure and install
+RUN docker-php-ext-configure inotify\
+  && docker-php-ext-install inotify
+# cleanup
+RUN rm /tmp/inotify.tar.gz
 
-# Install openswoole, pcov and mssql driver
-RUN wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
-    apk add --allow-untrusted msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
-    apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \
-    pecl install openswoole-${OPENSWOOLE_VERSION} pdo_sqlsrv-${PDO_SQLSRV_VERSION} pcov && \
-    docker-php-ext-enable openswoole pdo_sqlsrv pcov && \
-    apk del .phpize-deps && \
-    rm msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk
+# 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 composer
-COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
+RUN php -r "readfile('https://getcomposer.org/installer');" | php
+RUN chmod +x composer.phar
+RUN mv composer.phar /usr/local/bin/composer
 
 # Make home directory writable by anyone
 RUN chmod 777 /home
@@ -75,12 +82,12 @@ RUN chmod 777 /home
 VOLUME /home/shlink
 WORKDIR /home/shlink
 
-# Expose openswoole port
+# Expose swoole port
 EXPOSE 8080
 
 CMD \
     # Install dependencies if the vendor dir does not exist
     if [[ ! -d "./vendor" ]]; then /usr/local/bin/composer install ; fi && \
-    # When restarting the container, openswoole might think it is already in execution
+    # 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/bin/laminas mezzio:swoole:start; do sleep 1 ; done
+    until php ./vendor/bin/zend-expressive-swoole start; do sleep 1 ; done

data/infra/swoole_proxy_vhost.conf

@@ -1,14 +0,0 @@
-server {
-    listen 80 default_server;
-
-    error_log /home/shlink/www/data/infra/nginx/swoole_proxy.error.log;
-
-    location / {
-        proxy_http_version 1.1;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_pass http://shlink_swoole:8080;
-        proxy_read_timeout 90s;
-    }
-}

data/migrations/Version20160819142757.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
-use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\Migrations\AbstractMigration;
@@ -18,7 +18,7 @@ class Version20160819142757 extends AbstractMigration
     private const SQLITE = 'sqlite';
 
     /**
-     * @throws Exception
+     * @throws DBALException
      * @throws SchemaException
      */
     public function up(Schema $schema): void
@@ -35,15 +35,10 @@ class Version20160819142757 extends AbstractMigration
     }
 
     /**
-     * @throws Exception
+     * @throws DBALException
      */
     public function down(Schema $schema): void
     {
-        $this->connection->getDatabasePlatform()->getName();
-    }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        $db = $this->connection->getDatabasePlatform()->getName();
     }
 }

data/migrations/Version20160820191203.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace ShlinkMigrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\Types;
+use Doctrine\DBAL\Types\Type;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
@@ -30,12 +30,12 @@ class Version20160820191203 extends AbstractMigration
     private function createTagsTable(Schema $schema): void
     {
         $table = $schema->createTable('tags');
-        $table->addColumn('id', Types::BIGINT, [
+        $table->addColumn('id', Type::BIGINT, [
             'unsigned' => true,
             'autoincrement' => true,
             'notnull' => true,
         ]);
-        $table->addColumn('name', Types::STRING, [
+        $table->addColumn('name', Type::STRING, [
             'length' => 255,
             'notnull' => true,
         ]);
@@ -47,11 +47,11 @@ class Version20160820191203 extends AbstractMigration
     private function createShortUrlsInTagsTable(Schema $schema): void
     {
         $table = $schema->createTable('short_urls_in_tags');
-        $table->addColumn('short_url_id', Types::BIGINT, [
+        $table->addColumn('short_url_id', Type::BIGINT, [
             'unsigned' => true,
             'notnull' => true,
         ]);
-        $table->addColumn('tag_id', Types::BIGINT, [
+        $table->addColumn('tag_id', Type::BIGINT, [
             'unsigned' => true,
             'notnull' => true,
         ]);
@@ -73,9 +73,4 @@ class Version20160820191203 extends AbstractMigration
         $schema->dropTable('short_urls_in_tags');
         $schema->dropTable('tags');
     }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
 }

data/migrations/Version20171021093246.php

@@ -6,7 +6,7 @@ namespace ShlinkMigrations;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
-use Doctrine\DBAL\Types\Types;
+use Doctrine\DBAL\Types\Type;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
@@ -24,10 +24,10 @@ class Version20171021093246 extends AbstractMigration
             return;
         }
 
-        $shortUrls->addColumn('valid_since', Types::DATETIME_MUTABLE, [
+        $shortUrls->addColumn('valid_since', Type::DATETIME, [
             'notnull' => false,
         ]);
-        $shortUrls->addColumn('valid_until', Types::DATETIME_MUTABLE, [
+        $shortUrls->addColumn('valid_until', Type::DATETIME, [
             'notnull' => false,
         ]);
     }
@@ -45,9 +45,4 @@ class Version20171021093246 extends AbstractMigration
         $shortUrls->dropColumn('valid_since');
         $shortUrls->dropColumn('valid_until');
     }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
 }

data/migrations/Version20171022064541.php

@@ -6,7 +6,7 @@ namespace ShlinkMigrations;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
-use Doctrine\DBAL\Types\Types;
+use Doctrine\DBAL\Types\Type;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
@@ -24,7 +24,7 @@ class Version20171022064541 extends AbstractMigration
             return;
         }
 
-        $shortUrls->addColumn('max_visits', Types::INTEGER, [
+        $shortUrls->addColumn('max_visits', Type::INTEGER, [
             'unsigned' => true,
             'notnull' => false,
         ]);
@@ -42,9 +42,4 @@ class Version20171022064541 extends AbstractMigration
 
         $shortUrls->dropColumn('max_visits');
     }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
 }

data/migrations/Version20180801183328.php

@@ -17,6 +17,7 @@ final class Version20180801183328 extends AbstractMigration
     private const OLD_SIZE = 10;
 
     /**
+     * @param Schema $schema
      * @throws SchemaException
      */
     public function up(Schema $schema): void
@@ -25,6 +26,7 @@ final class Version20180801183328 extends AbstractMigration
     }
 
     /**
+     * @param Schema $schema
      * @throws SchemaException
      */
     public function down(Schema $schema): void
@@ -33,15 +35,12 @@ final class Version20180801183328 extends AbstractMigration
     }
 
     /**
+     * @param Schema $schema
+     * @param int $size
      * @throws SchemaException
      */
     private function setSize(Schema $schema, int $size): void
     {
         $schema->getTable('short_urls')->getColumn('short_code')->setLength($size);
     }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
 }

data/migrations/Version20180913205455.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
-use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 use PDO;
@@ -16,13 +16,17 @@ use Shlinkio\Shlink\Common\Util\IpAddress;
  */
 final class Version20180913205455 extends AbstractMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema): void
     {
         // Nothing to create
     }
 
     /**
-     * @throws Exception
+     * @param Schema $schema
+     * @throws DBALException
      */
     public function postUp(Schema $schema): void
     {
@@ -56,19 +60,17 @@ final class Version20180913205455 extends AbstractMigration
         }
 
         try {
-            return (string) IpAddress::fromString($addr)->getAnonymizedCopy();
-        } catch (InvalidArgumentException) {
+            return (string) IpAddress::fromString($addr)->getObfuscatedCopy();
+        } catch (InvalidArgumentException $e) {
             return null;
         }
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema): void
     {
         // Nothing to rollback
     }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
 }

data/migrations/Version20180915110857.php

@@ -19,6 +19,7 @@ final class Version20180915110857 extends AbstractMigration
     ];
 
     /**
+     * @param Schema $schema
      * @throws SchemaException
      */
     public function up(Schema $schema): void
@@ -38,7 +39,7 @@ final class Version20180915110857 extends AbstractMigration
                 [
                     'onDelete' => self::ON_DELETE_MAP[$foreignTable],
                     'onUpdate' => 'RESTRICT',
-                ],
+                ]
             );
         }
     }
@@ -47,9 +48,4 @@ final class Version20180915110857 extends AbstractMigration
     {
         // Nothing to run
     }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
 }

data/migrations/Version20181020060559.php

@@ -4,11 +4,11 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
-use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\DBAL\Schema\Table;
-use Doctrine\DBAL\Types\Types;
+use Doctrine\DBAL\Types\Type;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
@@ -24,6 +24,7 @@ final class Version20181020060559 extends AbstractMigration
     ];
 
     /**
+     * @param Schema $schema
      * @throws SchemaException
      */
     public function up(Schema $schema): void
@@ -35,14 +36,14 @@ final class Version20181020060559 extends AbstractMigration
     {
         foreach ($columnNames as $name) {
             if (! $visitLocations->hasColumn($name)) {
-                $visitLocations->addColumn($name, Types::STRING, ['notnull' => false]);
+                $visitLocations->addColumn($name, Type::STRING, ['notnull' => false]);
             }
         }
     }
 
     /**
      * @throws SchemaException
-     * @throws Exception
+     * @throws DBALException
      */
     public function postUp(Schema $schema): void
     {
@@ -65,9 +66,4 @@ final class Version20181020060559 extends AbstractMigration
     {
         // No down
     }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
 }

data/migrations/Version20181020065148.php

@@ -38,9 +38,4 @@ final class Version20181020065148 extends AbstractMigration
     {
         // No down
     }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
 }

data/migrations/Version20181110175521.php

@@ -34,9 +34,4 @@ final class Version20181110175521 extends AbstractMigration
     {
         return $schema->getTable('visits')->getColumn('user_agent');
     }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
 }

data/migrations/Version20190824075137.php

@@ -34,9 +34,4 @@ final class Version20190824075137 extends AbstractMigration
     {
         return $schema->getTable('visits')->getColumn('referer');
     }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
 }

data/migrations/Version20190930165521.php

@@ -6,7 +6,7 @@ namespace ShlinkMigrations;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
-use Doctrine\DBAL\Types\Types;
+use Doctrine\DBAL\Types\Type;
 use Doctrine\Migrations\AbstractMigration;
 
 final class Version20190930165521 extends AbstractMigration
@@ -22,19 +22,19 @@ final class Version20190930165521 extends AbstractMigration
         }
 
         $domains = $schema->createTable('domains');
-        $domains->addColumn('id', Types::BIGINT, [
+        $domains->addColumn('id', Type::BIGINT, [
             'unsigned' => true,
             'autoincrement' => true,
             'notnull' => true,
         ]);
-        $domains->addColumn('authority', Types::STRING, [
+        $domains->addColumn('authority', Type::STRING, [
             'length' => 512,
             'notnull' => true,
         ]);
         $domains->addUniqueIndex(['authority']);
         $domains->setPrimaryKey(['id']);
 
-        $shortUrls->addColumn('domain_id', Types::BIGINT, [
+        $shortUrls->addColumn('domain_id', Type::BIGINT, [
             'unsigned' => true,
             'notnull' => false,
         ]);
@@ -52,9 +52,4 @@ final class Version20190930165521 extends AbstractMigration
         $schema->getTable('short_urls')->dropColumn('domain_id');
         $schema->dropTable('domains');
     }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
 }

data/migrations/Version20191001201532.php

@@ -46,9 +46,4 @@ final class Version20191001201532 extends AbstractMigration
         $shortUrls->dropIndex('unique_short_code_plus_domain');
         $shortUrls->addUniqueIndex(['short_code']);
     }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
 }

data/migrations/Version20191020074522.php

@@ -34,9 +34,4 @@ final class Version20191020074522 extends AbstractMigration
     {
         return $schema->getTable('short_urls')->getColumn('original_url');
     }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
 }

data/migrations/Version20200105165647.php

@@ -1,101 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ShlinkMigrations;
-
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\Types;
-use Doctrine\Migrations\AbstractMigration;
-
-use function Functional\some;
-
-final class Version20200105165647 extends AbstractMigration
-{
-    private const COLUMNS = ['lat' => 'latitude', 'lon' => 'longitude'];
-
-    /**
-     * @throws Exception
-     */
-    public function preUp(Schema $schema): void
-    {
-        $visitLocations = $schema->getTable('visit_locations');
-        $this->skipIf(some(
-            self::COLUMNS,
-            fn (string $v, string $newColName) => $visitLocations->hasColumn($newColName),
-        ), 'New columns already exist');
-
-        foreach (self::COLUMNS as $columnName) {
-            $qb = $this->connection->createQueryBuilder();
-            $qb->update('visit_locations')
-               ->set($columnName, ':zeroValue')
-               ->where($qb->expr()->orX(
-                   $qb->expr()->eq($columnName, ':emptyString'),
-                   $qb->expr()->isNull($columnName),
-               ))
-               ->setParameters([
-                   'zeroValue' => '0',
-                   'emptyString' => '',
-               ])
-               ->execute();
-        }
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function up(Schema $schema): void
-    {
-        $visitLocations = $schema->getTable('visit_locations');
-
-        foreach (self::COLUMNS as $newName => $oldName) {
-            $visitLocations->addColumn($newName, Types::FLOAT, [
-                'default' => '0.0',
-            ]);
-        }
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function postUp(Schema $schema): void
-    {
-        $platformName = $this->connection->getDatabasePlatform()->getName();
-        $castType = $platformName === 'postgres' ? 'DOUBLE PRECISION' : 'DECIMAL(9,2)';
-
-        foreach (self::COLUMNS as $newName => $oldName) {
-            $qb = $this->connection->createQueryBuilder();
-            $qb->update('visit_locations')
-               ->set($newName, 'CAST(' . $oldName . ' AS ' . $castType . ')')
-               ->execute();
-        }
-    }
-
-    public function preDown(Schema $schema): void
-    {
-        foreach (self::COLUMNS as $newName => $oldName) {
-            $qb = $this->connection->createQueryBuilder();
-            $qb->update('visit_locations')
-               ->set($oldName, $newName)
-               ->execute();
-        }
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function down(Schema $schema): void
-    {
-        $visitLocations = $schema->getTable('visit_locations');
-
-        foreach (self::COLUMNS as $colName => $oldName) {
-            $visitLocations->dropColumn($colName);
-        }
-    }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
-}

data/migrations/Version20200106215144.php

@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ShlinkMigrations;
-
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\Types;
-use Doctrine\Migrations\AbstractMigration;
-
-use function Functional\none;
-
-final class Version20200106215144 extends AbstractMigration
-{
-    private const COLUMNS = ['latitude', 'longitude'];
-
-    /**
-     * @throws Exception
-     */
-    public function up(Schema $schema): void
-    {
-        $visitLocations = $schema->getTable('visit_locations');
-        $this->skipIf(none(
-            self::COLUMNS,
-            fn (string $oldColName) => $visitLocations->hasColumn($oldColName),
-        ), 'Old columns do not exist');
-
-        foreach (self::COLUMNS as $colName) {
-            $visitLocations->dropColumn($colName);
-        }
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function down(Schema $schema): void
-    {
-        $visitLocations = $schema->getTable('visit_locations');
-
-        foreach (self::COLUMNS as $colName) {
-            $visitLocations->addColumn($colName, Types::STRING, [
-                'notnull' => false,
-            ]);
-        }
-    }
-
-    public function isTransactional(): bool
-    {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
-    }
-}