Image in matrix for Postgres int tests

Author: micszo

.github/workflows/ci.yaml

@@ -73,12 +73,12 @@ jobs:
             - name: Run integration test suite
               run: composer run-script integration
 
-    integration-tests-postgres-14:
-        name: PostgreSQL integration tests (14)
+    integration-tests-postgres:
+        name: PostgreSQL integration tests
         needs: tests
         services:
             postgres:
-                image: postgres:14
+                image: ${{ matrix.image }}
                 ports:
                     - 5432
                 env:
@@ -100,6 +100,9 @@ jobs:
                     - '7.4'
                     - '8.0'
                     - '8.1'
+                image:
+                    - 'postgres:14'
+                    - 'postgres:18'
 
         steps:
             -   uses: actions/checkout@v2
@@ -126,59 +129,6 @@ jobs:
                     # Required by old repository tests
                     DATABASE: "pgsql://postgres:postgres@localhost:${{ job.services.postgres.ports[5432] }}/testdb"
 
-    integration-tests-postgres-18:
-        name: PostgreSQL integration tests (18)
-        needs: tests
-        services:
-            postgres:
-                image: postgres:18
-                ports:
-                    - 5432
-                env:
-                    POSTGRES_PASSWORD: postgres
-                    POSTGRES_DB: testdb
-                options: >-
-                    --health-cmd pg_isready
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-                    --tmpfs /var/lib/postgres
-        runs-on: "ubuntu-24.04"
-        timeout-minutes: 60
-
-        strategy:
-            fail-fast: false
-            matrix:
-                php:
-                    - '7.4'
-                    - '8.0'
-                    - '8.1'
-
-        steps:
-            -   uses: actions/checkout@v5
-
-            -   name: Setup PHP Action
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    coverage: none
-                    extensions: pdo_pgsql, gd
-                    tools: cs2pr
-
-            -   uses: ramsey/composer-install@v3
-                with:
-                    dependency-versions: "highest"
-
-            -   name: Setup problem matchers for PHPUnit
-                run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-            -   name: Run integration test suite vs Postgresql
-                run: composer run-script integration
-                env:
-                    DATABASE_URL: "pgsql://postgres:postgres@localhost:${{ job.services.postgres.ports[5432] }}/testdb?server_version=10"
-                    # Required by old repository tests
-                    DATABASE: "pgsql://postgres:postgres@localhost:${{ job.services.postgres.ports[5432] }}/testdb"
-
     integration-tests-mysql-80:
         name: MySQL integration tests (8.0)
         needs: tests