From b591c918457eea50a94df4e31a63fda1cdee3c29 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Mon, 7 Sep 2026 22:28:40 +0200 Subject: [PATCH 1/4] Update to doctrine/orm 3.7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ac46d4817..231189f7e 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "cuyz/valinor": "~2.5.0", "doctrine/dbal": "^4.4", "doctrine/migrations": "^3.9", - "doctrine/orm": "^3.6", + "doctrine/orm": "^3.7", "donatj/phpuseragentparser": "^1.11", "friendsofphp/proxy-manager-lts": "^1.0", "geoip2/geoip2": "^3.3", From 182a430b9e6a3e3ad31c69ffd0e59a77e0c54f3a Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Mon, 7 Sep 2026 22:31:20 +0200 Subject: [PATCH 2/4] Add PHP 8.6 to CI --- .github/workflows/ci-db-tests.yml | 3 ++- .github/workflows/ci-tests.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-db-tests.yml b/.github/workflows/ci-db-tests.yml index 8675d1bfa..53d187cda 100644 --- a/.github/workflows/ci-db-tests.yml +++ b/.github/workflows/ci-db-tests.yml @@ -13,9 +13,10 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - php-version: ['8.4', '8.5'] + php-version: ['8.4', '8.5', '8.6'] env: LC_ALL: C + continue-on-error: ${{ matrix.php-version == '8.6' }} steps: - uses: actions/checkout@v5 - name: Install MSSQL ODBC diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 1a45651b1..1b1c2d232 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -13,9 +13,10 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - php-version: ['8.4', '8.5'] + php-version: ['8.4', '8.5', '8.6'] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # rr get-binary picks this env automatically + continue-on-error: ${{ matrix.php-version == '8.6' }} steps: - uses: actions/checkout@v5 - name: Start postgres database server From cef79844f8755083152f23187ef09a3c8267c580 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Mon, 7 Sep 2026 22:35:11 +0200 Subject: [PATCH 3/4] Fix static analysis after update to doctrine/orm 3.7 --- module/Core/src/ShortUrl/Entity/ShortUrl.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/Core/src/ShortUrl/Entity/ShortUrl.php b/module/Core/src/ShortUrl/Entity/ShortUrl.php index 81483d9fb..187c9d5fc 100644 --- a/module/Core/src/ShortUrl/Entity/ShortUrl.php +++ b/module/Core/src/ShortUrl/Entity/ShortUrl.php @@ -8,6 +8,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Criteria; +use Doctrine\Common\Collections\Order; use Doctrine\Common\Collections\Selectable; use Shlinkio\Shlink\Common\Entity\AbstractEntity; use Shlinkio\Shlink\Core\Domain\Entity\Domain; @@ -186,7 +187,7 @@ public function mostRecentImportedVisitDate(): Chronos|null { $criteria = Criteria::create() ->where(Criteria::expr()->eq('type', VisitType::IMPORTED)) - ->orderBy(['id' => 'DESC']) + ->orderBy(['id' => Order::Descending]) ->setMaxResults(1); $visit = $this->visits->matching($criteria)->last(); From 3f08c5e638a774e0ace7cc0fb701139e3e99b4fc Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Mon, 7 Sep 2026 22:37:08 +0200 Subject: [PATCH 4/4] Ingore PHP platform req when installing deps in CI for PHP 8.6 --- .github/actions/ci-setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/ci-setup/action.yml b/.github/actions/ci-setup/action.yml index 3a6a86423..720a35e05 100644 --- a/.github/actions/ci-setup/action.yml +++ b/.github/actions/ci-setup/action.yml @@ -43,5 +43,5 @@ runs: coverage: xdebug - name: Install dependencies if: ${{ inputs.install-deps == 'yes' }} - run: composer install --no-interaction --prefer-dist + run: composer install --no-interaction --prefer-dist ${{ inputs.php-version == '8.6' && '--ignore-platform-req=php' || '' }} shell: bash