Merge pull request #1963 from shlinkio/develop

Release 3.7.2

.dockerignore

@@ -1,3 +1,4 @@
+bin/rr
 config/autoload/*local*
 data/infra
 data/cache/*
@@ -9,6 +10,7 @@ data/GeoLite2-City*
 data/database.sqlite
 data/shlink-tests.db
 CHANGELOG.md
+CONTRIBUTING.md
 UPGRADE.md
 composer.lock
 vendor
@@ -21,4 +23,4 @@ infection*
 **/test*
 build*
 **/.*
-bin/helper
+!config/roadrunner/.rr.yml

.github/DISCUSSION_TEMPLATE/help-wanted.yml

@@ -0,0 +1,51 @@
+title: 'Help wanted'
+body:
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Shlink version
+      placeholder: x.y.z
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: PHP version
+      placeholder: x.y.z
+  - type: dropdown
+    validations:
+      required: true
+    attributes:
+      label: How do you serve Shlink
+      options:
+        - Self-hosted Apache
+        - Self-hosted nginx
+        - Self-hosted openswoole
+        - Self-hosted RoadRunner
+        - Openswoole Docker image
+        - RoadRunner Docker image
+        - Other (explain in summary)
+  - type: dropdown
+    validations:
+      required: true
+    attributes:
+      label: Database engine
+      options:
+        - MySQL
+        - MariaDB
+        - PostgreSQL
+        - MicrosoftSQL
+        - SQLite
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Database version
+      placeholder: x.y.z
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Summary
+      value: '<!-- Describe your issue, question or request here. -->'
+

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 <!--
 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.
-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.
+I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personally 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

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Something on shlink is broken or not working as documented?
-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.
-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).
--->
-
-#### How Shlink is set-up
-
-* 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)
-
-#### Summary
-
-<!-- Provide a summary describing the problem you are experiencing. -->
-
-#### Current behavior
-
-<!-- How is it actually behaving (and it shouldn't)? -->
-
-#### Expected behavior
-
-<!-- How did you expected to behave? -->
-
-#### How to reproduce
-
-<!-- Provide steps to reproduce the bug. -->

.github/ISSUE_TEMPLATE/Bug.yml

@@ -0,0 +1,64 @@
+name: Bug report
+description: Something on Shlink is broken or not working as documented?
+labels: ['bug']
+body:
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Shlink version
+      placeholder: x.y.z
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: PHP version
+      placeholder: x.y.z
+  - type: dropdown
+    validations:
+      required: true
+    attributes:
+      label: How do you serve Shlink
+      options:
+        - Self-hosted Apache
+        - Self-hosted nginx
+        - Self-hosted openswoole
+        - Self-hosted RoadRunner
+        - Openswoole Docker image
+        - RoadRunner Docker image
+        - Other (explain in summary)
+  - type: dropdown
+    validations:
+      required: true
+    attributes:
+      label: Database engine
+      options:
+        - MySQL
+        - MariaDB
+        - PostgreSQL
+        - MicrosoftSQL
+        - SQLite
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Database version
+      placeholder: x.y.z
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Current behavior
+      value: '<!-- How is it actually behaving (and it should not)? -->'
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Expected behavior
+      value: '<!-- How did you expect it to behave? -->'
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: How to reproduce
+      value: '<!-- Provide steps to reproduce the bug. -->'

.github/ISSUE_TEMPLATE/Feature_Request.md

@@ -1,19 +0,0 @@
----
-name: Feature request
-about: Do you find shlink is missing some important feature that would make it more useful?
-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.
-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).
--->
-
-#### Summary
-
-<!-- Describe the new feature you would like to request. -->

.github/ISSUE_TEMPLATE/Feature_Request.yml

@@ -0,0 +1,16 @@
+name: Feature request
+description: Do you find Shlink is missing some important feature that would make it more useful?
+labels: ['feature']
+body:
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Summary
+      value: '<!-- Describe the new feature you would like to request. -->'
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Use case
+      value: '<!-- Explain why do you think this feature would be useful, and what problems would it help to solve. -->'

.github/ISSUE_TEMPLATE/Question_Support.md

@@ -1,26 +0,0 @@
----
-name: Question - Support
-about: Do you have a problem setting up or using shlink?
-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.
-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).
--->
-
-#### How Shlink is set-up
-
-* 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)
-
-#### Summary
-
-<!-- Describe the issue you are facing here. -->

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Question - Support
+    about: Do you need help setting up or using Shlink?
+    url: https://github.com/shlinkio/shlink/discussions/new?category=help-wanted

.github/actions/ci-setup/action.yml

@@ -0,0 +1,47 @@
+name: CI setup
+description: 'Sets up the environment to run CI actions for Shlink'
+
+inputs:
+  install-deps:
+    description: 'Tells if dependencies should be installed with composer. Default value is "yes"'
+    required: true
+    default: 'yes'
+  php-version:
+    description: 'The PHP version to be setup'
+    required: true
+  php-extensions:
+    description: 'The PHP extensions to install'
+    required: false
+    default: ''
+  extensions-cache-key:
+    description: 'The key used to cache PHP extensions. If empty value is provided, extension caching is disabled'
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Setup cache environment
+      id: extcache
+      uses: shivammathur/cache-extensions@v1
+      with:
+        php-version: ${{ inputs.php-version }}
+        extensions: ${{ inputs.php-extensions }}
+        key: ${{ inputs.extensions-cache-key }}
+    - name: Cache extensions
+      uses: actions/cache@v3
+      with:
+        path: ${{ steps.extcache.outputs.dir }}
+        key: ${{ steps.extcache.outputs.key }}
+        restore-keys: ${{ steps.extcache.outputs.key }}
+    - name: Use PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ inputs.php-version }}
+        tools: composer
+        extensions: ${{ inputs.php-extensions }}
+        coverage: pcov
+        ini-values: pcov.directory=module
+    - name: Install dependencies
+      if: ${{ inputs.install-deps == 'yes' }}
+      run: composer install --no-interaction --prefer-dist ${{ inputs.php-version == '8.3' && '--ignore-platform-reqs' || '' }}
+      shell: bash

.github/workflows/ci-db-tests.yml

@@ -0,0 +1,45 @@
+name: Database tests
+
+on:
+  workflow_call:
+    inputs:
+      platform:
+        type: string
+        required: true
+        description: One of sqlite:ci, mysql, maria, postgres or ms
+
+jobs:
+  db-tests:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        php-version: ['8.2', '8.3']
+    continue-on-error: ${{ matrix.php-version == '8.3' }}
+    env:
+      LC_ALL: C
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install MSSQL ODBC
+        if: ${{ inputs.platform == 'ms' }}
+        run: sudo ./data/infra/ci/install-ms-odbc.sh
+      - name: Start database server
+        if: ${{ inputs.platform != 'sqlite:ci' }}
+        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_${{ inputs.platform }}
+      - uses: './.github/actions/ci-setup'
+        with:
+          php-version: ${{ matrix.php-version }}
+          php-extensions: openswoole-22.1.0, pdo_sqlsrv-5.11.1
+          extensions-cache-key: db-tests-extensions-${{ matrix.php-version }}-${{ inputs.platform }}
+      - name: Create test database
+        if: ${{ inputs.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:${{ inputs.platform }}
+      - name: Upload code coverage
+        uses: actions/upload-artifact@v4
+        if: ${{ matrix.php-version == '8.2' && inputs.platform == 'sqlite:ci' }}
+        with:
+          name: coverage-db
+          path: |
+            build/coverage-db
+            build/coverage-db.cov

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

@@ -0,0 +1,14 @@
+name: Build docker image
+
+on:
+  pull_request:
+    paths:
+      - 'Dockerfile'
+
+jobs:
+  build-docker-image:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - run: docker build -t shlink-docker-image:temp .

.github/workflows/ci-mutation-tests.yml

@@ -0,0 +1,46 @@
+name: Mutation tests
+
+on:
+  workflow_call:
+    inputs:
+      test-group:
+        type: string
+        required: true
+        description: One of unit, db, api or cli
+
+jobs:
+  mutation-tests:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        php-version: ['8.2', '8.3']
+    continue-on-error: ${{ matrix.php-version == '8.3' }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: './.github/actions/ci-setup'
+        with:
+          php-version: ${{ matrix.php-version }}
+          php-extensions: openswoole-22.1.0
+          extensions-cache-key: mutation-tests-extensions-${{ matrix.php-version }}-${{ inputs.test-group }}
+      - uses: actions/download-artifact@v4
+        with:
+          name: coverage-${{ inputs.test-group }}
+          path: build
+      - name: Resolve infection args
+        id: infection_args
+        run: echo "args=--logger-github=false" >> $GITHUB_OUTPUT
+#        TODO Try to filter mutation tests to improve execution times. Investigate why --git-diff-lines --git-diff-base=develop does not work
+#        run: |
+#          BRANCH="${GITHUB_REF#refs/heads/}" |
+#          if [[ $BRANCH == 'main' || $BRANCH == 'develop' ]]; then
+#            echo "args=--logger-github=false" >> $GITHUB_OUTPUT
+#          else
+#            echo "args=--logger-github=false --git-diff-lines --git-diff-base=develop" >> $GITHUB_OUTPUT
+#          fi;
+        shell: bash
+      - if: ${{ inputs.test-group == 'unit' }}
+        run: composer infect:ci:unit -- ${{ steps.infection_args.outputs.args }}
+        env:
+          INFECTION_BADGE_API_KEY: ${{ secrets.INFECTION_BADGE_API_KEY }}
+      - if: ${{ inputs.test-group != 'unit' }}
+        run: composer infect:ci:${{ inputs.test-group }} -- ${{ steps.infection_args.outputs.args }}

.github/workflows/ci-tests.yml

@@ -0,0 +1,38 @@
+name: Tests
+
+on:
+  workflow_call:
+    inputs:
+      test-group:
+        type: string
+        required: true
+        description: One of unit, api or cli
+
+jobs:
+  tests:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        php-version: ['8.2', '8.3']
+    continue-on-error: ${{ matrix.php-version == '8.3' }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Start postgres database server
+        if: ${{ inputs.test-group == 'api' }}
+        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_postgres
+      - name: Start maria database server
+        if: ${{ inputs.test-group == 'cli' }}
+        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_maria
+      - uses: './.github/actions/ci-setup'
+        with:
+          php-version: ${{ matrix.php-version }}
+          php-extensions: openswoole-22.1.0
+          extensions-cache-key: tests-extensions-${{ matrix.php-version }}-${{ inputs.test-group }}
+      - run: composer test:${{ inputs.test-group }}:ci
+      - uses: actions/upload-artifact@v4
+        if: ${{ matrix.php-version == '8.2' }}
+        with:
+          name: coverage-${{ inputs.test-group }}
+          path: |
+            build/coverage-${{ inputs.test-group }}
+            build/coverage-${{ inputs.test-group }}.cov

.github/workflows/ci.yml

@@ -1,158 +1,160 @@
 name: Continuous integration
 
 on:
-  pull_request: null
+  pull_request:
+    paths-ignore:
+      - 'LICENSE'
+      - '.*'
+      - '*.md'
+      - '*.xml'
+      - '*.yml*'
+      - '*.json5'
+      - '*.neon'
   push:
     branches:
       - main
       - develop
+      - 2.x
+    paths-ignore:
+      - 'LICENSE'
+      - '.*'
+      - '*.md'
+      - '*.xml'
+      - '*.yml*'
+      - '*.json5'
+      - '*.neon'
 
 jobs:
   static-analysis:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: ['8.0']
+        php-version: ['8.2']
         command: ['cs', 'stan', 'swagger:validate']
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
+      - uses: actions/checkout@v4
+      - uses: './.github/actions/ci-setup'
         with:
           php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: openswoole-4.8.1
-          coverage: none
-      - run: composer install --no-interaction --prefer-dist
+          php-extensions: openswoole-22.1.0
+          extensions-cache-key: tests-extensions-${{ matrix.php-version }}-${{ matrix.command }}
       - 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
+  unit-tests:
+    uses: './.github/workflows/ci-tests.yml'
+    with:
+      test-group: unit
 
-  db-tests:
-    runs-on: ubuntu-20.04
+  cli-tests:
+    uses: './.github/workflows/ci-tests.yml'
+    with:
+      test-group: cli
+
+  openswoole-api-tests:
+    uses: './.github/workflows/ci-tests.yml'
+    with:
+      test-group: api
+
+  roadrunner-api-tests:
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: ['8.0', '8.1']
-        platform: ['sqlite:ci', 'mysql', 'maria', 'postgres', 'ms']
+        php-version: ['8.2', '8.3']
+    continue-on-error: ${{ matrix.php-version == '8.3' }}
     env:
-      LC_ALL: C
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # rr get-binary picks this env automatically
     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
+      - uses: actions/checkout@v4
+      - run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_postgres
+      - 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
+      - run: composer install --no-interaction --prefer-dist --ignore-platform-req=ext-openswoole ${{ matrix.php-version == '8.3' && '--ignore-platform-reqs' || '' }}
+      - run: ./vendor/bin/rr get --no-interaction --no-config --location bin/ && chmod +x bin/rr
+      - run: composer test:api:rr
 
-  mutation-tests:
+  sqlite-db-tests:
+    uses: './.github/workflows/ci-db-tests.yml'
+    with:
+      platform: 'sqlite:ci'
+
+  mysql-db-tests:
+    uses: './.github/workflows/ci-db-tests.yml'
+    with:
+      platform: 'mysql'
+
+  maria-db-tests:
+    uses: './.github/workflows/ci-db-tests.yml'
+    with:
+      platform: 'maria'
+
+  postgres-db-tests:
+    uses: './.github/workflows/ci-db-tests.yml'
+    with:
+      platform: 'postgres'
+
+  ms-db-tests:
+    uses: './.github/workflows/ci-db-tests.yml'
+    with:
+      platform: 'ms'
+
+  unit-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 }}
+      - unit-tests
+    uses: './.github/workflows/ci-mutation-tests.yml'
+    with:
+      test-group: unit
+
+  db-mutation-tests:
+    needs:
+      - sqlite-db-tests
+    uses: './.github/workflows/ci-mutation-tests.yml'
+    with:
+      test-group: db
+
+  api-mutation-tests:
+    needs:
+      - openswoole-api-tests
+    uses: './.github/workflows/ci-mutation-tests.yml'
+    with:
+      test-group: api
+
+  cli-mutation-tests:
+    needs:
+      - cli-tests
+    uses: './.github/workflows/ci-mutation-tests.yml'
+    with:
+      test-group: cli
 
   upload-coverage:
     needs:
-      - tests
-      - db-tests
-    runs-on: ubuntu-20.04
+      - unit-tests
+      - openswoole-api-tests
+      - cli-tests
+      - sqlite-db-tests
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: ['8.0']
+        php-version: ['8.2']
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - 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
+      - uses: actions/download-artifact@v4
         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
+      - run: mv build/coverage-cli/coverage-cli.cov build/coverage-cli.cov
+      - run: wget https://phar.phpunit.de/phpcov-9.0.0.phar
+      - run: php phpcov-9.0.0.phar merge build --clover build/clover.xml
       - name: Publish coverage
         uses: codecov/codecov-action@v1
         with:
@@ -160,29 +162,14 @@ jobs:
 
   delete-artifacts:
     needs:
-      - mutation-tests
+      - unit-mutation-tests
+      - db-mutation-tests
+      - api-mutation-tests
+      - cli-mutation-tests
       - upload-coverage
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: geekyeggo/delete-artifact@v1
+      - uses: geekyeggo/delete-artifact@v2
         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"
+            coverage-*

.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-docker-image.yml

@@ -0,0 +1,34 @@
+name: Build and publish docker image
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build-image:
+    strategy:
+      matrix:
+        include:
+          - runtime: 'rr'
+            platforms: 'linux/arm64/v8,linux/amd64'
+          - runtime: 'rr'
+            tag-suffix: 'roadrunner'
+            platforms: 'linux/arm64/v8,linux/amd64'
+          - runtime: 'openswoole'
+            tag-suffix: 'openswoole'
+            platforms: 'linux/arm/v7,linux/arm64/v8,linux/amd64'
+          - runtime: 'rr'
+            tag-suffix: 'non-root'
+            platforms: 'linux/arm64/v8,linux/amd64'
+            user-id: '1001'
+    uses: shlinkio/github-actions/.github/workflows/docker-build-and-publish.yml@main
+    secrets: inherit
+    with:
+      image-name: shlinkio/shlink
+      version-arg-name: SHLINK_VERSION
+      platforms: ${{ matrix.platforms }}
+      tags-suffix: ${{ matrix.tag-suffix }}
+      extra-build-args: |
+        SHLINK_RUNTIME=${{ matrix.runtime }}
+        SHLINK_USER_ID=${{ matrix.user-id && matrix.user-id || 'root' }}

.github/workflows/publish-release.yml

@@ -7,36 +7,34 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: ['8.0', '8.1']
+        php-version: ['8.2', '8.3']
         swoole: ['yes', 'no']
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
+      - uses: actions/checkout@v4
+      - uses: './.github/actions/ci-setup'
         with:
           php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: openswoole-4.8.1
+          php-extensions: openswoole-22.1.0
+          extensions-cache-key: publish-swagger-spec-extensions-${{ matrix.php-version }}
+          install-deps: 'no'
       - 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
+      - uses: actions/upload-artifact@v4
         with:
           name: dist-files-${{ matrix.php-version }}-${{ matrix.swoole }}
           path: build
 
   publish:
     needs: ['build']
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           path: build
       - name: Publish release with assets
@@ -50,12 +48,8 @@ jobs:
 
   delete-artifacts:
     needs: ['publish']
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: [ '8.0', '8.1' ]
-        swoole: [ 'yes', 'no' ]
+    runs-on: ubuntu-22.04
     steps:
-      - uses: geekyeggo/delete-artifact@v1
+      - uses: geekyeggo/delete-artifact@v2
         with:
-          name: dist-files-${{ matrix.php-version }}-${{ matrix.swoole }}
+          name: dist-files-*

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

@@ -7,30 +7,26 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: ['8.0']
+        php-version: ['8.2']
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Determine version
         id: determine_version
-        run: echo "::set-output name=version::${GITHUB_REF#refs/tags/}"
+        run: echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
         shell: bash
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
+      - uses: './.github/actions/ci-setup'
         with:
           php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: openswoole-4.8.1
-          coverage: none
-      - run: composer install --no-interaction --prefer-dist
+          php-extensions: openswoole-22.1.0
+          extensions-cache-key: publish-swagger-spec-extensions-${{ matrix.php-version }}
       - 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
+      - run: mv docs/swagger/swagger-inlined.json ${{ steps.determine_version.outputs.version }}/open-api-spec.json
       - name: Publish spec
-        uses: JamesIves/github-pages-deploy-action@4.1.7
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
           token: ${{ secrets.OAS_PUBLISH_TOKEN }}
           repository-name: 'shlinkio/shlink-open-api-specs'

.gitignore

@@ -1,4 +1,6 @@
 .idea
+bin/rr
+config/roadrunner/.pid
 build
 !docker/build
 composer.lock
@@ -7,6 +9,7 @@ vendor/
 data/database.sqlite
 data/shlink-tests.db
 data/GeoLite2-City.*
+data/infra/matomo
 docs/swagger-ui*
 docs/mercure.html
 docker-compose.override.yml

CHANGELOG.md

@@ -4,6 +4,707 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [3.7.2] - 2023-12-26
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1960](https://github.com/shlinkio/shlink/issues/1960) Allow QR codes to be optionally resolved even when corresponding short URL is not enabled.
+
+
+## [3.7.1] - 2023-12-17
+### Added
+* *Nothing*
+
+### Changed
+* Remove dependency on functional-php library
+* [#1939](https://github.com/shlinkio/shlink/issues/1939) Fine-tune RoadRunner logs to avoid too many useless info.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1947](https://github.com/shlinkio/shlink/issues/1947) Fix error when importing short URLs while using Postgres.
+
+
+## [3.7.0] - 2023-11-25
+### Added
+* [#1798](https://github.com/shlinkio/shlink/issues/1798) Experimental support to send visits to an external Matomo instance.
+* [#1780](https://github.com/shlinkio/shlink/issues/1780) Add new `NO_ORPHAN_VISITS` API key role.
+
+  Keys with this role will always get `0` when fetching orphan visits.
+
+  When trying to delete orphan visits the result will also be `0` and no visits will actually get deleted.
+
+* [#1879](https://github.com/shlinkio/shlink/issues/1879) Cache namespace can now be customized via config option or `CACHE_NAMESPACE` env var.
+
+  This is important if you are running multiple Shlink instance on the same server, or they share the same Redis instance (even more so if they are on different versions).
+
+* [#1905](https://github.com/shlinkio/shlink/issues/1905) Add support for PHP 8.3.
+* [#1927](https://github.com/shlinkio/shlink/issues/1927) Allow redis credentials be URL-decoded before passing them to connection.
+* [#1834](https://github.com/shlinkio/shlink/issues/1834) Add support for redis encrypted connections using SSL/TLS.
+
+  Encryption should work out of the box if servers schema is set tp `tls` or `rediss`, including support for self-signed certificates.
+
+  This has been tested with AWS ElasticCache using in-transit encryption, and with Digital Ocean Redis database.
+
+* [#1906](https://github.com/shlinkio/shlink/issues/1906) Add support for RabbitMQ encrypted connections using SSL/TLS.
+
+  In order to enable SLL, you need to pass `RABBITMQ_USE_SSL=true` or the corresponding config option.
+
+  Connections using self-signed certificates should work out of the box.
+
+  This has been tested with AWS RabbitMQ using in-transit encryption, and with CloudAMQP.
+
+### Changed
+* [#1799](https://github.com/shlinkio/shlink/issues/1799) RoadRunner/openswoole jobs are not run anymore for tasks that are actually disabled.
+
+  For example, if you did not enable RabbitMQ real-time updates, instead of triggering a job that ends immediately, the job will not even be enqueued.
+
+* [#1835](https://github.com/shlinkio/shlink/issues/1835) Docker image is now built only when a release is tagged, and new tags are included, for minor and major versions.
+* [#1055](https://github.com/shlinkio/shlink/issues/1055) Update OAS definition to v3.1.
+* [#1885](https://github.com/shlinkio/shlink/issues/1885) Update to chronos 3.0.
+* [#1896](https://github.com/shlinkio/shlink/issues/1896) Requests to health endpoint are no longer logged.
+* [#1877](https://github.com/shlinkio/shlink/issues/1877) Print a warning when manually running `visit:download-db` command and a GeoLite2 license was not provided.
+
+### Deprecated
+* [#1783](https://github.com/shlinkio/shlink/issues/1783) Deprecated support for openswoole. RoadRunner is the best replacement, with the same capabilities, but much easier and convenient to install and manage.
+
+### Removed
+* [#1790](https://github.com/shlinkio/shlink/issues/1790) Drop support for PHP 8.1.
+
+### Fixed
+* [#1819](https://github.com/shlinkio/shlink/issues/1819) Fix incorrect timeout when running DB commands during Shlink start-up.
+* [#1901](https://github.com/shlinkio/shlink/issues/1901) Do not allow short URLs with custom slugs containing URL-reserved characters, as they will not work at all afterward.
+* [#1900](https://github.com/shlinkio/shlink/issues/1900) Fix short URL visits deletion when multi-segment slugs are enabled.
+
+
+## [3.6.4] - 2023-09-23
+### Added
+* *Nothing*
+
+### Changed
+* [#1866](https://github.com/shlinkio/shlink/issues/1866) The `INITIAL_API_KEY` env var is now only relevant for the official docker image.
+
+  Going forward, new non-docker Shlink installations provisioned with env vars that also wish to provide an initial API key, should do it by using the `vendor/bin/shlink-installer init --initial-api-key=%SOME_KEY%` command, instead of using `INITIAL_API_KEY`.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1819](https://github.com/shlinkio/shlink/issues/1819) Fix incorrect timeout when running DB commands during Shlink start-up.
+* [#1870](https://github.com/shlinkio/shlink/issues/1870) Make sure shared locks include the cache prefix when using Redis.
+* [#1866](https://github.com/shlinkio/shlink/issues/1866) Fix error when starting docker image with `INITIAL_API_KEY` env var.
+
+
+## [3.6.3] - 2023-06-14
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1817](https://github.com/shlinkio/shlink/issues/1817) Fix Shlink trying to create SQLite database tables even if they already exist.
+
+
+## [3.6.2] - 2023-06-08
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1808](https://github.com/shlinkio/shlink/issues/1808) Fix `rr` binary downloading during Shlink update.
+
+
+## [3.6.1] - 2023-06-04
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1413](https://github.com/shlinkio/shlink/issues/1413) Fix error when creating initial DB in Postgres in a cluster where a default `postgres` db does not exist or the credentials do not grant permissions to connect.
+* [#1803](https://github.com/shlinkio/shlink/issues/1803) Fix default RoadRunner port when not using docker image.
+
+
+## [3.6.0] - 2023-05-24
+### Added
+* [#1148](https://github.com/shlinkio/shlink/issues/1148) Add support to delete short URL visits.
+
+  This can be done via `DELETE /short-urls/{shortCode}/visits` REST endpoint or via `short-url:visits-delete` console command.
+
+  The CLI command includes a warning and requires the user to confirm before proceeding.
+
+* [#1681](https://github.com/shlinkio/shlink/issues/1681) Add support to delete orphan visits.
+
+  This can be done via `DELETE /visits/orphan` REST endpoint or via `visit:orphan-delete` console command.
+
+  The CLI command includes a warning and requires the user to confirm before proceeding.
+
+* [#1753](https://github.com/shlinkio/shlink/issues/1753) Add a new `vendor/bin/shlink-installer init` command that can be used to automate Shlink installations.
+
+  This command can create the initial database, update it, create proxies, clean cache, download initial GeoLite db files, etc
+
+  The official docker image also uses it on its entry point script.
+
+* [#1656](https://github.com/shlinkio/shlink/issues/1656) Add support for openswoole 22
+* [#1784](https://github.com/shlinkio/shlink/issues/1784) Add new docker tag where the container runs as a non-root user.
+* [#953](https://github.com/shlinkio/shlink/issues/953) Add locks that prevent errors on duplicated keys when creating short URLs in parallel that depend on the same new tag or domain.
+
+### Changed
+* [#1755](https://github.com/shlinkio/shlink/issues/1755) Update to roadrunner 2023
+* [#1745](https://github.com/shlinkio/shlink/issues/1745) Roadrunner is now the default docker runtime.
+
+  There are now three different docker images published:
+
+  * Versions without suffix (like `3.6.0`) will contain the default runtime, whichever it is.
+  * Versions with `-roadrunner` suffix (like `3.6.0-roadrunner`) will always use roadrunner as the runtime, even if default one changes in the future.
+  * Versions with `-openswoole` suffix (like `3.6.0-openswoole`) will always use openswoole as the runtime, even if default one changes in the future.
+
+### Deprecated
+* Deprecated `ENABLE_PERIODIC_VISIT_LOCATE` env var. Use an external mechanism to automate visit locations.
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1760](https://github.com/shlinkio/shlink/issues/1760) Fix domain not being set to null when importing short URLs with default domain.
+* [#953](https://github.com/shlinkio/shlink/issues/953) Fix duplicated key errors and short URL creation failing when creating short URLs in parallel that depend on the same new tag or domain.
+* [#1741](https://github.com/shlinkio/shlink/issues/1741) Fix randomly using 100% CPU in task workers when trying to download GeoLite DB files.
+* Fix Shlink trying to connect to RabbitMQ even if configuration set to not connect.
+
+
+## [3.5.4] - 2023-04-12
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1742](https://github.com/shlinkio/shlink/issues/1742) Fix URLs using schemas which do not contain `//`, like `mailto:`, to no longer be considered valid.
+* [#1743](https://github.com/shlinkio/shlink/issues/1743) Fix Error when trying to create short URLs from CLI on an openswoole context.
+
+  Unfortunately the reason are real-time updates do not work with openswoole when outside an openswoole request, so the feature has been disabled for that context.
+
+
+## [3.5.3] - 2023-03-31
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1715](https://github.com/shlinkio/shlink/issues/1715) Fix short URL creation/edition allowing long URLs without schema. Now a validation error is thrown.
+* [#1537](https://github.com/shlinkio/shlink/issues/1537) Fix incorrect list of tags being returned for some author-only API keys.
+* [#1738](https://github.com/shlinkio/shlink/issues/1738) Fix memory leak when importing short URLs with many visits.
+
+
+## [3.5.2] - 2023-02-16
+### Added
+* *Nothing*
+
+### Changed
+* [#1696](https://github.com/shlinkio/shlink/issues/1696) Migrated to PHPUnit 10.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1698](https://github.com/shlinkio/shlink/issues/1698) Fixed error 500 in `robots.txt`.
+* [#1688](https://github.com/shlinkio/shlink/issues/1688) Fixed huge performance degradation on `/tags/stats` endpoint.
+* [#1693](https://github.com/shlinkio/shlink/issues/1693) Fixed Shlink thinking database already exists if it finds foreign tables.
+
+
+## [3.5.1] - 2023-02-04
+### Added
+* *Nothing*
+
+### Changed
+* [#1685](https://github.com/shlinkio/shlink/issues/1685) Changed `loosely` mode to `loose`, as it was a typo. The old one keeps working and maps to the new one, but it's considered deprecated.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1682](https://github.com/shlinkio/shlink/issues/1682) Fixed incorrect case-insensitive checks in short URLs when using Microsoft SQL server.
+* [#1684](https://github.com/shlinkio/shlink/issues/1684) Fixed entities metadata cache not being cleared at docker container start-up when using redis with replication.
+
+
+## [3.5.0] - 2023-01-28
+### Added
+* [#1557](https://github.com/shlinkio/shlink/issues/1557) Added support to dynamically redirect to different long URLs based on the visitor's device type.
+
+  For the moment, only `android`, `ios` and `desktop` can have their own specific long URL, and when the visitor cannot be matched against any of them, the regular long URL will be used.
+
+  In the future, more granular device types could be added if appropriate (iOS tablet, android table, tablet, mobile phone, Linux, Mac, Windows, etc).
+
+  In order to match the visitor's device, the `User-Agent` header is used.
+
+* [#1632](https://github.com/shlinkio/shlink/issues/1632) Added amount of bots, non-bots and total visits to the visits summary endpoint.
+* [#1633](https://github.com/shlinkio/shlink/issues/1633) Added amount of bots, non-bots and total visits to the tag stats endpoint.
+* [#1653](https://github.com/shlinkio/shlink/issues/1653) Added support for all HTTP methods in short URLs, together with two new redirect status codes, 307 and 308.
+
+  Existing Shlink instances will continue to work the same. However, if you decide to set the redirect status codes as 307 or 308, Shlink will also return a redirect for short URLs even when the request method is different from `GET`.
+
+  The status 308 is equivalent to 301, and 307 is equivalent to 302. The difference is that the spec requires the client to respect the original HTTP method when performing the redirect. With 301 and 302, some old clients might perform a `GET` request during the redirect, regardless the original request method.
+
+* [#1662](https://github.com/shlinkio/shlink/issues/1662) Added support to provide openswoole-specific config options via env vars prefixed with `OPENSWOOLE_`.
+* [#1389](https://github.com/shlinkio/shlink/issues/1389) and [#706](https://github.com/shlinkio/shlink/issues/706) Added support for case-insensitive short URLs.
+
+  In order to achieve this, a new env var/config option has been implemented (`SHORT_URL_MODE`), which allows either `strict` or ~~`loosely`~~ `loose`.
+
+  Default value is `strict`, but if `loose` is provided, then short URLs will be matched in a case-insensitive way, and new short URLs will be generated with short-codes in lowercase only.
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* [#1676](https://github.com/shlinkio/shlink/issues/1676) Deprecated `GET /short-urls/shorten` endpoint. Use `POST /short-urls` to create short URLs instead.
+* [#1678](https://github.com/shlinkio/shlink/issues/1678) Deprecated `validateUrl` option on URL creation/edition.
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1639](https://github.com/shlinkio/shlink/issues/1639) Fixed 500 error returned when request body is not valid JSON, instead of a proper descriptive error.
+
+
+## [3.4.0] - 2022-12-16
+### Added
+* [#1612](https://github.com/shlinkio/shlink/issues/1612) Allowed to filter short URLs out of lists, when `validUntil` date is in the past or have reached their maximum amount of visits.
+
+  This can be done by:
+
+  * Providing `excludeMaxVisitsReached=true` and/or `excludePastValidUntil=true` to the `GET /short-urls` endpoint.
+  * Providing `--exclude-max-visits-reached` and/or `--exclude-past-valid-until` to the `short-urls:list` command.
+
+* [#1613](https://github.com/shlinkio/shlink/issues/1613) Added amount of visits coming from bots, non-bots and total to every short URL in the short URLs list.
+
+  Additionally, added option to order by non-bot visits, by passing `nonBotVisits-DESC` or `nonBotVisits-ASC`.
+
+* [#1599](https://github.com/shlinkio/shlink/issues/1599) Added support for credentials on redis DSNs, either only password, or both username and password.
+* [#1616](https://github.com/shlinkio/shlink/issues/1616) Added support to import orphan visits when importing short URLs from another Shlink instance.
+* [#1519](https://github.com/shlinkio/shlink/issues/1519) Allowing to search short URLs by default domain.
+* [#1555](https://github.com/shlinkio/shlink/issues/1555) and [#1625](https://github.com/shlinkio/shlink/issues/1625) Added full support for PHP 8.2, updating the docker image to this version.
+
+### Changed
+* [#1563](https://github.com/shlinkio/shlink/issues/1563) Moved logic to reuse command options to option classes instead of base abstract command classes.
+* [#1569](https://github.com/shlinkio/shlink/issues/1569) Migrated test doubles from phpspec/prophecy to PHPUnit mocks.
+* [#1329](https://github.com/shlinkio/shlink/issues/1329) Split some logic from `VisitRepository` and `ShortUrlRepository` into separated repository classes.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1618](https://github.com/shlinkio/shlink/issues/1618) Fixed imported short URLs and visits dates not being set to the target server timezone.
+* [#1578](https://github.com/shlinkio/shlink/issues/1578) Fixed short URL allowing an empty string as the domain during creation.
+* [#1580](https://github.com/shlinkio/shlink/issues/1580) Fixed `FLUSHDB` being run on Shlink docker start-up when using redis, causing full cache to be flushed.
+
+
+## [3.3.2] - 2022-10-18
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1576](https://github.com/shlinkio/shlink/issues/1576) Fixed error when trying to retry visits location from CLI.
+
+
+## [3.3.1] - 2022-09-30
+### Added
+* *Nothing*
+
+### Changed
+* [#1474](https://github.com/shlinkio/shlink/issues/1474) Added preliminary support for PHP 8.2 during CI workflow.
+* [#1551](https://github.com/shlinkio/shlink/issues/1551) Moved services related to geolocating visits to the `Visit\Geolocation` namespace.
+* [#1550](https://github.com/shlinkio/shlink/issues/1550) Reorganized main namespaces from Core module.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1556](https://github.com/shlinkio/shlink/issues/1556) Fixed trailing slash not working when enabling multi-segment slashes.
+
+
+## [3.3.0] - 2022-09-18
+### Added
+* [#1221](https://github.com/shlinkio/shlink/issues/1221) Added experimental support to run Shlink with [RoadRunner](https://roadrunner.dev) instead of openswoole.
+* [#1531](https://github.com/shlinkio/shlink/issues/1531) and [#1090](https://github.com/shlinkio/shlink/issues/1090) Added support for trailing slashes in short URLs.
+* [#1406](https://github.com/shlinkio/shlink/issues/1406) Added new REST API version 3.
+
+  When making requests to the REST API with `/rest/v3/...` and an error occurs, all error types will be different, with the next correlation:
+
+  * `INVALID_ARGUMENT` -> `https://shlink.io/api/error/invalid-data`
+  * `INVALID_SHORT_URL_DELETION` -> `https://shlink.io/api/error/invalid-short-url-deletion`
+  * `DOMAIN_NOT_FOUND` -> `https://shlink.io/api/error/domain-not-found`
+  * `FORBIDDEN_OPERATION` -> `https://shlink.io/api/error/forbidden-tag-operation`
+  * `INVALID_URL` -> `https://shlink.io/api/error/invalid-url`
+  * `INVALID_SLUG` -> `https://shlink.io/api/error/non-unique-slug`
+  * `INVALID_SHORTCODE` -> `https://shlink.io/api/error/short-url-not-found`
+  * `TAG_CONFLICT` -> `https://shlink.io/api/error/tag-conflict`
+  * `TAG_NOT_FOUND` -> `https://shlink.io/api/error/tag-not-found`
+  * `MERCURE_NOT_CONFIGURED` -> `https://shlink.io/api/error/mercure-not-configured`
+  * `INVALID_AUTHORIZATION` -> `https://shlink.io/api/error/missing-authentication`
+  * `INVALID_API_KEY` -> `https://shlink.io/api/error/invalid-api-key`
+
+  If you make a request to the API with v2 or v1, the old error types will be returned, until Shlink 4 is released, when only the new ones will be used.
+
+  Non-error responses are not affected.
+
+* [#1513](https://github.com/shlinkio/shlink/issues/1513) Added publishing of the docker image in GHCR.
+* [#1114](https://github.com/shlinkio/shlink/issues/1114) Added support to provide an initial API key via `INITIAL_API_KEY` env var, when running Shlink with openswoole or RoadRunner.
+
+  Also, the installer tool now allows to generate an initial API key that can be copy-pasted (this tool is run interactively), in case you use php-fpm or you don't want to use env vars.
+
+* [#1528](https://github.com/shlinkio/shlink/issues/1528) Added support to delay when the GeoLite2 DB file is downloaded in docker images, speeding up its startup time.
+
+  In order to do it, pass `SKIP_INITIAL_GEOLITE_DOWNLOAD=true` when creating the container.
+
+### Changed
+* [#1339](https://github.com/shlinkio/shlink/issues/1339) Added new test suite for CLI E2E tests.
+* [#1503](https://github.com/shlinkio/shlink/issues/1503) Drastically improved build time in GitHub Actions, by optimizing parallelization and adding php extensions cache.
+* [#1525](https://github.com/shlinkio/shlink/issues/1525) Migrated to custom doctrine CLI entry point.
+* [#1492](https://github.com/shlinkio/shlink/issues/1492) Migrated to immutable options objects, mapped with [cuyz/valinor](https://github.com/CuyZ/Valinor).
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* *Nothing*
+
+
+## [3.2.1] - 2022-08-08
+### Added
+* *Nothing*
+
+### Changed
+* [#1495](https://github.com/shlinkio/shlink/issues/1495) Centralized how routes are configured to support multi-segment slugs.
+* [#1497](https://github.com/shlinkio/shlink/issues/1497) Updated to latest shlink dependencies with support for PHP 8.1 only.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1499](https://github.com/shlinkio/shlink/issues/1499) Fixed loading of config options as env vars, which was making all default configurations to be loaded unless env vars were explicitly provided.
+
+
+## [3.2.0] - 2022-08-05
+### Added
+* [#854](https://github.com/shlinkio/shlink/issues/854) Added support for multi-segment custom slugs.
+
+  The feature is disabled by default, but you can optionally opt in. If you do, you will be able to create short URLs with multiple segments in the custom slug, like `https://example.com/foo/bar/baz`.
+
+* [#1280](https://github.com/shlinkio/shlink/issues/1280) Added missing visit-related commands.
+
+  Now you can run `tag:visits`, `domain:visits`, `visit:orphan` or `visit:non-orphan` to get the corresponding list of visits from the command line.
+
+* [#962](https://github.com/shlinkio/shlink/issues/962) Added new real-time update for new short URLs.
+
+  You can now subscribe to the `https://shlink.io/new-short-url` topic on any of the supported async updates technologies in order to get notified when a short URL is created.
+
+* [#1367](https://github.com/shlinkio/shlink/issues/1367) Added support to publish real-time updates in redis pub/sub.
+
+  The publishing will happen in the same redis instance/cluster configured for caching.
+
+### Changed
+* [#1452](https://github.com/shlinkio/shlink/issues/1452) Updated to monolog 3
+* [#1485](https://github.com/shlinkio/shlink/issues/1485) Changed payload published in RabbitMQ for all visits events, in order to conform with the Async API spec.
+
+  Since this is a breaking change, also provided a new `RABBITMQ_LEGACY_VISITS_PUBLISHING=true` env var that can be provided in order to keep the old payload.
+
+  This env var is considered deprecated and will be removed in Shlink 4, when the legacy format will no longer be supported.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* [#1280](https://github.com/shlinkio/shlink/issues/1280) Dropped support for PHP 8.0
+
+### Fixed
+* [#1471](https://github.com/shlinkio/shlink/issues/1471) Fixed error when running `visit:locate` command with any extra parameter (like `--retry`).
+
+
+## [3.1.2] - 2022-06-04
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1448](https://github.com/shlinkio/shlink/issues/1448) Fixed HTML entities not being properly parsed when auto-resolving page titles.
+* [#1458](https://github.com/shlinkio/shlink/issues/1458) Fixed 500 error when filtering short URLs by ALL tags and search term.
+
+
+## [3.1.1] - 2022-05-09
+### Added
+* *Nothing*
+
+### Changed
+* [#1444](https://github.com/shlinkio/shlink/issues/1444) Updated docker image to openswoole 4.11.1, in an attempt to fix error.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1439](https://github.com/shlinkio/shlink/issues/1439) Fixed crash when trying to auto-resolve titles for URLs which serve large binary files.
+
+
+## [3.1.0] - 2022-04-23
+### Added
+* [#1294](https://github.com/shlinkio/shlink/issues/1294) Allowed to provide a specific domain when importing URLs from YOURLS.
+* [#1416](https://github.com/shlinkio/shlink/issues/1416) Added support to import URLs from Kutt.it.
+* [#1418](https://github.com/shlinkio/shlink/issues/1418) Added support to customize the timezone used by Shlink, falling back to the default one set in PHP config.
+
+  The timezone can be set via the `TIMEZONE` env var, or using the installer tool.
+
+* [#1309](https://github.com/shlinkio/shlink/issues/1309) Improved URL importing, ensuring individual errors do not make the whole process fail, and instead, failing URLs are skipped.
+* [#1162](https://github.com/shlinkio/shlink/issues/1162) Added new endpoint to get visits by domain.
+
+  The endpoint is `GET /domains/{domain}/visits`, and it has the same capabilities as any other visits endpoint, allowing pagination and filtering.
+
+### Changed
+* [#1359](https://github.com/shlinkio/shlink/issues/1359) Hidden database commands.
+* [#1385](https://github.com/shlinkio/shlink/issues/1385) Prevented a big error message from being logged when using Shlink without mercure.
+* [#1398](https://github.com/shlinkio/shlink/issues/1398) Increased required mutation score for unit tests to 85%.
+* [#1419](https://github.com/shlinkio/shlink/issues/1419) Input dates are now parsed to Shlink's configured timezone or default timezone before using them for database queries.
+* [#1428](https://github.com/shlinkio/shlink/issues/1428) Updated native dependencies in docker image and base image to PHP v8.1.5.
+
+### Deprecated
+* [#1340](https://github.com/shlinkio/shlink/issues/1340) Deprecated webhooks. New events will only be added to other real-time updates approaches, and webhooks will be completely removed in Shlink 4.0.0.
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1397](https://github.com/shlinkio/shlink/issues/1397) Fixed `db:create` command always reporting the schema exists if the `db:migrate` command has been run before by mistake.
+* [#1402](https://github.com/shlinkio/shlink/issues/1402) Fixed the base path getting appended with the default domain by mistake, causing multiple side effects in several places.
+
+
+## [3.0.3] - 2022-02-19
+### Added
+* *Nothing*
+
+### Changed
+* [#1382](https://github.com/shlinkio/shlink/issues/1382) Updated docker image to PHP 8.1.3.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1377](https://github.com/shlinkio/shlink/issues/1377) Fixed installer always setting delete threshold with value 1.
+* [#1379](https://github.com/shlinkio/shlink/issues/1379) Ensured API keys cannot be created with a domain-only role linked to default domain.
+
+
+## [3.0.2] - 2022-02-10
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1373](https://github.com/shlinkio/shlink/issues/1373) Fixed incorrect config import when updating from Shlink 2.x using SQLite.
+* [#1369](https://github.com/shlinkio/shlink/issues/1369) Fixed slow regexps in `.htaccess` file.
+
+
+## [3.0.1] - 2022-02-04
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1363](https://github.com/shlinkio/shlink/issues/1363) Fixed titles being resolved no matter what when `validateUrl` is not set or is explicitly set to true.
+* [#1352](https://github.com/shlinkio/shlink/issues/1352) Updated to stable pdo_sqlsrv in docker image.
+
+
+## [3.0.0] - 2022-01-28
+### Added
+* [#767](https://github.com/shlinkio/shlink/issues/767) Added full support to use emojis everywhere, whether it is custom slugs, titles, referrers, etc.
+* [#1274](https://github.com/shlinkio/shlink/issues/1274) Added support to filter short URLs lists by all provided tags.
+
+  The `GET /short-urls` endpoint now accepts a `tagsMode=all` param which will make only short URLs matching **all** the tags in the `tags[]` query param, to be returned.
+
+  The `short-urls:list` command now accepts a `-i`/`--including-all-tags` flag which behaves the same.
+
+* [#1273](https://github.com/shlinkio/shlink/issues/1273) Added support for pagination in tags lists, allowing to improve performance by loading subsets of tags.
+
+  For backwards compatibility, lists continue returning all items by default, but the `GET /tags` endpoint now supports `page` and `itemsPerPage` query params, to make sure only a subset of the tags is returned.
+
+  This is supported both when invoking the endpoint with and without `withStats=true` query param.
+
+  Additionally, the endpoint also supports filtering by `searchTerm` query param. When provided, only tags matching it will be returned.
+
+* [#1063](https://github.com/shlinkio/shlink/issues/1063) Added new endpoint that allows fetching all existing non-orphan visits, in case you need a global view of all visits received by your Shlink instance.
+
+  This can be achieved using the `GET /visits/non-orphan` endpoint.
+
+### Changed
+* [#1277](https://github.com/shlinkio/shlink/issues/1277) Reduced docker image size to 45% of the original size.
+* [#1268](https://github.com/shlinkio/shlink/issues/1268) Updated dependencies, including symfony/console 6 and mezzio/mezzio-swoole 4.
+* [#1283](https://github.com/shlinkio/shlink/issues/1283) Changed behavior of `DELETE_SHORT_URL_THRESHOLD` env var, disabling the feature if a value was not provided.
+* [#1300](https://github.com/shlinkio/shlink/issues/1300) Changed default ordering for short URLs list, returning always from newest to oldest.
+* [#1299](https://github.com/shlinkio/shlink/issues/1299) Updated to the latest base docker images, based in PHP 8.1.1, and bumped openswoole to v4.9.1.
+* [#1282](https://github.com/shlinkio/shlink/issues/1282) Env vars now have precedence over installer options.
+* [#1328](https://github.com/shlinkio/shlink/issues/1328) Refactored ShortUrlsRepository to use DTOs in methods with too many arguments.
+
+### Deprecated
+* [#1315](https://github.com/shlinkio/shlink/issues/1315) Deprecated `GET /tags?withStats=true` endpoint. Use `GET /tags/stats` instead.
+
+### Removed
+* [#1275](https://github.com/shlinkio/shlink/issues/1275) Removed everything that was deprecated in Shlink 2.x.
+
+  See [UPGRADE](UPGRADE.md#from-v2x-to-v3x) doc in order to get details on how to migrate to this version.
+
+* [#1347](https://github.com/shlinkio/shlink/issues/1347) Dropped support for regular swoole in favor of openswoole.
+
+  Since openswoole support was introduced in the previous release version, Shlink will still consider the swoole extension as openswoole, as at the moment, functionality hasn't deviated too much, and will simplify migrating to Shlink 3.0.0
+
+  However, there's no longer active testing with regular swoole, and it is considered no longer supported. If some incompatibility arises, the only supported solution will be to migrate to openswoole.
+
+### Fixed
+* *Nothing*
+
+
+## [2.10.3] - 2022-01-23
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1349](https://github.com/shlinkio/shlink/issues/1349) Fixed memory leak in cache implementation.
+
+
+## [2.10.2] - 2022-01-07
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1293](https://github.com/shlinkio/shlink/issues/1293) Fixed error when trying to create/import short URLs with a too long title.
+* [#1306](https://github.com/shlinkio/shlink/issues/1306) Ensured remote IP address is not logged when using swoole/openswoole.
+* [#1308](https://github.com/shlinkio/shlink/issues/1308) Fixed memory leak when using redis due to the amount of non-expiring keys created by doctrine. Now they have a 24h expiration by default.
+
+
 ## [2.10.1] - 2021-12-21
 ### Added
 * *Nothing*
@@ -401,7 +1102,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 * *Nothing*
 
 ### Fixed
-* [#979](https://github.com/shlinkio/shlink/issues/979) Added missing `itemsPerPage` query param to swagger docs for short RULs list.
+* [#979](https://github.com/shlinkio/shlink/issues/979) Added missing `itemsPerPage` query param to swagger docs for short URLs list.
 * [#980](https://github.com/shlinkio/shlink/issues/980) Fixed value used for `Access-Control-Allow-Origin`, that could not work as expected when including an IP address.
 * [#947](https://github.com/shlinkio/shlink/issues/947) Fixed incorrect value returned in `Access-Control-Allow-Methods` header, which always contained all methods.
 
@@ -870,7 +1571,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
     * Preview generation feature completely removed.
     * Authentication against REST API using JWT is no longer supported.
 
-    See [UPGRADE](UPGRADE.md) doc in order to get details on how to migrate to this version.
+    See [UPGRADE](UPGRADE.md#from-v1x-to-v2x) doc in order to get details on how to migrate to this version.
 
 ### Fixed
 * [#600](https://github.com/shlinkio/shlink/issues/600) Fixed health action so that it works with and without version in the path.
@@ -1049,7 +1750,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
     Endpoints and commands which create short URLs support providing the `domain` now (via query param or CLI flag). If not provided, the short URLs will still be "attached" to the default domain.
 
-    Custom slugs can be created on multiple domains, allowing to share links like `https://doma.in/my-compaign` and `https://example.com/my-campaign`, under the same shlink instance.
+    Custom slugs can be created on multiple domains, allowing to share links like `https://s.test/my-campaign` and `https://example.com/my-campaign`, under the same shlink instance.
 
     When resolving a short URL to redirect end users, the following rules are applied:
 
@@ -1299,7 +2000,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 ### Fixed
 * [#309](https://github.com/shlinkio/shlink/issues/309) Added missing favicon to prevent 404 errors logged when an error page is loaded in a browser.
-* [#310](https://github.com/shlinkio/shlink/issues/310) Fixed execution context not being properly detected, making `CloseDbConnectionMiddlware` to be always piped. Now the check is not even made, which simplifies everything.
+* [#310](https://github.com/shlinkio/shlink/issues/310) Fixed execution context not being properly detected, making `CloseDbConnectionMiddleware` to be always piped. Now the check is not even made, which simplifies everything.
 
 
 ## [1.15.0] - 2018-12-02
@@ -1364,7 +2065,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 ### Changed
 * [#241](https://github.com/shlinkio/shlink/issues/241) Fixed columns in `visit_locations` table, to be snake_case instead of camelCase.
-* [#228](https://github.com/shlinkio/shlink/issues/228) Updated how exceptions are serialized into logs, by using monlog's `PsrLogMessageProcessor`.
+* [#228](https://github.com/shlinkio/shlink/issues/228) Updated how exceptions are serialized into logs, by using monolog's `PsrLogMessageProcessor`.
 * [#225](https://github.com/shlinkio/shlink/issues/225) Performance and maintainability slightly improved by enforcing via code sniffer that all global namespace classes, functions and constants are explicitly imported.
 * [#196](https://github.com/shlinkio/shlink/issues/196) Reduced anemic model in entities, defining more expressive public APIs instead.
 * [#249](https://github.com/shlinkio/shlink/issues/249) Added [functional-php](https://github.com/lstrojny/functional-php) to ease collections handling.
@@ -1512,7 +2213,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
     ```json
     {
         "shortCode": "12Kb3",
-        "shortUrl": "https://doma.in/12Kb3",
+        "shortUrl": "https://s.test/12Kb3",
         "longUrl": "https://shlink.io",
         "dateCreated": "2016-05-01T20:34:16+02:00",
         "visitsCount": 1029,
@@ -1579,7 +2280,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 * [#174](https://github.com/shlinkio/shlink/issues/174) Fixed geolocation not working due to a deprecation on used service.
 * [#172](https://github.com/shlinkio/shlink/issues/172) Documented missing filtering params for `[GET] /short-codes/{shortCode}/visits` API endpoint, which allow the list to be filtered by date range.
 
-    For example: `https://doma.in/rest/v1/short-urls/abc123/visits?startDate=2017-05-23&endDate=2017-10-05`
+    For example: `https://s.test/rest/v1/short-urls/abc123/visits?startDate=2017-05-23&endDate=2017-10-05`
 
 * [#169](https://github.com/shlinkio/shlink/issues/169) Fixed unhandled error when parsing `ShortUrlMeta` and date fields are already `DateTime` instances.
 
@@ -1651,7 +2352,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
     This eases integration with third party services.
     
-    With this feature, a simple request to a URL like `https://doma.in/rest/v1/short-codes/shorten?apiKey=[YOUR_API_KEY]&longUrl=[URL_TO_BE_SHORTENED]` would return the shortened one in JSON or plain text format.
+    With this feature, a simple request to a URL like `https://s.test/rest/v1/short-codes/shorten?apiKey=[YOUR_API_KEY]&longUrl=[URL_TO_BE_SHORTENED]` would return the shortened one in JSON or plain text format.
 
 ### Changed
 * *Nothing*
@@ -1687,7 +2388,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 ### Added
 * [#125](https://github.com/shlinkio/shlink/issues/125) Implemented a path which returns a 1px image instead of a redirection.
 
-    Useful to track emails. Just add an image pointing to a URL like `https://doma.in/abc123/track` to any email and an invisible image will be generated tracking every time the email is opened.
+    Useful to track emails. Just add an image pointing to a URL like `https://s.test/abc123/track` to any email and an invisible image will be generated tracking every time the email is opened.
 
 * [#132](https://github.com/shlinkio/shlink/issues/132) Added infection to improve tests
 
@@ -1968,7 +2669,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 ### Added
 * [#46](https://github.com/shlinkio/shlink/issues/46) Defined a route that returns a QR code representing the shortened URL.
 
-    In order to get the QR code URL, use a pattern like `https://doma.in/abc123/qr-code`
+    In order to get the QR code URL, use a pattern like `https://s.test/abc123/qr-code`
 
 * [#32](https://github.com/shlinkio/shlink/issues/32) Added support for other cache adapters by improving the Cache factory
 * [#14](https://github.com/shlinkio/shlink/issues/14) Added logger and enabled errors logging

CONTRIBUTING.md

@@ -6,9 +6,9 @@ You will also see how to ensure the code fulfills the expected code checks, and
 
 ## System dependencies
 
-The project provides all its dependencies as docker containers through a docker-compose configuration.
+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/).
+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
 
@@ -21,7 +21,7 @@ Then you will have to follow these steps:
     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`.
+* 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.
 
@@ -31,7 +31,7 @@ Then you will have to follow these steps:
 * 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.
+Once you finish this, you will have the project exposed in ports `8800` through RoadRunner, `8080` through openswoole and `8000` through nginx+php-fpm.
 
 > Note: The `indocker` shell script is a helper tool used to run commands inside the main docker container.
 
@@ -46,9 +46,7 @@ This is a simplified version of the project structure:
 ```
 shlink
 ├── bin
-│   ├── cli
-│   ├── install
-│   └── update
+│   └── cli
 ├── config
 │   ├── autoload
 │   ├── params
@@ -75,12 +73,12 @@ shlink
 
 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.
+* `bin`: It contains the CLI tools. The `cli` one is the main entry point to run Shlink from the command line.
 * `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.
+* `module`: Contains a sub-folder 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 RoadRunner or openswoole.
 
 ## Project tests
 
@@ -96,7 +94,7 @@ In order to ensure stability and no regressions are introduced while developing
 
     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.
+* **API tests**: These are E2E tests that spin up an instance of the app with RoadRunner or openswoole, 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.
 
@@ -104,7 +102,9 @@ In order to ensure stability and no regressions are introduced while developing
 
     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*
+* **CLI tests**: These are E2E tests too, but they test console commands instead of REST endpoints.
+
+    They use Maria DB as the database engine, and include the same fixtures as the API tests, that ensure the same data exists at the beginning of the execution.
 
 Depending on the kind of contribution, maybe not all kinds of tests are needed, but the more you provide, the better.
 
@@ -121,15 +121,15 @@ Depending on the kind of contribution, maybe not all kinds of tests are needed,
     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 test:cli` to run CLI E2E tests. For these, the Maria DB 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.
+* Run `./indocker composer ci` to run all previous commands together, 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.
+## Testing endpoints
+
+The project provides a Swagger UI container for dev envs, which can be accessed in http://localhost:8005.
+
+It will automatically load the contents of `docs/swagger`, so you can make any updates and they will get reflected.
 
 ## Pull request process
 
@@ -141,7 +141,7 @@ Once everything is clear, to provide a pull request to this project, you should
 
 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.
+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`, or wait for the build to be run automatically after the pull request is created.
 
 ## Architectural Decision Records
 

Dockerfile

@@ -1,58 +1,60 @@
-FROM php:8.1.0-alpine3.15 as base
+FROM php:8.2-alpine3.17 as base
 
 ARG SHLINK_VERSION=latest
 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"
+ARG SHLINK_RUNTIME=rr
+ENV SHLINK_RUNTIME ${SHLINK_RUNTIME}
+ARG SHLINK_USER_ID='root'
+ENV SHLINK_USER_ID ${SHLINK_USER_ID}
+
+ENV OPENSWOOLE_VERSION 22.1.0
+ENV PDO_SQLSRV_VERSION 5.11.1
+ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
+ENV MS_ODBC_SQL_VERSION 18_18.1.1.1
+ENV LC_ALL 'C'
 
 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 sqlite
-    apk add --no-cache sqlite-libs sqlite-dev && \
+    # Temp install dev dependencies needed to compile the extensions
+    apk add --no-cache --virtual .dev-deps sqlite-dev postgresql-dev icu-dev libzip-dev zlib-dev libpng-dev linux-headers && \
+    docker-php-ext-install -j"$(nproc)" pdo_mysql pdo_pgsql intl calendar sockets bcmath zip gd && \
+    apk add --no-cache sqlite-libs && \
     docker-php-ext-install -j"$(nproc)" pdo_sqlite && \
-    # Install postgres
-    apk add --no-cache postgresql-dev && \
-    docker-php-ext-install -j"$(nproc)" pdo_pgsql && \
-    # Install intl
-    apk add --no-cache icu-dev && \
-    docker-php-ext-install -j"$(nproc)" intl && \
-    # Install zip and gd
-    apk add --no-cache libzip-dev zlib-dev libpng-dev && \
-    docker-php-ext-install -j"$(nproc)" zip gd && \
-    # Install gmp
-    apk add --no-cache gmp-dev && \
-    docker-php-ext-install -j"$(nproc)" gmp
+    # Remove temp dev extensions, and install prod equivalents that are required at runtime
+    apk del .dev-deps && \
+    apk add --no-cache postgresql icu libzip libpng
 
-# 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 && \
+# Install openswoole and sqlsrv driver for x86_64 builds
+RUN apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} unixodbc-dev && \
+    if [ "$SHLINK_RUNTIME" == 'openswoole' ]; then \
+        # Openswoole is deprecated. Remove in v4.0.0
+        pecl install openswoole-${OPENSWOOLE_VERSION} && \
+        docker-php-ext-enable openswoole ; \
+    fi; \
+    if [ $(uname -m) == "x86_64" ]; then \
+      wget https://download.microsoft.com/download/${MS_ODBC_DOWNLOAD}/msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
+      apk add --allow-untrusted msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
       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
-RUN apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} && \
-    pecl install openswoole-${OPENSWOOLE_VERSION} && \
-    docker-php-ext-enable openswoole && \
+      rm msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk ; \
+    fi; \
     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 && \
-    php composer.phar install --no-dev --optimize-autoloader --prefer-dist --no-progress --no-interaction && \
+    # FIXME Ignoring ext-openswoole platform req, as it makes install fail with roadrunner, even though it's a dev dependency and we are passing --no-dev
+    php composer.phar install --no-dev --prefer-dist --optimize-autoloader --no-progress --no-interaction --ignore-platform-req=ext-openswoole && \
+    if [ "$SHLINK_RUNTIME" == 'openswoole' ]; then \
+        # Openswoole is deprecated. Remove in v4.0.0
+        php composer.phar remove spiral/roadrunner spiral/roadrunner-jobs spiral/roadrunner-cli spiral/roadrunner-http --with-all-dependencies --update-no-dev --optimize-autoloader --no-progress --no-interaction ; \
+    elif [ "$SHLINK_RUNTIME" == 'rr' ]; then \
+        php composer.phar remove mezzio/mezzio-swoole --with-all-dependencies --update-no-dev --optimize-autoloader --no-progress --no-interaction --ignore-platform-req=ext-openswoole ; \
+    fi; \
     php composer.phar clear-cache && \
     rm -r docker composer.* && \
     sed -i "s/%SHLINK_VERSION%/${SHLINK_VERSION}/g" config/autoload/app_options.global.php
@@ -62,10 +64,13 @@ RUN apk add --no-cache git && \
 FROM base
 LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
 
-COPY --from=builder /etc/shlink .
-RUN ln -s /etc/shlink/bin/cli /usr/local/bin/shlink
+COPY --from=builder --chown=${SHLINK_USER_ID} /etc/shlink .
+RUN ln -s /etc/shlink/bin/cli /usr/local/bin/shlink && \
+    if [ "$SHLINK_RUNTIME" == 'rr' ]; then \
+      php ./vendor/bin/rr get --no-interaction --no-config --location bin/ && chmod +x bin/rr ; \
+    fi;
 
-# Expose default openswoole port
+# Expose default port
 EXPOSE 8080
 
 # Copy config specific for the image
@@ -73,14 +78,6 @@ 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
+USER ${SHLINK_USER_ID}
 
 ENTRYPOINT ["/bin/sh", "./docker-entrypoint.sh"]

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2021 Alejandro Celaya
+Copyright (c) 2016-2023 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,20 +1,22 @@
 ![Shlink](https://raw.githubusercontent.com/shlinkio/shlink.io/main/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)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/shlinkio/shlink/ci.yml?branch=develop&logo=github&style=flat-square)](https://github.com/shlinkio/shlink/actions/workflows/ci.yml?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)
 [![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)
+[![Twitter](https://img.shields.io/badge/follow-shlinkio-blue.svg?style=flat-square&logo=x&color=black)](https://twitter.com/shlinkio)
+[![Mastodon](https://img.shields.io/mastodon/follow/109329425426175098?color=%236364ff&domain=https%3A%2F%2Ffosstodon.org&label=follow&logo=mastodon&logoColor=white&style=flat-square)](https://fosstodon.org/@shlinkio)
 [![Paypal donate](https://img.shields.io/badge/Donate-paypal-blue.svg?style=flat-square&logo=paypal&colorA=aaaaaa)](https://slnk.to/donate)
 
-A PHP-based self-hosted URL shortener that can be used to serve shortened URLs under your own custom domain.
+A PHP-based self-hosted URL shortener that can be used to serve shortened URLs under your own domain.
 
 ## Table of Contents
 
 - [Full documentation](#full-documentation)
 - [Docker image](#docker-image)
-- [Self hosted](#self-hosted)
+- [Self-hosted](#self-hosted)
     - [Download](#download)
     - [Configure](#configure)
 - [Using shlink](#using-shlink)
@@ -26,21 +28,22 @@ This document contains the very basics to get started with Shlink. If you want t
 
 ## 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/).
+You can learn how to use the official docker image 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
+## Self-hosted
 
 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.
+* PHP 8.2 or 8.3
+* The next PHP extensions: json, curl, pdo, intl, gd and gmp/bcmath.
+    * apcu extension is recommended if you don't plan to use 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.
-* The web server of your choice with PHP integration (Apache or Nginx recommended).
+* MySQL, MariaDB, PostgreSQL, MicrosoftSQL or SQLite.
+    * You will also need the corresponding pdo variation for the database you are planning to use: `pdo_mysql`, `pdo_pgsql`, `pdo_sqlsrv` or `pdo_sqlite`.
+* The [openswoole](https://openswoole.com/) PHP extension (if you plan to serve Shlink with openswoole) or the web server of your choice with PHP integration (like Apache or Nginx).
 
 ### Download
 
@@ -50,7 +53,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*_dist.zip` file that suits your needs. You will find one for every supported PHP version and with/without openswoole integration.
 
     Finally, decompress the file in the location of your choice.
 
@@ -60,11 +63,13 @@ 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 3.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).
 
     After that, you will have a dist file inside the `build` directory, that you need to decompress in the location of 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.
+    > **Note**
+    >
+    > 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.
 
 ### Configure
 
@@ -72,24 +77,24 @@ Despite how you built the project, you now need to configure it, by following th
 
 * If you are going to use MySQL, MariaDB, PostgreSQL or Microsoft SQL Server, 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.
+* Set up the application by running the `vendor/bin/shlink-installer 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.
 
 ## Using shlink
 
 Once shlink is installed, there are two main ways to interact with it:
 
-* **The command line**. Try running `bin/cli` and see all the [available commands](#shlink-cli-help).
+* **The command line**: Try running `bin/cli` to see all the available commands.
 
-    All of those commands can be run with the `--help`/`-h` flag in order to see how to use them and all the available options.
+    All of them can be run with the `--help`/`-h` flag in order to see how to use them and all the available options.
 
     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/documentation/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.
 
-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.
+Both the API and CLI allow you to do mostly the same operations, except for API key management, which can be done from the command line interface only.
 
 ## Contributing
 

UPGRADE.md

@@ -1,5 +1,53 @@
 # Upgrading
 
+## From v2.x to v3.x
+
+### Changes in REST API
+
+* The `type` property returned when trying to delete a URL that reached the visits threshold, when using the `DELETE /short-urls/{shortCode}` endpoint, is now `INVALID_SHORT_URL_DELETION` instead of `INVALID_SHORTCODE_DELETION`.
+* The `INVALID_AUTHORIZATION` error no longer includes the `expectedTypes` property. Use `expectedHeaders` one instead.
+* The `GET /rest/v2/short-urls` endpoint no longer allows ordering by `visitsCount`, `visitCount` or `originalUrl`. Use `visits` instead of the first two, and `longUrl` instead of the last one.
+* The `GET /rest/v2/short-urls` endpoint no longer allows providing the ordering params with array notation, as in `/shortUrls?orderBy[longUrl]=DESC`. Instead, use the following notation `/shortUrls?orderBy=longUrl-DESC`.
+* The `GET /rest/v2/short-urls` endpoint now has a default ordering of newest-to-oldest. Use `/shortUrls?orderBy=dateCreated-ASC` in order to keep the oldest-to-newest behavior.
+* Requests expecting a body no longer support url-encoded payloads. Instead, always use JSON bodies with `Content-Type: application/json`.
+* The next endpoints have been removed:
+  * `PUT /rest/v2/short-urls/{shortCode}/tags`: Use the `PATCH /rest/v2/short-urls/{shortCode}` endpoint to set the short URL tags.
+  * `POST /rest/v2/tags`: Use `POST /rest/v2/short-urls` or `PATCH /rest/v2/short-urls/{shortCodes}` to create new tags already attached to a short URL. Creating orphan tags makes no sense.
+
+### Changes in CLI
+
+* The next commands have been removed:
+  * `short-url:generate`: Use `short-url:create` instead.
+  * `tag:create`: Creating orphan tags makes no sense.
+* Params in camelCase format are no longer supported. They all have an equivalent kebab-case replacement. (for example, from `--startDate` to `--start-date`).
+* The `short-url:create` command no longer accepts the `--no-validate-url` flag. Now URLs are never validated, unless `--validate-url` is passed.
+* The CLI installer tool entry-points have changed.
+  * `bin/install`: replaced by `vendor/bin/shlink-installer install`
+  * `bin/update`: replaced by `vendor/bin/shlink-installer update`
+  * `bin/set-option`: replaced by `vendor/bin/shlink-installer set-option`
+
+### Changes in config
+
+* The next env vars have been removed:
+  * `INVALID_SHORT_URL_REDIRECT_TO`: Replaced by `DEFAULT_INVALID_SHORT_URL_REDIRECT`.
+  * `REGULAR_404_REDIRECT_TO`: Replaced by `DEFAULT_REGULAR_404_REDIRECT`.
+  * `BASE_URL_REDIRECT_TO`: Replaced by `DEFAULT_BASE_URL_REDIRECT`.
+  * `SHORT_DOMAIN_HOST`: Replaced by `DEFAULT_DOMAIN`.
+  * `SHORT_DOMAIN_SCHEMA`: Replaced by `IS_HTTPS_ENABLED`.
+  * `USE_HTTPS`: Replaced by `IS_HTTPS_ENABLED`.
+  * `VALIDATE_URLS`: There's no replacement. URLs are not validated, unless explicitly requested during creation or edition.
+* The next env vars behavior has changed:
+  * `DELETE_SHORT_URL_THRESHOLD`: Now, if this env var is not provided, the "visits threshold" won't be checked at all when deleting short URLs. Make sure you explicitly provide a value if you want to enable this feature.
+* Environment variables now have precedence over configuration set via the installer tool.
+
+### Other changes
+
+* A default GeoLite2 license key is no longer provided. If you don't provide your own as explained in [the docs](https://shlink.io/documentation/geolite-license-key/), Shlink will not try to update the file anymore.
+* The docker image no longer accepts providing configuration via json files mounted in the `config/params` folder. Only env vars are supported now.
+* If you were manually serving Shlink with swoole, the entry script has to be changed from `/path/to/shlink/vendor/bin/mezzio-swoole start` to `/path/to/shlink/vendor/bin/laminas mezzio:swoole:start`
+* The `GET /{shortCode}/qr-code/{size}` url has been removed. Use `GET /{shortCode}/qr-code?size={size}` instead.
+* Regular swoole extension is no longer supported. Use openswoole instead, as a direct replacement. In most of the cases you just need to uninstall one and install the other, the rest is transparent.
+
 ## From v1.x to v2.x
 
 ### PHP 7.4 required
@@ -28,7 +76,7 @@ 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.
+When using the old ones, a 404 status will be returned now.
 
 ### Removed command and route aliases
 

bin/doctrine

@@ -0,0 +1,12 @@
+#!/usr/bin/env php
+<?php
+
+declare(strict_types=1);
+
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Tools\Console\ConsoleRunner;
+use Doctrine\ORM\Tools\Console\EntityManagerProvider\SingleManagerProvider;
+
+/** @var EntityManager $app */
+$em = require __DIR__ . '/../config/entity-manager.php';
+ConsoleRunner::run(new SingleManagerProvider($em));

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

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

bin/roadrunner-worker.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+use Mezzio\Application;
+use Psr\Container\ContainerInterface;
+use Shlinkio\Shlink\EventDispatcher\RoadRunner\RoadRunnerTaskConsumerToListener;
+use Spiral\RoadRunner\Http\PSR7Worker;
+
+use function Shlinkio\Shlink\Config\env;
+
+(static function (): void {
+    /** @var ContainerInterface $container */
+    $container = include __DIR__ . '/../config/container.php';
+    $rrMode = env('RR_MODE');
+
+    if ($rrMode === 'http') {
+        // This was spin-up as a web worker
+        $app = $container->get(Application::class);
+        $worker = $container->get(PSR7Worker::class);
+
+        while ($req = $worker->waitRequest()) {
+            try {
+                $worker->respond($app->handle($req));
+            } catch (Throwable $e) {
+                $worker->getWorker()->error((string) $e);
+            }
+        }
+    } else {
+        $container->get(RoadRunnerTaskConsumerToListener::class)->listenForTasks();
+    }
+})();

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,38 @@
 #!/usr/bin/env sh
-export APP_ENV=test
-export DB_DRIVER=postgres
-export TEST_ENV=api
-export GENERATE_COVERAGE=${GENERATE_COVERAGE:-"no"}
 
+export APP_ENV=test
+export TEST_ENV=api
+export TEST_RUNTIME="${TEST_RUNTIME:-"openswoole"}" # Openswoole is deprecated. Remove in v4.0.0
+export DB_DRIVER="${DB_DRIVER:-"postgres"}"
+export GENERATE_COVERAGE="${GENERATE_COVERAGE:-"no"}"
+
+# Reset logs
+OUTPUT_LOGS=data/log/api-tests/output.log
 rm -rf data/log/api-tests
+mkdir data/log/api-tests
+touch $OUTPUT_LOGS
 
 # Try to stop server just in case it hanged in last execution
-vendor/bin/laminas mezzio:swoole:stop
+[ "$TEST_RUNTIME" = 'openswoole' ] && vendor/bin/laminas mezzio:swoole:stop
+[ "$TEST_RUNTIME" = 'rr' ] && bin/rr stop -f
 
 echo 'Starting server...'
-vendor/bin/laminas mezzio:swoole:start -d
-sleep 2
+[ "$TEST_RUNTIME" = 'openswoole' ] && vendor/bin/laminas mezzio:swoole:start -d
+[ "$TEST_RUNTIME" = 'rr' ] && bin/rr serve -p -c=config/roadrunner/.rr.dev.yml \
+  -o=http.address=0.0.0.0:9999 \
+  -o=logs.encoding=json \
+  -o=logs.channels.http.encoding=json \
+  -o=logs.channels.server.encoding=json \
+  -o=logs.output="${PWD}/${OUTPUT_LOGS}" \
+  -o=logs.channels.http.output="${PWD}/${OUTPUT_LOGS}" \
+  -o=logs.channels.server.output="${PWD}/${OUTPUT_LOGS}" &
+sleep 2 # Let's give the server a couple of seconds to start
 
 vendor/bin/phpunit --order-by=random -c phpunit-api.xml --testdox --colors=always --log-junit=build/coverage-api/junit.xml $*
 testsExitCode=$?
 
-vendor/bin/laminas mezzio:swoole:stop
+[ "$TEST_RUNTIME" = 'openswoole' ] && vendor/bin/laminas mezzio:swoole:stop
+[ "$TEST_RUNTIME" = 'rr' ] && bin/rr stop -c config/roadrunner/.rr.dev.yml -o=http.address=0.0.0.0:9999
 
 # Exit this script with the same code as the tests. If tests failed, this script has to fail
 exit $testsExitCode

bin/update

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

build.sh

@@ -10,7 +10,8 @@ fi
 version=$1
 noSwoole=$2
 phpVersion=$(php -r 'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION;')
-[[ $noSwoole ]] && swooleSuffix="" || swooleSuffix="_swoole"
+# Openswoole is deprecated. Remove in v4.0.0
+[[ $noSwoole ]] && swooleSuffix="" || swooleSuffix="_openswoole"
 distId="shlink${version}_php${phpVersion}${swooleSuffix}_dist"
 builtContent="./build/${distId}"
 projectdir=$(pwd)
@@ -24,28 +25,31 @@ rsync -av * "${builtContent}" \
     --exclude=*docker* \
     --exclude=Dockerfile \
     --include=.htaccess \
+    --include=config/roadrunner/.rr.yml \
     --exclude-from=./.dockerignore
 cd "${builtContent}"
 
 # Install dependencies
 echo "Installing dependencies with $composerBin..."
-composerFlags="--optimize-autoloader --no-progress --no-interaction"
+# Deprecated. Do not ignore PHP platform req for Shlink v4.0.0
+composerFlags="--optimize-autoloader --no-progress --no-interaction --ignore-platform-req=php+"
 ${composerBin} self-update
 ${composerBin} install --no-dev --prefer-dist $composerFlags
 
 if [[ $noSwoole ]]; then
-  # If generating a dist not for swoole, uninstall mezzio-swoole
+  # If generating a dist not for openswoole, 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"
+  # Deprecated. Remove in Shlink v4.0.0
+  # If generating a dist for openswoole, uninstall RoadRunner
+  ${composerBin} remove spiral/roadrunner spiral/roadrunner-jobs spiral/roadrunner-cli spiral/roadrunner-http --with-all-dependencies --update-no-dev $composerFlags
 fi
 
 # Delete development files
 echo 'Deleting dev files...'
 rm composer.*
 
-# Update shlink version in config
+# Update Shlink version in config
 sed -i "s/%SHLINK_VERSION%/${version}/g" config/autoload/app_options.global.php
 
 # Compressing file

composer.json

@@ -12,72 +12,75 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.2",
+        "ext-curl": "*",
+        "ext-gd": "*",
         "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",
+        "cakephp/chronos": "^3.0.2",
+        "doctrine/migrations": "^3.6",
+        "doctrine/orm": "^2.16",
+        "endroid/qr-code": "^4.8",
+        "friendsofphp/proxy-manager-lts": "^1.0",
+        "geoip2/geoip2": "^3.0",
+        "guzzlehttp/guzzle": "^7.5",
         "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",
+        "jaybizzle/crawler-detect": "^1.2.116",
+        "laminas/laminas-config": "^3.8",
+        "laminas/laminas-config-aggregator": "^1.13",
+        "laminas/laminas-diactoros": "^3.3",
+        "laminas/laminas-inputfilter": "^2.27",
+        "laminas/laminas-servicemanager": "^3.21",
+        "laminas/laminas-stdlib": "^3.17",
+        "league/uri": "^6.8",
+        "matomo/matomo-php-tracker": "^3.2",
+        "mezzio/mezzio": "^3.17",
+        "mezzio/mezzio-fastroute": "^3.10",
+        "mezzio/mezzio-problem-details": "^1.13",
+        "mezzio/mezzio-swoole": "^4.7",
+        "mlocati/ip-lib": "^1.18",
+        "mobiledetect/mobiledetectlib": "^4.8",
+        "pagerfanta/core": "^3.8",
         "php-middleware/request-id": "^4.1",
-        "predis/predis": "^1.1",
-        "pugx/shortid-php": "^1.0",
-        "ramsey/uuid": "^4.2",
-        "shlinkio/shlink-common": "^4.2.1",
-        "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": "^1.1",
+        "ramsey/uuid": "^4.7",
+        "shlinkio/shlink-common": "^5.7.1",
+        "shlinkio/shlink-config": "^2.5",
+        "shlinkio/shlink-event-dispatcher": "^3.1",
+        "shlinkio/shlink-importer": "^5.2.1",
+        "shlinkio/shlink-installer": "^8.7",
+        "shlinkio/shlink-ip-geolocation": "^3.4",
+        "shlinkio/shlink-json": "^1.1",
+        "spiral/roadrunner": "^2023.2",
+        "spiral/roadrunner-cli": "^2.5",
+        "spiral/roadrunner-http": "^3.1",
+        "spiral/roadrunner-jobs": "^4.0",
+        "symfony/console": "^6.3",
+        "symfony/filesystem": "^6.3",
+        "symfony/lock": "^6.3",
+        "symfony/process": "^6.3",
+        "symfony/string": "^6.3"
     },
     "require-dev": {
-        "cebe/php-openapi": "^1.5",
+        "devizzent/cebe-php-openapi": "^1.0.1",
         "devster/ubench": "^2.1",
-        "dms/phpunit-arraysubset-asserts": "^0.3.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.27",
+        "openswoole/ide-helper": "~22.0.0",
+        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan-doctrine": "^1.3",
+        "phpstan/phpstan-phpunit": "^1.3",
+        "phpstan/phpstan-symfony": "^1.3",
+        "phpunit/php-code-coverage": "^10.1",
+        "phpunit/phpunit": "^10.4",
         "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.3.0",
+        "shlinkio/shlink-test-utils": "^3.8",
+        "symfony/var-dumper": "^6.3",
+        "veewee/composer-run-parallel": "^1.3"
+    },
+    "conflict": {
+        "symfony/var-exporter": ">=6.3.9,<=6.4.0"
     },
     "autoload": {
         "psr-4": {
@@ -87,18 +90,20 @@
         },
         "files": [
             "config/constants.php",
+            "module/Core/functions/array-utils.php",
             "module/Core/functions/functions.php"
         ]
     },
     "autoload-dev": {
         "psr-4": {
             "ShlinkioTest\\Shlink\\CLI\\": "module/CLI/test",
+            "ShlinkioCliTest\\Shlink\\CLI\\": "module/CLI/test-cli",
             "ShlinkioTest\\Shlink\\Rest\\": "module/Rest/test",
             "ShlinkioApiTest\\Shlink\\Rest\\": "module/Rest/test-api",
-            "ShlinkioTest\\Shlink\\Core\\": [
-                "module/Core/test",
-                "module/Core/test-db"
-            ]
+            "ShlinkioDbTest\\Shlink\\Rest\\": "module/Rest/test-db",
+            "ShlinkioTest\\Shlink\\Core\\": "module/Core/test",
+            "ShlinkioDbTest\\Shlink\\Core\\": "module/Core/test-db",
+            "ShlinkioApiTest\\Shlink\\Core\\": "module/Core/test-api"
         },
         "files": [
             "config/test/constants.php"
@@ -106,32 +111,19 @@
     },
     "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"
+            "@parallel infect:test:api infect:test:cli infect:ci:unit infect:ci:db"
         ],
-        "cs": "phpcs",
+        "cs": "phpcs -s",
         "cs:fix": "phpcbf",
-        "stan": "APP_ENV=test php vendor/bin/phpstan analyse module/*/src module/*/config config docker/config data/migrations --level=8",
+        "stan": "APP_ENV=test php vendor/bin/phpstan analyse module/*/src module/*/test* module/*/config config docker/config data/migrations --level=8",
         "test": [
-            "@test:unit",
-            "@test:db",
-            "@test:api"
+            "@parallel test:unit test:db",
+            "@parallel test:api test:cli"
         ],
-        "test:ci": [
-            "@test:unit:ci",
-            "@test:db",
-            "@test:api:ci"
-        ],
-        "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:unit": "@php vendor/bin/phpunit --order-by=random --colors=always --testdox",
+        "test:unit:ci": "@test:unit --coverage-php=build/coverage-unit.cov --coverage-xml=build/coverage-unit/coverage-xml --log-junit=build/coverage-unit/junit.xml",
+        "test:unit:pretty": "@test:unit --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",
@@ -140,12 +132,18 @@
         "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:rr": "TEST_RUNTIME=rr 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",
+        "test:api:pretty": "GENERATE_COVERAGE=pretty composer test:api",
+        "test:cli": "APP_ENV=test DB_DRIVER=maria TEST_ENV=cli php vendor/bin/phpunit --order-by=random --colors=always --testdox -c phpunit-cli.xml --log-junit=build/coverage-cli/junit.xml",
+        "test:cli:ci": "GENERATE_COVERAGE=yes composer test:cli",
+        "test:cli:pretty": "GENERATE_COVERAGE=pretty composer test:cli",
+        "infect:ci:base": "infection --threads=max --only-covered --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",
+        "infect:ci:db": "@infect:ci:base --coverage=build/coverage-db --min-msi=95 --configuration=infection-db.json5",
+        "infect:ci:api": "@infect:ci:base --coverage=build/coverage-api --min-msi=95 --configuration=infection-api.json5",
+        "infect:ci:cli": "@infect:ci:base --coverage=build/coverage-cli --min-msi=90 --configuration=infection-cli.json5",
+        "infect:ci": "@parallel infect:ci:unit infect:ci:db infect:ci:api infect:ci:cli",
         "infect:test": [
             "@parallel test:unit:ci test:db:sqlite:ci test:api:ci",
             "@infect:ci"
@@ -154,22 +152,28 @@
             "@test:unit:ci",
             "@infect:ci:unit"
         ],
+        "infect:test:db": [
+            "@test:db:sqlite:ci",
+            "@infect:ci:db"
+        ],
         "infect:test:api": [
             "@test:api:ci",
             "@infect:ci:api"
         ],
+        "infect:test:cli": [
+            "@test:cli:ci",
+            "@infect:ci:cli"
+        ],
         "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</>",
         "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</>",
         "test": "<fg=blue;options=bold>Runs all test suites</>",
-        "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</>",
@@ -179,9 +183,13 @@
         "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:db:ms": "<fg=blue;options=bold>Runs database test suites on a Microsoft 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</>",
+        "test:api:ci": "<fg=blue;options=bold>Runs API test suites, and generates code coverage for CI</>",
+        "test:api:pretty": "<fg=blue;options=bold>Runs API test suites, and generates code coverage in HTML format</>",
+        "test:cli": "<fg=blue;options=bold>Runs CLI test suites</>",
+        "test:cli:ci": "<fg=blue;options=bold>Runs CLI test suites, and generates code coverage for CI</>",
+        "test:cli:pretty": "<fg=blue;options=bold>Runs CLI test suites, and generates code coverage in HTML format</>",
         "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</>",
@@ -192,6 +200,12 @@
     },
     "config": {
         "sort-packages": true,
-        "platform-check": false
+        "platform-check": false,
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "infection/extension-installer": true,
+            "veewee/composer-run-parallel": true
+        }
     }
 }

config/autoload/app_options.local.php.dist

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    'app_options' => [
+        'version' => 'latest',
+    ],
+
+];

config/autoload/cache.global.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+use Shlinkio\Shlink\Core\Config\EnvVars;
+
+return (static function (): array {
+    $redisServers = EnvVars::REDIS_SERVERS->loadFromEnv();
+    $redis = ['pub_sub_enabled' => $redisServers !== null && EnvVars::REDIS_PUB_SUB_ENABLED->loadFromEnv(false)];
+    $cacheRedisBlock = $redisServers === null ? [] : [
+        'redis' => [
+            'servers' => $redisServers,
+            'sentinel_service' => EnvVars::REDIS_SENTINEL_SERVICE->loadFromEnv(),
+            'decode_credentials' => (bool) EnvVars::REDIS_DECODE_CREDENTIALS->loadFromEnv(false),
+        ],
+    ];
+
+    return [
+        'cache' => [
+            'namespace' => EnvVars::CACHE_NAMESPACE->loadFromEnv('Shlink'),
+            ...$cacheRedisBlock,
+        ],
+        'redis' => $redis,
+    ];
+})();

config/autoload/common.global.php

@@ -8,8 +8,8 @@ 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
+    // Disabling config cache for cli, ensures it's never used for openswoole/RoadRunner, and also that console
+    // commands don't generate a cache file that's then used by php-fpm web executions
     ConfigAggregator::ENABLE_CACHE => PHP_SAPI !== 'cli',
 
 ];

config/autoload/delete_short_urls.global.php

@@ -4,15 +4,17 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
-use const Shlinkio\Shlink\DEFAULT_DELETE_SHORT_URL_THRESHOLD;
+return (static function (): array {
+    $threshold = EnvVars::DELETE_SHORT_URL_THRESHOLD->loadFromEnv();
 
-return [
+    return [
 
-    'delete_short_urls' => [
-        'check_visits_threshold' => true,
-        'visits_threshold' => (int) env('DELETE_SHORT_URL_THRESHOLD', DEFAULT_DELETE_SHORT_URL_THRESHOLD),
-    ],
+        'delete_short_urls' => [
+            'check_visits_threshold' => $threshold !== null,
+            'visits_threshold' => (int) ($threshold ?? DEFAULT_DELETE_SHORT_URL_THRESHOLD),
+        ],
 
-];
+    ];
+})();

config/autoload/dependencies.global.php

@@ -3,14 +3,25 @@
 declare(strict_types=1);
 
 use GuzzleHttp\Client;
+use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
+use Mezzio\Application;
 use Mezzio\Container;
 use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\ServerRequestFactoryInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Message\UploadedFileFactoryInterface;
+use Spiral\RoadRunner\Http\PSR7Worker;
+use Spiral\RoadRunner\WorkerInterface;
 
 return [
 
     'dependencies' => [
+        'factories' => [
+            PSR7Worker::class => ConfigAbstractFactory::class,
+        ],
+
         'delegators' => [
-            Mezzio\Application::class => [
+            Application::class => [
                 Container\ApplicationConfigInjectionDelegator::class,
             ],
         ],
@@ -26,4 +37,13 @@ return [
         ],
     ],
 
+    ConfigAbstractFactory::class => [
+        PSR7Worker::class => [
+            WorkerInterface::class,
+            ServerRequestFactoryInterface::class,
+            StreamFactoryInterface::class,
+            UploadedFileFactoryInterface::class,
+        ],
+    ],
+
 ];

config/autoload/entity-manager.global.php

@@ -3,13 +3,13 @@
 declare(strict_types=1);
 
 use Happyr\DoctrineSpecification\Repository\EntitySpecificationRepository;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
-use function Functional\contains;
-use function Shlinkio\Shlink\Common\env;
+use function Shlinkio\Shlink\Core\ArrayUtils\contains;
 
 return (static function (): array {
-    $driver = env('DB_DRIVER');
-    $isMysqlCompatible = contains(['maria', 'mysql'], $driver);
+    $driver = EnvVars::DB_DRIVER->loadFromEnv();
+    $isMysqlCompatible = contains($driver, ['maria', 'mysql']);
 
     $resolveDriver = static fn () => match ($driver) {
         'postgres' => 'pdo_pgsql',
@@ -21,20 +21,30 @@ return (static function (): array {
         'mssql' => '1433',
         default => '3306',
     };
-    $resolveConnection = static fn () => match (true) {
-        $driver === null || $driver === 'sqlite' => [
+    $resolveCharset = static fn () => match ($driver) {
+        // This does not determine charsets or collations in tables or columns, but the charset used in the data
+        // flowing in the connection, so it has to match what has been set in the database.
+        'maria', 'mysql' => 'utf8mb4',
+        'postgres' => 'utf8',
+        default => null,
+    };
+    $resolveConnection = static fn () => match ($driver) {
+        null, 'sqlite' => [
             'driver' => 'pdo_sqlite',
             'path' => 'data/database.sqlite',
         ],
         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,
-            'charset' => 'utf8',
+            'dbname' => EnvVars::DB_NAME->loadFromEnv('shlink'),
+            'user' => EnvVars::DB_USER->loadFromEnv(),
+            'password' => EnvVars::DB_PASSWORD->loadFromEnv(),
+            'host' => EnvVars::DB_HOST->loadFromEnv(EnvVars::DB_UNIX_SOCKET->loadFromEnv()),
+            'port' => EnvVars::DB_PORT->loadFromEnv($resolveDefaultPort()),
+            'unix_socket' => $isMysqlCompatible ? EnvVars::DB_UNIX_SOCKET->loadFromEnv() : null,
+            'charset' => $resolveCharset(),
+            'driverOptions' => $driver !== 'mssql' ? [] : [
+                'TrustServerCertificate' => 'true',
+            ],
         ],
     };
 

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

@@ -6,12 +6,40 @@ return [
 
     'entity_manager' => [
         'connection' => [
+            // MySQL
             'user' => 'root',
             'password' => 'root',
             'driver' => 'pdo_mysql',
             'host' => 'shlink_db_mysql',
             'dbname' => 'shlink',
-            'charset' => 'utf8',
+//            'dbname' => 'shlink_foo',
+            'charset' => 'utf8mb4',
+
+            // MariaDB
+//            'user' => 'root',
+//            'password' => 'root',
+//            'driver' => 'pdo_mysql',
+//            'host' => 'shlink_db_maria',
+//            'dbname' => 'shlink_foo',
+//            'charset' => 'utf8mb4',
+
+            // Postgres
+//            'user' => 'postgres',
+//            'password' => 'root',
+//            'driver' => 'pdo_pgsql',
+//            'host' => 'shlink_db_postgres',
+//            'dbname' => 'shlink_foo',
+//            'charset' => 'utf8',
+
+            // MSSQL
+//            'user' => 'sa',
+//            'password' => 'Passw0rd!',
+//            'driver' => 'pdo_sqlsrv',
+//            'host' => 'shlink_db_ms',
+//            'dbname' => 'shlink_foo',
+//            'driverOptions' => [
+//                'TrustServerCertificate' => 'true',
+//            ],
         ],
     ],
 

config/autoload/error-handler.global.php

@@ -6,12 +6,14 @@ use Laminas\Stratigility\Middleware\ErrorHandler;
 use Mezzio\ProblemDetails\ProblemDetailsMiddleware;
 use Shlinkio\Shlink\Common\Logger;
 
+use function Shlinkio\Shlink\Core\toProblemDetailsType;
+
 return [
 
     'problem-details' => [
         'default_types_map' => [
-            404 => 'NOT_FOUND',
-            500 => 'INTERNAL_SERVER_ERROR',
+            404 => toProblemDetailsType('not-found'),
+            500 => toProblemDetailsType('internal-server-error'),
         ],
     ],
 

config/autoload/geolite2.global.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
 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
+        'license_key' => EnvVars::GEOLITE_LICENSE_KEY->loadFromEnv(),
     ],
 
 ];

config/autoload/installer.global.php

@@ -11,6 +11,7 @@ return [
 
     'installer' => [
         'enabled_options' => [
+            Option\Server\RuntimeConfigOption::class,
             Option\Database\DatabaseDriverConfigOption::class,
             Option\Database\DatabaseNameConfigOption::class,
             Option\Database\DatabaseHostConfigOption::class,
@@ -18,22 +19,23 @@ return [
             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\TimezoneConfigOption::class,
+            Option\Cache\CacheNamespaceConfigOption::class,
             Option\Worker\TaskWorkerNumConfigOption::class,
             Option\Worker\WebWorkerNumConfigOption::class,
-            Option\RedisServersConfigOption::class,
+            Option\Redis\RedisServersConfigOption::class,
+            Option\Redis\RedisDecodeCredentialsConfigOption::class,
+            Option\Redis\RedisSentinelServiceConfigOption::class,
+            Option\Redis\RedisPubSubConfigOption::class,
             Option\UrlShortener\ShortCodeLengthOption::class,
             Option\Mercure\EnableMercureConfigOption::class,
             Option\Mercure\MercurePublicUrlConfigOption::class,
@@ -44,6 +46,9 @@ return [
             Option\UrlShortener\RedirectCacheLifeTimeConfigOption::class,
             Option\UrlShortener\AutoResolveTitlesConfigOption::class,
             Option\UrlShortener\AppendExtraPathConfigOption::class,
+            Option\UrlShortener\EnableMultiSegmentSlugsConfigOption::class,
+            Option\UrlShortener\EnableTrailingSlashConfigOption::class,
+            Option\UrlShortener\ShortUrlModeConfigOption::class,
             Option\Tracking\IpAnonymizationConfigOption::class,
             Option\Tracking\OrphanVisitsTrackingConfigOption::class,
             Option\Tracking\DisableTrackParamConfigOption::class,
@@ -57,24 +62,42 @@ return [
             Option\QrCode\DefaultFormatConfigOption::class,
             Option\QrCode\DefaultErrorCorrectionConfigOption::class,
             Option\QrCode\DefaultRoundBlockSizeConfigOption::class,
+            Option\QrCode\EnabledForDisabledShortUrlsConfigOption::class,
             Option\RabbitMq\RabbitMqEnabledConfigOption::class,
             Option\RabbitMq\RabbitMqHostConfigOption::class,
+            Option\RabbitMq\RabbitMqUseSslConfigOption::class,
             Option\RabbitMq\RabbitMqPortConfigOption::class,
             Option\RabbitMq\RabbitMqUserConfigOption::class,
             Option\RabbitMq\RabbitMqPasswordConfigOption::class,
             Option\RabbitMq\RabbitMqVhostConfigOption::class,
+            Option\Matomo\MatomoEnabledConfigOption::class,
+            Option\Matomo\MatomoBaseUrlConfigOption::class,
+            Option\Matomo\MatomoSiteIdConfigOption::class,
+            Option\Matomo\MatomoApiTokenConfigOption::class,
         ],
 
         'installation_commands' => [
-            InstallationCommand::DB_CREATE_SCHEMA => [
+            InstallationCommand::DB_CREATE_SCHEMA->value => [
                 'command' => 'bin/cli ' . Command\Db\CreateDatabaseCommand::NAME,
             ],
-            InstallationCommand::DB_MIGRATE => [
+            InstallationCommand::DB_MIGRATE->value => [
                 'command' => 'bin/cli ' . Command\Db\MigrateDatabaseCommand::NAME,
             ],
-            InstallationCommand::GEOLITE_DOWNLOAD_DB => [
+            InstallationCommand::ORM_PROXIES->value => [
+                'command' => 'bin/doctrine orm:generate-proxies',
+            ],
+            InstallationCommand::ORM_CLEAR_CACHE->value => [
+                'command' => 'bin/doctrine orm:clear-cache:metadata',
+            ],
+            InstallationCommand::GEOLITE_DOWNLOAD_DB->value => [
                 'command' => 'bin/cli ' . Command\Visit\DownloadGeoLiteDbCommand::NAME,
             ],
+            InstallationCommand::API_KEY_GENERATE->value => [
+                'command' => 'bin/cli ' . Command\Api\GenerateKeyCommand::NAME,
+            ],
+            InstallationCommand::API_KEY_CREATE->value => [
+                'command' => 'bin/cli ' . Command\Api\InitialApiKeyCommand::NAME,
+            ],
         ],
     ],
 

config/autoload/locks.global.php

@@ -3,12 +3,12 @@
 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\NamespacedStore;
 use Shlinkio\Shlink\Common\Logger\LoggerAwareDelegatorFactory;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 use Symfony\Component\Lock;
 
-use function Shlinkio\Shlink\Common\env;
-
 use const Shlinkio\Shlink\LOCAL_LOCK_FACTORY;
 
 return [
@@ -23,11 +23,12 @@ return [
             Lock\Store\RedisStore::class => ConfigAbstractFactory::class,
             Lock\LockFactory::class => ConfigAbstractFactory::class,
             LOCAL_LOCK_FACTORY => ConfigAbstractFactory::class,
+            NamespacedStore::class => ConfigAbstractFactory::class,
         ],
         'aliases' => [
-            'lock_store' => env('REDIS_SERVERS') === null ? 'local_lock_store' : 'redis_lock_store',
+            'lock_store' => EnvVars::REDIS_SERVERS->existsInEnv() ? 'redis_lock_store' : 'local_lock_store',
 
-            'redis_lock_store' => Lock\Store\RedisStore::class,
+            'redis_lock_store' => NamespacedStore::class,
             'local_lock_store' => Lock\Store\FlockStore::class,
         ],
         'delegators' => [
@@ -39,7 +40,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],
+        NamespacedStore::class => [Lock\Store\RedisStore::class, 'config.cache.namespace'],
+
         Lock\LockFactory::class => ['lock_store'],
         LOCAL_LOCK_FACTORY => ['local_lock_store'],
     ],

config/autoload/logger.global.php

@@ -4,87 +4,64 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
 
-use Monolog\Formatter;
-use Monolog\Handler;
+use Laminas\ServiceManager\Factory\InvokableFactory;
+use Monolog\Level;
 use Monolog\Logger;
-use Monolog\Processor;
-use MonologFactory\DiContainerLoggerFactory;
 use PhpMiddleware\RequestId;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+use Shlinkio\Shlink\Common\Logger\LoggerFactory;
+use Shlinkio\Shlink\Common\Logger\LoggerType;
+use Shlinkio\Shlink\Common\Middleware\AccessLogMiddleware;
 
-use const PHP_EOL;
+use function Shlinkio\Shlink\Config\runningInRoadRunner;
 
-$processors = [
-    'exception_with_new_line' => [
-        'name' => Common\Logger\Processor\ExceptionWithNewLineProcessor::class,
-    ],
-    '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,
-        'allow_inline_line_breaks' => true,
-    ],
-];
+return (static function (): array {
+    $common = [
+        'level' => Level::Info->value,
+        'processors' => [RequestId\MonologProcessor::class],
+        'line_format' => '[%datetime%] [%extra.request_id%] %channel%.%level_name% - %message%',
+    ];
 
-return [
+    return [
 
-    'logger' => [
-        'Shlink' => [
-            'name' => 'Shlink',
-            'handlers' => [
-                'shlink_handler' => [
-                    'name' => Handler\RotatingFileHandler::class,
-                    'params' => [
-                        'level' => Logger::INFO,
-                        'filename' => 'data/log/shlink_log.log',
-                        'max_files' => 30,
-                        'file_permission' => 0666,
-                    ],
-                    'formatter' => $formatter,
+        'logger' => [
+            'Shlink' => [
+                'type' => LoggerType::FILE->value,
+                ...$common,
+            ],
+            'Access' => [
+                'type' => LoggerType::STREAM->value,
+                'destination' => 'php://stderr',
+                'add_new_line' => ! runningInRoadRunner(),
+                ...$common,
+            ],
+        ],
+
+        'dependencies' => [
+            'factories' => [
+                'Logger_Shlink' => [LoggerFactory::class, 'Shlink'],
+                'Logger_Access' => [LoggerFactory::class, 'Access'],
+                NullLogger::class => InvokableFactory::class,
+            ],
+            'aliases' => [
+                'logger' => 'Logger_Shlink',
+                Logger::class => 'Logger_Shlink',
+                LoggerInterface::class => 'Logger_Shlink',
+                AccessLogMiddleware::LOGGER_SERVICE_NAME => 'Logger_Access',
+            ],
+        ],
+
+        // Deprecated. Remove in Shlink 4.0.0
+        'mezzio-swoole' => [
+            'swoole-http-server' => [
+                'logger' => [
+                    // Let's disable mezio-swoole access logging, so that we can provide our own implementation,
+                    // consistent for roadrunner and openswoole
+                    'logger-name' => NullLogger::class,
                 ],
             ],
-            'processors' => $processors,
         ],
-        'Access' => [
-            'name' => 'Access',
-            'handlers' => [
-                'access_handler' => [
-                    'name' => Handler\StreamHandler::class,
-                    'params' => [
-                        'level' => Logger::INFO,
-                        'stream' => 'php://stdout',
-                    ],
-                    'formatter' => $formatter,
-                ],
-            ],
-            'processors' => $processors,
-        ],
-    ],
 
-    'dependencies' => [
-        'factories' => [
-            'Logger_Shlink' => [DiContainerLoggerFactory::class, 'Shlink'],
-            'Logger_Access' => [DiContainerLoggerFactory::class, 'Access'],
-        ],
-        'aliases' => [
-            'logger' => 'Logger_Shlink',
-            Logger::class => 'Logger_Shlink',
-            LoggerInterface::class => 'Logger_Shlink',
-        ],
-    ],
-
-    'mezzio-swoole' => [
-        'swoole-http-server' => [
-            'logger' => [
-                'logger-name' => 'Logger_Access',
-                'format' => '%h %l %u "%r" %>s %b',
-            ],
-        ],
-    ],
-
-];
+    ];
+})();

config/autoload/logger.local.php.dist

@@ -2,33 +2,16 @@
 
 declare(strict_types=1);
 
-use Monolog\Handler\StreamHandler;
-use Monolog\Logger;
-
-$isSwoole = extension_loaded('openswoole');
-
-// For swoole, send logs to standard output
-$handler = $isSwoole
-    ? [
-        'name' => StreamHandler::class,
-        'params' => [
-            'level' => Logger::DEBUG,
-            'stream' => 'php://stdout',
-        ],
-    ]
-    : [
-        'params' => [
-            'level' => Logger::DEBUG,
-        ],
-    ];
+use Monolog\Level;
+use Shlinkio\Shlink\Common\Logger\LoggerType;
 
 return [
 
     'logger' => [
         'Shlink' => [
-            'handlers' => [
-                'shlink_handler' => $handler,
-            ],
+            'type' => LoggerType::STREAM->value,
+            'destination' => 'php://stderr',
+            'level' => Level::Debug->value,
         ],
     ],
 

config/autoload/matomo.global.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+use Shlinkio\Shlink\Core\Config\EnvVars;
+
+return [
+
+    'matomo' => [
+        'enabled' => (bool) EnvVars::MATOMO_ENABLED->loadFromEnv(false),
+        'base_url' => EnvVars::MATOMO_BASE_URL->loadFromEnv(),
+        'site_id' => EnvVars::MATOMO_SITE_ID->loadFromEnv(),
+        'api_token' => EnvVars::MATOMO_API_TOKEN->loadFromEnv(),
+    ],
+
+];

config/autoload/matomo.local.php.dist

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Dev matomo instance needs to be manually configured once before enabling the configuration below.
+ *
+ * 1. Go to http://localhost:8003 and follow the installation instructions.
+ * 2. Open data/infra/matomo/config/config.ini.php and replace `trusted_hosts[] = "localhost"` with
+ *   `trusted_hosts[] = "localhost:8003"` (see https://github.com/matomo-org/matomo/issues/9549)
+ * 3. Go to http://localhost:8003/index.php?module=SitesManager&action=index and paste the ID for the site you just
+ *    created into the `site_id` field below.
+ * 4. Go to http://localhost:8003/index.php?module=UsersManager&action=userSecurity, scroll down, click
+ *    "Create new token" and once generated, paste the token into the `api_token` field below.
+ */
+
+return [
+
+    'matomo' => [
+//        'enabled' => true,
+//        'base_url' => 'http://shlink_matomo',
+//        'site_id' => '...',
+//        'api_token' => '...',
+    ],
+
+];

config/autoload/mercure.global.php

@@ -4,20 +4,19 @@ declare(strict_types=1);
 
 use Laminas\ServiceManager\Proxy\LazyServiceFactory;
 use Shlinkio\Shlink\Common\Mercure\LcobucciJwtProvider;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 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');
+    $publicUrl = EnvVars::MERCURE_PUBLIC_HUB_URL->loadFromEnv();
 
     return [
 
         'mercure' => [
             'public_hub_url' => $publicUrl,
-            'internal_hub_url' => env('MERCURE_INTERNAL_HUB_URL', $publicUrl),
-            'jwt_secret' => env('MERCURE_JWT_SECRET'),
+            'internal_hub_url' => EnvVars::MERCURE_INTERNAL_HUB_URL->loadFromEnv($publicUrl),
+            'jwt_secret' => EnvVars::MERCURE_JWT_SECRET->loadFromEnv(),
             'jwt_issuer' => 'Shlink',
         ],
 

config/autoload/mercure.local.php.dist

@@ -7,7 +7,7 @@ return [
     'mercure' => [
         'public_hub_url' => 'http://localhost:8001',
         'internal_hub_url' => 'http://shlink_mercure_proxy',
-        'jwt_secret' => 'mercure_jwt_key',
+        'jwt_secret' => 'mercure_jwt_key_long_enough_to_avoid_error',
     ],
 
 ];

config/autoload/middleware-pipeline.global.php

@@ -9,6 +9,7 @@ use Mezzio\ProblemDetails;
 use Mezzio\Router;
 use PhpMiddleware\RequestId\RequestIdMiddleware;
 use RKA\Middleware\IpAddress;
+use Shlinkio\Shlink\Common\Middleware\AccessLogMiddleware;
 use Shlinkio\Shlink\Common\Middleware\ContentLengthMiddleware;
 
 return [
@@ -16,6 +17,7 @@ return [
     'middleware_pipeline' => [
         'error-handler' => [
             'middleware' => [
+                AccessLogMiddleware::class,
                 ContentLengthMiddleware::class,
                 RequestIdMiddleware::class,
                 ErrorHandler::class,
@@ -45,6 +47,7 @@ return [
         'rest' => [
             'path' => '/rest',
             'middleware' => [
+                Rest\Middleware\ErrorHandler\BackwardsCompatibleProblemDetailsHandler::class,
                 Router\Middleware\ImplicitOptionsMiddleware::class,
                 Rest\Middleware\BodyParserMiddleware::class,
                 Rest\Middleware\AuthenticationMiddleware::class,

config/autoload/qr-codes.global.php

@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
+use const Shlinkio\Shlink\DEFAULT_QR_CODE_ENABLED_FOR_DISABLED_SHORT_URLS;
 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;
@@ -13,11 +14,18 @@ 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),
+        'size' => (int) EnvVars::DEFAULT_QR_CODE_SIZE->loadFromEnv(DEFAULT_QR_CODE_SIZE),
+        'margin' => (int) EnvVars::DEFAULT_QR_CODE_MARGIN->loadFromEnv(DEFAULT_QR_CODE_MARGIN),
+        'format' => EnvVars::DEFAULT_QR_CODE_FORMAT->loadFromEnv(DEFAULT_QR_CODE_FORMAT),
+        'error_correction' => EnvVars::DEFAULT_QR_CODE_ERROR_CORRECTION->loadFromEnv(
+            DEFAULT_QR_CODE_ERROR_CORRECTION,
+        ),
+        'round_block_size' => (bool) EnvVars::DEFAULT_QR_CODE_ROUND_BLOCK_SIZE->loadFromEnv(
+            DEFAULT_QR_CODE_ROUND_BLOCK_SIZE,
+        ),
+        'enabled_for_disabled_short_urls' => (bool) EnvVars::QR_CODE_FOR_DISABLED_SHORT_URLS->loadFromEnv(
+            DEFAULT_QR_CODE_ENABLED_FOR_DISABLED_SHORT_URLS,
+        ),
     ],
 
 ];

config/autoload/rabbit.global.php

@@ -2,47 +2,21 @@
 
 declare(strict_types=1);
 
-use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Laminas\ServiceManager\Proxy\LazyServiceFactory;
-use PhpAmqpLib\Connection\AMQPStreamConnection;
-
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
 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', '/'),
-    ],
+        'enabled' => (bool) EnvVars::RABBITMQ_ENABLED->loadFromEnv(false),
+        'host' => EnvVars::RABBITMQ_HOST->loadFromEnv(),
+        'use_ssl' => (bool) EnvVars::RABBITMQ_USE_SSL->loadFromEnv(false),
+        'port' => (int) EnvVars::RABBITMQ_PORT->loadFromEnv('5672'),
+        'user' => EnvVars::RABBITMQ_USER->loadFromEnv(),
+        'password' => EnvVars::RABBITMQ_PASSWORD->loadFromEnv(),
+        'vhost' => EnvVars::RABBITMQ_VHOST->loadFromEnv('/'),
 
-    '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',
-        ],
+        // Deprecated
+        'legacy_visits_publishing' => (bool) EnvVars::RABBITMQ_LEGACY_VISITS_PUBLISHING->loadFromEnv(false),
     ],
 
 ];

config/autoload/redirects.global.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
 use const Shlinkio\Shlink\DEFAULT_REDIRECT_CACHE_LIFETIME;
 use const Shlinkio\Shlink\DEFAULT_REDIRECT_STATUS_CODE;
@@ -10,16 +10,16 @@ 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')),
+        'invalid_short_url' => EnvVars::DEFAULT_INVALID_SHORT_URL_REDIRECT->loadFromEnv(),
+        'regular_404' => EnvVars::DEFAULT_REGULAR_404_REDIRECT->loadFromEnv(),
+        'base_url' => EnvVars::DEFAULT_BASE_URL_REDIRECT->loadFromEnv(),
     ],
 
-    '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),
+    'redirects' => [
+        'redirect_status_code' => (int) EnvVars::REDIRECT_STATUS_CODE->loadFromEnv(DEFAULT_REDIRECT_STATUS_CODE->value),
+        'redirect_cache_lifetime' => (int) EnvVars::REDIRECT_CACHE_LIFETIME->loadFromEnv(
+            DEFAULT_REDIRECT_CACHE_LIFETIME,
+        ),
     ],
 
 ];

config/autoload/redis.global.php

@@ -1,21 +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' => [
-                'redis' => [
-                    'servers' => $redisServers,
-                    'sentinel_service' => env('REDIS_SENTINEL_SERVICE'),
-                ],
-            ],
-        ],
-    };
-})();

config/autoload/redis.local.php.local

@@ -7,12 +7,15 @@ return [
     'cache' => [
         'redis' => [
             'servers' => 'tcp://shlink_redis:6379',
-//            'servers' => [
-//                'tcp://shlink_redis:6379',
-//            ],
+//            'servers' => 'tcp://barbar@shlink_redis_acl:6379',
+//            'servers' => 'tcp://foo:bar@shlink_redis_acl:6379',
         ],
     ],
 
+    'redis' => [
+        'pub_sub_enabled' => true,
+    ],
+
     'dependencies' => [
         'aliases' => [
             // With this config, a user could alias 'lock_store' => 'redis_lock_store' to override the default

config/autoload/request_id.global.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Laminas\ServiceManager\Factory\InvokableFactory;
 use PhpMiddleware\RequestId;
+use Shlinkio\Shlink\Common\Logger\Processor\BackwardsCompatibleMonologProcessorDelegator;
 
 return [
 
@@ -20,6 +21,11 @@ return [
             RequestId\RequestIdMiddleware::class => ConfigAbstractFactory::class,
             RequestId\MonologProcessor::class => ConfigAbstractFactory::class,
         ],
+        'delegators' => [
+            RequestId\MonologProcessor::class => [
+                BackwardsCompatibleMonologProcessorDelegator::class,
+            ],
+        ],
     ],
 
     ConfigAbstractFactory::class => [

config/autoload/router.global.php

@@ -3,13 +3,12 @@
 declare(strict_types=1);
 
 use Mezzio\Router\FastRouteRouter;
-
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
 return [
 
     'router' => [
-        'base_path' => env('BASE_PATH', ''),
+        'base_path' => EnvVars::BASE_PATH->loadFromEnv(''),
 
         'fastroute' => [
             FastRouteRouter::CONFIG_CACHE_ENABLED => true,

config/autoload/routes.config.php

@@ -0,0 +1,115 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink;
+
+use Fig\Http\Message\RequestMethodInterface;
+use RKA\Middleware\IpAddress;
+use Shlinkio\Shlink\Core\Action as CoreAction;
+use Shlinkio\Shlink\Core\Config\EnvVars;
+use Shlinkio\Shlink\Core\ShortUrl\Middleware\TrimTrailingSlashMiddleware;
+use Shlinkio\Shlink\Rest\Action;
+use Shlinkio\Shlink\Rest\ConfigProvider;
+use Shlinkio\Shlink\Rest\Middleware;
+use Shlinkio\Shlink\Rest\Middleware\Mercure\NotConfiguredMercureErrorHandler;
+
+use function sprintf;
+
+return (static function (): array {
+    $contentNegotiationMiddleware = Middleware\ShortUrl\CreateShortUrlContentNegotiationMiddleware::class;
+    $dropDomainMiddleware = Middleware\ShortUrl\DropDefaultDomainFromRequestMiddleware::class;
+    $overrideDomainMiddleware = Middleware\ShortUrl\OverrideDomainMiddleware::class;
+
+    // TODO This should be based on config, not the env var
+    $shortUrlRouteSuffix = EnvVars::SHORT_URL_TRAILING_SLASH->loadFromEnv(false) ? '[/]' : '';
+
+    return [
+
+        // The order of the routes defined here matters. Changing it might cause path conflicts
+        'routes' => [
+            // Rest
+            ...ConfigProvider::applyRoutesPrefix([
+                Action\HealthAction::getRouteDef(),
+
+                // Visits.
+                // These routes must go first, as they have a more specific path, otherwise, when multi-segment slugs
+                // are enabled, routes with a less-specific path might match first
+                Action\Visit\ShortUrlVisitsAction::getRouteDef([$dropDomainMiddleware]),
+                Action\ShortUrl\DeleteShortUrlVisitsAction::getRouteDef([$dropDomainMiddleware]),
+                Action\Visit\TagVisitsAction::getRouteDef(),
+                Action\Visit\DomainVisitsAction::getRouteDef(),
+                Action\Visit\GlobalVisitsAction::getRouteDef(),
+                Action\Visit\OrphanVisitsAction::getRouteDef(),
+                Action\Visit\DeleteOrphanVisitsAction::getRouteDef(),
+                Action\Visit\NonOrphanVisitsAction::getRouteDef(),
+
+                // Short URLs
+                Action\ShortUrl\CreateShortUrlAction::getRouteDef([
+                    $contentNegotiationMiddleware,
+                    $dropDomainMiddleware,
+                    $overrideDomainMiddleware,
+                    Middleware\ShortUrl\DefaultShortCodesLengthMiddleware::class,
+                ]),
+                Action\ShortUrl\SingleStepCreateShortUrlAction::getRouteDef([
+                    $contentNegotiationMiddleware,
+                    $overrideDomainMiddleware,
+                ]),
+                Action\ShortUrl\EditShortUrlAction::getRouteDef([$dropDomainMiddleware]),
+                Action\ShortUrl\DeleteShortUrlAction::getRouteDef([$dropDomainMiddleware]),
+                Action\ShortUrl\ResolveShortUrlAction::getRouteDef([$dropDomainMiddleware]),
+                Action\ShortUrl\ListShortUrlsAction::getRouteDef(),
+
+                // Tags
+                Action\Tag\ListTagsAction::getRouteDef(),
+                Action\Tag\TagsStatsAction::getRouteDef(),
+                Action\Tag\DeleteTagsAction::getRouteDef(),
+                Action\Tag\UpdateTagAction::getRouteDef(),
+
+                // Domains
+                Action\Domain\ListDomainsAction::getRouteDef(),
+                Action\Domain\DomainRedirectsAction::getRouteDef(),
+
+                Action\MercureInfoAction::getRouteDef([NotConfiguredMercureErrorHandler::class]),
+            ]),
+
+            // Non-rest
+            [
+                'name' => CoreAction\RobotsAction::class,
+                'path' => '/robots.txt',
+                'middleware' => [
+                    CoreAction\RobotsAction::class,
+                ],
+                'allowed_methods' => [RequestMethodInterface::METHOD_GET],
+            ],
+            [
+                'name' => CoreAction\PixelAction::class,
+                'path' => '/{shortCode}/track',
+                'middleware' => [
+                    IpAddress::class,
+                    CoreAction\PixelAction::class,
+                ],
+                'allowed_methods' => [RequestMethodInterface::METHOD_GET],
+            ],
+            [
+                'name' => CoreAction\QrCodeAction::class,
+                'path' => '/{shortCode}/qr-code',
+                'middleware' => [
+                    CoreAction\QrCodeAction::class,
+                ],
+                'allowed_methods' => [RequestMethodInterface::METHOD_GET],
+            ],
+            [
+                'name' => CoreAction\RedirectAction::class,
+                'path' => sprintf('/{shortCode}%s', $shortUrlRouteSuffix),
+                'middleware' => [
+                    IpAddress::class,
+                    TrimTrailingSlashMiddleware::class,
+                    CoreAction\RedirectAction::class,
+                ],
+                'allowed_methods' => [RequestMethodInterface::METHOD_GET],
+            ],
+        ],
+
+    ];
+})();

config/autoload/swoole.global.php

@@ -2,12 +2,14 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
+
+use function Shlinkio\Shlink\Config\getOpenswooleConfigFromEnv;
 
 use const Shlinkio\Shlink\MIN_TASK_WORKERS;
 
-return (static function () {
-    $taskWorkers = (int) env('TASK_WORKER_NUM', 16);
+return (static function (): array {
+    $taskWorkers = (int) EnvVars::TASK_WORKER_NUM->loadFromEnv(16);
 
     return [
 
@@ -17,11 +19,12 @@ return (static function () {
 
             'swoole-http-server' => [
                 'host' => '0.0.0.0',
-                'port' => (int) env('PORT', 8080),
+                'port' => (int) EnvVars::PORT->loadFromEnv(8080),
                 'process-name' => 'shlink',
 
                 'options' => [
-                    'worker_num' => (int) env('WEB_WORKER_NUM', 16),
+                    ...getOpenswooleConfigFromEnv(),
+                    'worker_num' => (int) EnvVars::WEB_WORKER_NUM->loadFromEnv(16),
                     'task_worker_num' => max($taskWorkers, MIN_TASK_WORKERS),
                 ],
             ],

config/autoload/tracking.global.php

@@ -2,35 +2,42 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
-return [
+return (static function (): array {
+    /** @var string|null $disableTrackingFrom */
+    $disableTrackingFrom = EnvVars::DISABLE_TRACKING_FROM->loadFromEnv();
 
-    '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),
+    return [
 
-        // 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),
+        '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) EnvVars::ANONYMIZE_REMOTE_ADDR->loadFromEnv(true),
 
-        // A query param that, if provided, will disable tracking of one particular visit. Always takes precedence
-        'disable_track_param' => env('DISABLE_TRACK_PARAM'),
+            // Tells if visits to not-found URLs should be tracked. The disable_tracking option takes precedence
+            'track_orphan_visits' => (bool) EnvVars::TRACK_ORPHAN_VISITS->loadFromEnv(true),
 
-        // If true, visits will not be tracked at all
-        'disable_tracking' => (bool) env('DISABLE_TRACKING', false),
+            // A query param that, if provided, will disable tracking of one particular visit. Always takes precedence
+            'disable_track_param' => EnvVars::DISABLE_TRACK_PARAM->loadFromEnv(),
 
-        // 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, visits will not be tracked at all
+            'disable_tracking' => (bool) EnvVars::DISABLE_TRACKING->loadFromEnv(false),
 
-        // If true, the referrer will not be tracked
-        'disable_referrer_tracking' => (bool) env('DISABLE_REFERRER_TRACKING', false),
+            // If true, visits will be tracked, but neither the IP address, nor the location will be resolved
+            'disable_ip_tracking' => (bool) EnvVars::DISABLE_IP_TRACKING->loadFromEnv(false),
 
-        // If true, the user agent will not be tracked
-        'disable_ua_tracking' => (bool) env('DISABLE_UA_TRACKING', false),
+            // If true, the referrer will not be tracked
+            'disable_referrer_tracking' => (bool) EnvVars::DISABLE_REFERRER_TRACKING->loadFromEnv(false),
 
-        // A list of IP addresses, patterns or CIDR blocks from which tracking is disabled by default
-        'disable_tracking_from' => env('DISABLE_TRACKING_FROM'),
-    ],
+            // If true, the user agent will not be tracked
+            'disable_ua_tracking' => (bool) EnvVars::DISABLE_UA_TRACKING->loadFromEnv(false),
 
-];
+            // A list of IP addresses, patterns or CIDR blocks from which tracking is disabled by default
+            'disable_tracking_from' => $disableTrackingFrom === null
+                ? []
+                : array_map(trim(...), explode(',', $disableTrackingFrom)),
+        ],
+
+    ];
+})();

config/autoload/url-shortener.global.php

@@ -2,40 +2,33 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
+use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlMode;
 
 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),
+        (int) EnvVars::DEFAULT_SHORT_CODES_LENGTH->loadFromEnv(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');
-    };
+    $modeFromEnv = EnvVars::SHORT_URL_MODE->loadFromEnv(ShortUrlMode::STRICT->value);
+    $mode = ShortUrlMode::tryDeprecated($modeFromEnv) ?? ShortUrlMode::STRICT;
 
     return [
 
         'url_shortener' => [
-            'domain' => [
-                // Deprecated SHORT_DOMAIN_* env vars
-                'schema' => $resolveSchema(),
-                'hostname' => env('DEFAULT_DOMAIN', env('SHORT_DOMAIN_HOST', '')),
+            'domain' => [ // TODO Refactor this structure to url_shortener.schema and url_shortener.default_domain
+                'schema' => ((bool) EnvVars::IS_HTTPS_ENABLED->loadFromEnv(true)) ? 'https' : 'http',
+                'hostname' => EnvVars::DEFAULT_DOMAIN->loadFromEnv(''),
             ],
-            '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),
+            'auto_resolve_titles' => (bool) EnvVars::AUTO_RESOLVE_TITLES->loadFromEnv(false),
+            'append_extra_path' => (bool) EnvVars::REDIRECT_APPEND_EXTRA_PATH->loadFromEnv(false),
+            'multi_segment_slugs_enabled' => (bool) EnvVars::MULTI_SEGMENT_SLUGS_ENABLED->loadFromEnv(false),
+            'trailing_slash_enabled' => (bool) EnvVars::SHORT_URL_TRAILING_SLASH->loadFromEnv(false),
+            'mode' => $mode,
         ],
 
     ];

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

@@ -2,16 +2,23 @@
 
 declare(strict_types=1);
 
-$isSwoole = extension_loaded('openswoole');
+use function Shlinkio\Shlink\Config\runningInOpenswoole;
+use function Shlinkio\Shlink\Config\runningInRoadRunner;
 
 return [
 
     'url_shortener' => [
         'domain' => [
             'schema' => 'http',
-            'hostname' => sprintf('localhost:%s', $isSwoole ? '8080' : '8000'),
+            'hostname' => sprintf('localhost:%s', match (true) {
+                runningInRoadRunner() => '8800',
+                runningInOpenswoole() => '8080',
+                default => '8000',
+            }),
         ],
         'auto_resolve_titles' => true,
+//        'multi_segment_slugs_enabled' => true,
+//        'trailing_slash_enabled' => true,
     ],
 
 ];

config/autoload/webhooks.global.php

@@ -2,17 +2,18 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
+// Deprecated. Webhooks are no longer supported. To be removed in Shlink 4.0.0
 return (static function (): array {
-    $webhooks = env('VISITS_WEBHOOKS');
+    $webhooks = EnvVars::VISITS_WEBHOOKS->loadFromEnv();
 
     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),
+        'visits_webhooks' => [
+            'webhooks' => $webhooks === null ? [] : explode(',', $webhooks),
+            'notify_orphan_visits_to_webhooks' =>
+                (bool) EnvVars::NOTIFY_ORPHAN_VISITS_TO_WEBHOOKS->loadFromEnv(false),
         ],
 
     ];

config/cli-app.php

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

config/cli-config.php

@@ -2,11 +2,26 @@
 
 declare(strict_types=1);
 
-use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Tools\Console\ConsoleRunner;
+use Doctrine\Migrations\Configuration\EntityManager\ExistingEntityManager;
+use Doctrine\Migrations\Configuration\Migration\ConfigurationArray;
+use Doctrine\Migrations\DependencyFactory;
+
+// This file is currently used by doctrine migrations only
 
 return (static function () {
-    /** @var EntityManager $em */
+    $migrationsConfig = [
+        'migrations_paths' => [
+            'ShlinkMigrations' => 'data/migrations',
+        ],
+        'table_storage' => [
+            'table_name' => 'migrations',
+        ],
+        'custom_template' => 'data/migrations_template.txt',
+    ];
     $em = include __DIR__ . '/entity-manager.php';
-    return ConsoleRunner::createHelperSet($em);
+
+    return DependencyFactory::fromEntityManager(
+        new ConfigurationArray($migrationsConfig),
+        new ExistingEntityManager($em),
+    );
 })();

config/config.php

@@ -9,38 +9,52 @@ use Laminas\Diactoros;
 use Mezzio;
 use Mezzio\ProblemDetails;
 use Mezzio\Swoole;
+use Shlinkio\Shlink\Config\ConfigAggregator\EnvVarLoaderProvider;
 
 use function class_exists;
-use function Shlinkio\Shlink\Common\env;
+use function Shlinkio\Shlink\Config\env;
+use function Shlinkio\Shlink\Config\openswooleIsInstalled;
+use function Shlinkio\Shlink\Config\runningInRoadRunner;
+use function Shlinkio\Shlink\Core\enumValues;
 
 use const PHP_SAPI;
 
-$isCli = PHP_SAPI === 'cli';
+$isTestEnv = env('APP_ENV') === 'test';
+$enableSwoole = PHP_SAPI === 'cli' && openswooleIsInstalled() && ! runningInRoadRunner();
 
-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([]),
-    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,
-    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}}'),
-], 'data/cache/app_config.php', [
-    Core\Config\SimplifiedConfigParser::class,
-    Core\Config\BasePathPrefixer::class,
-    Core\Config\DeprecatedConfigParser::class,
-]))->getMergedConfig();
+return (new ConfigAggregator\ConfigAggregator(
+    providers: [
+        ! $isTestEnv
+            ? new EnvVarLoaderProvider('config/params/generated_config.php', enumValues(Core\Config\EnvVars::class))
+            : new ConfigAggregator\ArrayProvider([]),
+        Mezzio\ConfigProvider::class,
+        Mezzio\Router\ConfigProvider::class,
+        Mezzio\Router\FastRouteRouter\ConfigProvider::class,
+        $enableSwoole && class_exists(Swoole\ConfigProvider::class)
+            ? Swoole\ConfigProvider::class
+            : new ConfigAggregator\ArrayProvider([]),
+        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,
+        new ConfigAggregator\PhpFileProvider('config/autoload/{,*.}global.php'),
+        // Local config should not be loaded during tests, whereas test config should be loaded ONLY during tests
+        new ConfigAggregator\PhpFileProvider(
+            $isTestEnv ? 'config/test/*.global.php' : 'config/autoload/{,*.}local.php',
+        ),
+        // Routes have to be loaded last
+        new ConfigAggregator\PhpFileProvider('config/autoload/routes.config.php'),
+    ],
+    cachedConfigFile: 'data/cache/app_config.php',
+    postProcessors: [
+        Core\Config\PostProcessor\BasePathPrefixer::class,
+        Core\Config\PostProcessor\MultiSegmentSlugProcessor::class,
+        Core\Config\PostProcessor\ShortUrlMethodsProcessor::class,
+    ],
+))->getMergedConfig();

config/constants.php

@@ -4,19 +4,21 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
 
-use Fig\Http\Message\StatusCodeInterface;
+use Shlinkio\Shlink\Core\Util\RedirectStatus;
 
 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_STATUS_CODE = RedirectStatus::STATUS_302; // Deprecated. Default to 307 for Shlink v4
 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 TITLE_TAG_VALUE = '/<title[^>]*>(.*?)<\/title>/i'; // Matches the value inside a html title tag
+const LOOSE_URI_MATCHER = '/(.+)\:(.+)/i'; // Matches anything starting with a schema.
 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;
+// Deprecated. Shlink 4.0.0 should change default value to `true`
+const DEFAULT_QR_CODE_ENABLED_FOR_DISABLED_SHORT_URLS = false;
 const MIN_TASK_WORKERS = 4;

config/container.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Laminas\ServiceManager\ServiceManager;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 use Symfony\Component\Lock;
 
 use const Shlinkio\Shlink\LOCAL_LOCK_FACTORY;
@@ -11,14 +12,27 @@ chdir(dirname(__DIR__));
 
 require 'vendor/autoload.php';
 
+// Workaround to make this compatible with both openswoole 22 and earlier versions.
+// Openswoole support is deprecated. Remove in v4.0.0
+if (! function_exists('swoole_set_process_name')) {
+    // phpcs:disable
+    function swoole_set_process_name(string $name): void
+    {
+        OpenSwoole\Util::setProcessName($name);
+    }
+    // phpcs:enable
+}
+
+// This is one of the first files loaded. Configure the timezone here
+date_default_timezone_set(EnvVars::TIMEZONE->loadFromEnv(date_default_timezone_get()));
+
 // 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);
 }
 
-// Build container
-return (function () {
+return (static function (): ServiceManager {
     $config = require __DIR__ . '/config.php';
     $container = new ServiceManager($config['dependencies']);
     $container->setService('config', $config);

config/entity-manager.php

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

config/roadrunner/.rr.dev.yml

@@ -0,0 +1,42 @@
+version: '3'
+
+rpc:
+  listen: tcp://127.0.0.1:6001
+
+server:
+  command: 'php ../../bin/roadrunner-worker.php'
+
+http:
+  address: '0.0.0.0:8080'
+  middleware: ['static']
+  static:
+    dir: '../../public'
+    forbid: ['.php', '.htaccess']
+  pool:
+    num_workers: 1
+    debug: true
+
+jobs:
+  pool:
+    num_workers: 1
+    debug: true
+  timeout: 300
+  consume: ['shlink']
+  pipelines:
+    shlink:
+      driver: memory
+      config:
+        priority: 10
+        prefetch: 10
+
+logs:
+  mode: development
+  channels:
+    http:
+      mode: 'off' # Disable logging as Shlink handles it internally
+    server:
+      level: info
+    metrics:
+      level: debug
+    jobs:
+      level: debug

config/roadrunner/.rr.yml

@@ -0,0 +1,38 @@
+version: '3'
+
+rpc:
+  listen: tcp://127.0.0.1:6001
+
+server:
+  command: 'php -dopcache.enable_cli=1 -dopcache.validate_timestamps=0 ../../bin/roadrunner-worker.php'
+
+http:
+  address: '0.0.0.0:${PORT:-8080}'
+  middleware: ['static']
+  static:
+    dir: '../../public'
+    forbid: ['.php', '.htaccess']
+  pool:
+    num_workers: ${WEB_WORKER_NUM:-0}
+
+jobs:
+  timeout: 300 # 5 minutes
+  pool:
+    num_workers: ${TASK_WORKER_NUM:-0}
+  consume: ['shlink']
+  pipelines:
+    shlink:
+      driver: memory
+      config:
+        priority: 10
+        prefetch: 10
+
+logs:
+  mode: production
+  channels:
+    http:
+      mode: 'off' # Disable logging as Shlink handles it internally
+    server:
+      level: info
+    jobs:
+      level: debug

config/test/bootstrap_api_tests.php

@@ -10,8 +10,8 @@ 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;
+use const ShlinkioTest\Shlink\API_TESTS_HOST;
+use const ShlinkioTest\Shlink\API_TESTS_PORT;
 
 /** @var ContainerInterface $container */
 $container = require __DIR__ . '/../container.php';
@@ -24,10 +24,15 @@ $httpClient = $container->get('shlink_test_api_client');
 register_shutdown_function(function () use ($httpClient): void {
     $httpClient->request(
         'GET',
-        sprintf('http://%s:%s/api-tests/stop-coverage', SWOOLE_TESTING_HOST, SWOOLE_TESTING_PORT),
+        sprintf('http://%s:%s/api-tests/stop-coverage', API_TESTS_HOST, API_TESTS_PORT),
     );
 });
 
-$testHelper->createTestDb(['bin/cli', 'db:create'], ['bin/cli', 'db:migrate']);
+$testHelper->createTestDb(
+    ['bin/cli', 'db:create'],
+    ['bin/cli', 'db:migrate'],
+    ['bin/doctrine', 'orm:schema-tool:drop'],
+    ['bin/doctrine', 'dbal:run-sql'],
+);
 ApiTest\ApiTestCase::setApiClient($httpClient);
 ApiTest\ApiTestCase::setSeedFixturesCallback(fn () => $testHelper->seedFixtures($em, $config['data_fixtures'] ?? []));

config/test/bootstrap_cli_tests.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\TestUtils;
+
+use Doctrine\ORM\EntityManager;
+use Psr\Container\ContainerInterface;
+
+use function file_exists;
+use function unlink;
+
+/** @var ContainerInterface $container */
+$container = require __DIR__ . '/../container.php';
+$testHelper = $container->get(Helper\TestHelper::class);
+$config = $container->get('config');
+$em = $container->get(EntityManager::class);
+
+// Delete old coverage in PHP, to avoid merging older executions with current one
+$covFile = __DIR__ . '/../../build/coverage-cli.cov';
+if (file_exists($covFile)) {
+    unlink($covFile);
+}
+
+$testHelper->createTestDb(
+    createDbCommand: ['bin/cli', 'db:create'],
+    migrateDbCommand: ['bin/cli', 'db:migrate'],
+    dropSchemaCommand: ['bin/doctrine', 'orm:schema-tool:drop'],
+    runSqlCommand: ['bin/doctrine', 'dbal:run-sql'],
+);
+CliTest\CliTestCase::setSeedFixturesCallback(
+    static fn () => $testHelper->seedFixtures($em, $config['data_fixtures'] ?? []),
+);

config/test/bootstrap_db_tests.php

@@ -8,5 +8,10 @@ use Psr\Container\ContainerInterface;
 
 /** @var ContainerInterface $container */
 $container = require __DIR__ . '/../container.php';
-$container->get(Helper\TestHelper::class)->createTestDb();
+$container->get(Helper\TestHelper::class)->createTestDb(
+    ['bin/cli', 'db:create'],
+    ['bin/cli', 'db:migrate'],
+    ['bin/doctrine', 'orm:schema-tool:drop'],
+    ['bin/doctrine', 'dbal:run-sql'],
+);
 DbTest\DatabaseTestCase::setEntityManager($container->get('em'));

config/test/constants.php

@@ -4,5 +4,12 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink;
 
-const SWOOLE_TESTING_HOST = '127.0.0.1';
-const SWOOLE_TESTING_PORT = 9999;
+const API_TESTS_HOST = '127.0.0.1';
+const API_TESTS_PORT = 9999;
+
+const ANDROID_USER_AGENT = 'Mozilla/5.0 (Linux; Android 13) AppleWebKit/537.36 (KHTML, like Gecko) '
+    . 'Chrome/109.0.5414.86 Mobile Safari/537.36';
+const IOS_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 16_2 like Mac OS X) AppleWebKit/605.1.15 '
+    . '(KHTML, like Gecko) FxiOS/109.0 Mobile/15E148 Safari/605.1.15';
+const DESKTOP_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like '
+    . 'Gecko) Chrome/109.0.0.0 Safari/537.36 Edg/109.0.1518.61';

config/test/test_config.global.php

@@ -8,9 +8,10 @@ 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 League\Event\EventDispatcher;
+use Monolog\Level;
 use PHPUnit\Runner\Version;
+use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -20,24 +21,61 @@ 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 Shlinkio\Shlink\Common\Logger\LoggerType;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Event\ConsoleCommandEvent;
+use Symfony\Component\Console\Event\ConsoleTerminateEvent;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
+use function file_exists;
 use function Laminas\Stratigility\middleware;
-use function Shlinkio\Shlink\Common\env;
+use function Shlinkio\Shlink\Config\env;
+use function Shlinkio\Shlink\Core\ArrayUtils\contains;
 use function sprintf;
 use function sys_get_temp_dir;
 
-use const ShlinkioTest\Shlink\SWOOLE_TESTING_HOST;
-use const ShlinkioTest\Shlink\SWOOLE_TESTING_PORT;
+use const ShlinkioTest\Shlink\API_TESTS_HOST;
+use const ShlinkioTest\Shlink\API_TESTS_PORT;
 
 $isApiTest = env('TEST_ENV') === 'api';
-$generateCoverage = env('GENERATE_COVERAGE') === 'yes';
-if ($isApiTest && $generateCoverage) {
+$isCliTest = env('TEST_ENV') === 'cli';
+$isE2eTest = $isApiTest || $isCliTest;
+$coverageType = env('GENERATE_COVERAGE');
+$generateCoverage = contains($coverageType, ['yes', 'pretty']);
+
+$coverage = null;
+if ($isE2eTest && $generateCoverage) {
     $filter = new Filter();
     $filter->includeDirectory(__DIR__ . '/../../module/Core/src');
-    $filter->includeDirectory(__DIR__ . '/../../module/Rest/src');
+    $filter->includeDirectory(__DIR__ . '/../../module/' . ($isApiTest ? 'Rest' : 'CLI') . '/src');
     $coverage = new CodeCoverage((new Selector())->forLineCoverage($filter), $filter);
 }
 
+/**
+ * @param 'api'|'cli' $type
+ */
+$exportCoverage = static function (string $type = 'api') use (&$coverage, $coverageType): void {
+    if ($coverage === null) {
+        return;
+    }
+
+    $basePath = __DIR__ . '/../../build/coverage-' . $type;
+    $covPath = $basePath . '.cov';
+
+    // Every CLI test runs on its own process and dumps the coverage afterwards.
+    // Try to load it and merge it, so that we end up with the whole coverage at the end.
+    if ($type === 'cli' && file_exists($covPath)) {
+        $coverage->merge(require $covPath);
+    }
+
+    if ($coverageType === 'pretty') {
+        (new Html())->process($coverage, $basePath . '/coverage-html');
+    } else {
+        (new PHP())->process($coverage, $covPath);
+        (new Xml(Version::getVersionString()))->process($coverage, $basePath . '/coverage-xml');
+    }
+};
+
 $buildDbConnection = static function (): array {
     $driver = env('DB_DRIVER', 'sqlite');
     $isCi = env('CI', false);
@@ -46,7 +84,7 @@ $buildDbConnection = static function (): array {
     return match ($driver) {
         'sqlite' => [
             'driver' => 'pdo_sqlite',
-            'path' => sys_get_temp_dir() . '/shlink-tests.db',
+            'memory' => true,
         ],
         'postgres' => [
             'driver' => 'pdo_pgsql',
@@ -63,6 +101,9 @@ $buildDbConnection = static function (): array {
             'user' => 'sa',
             'password' => 'Passw0rd!',
             'dbname' => 'shlink_test',
+            'driverOptions' => [
+                'TrustServerCertificate' => 'true',
+            ],
         ],
         default => [ // mysql and maria
             'driver' => 'pdo_mysql',
@@ -71,21 +112,16 @@ $buildDbConnection = static function (): array {
             'user' => 'root',
             'password' => 'root',
             'dbname' => 'shlink_test',
-            'charset' => 'utf8',
+            'charset' => 'utf8mb4',
         ],
     };
 };
 
-$buildTestLoggerConfig = fn (string $handlerName, string $filename) => [
-    'handlers' => [
-        $handlerName => [
-            'name' => StreamHandler::class,
-            'params' => [
-                'level' => Logger::DEBUG,
-                'stream' => sprintf('data/log/api-tests/%s', $filename),
-            ],
-        ],
-    ],
+$buildTestLoggerConfig = static fn (string $filename) => [
+    'level' => Level::Debug->value,
+    'type' => LoggerType::STREAM->value,
+    'destination' => sprintf('data/log/api-tests/%s', $filename),
+    'add_new_line' => true,
 ];
 
 return [
@@ -96,19 +132,19 @@ return [
     'url_shortener' => [
         'domain' => [
             'schema' => 'http',
-            'hostname' => 'doma.in',
+            'hostname' => 's.test',
         ],
-        'validate_url' => true,
     ],
 
     'mezzio-swoole' => [
         'enable_coroutine' => false,
         'swoole-http-server' => [
-            'host' => SWOOLE_TESTING_HOST,
-            'port' => SWOOLE_TESTING_PORT,
+            'host' => API_TESTS_HOST,
+            'port' => API_TESTS_PORT,
             'process-name' => 'shlink_test',
             'options' => [
                 'pid_file' => sys_get_temp_dir() . '/shlink-test-swoole.pid',
+                'log_file' => __DIR__ . '/../../data/log/api-tests/output.log',
                 'enable_coroutine' => false,
             ],
         ],
@@ -118,17 +154,10 @@ return [
         [
             'name' => 'dump_coverage',
             'path' => '/api-tests/stop-coverage',
-            'middleware' => middleware(static function () use (&$coverage) {
+            'middleware' => middleware(static function () use ($exportCoverage) {
                 // 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');
-                }
-
+                $exportCoverage();
                 return new EmptyResponse();
             }),
             'allowed_methods' => ['GET'],
@@ -162,13 +191,69 @@ return [
     '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/', API_TESTS_HOST, API_TESTS_PORT),
                 'http_errors' => false,
             ]),
         ],
         'factories' => [
             TestUtils\Helper\TestHelper::class => InvokableFactory::class,
         ],
+        'delegators' => $isCliTest ? [
+            Application::class => [
+                static function (
+                    ContainerInterface $c,
+                    string $serviceName,
+                    callable $callback,
+                ) use (
+                    &$coverage,
+                    $exportCoverage,
+                ) {
+                    /** @var Application $app */
+                    $app = $callback();
+                    $wrappedEventDispatcher = new EventDispatcher();
+
+                    // When the command starts, start collecting coverage
+                    $wrappedEventDispatcher->subscribeTo(
+                        ConsoleCommandEvent::class,
+                        static function () use (&$coverage): void {
+                            $id = env('COVERAGE_ID');
+                            if ($id === null) {
+                                return;
+                            }
+
+                            $coverage?->start($id);
+                        },
+                    );
+                    // When the command ends, stop collecting coverage
+                    $wrappedEventDispatcher->subscribeTo(
+                        ConsoleTerminateEvent::class,
+                        static function () use (&$coverage, $exportCoverage): void {
+                            $id = env('COVERAGE_ID');
+                            if ($id === null) {
+                                return;
+                            }
+
+                            $coverage?->stop();
+                            $exportCoverage('cli');
+                        },
+                    );
+
+                    $app->setDispatcher(new class ($wrappedEventDispatcher) implements EventDispatcherInterface {
+                        public function __construct(private EventDispatcher $wrappedDispatcher)
+                        {
+                        }
+
+                        public function dispatch(object $event, ?string $eventName = null): object
+                        {
+                            $this->wrappedDispatcher->dispatch($event);
+                            return $event;
+                        }
+                    });
+
+                    return $app;
+                },
+            ],
+        ] : [],
     ],
 
     'entity_manager' => [
@@ -177,13 +262,14 @@ return [
 
     'data_fixtures' => [
         'paths' => [
+            // TODO These are used for CLI tests too, so maybe should be somewhere else
             __DIR__ . '/../../module/Rest/test-api/Fixtures',
         ],
     ],
 
     'logger' => [
-        'Shlink' => $buildTestLoggerConfig('shlink_handler', 'shlink.log'),
-        'Access' => $buildTestLoggerConfig('access_handler', 'access.log'),
+        'Shlink' => $buildTestLoggerConfig('shlink.log'),
+        'Access' => $buildTestLoggerConfig('access.log'),
     ],
 
 ];

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

@@ -3,7 +3,7 @@
 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
+curl https://packages.microsoft.com/config/ubuntu/22.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
+ACCEPT_EULA=Y apt-get install msodbcsql18
+# apt-get install unixodbc-dev

data/infra/examples/apache-vhost.conf

@@ -1,5 +1,5 @@
 <VirtualHost *:80>
-    ServerName doma.in
+    ServerName s.test
     DocumentRoot "/path/to/shlink/public"
 
     <Directory "/path/to/shlink/public">

data/infra/examples/nginx-vhost.conf

@@ -1,5 +1,5 @@
 server {
-    server_name doma.in;
+    server_name s.test;
     listen 80;
     root /path/to/shlink/public;
     index index.php;
@@ -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/php8.2-fpm.sock;
         fastcgi_index index.php;
         include fastcgi.conf;
     }

data/infra/examples/shlink-daemon-logrotate.conf

@@ -1,4 +1,4 @@
-/var/log/shlink/shlink_swoole.log {
+/var/log/shlink/shlink_openswoole.log {
     su root root
     daily
     missingok
@@ -8,6 +8,6 @@
     notifempty
     create 0640 root root
     postrotate
-        /etc/init.d/shlink_swoole restart
+        /etc/init.d/shlink_openswoole restart
     endscript
 }

data/infra/examples/shlink-daemon.sh

@@ -1,26 +1,26 @@
 #!/bin/bash
 ### BEGIN INIT INFO
-# Provides:          shlink_swoole
+# Provides:          shlink_openswoole
 # 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
+# Description:       Shlink non-blocking server with openswoole
 ### END INIT INFO
 
 SCRIPT=/path/to/shlink/vendor/bin/laminas\ mezzio:swoole:start
 RUNAS=root
 
-PIDFILE=/var/run/shlink_swoole.pid
+PIDFILE=/var/run/shlink_openswoole.pid
 LOGDIR=/var/log/shlink
-LOGFILE=${LOGDIR}/shlink_swoole.log
+LOGFILE=${LOGDIR}/shlink_openswoole.log
 
 start() {
   if [[ -f "$PIDFILE" ]] && kill -0 $(cat "$PIDFILE"); then
-    echo 'Shlink with swoole already running' >&2
+    echo 'Shlink with openswoole already running' >&2
     return 1
   fi
-  echo 'Starting shlink with swoole' >&2
+  echo 'Starting shlink with openswoole' >&2
   mkdir -p "$LOGDIR"
   touch "$LOGFILE"
   local CMD="$SCRIPT &> \"$LOGFILE\" & echo \$!"
@@ -30,10 +30,10 @@ start() {
 
 stop() {
   if [[ ! -f "$PIDFILE" ]] || ! kill -0 $(cat "$PIDFILE"); then
-    echo 'Shlink with swoole not running' >&2
+    echo 'Shlink with openswoole not running' >&2
     return 1
   fi
-  echo 'Stopping shlink with swoole' >&2
+  echo 'Stopping shlink with openswoole' >&2
   kill -15 $(cat "$PIDFILE") && rm -f "$PIDFILE"
   echo 'Shlink stopped' >&2
 }

data/infra/php.Dockerfile

@@ -1,15 +1,15 @@
-FROM php:8.1.0-fpm-alpine3.15
+FROM php:8.2-fpm-alpine3.17
 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 PDO_SQLSRV_VERSION 5.11.1
+ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
+ENV MS_ODBC_SQL_VERSION 18_18.1.1.1
 
 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
@@ -31,10 +31,9 @@ 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 apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS linux-headers && \
+    docker-php-ext-install sockets && \
+    apk del .phpize-deps
 RUN docker-php-ext-install bcmath
 
 # Install APCu extension
@@ -48,13 +47,13 @@ RUN mkdir -p /usr/src/php/ext/apcu \
   && echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini
 
 # 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 && \
+RUN wget https://download.microsoft.com/download/${MS_ODBC_DOWNLOAD}/msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
+    apk add --allow-untrusted msodbcsql${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
+    rm msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk
 
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

data/infra/redis/redis-acl.conf

@@ -0,0 +1,2 @@
+user foo allcommands allkeys on >bar
+requirepass barbar

data/infra/roadrunner.Dockerfile

@@ -0,0 +1,76 @@
+FROM php:8.2-alpine3.17
+MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
+
+ENV APCU_VERSION 5.1.21
+ENV PDO_SQLSRV_VERSION 5.11.1
+ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
+ENV MS_ODBC_SQL_VERSION 18_18.1.1.1
+
+RUN apk update
+
+# Install common php extensions
+RUN docker-php-ext-install pdo_mysql
+RUN docker-php-ext-install calendar
+
+RUN apk add --no-cache oniguruma-dev
+RUN docker-php-ext-install mbstring
+
+RUN apk add --no-cache sqlite-libs
+RUN apk add --no-cache sqlite-dev
+RUN docker-php-ext-install pdo_sqlite
+
+RUN apk add --no-cache icu-dev
+RUN docker-php-ext-install intl
+
+RUN apk add --no-cache libzip-dev zlib-dev
+RUN docker-php-ext-install zip
+
+RUN apk add --no-cache libpng-dev
+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 --virtual .phpize-deps $PHPIZE_DEPS linux-headers && \
+    docker-php-ext-install sockets && \
+    apk del .phpize-deps
+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
+
+# Install pcov and sqlsrv driver
+RUN wget https://download.microsoft.com/download/${MS_ODBC_DOWNLOAD}/msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
+    apk add --allow-untrusted msodbcsql${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 msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk
+
+# Install composer
+COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
+
+# Make home directory writable by anyone
+RUN chmod 777 /home
+
+VOLUME /home/shlink
+WORKDIR /home/shlink
+
+# Expose roadrunner port
+EXPOSE 8080
+
+CMD \
+    # Install dependencies if the vendor dir does not exist
+    if [[ ! -d "./vendor" ]]; then /usr/local/bin/composer install ; fi && \
+    # Download roadrunner binary
+    if [[ ! -f "./bin/rr" ]]; then ./vendor/bin/rr get --no-interaction --no-config --location bin/ && chmod +x bin/rr ; fi && \
+    # This forces the app to be started every second until the exit code is 0
+    until ./bin/rr serve -c config/roadrunner/.rr.dev.yml; do sleep 1 ; done

data/infra/swoole.Dockerfile

@@ -1,17 +1,17 @@
-FROM php:8.1.0-alpine3.15
+FROM php:8.2-alpine3.17
 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 OPENSWOOLE_VERSION 22.1.0
+ENV PDO_SQLSRV_VERSION 5.11.1
+ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
+ENV MS_ODBC_SQL_VERSION 18_18.1.1.1
 
 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
@@ -33,10 +33,9 @@ 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 apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS linux-headers && \
+    docker-php-ext-install sockets && \
+    apk del .phpize-deps
 RUN docker-php-ext-install bcmath
 
 # Install APCu extension
@@ -58,13 +57,13 @@ RUN mkdir -p /usr/src/php/ext/inotify \
   && 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 && \
+RUN wget https://download.microsoft.com/download/${MS_ODBC_DOWNLOAD}/msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
+    apk add --allow-untrusted msodbcsql${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
+    rm msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk
 
 # Install composer
 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer

data/migrations/Version20160819142757.php

@@ -5,45 +5,45 @@ declare(strict_types=1);
 namespace ShlinkMigrations;
 
 use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
+use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\Migrations\AbstractMigration;
 
+use function is_subclass_of;
+
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
 class Version20160819142757 extends AbstractMigration
 {
-    private const MYSQL = 'mysql';
-    private const SQLITE = 'sqlite';
-
     /**
      * @throws Exception
      * @throws SchemaException
      */
     public function up(Schema $schema): void
     {
-        $db = $this->connection->getDatabasePlatform()->getName();
+        $platformClass = $this->connection->getDatabasePlatform();
         $table = $schema->getTable('short_urls');
         $column = $table->getColumn('short_code');
 
-        if ($db === self::MYSQL) {
-            $column->setPlatformOption('collation', 'utf8_bin');
-        } elseif ($db === self::SQLITE) {
-            $column->setPlatformOption('collate', 'BINARY');
-        }
+        match (true) {
+            is_subclass_of($platformClass, MySQLPlatform::class) => $column
+                ->setPlatformOption('charset', 'utf8mb4')
+                ->setPlatformOption('collation', 'utf8mb4_bin'),
+            is_subclass_of($platformClass, SqlitePlatform::class) => $column->setPlatformOption('collate', 'BINARY'),
+            default => null,
+        };
     }
 
-    /**
-     * @throws Exception
-     */
     public function down(Schema $schema): void
     {
-        $this->connection->getDatabasePlatform()->getName();
+        // Nothing to roll back
     }
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20160820191203.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -76,6 +77,6 @@ class Version20160820191203 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20171021093246.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\DBAL\Types\Types;
@@ -48,6 +49,6 @@ class Version20171021093246 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20171022064541.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\DBAL\Types\Types;
@@ -45,6 +46,6 @@ class Version20171022064541 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20180801183328.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\Migrations\AbstractMigration;
@@ -42,6 +43,6 @@ final class Version20180801183328 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20180913205455.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkMigrations;
 
 use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 use PDO;
@@ -69,6 +70,6 @@ final class Version20180913205455 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20180915110857.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\Migrations\AbstractMigration;
@@ -50,6 +51,6 @@ final class Version20180915110857 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20181020060559.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkMigrations;
 
 use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\DBAL\Schema\Table;
@@ -58,7 +59,7 @@ final class Version20181020060559 extends AbstractMigration
         foreach (self::COLUMNS as $camelCaseName => $snakeCaseName) {
             $qb->set($snakeCaseName, $camelCaseName);
         }
-        $qb->execute();
+        $qb->executeStatement();
     }
 
     public function down(Schema $schema): void
@@ -68,6 +69,6 @@ final class Version20181020060559 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20181020065148.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\Migrations\AbstractMigration;
@@ -41,6 +42,6 @@ final class Version20181020065148 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20181110175521.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
@@ -37,6 +38,6 @@ final class Version20181110175521 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20190824075137.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
@@ -37,6 +38,6 @@ final class Version20190824075137 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20190930165521.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\DBAL\Types\Types;
@@ -55,6 +56,6 @@ final class Version20190930165521 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }