From 794609fdb1852f486e2f1aadd9783ac7bf14de8c Mon Sep 17 00:00:00 2001 From: "aidan.casey" Date: Thu, 3 Sep 2026 21:52:33 -0400 Subject: [PATCH 1/4] Remove coverage dependencies where unused. --- .github/workflows/integration-tests.yml | 4 ++-- .github/workflows/isolated-tests.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 0ab2c4d50..3f1e1792a 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -37,7 +37,7 @@ jobs: with: php-version: ${{ matrix.php }} extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, pdo_pgsql, intl, ftp, zip - coverage: pcov + coverage: none - name: Setup Bun uses: oven-sh/setup-bun@v2 @@ -83,7 +83,7 @@ jobs: with: php-version: ${{ matrix.php }} extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, pdo_pgsql, intl, ftp, zip - coverage: pcov + coverage: none - name: Setup problem matchers run: | diff --git a/.github/workflows/isolated-tests.yml b/.github/workflows/isolated-tests.yml index 3662ec5ee..2ba1b33b4 100644 --- a/.github/workflows/isolated-tests.yml +++ b/.github/workflows/isolated-tests.yml @@ -63,7 +63,7 @@ jobs: with: php-version: ${{ matrix.php }} extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, intl - coverage: pcov + coverage: none - name: Setup Redis if: ${{ matrix.os != 'windows-latest' && matrix.package.name == 'kv-store' }} From 6706269d05b2393b17c382114449a8f2335bdd8b Mon Sep 17 00:00:00 2001 From: "aidan.casey" Date: Thu, 3 Sep 2026 22:07:29 -0400 Subject: [PATCH 2/4] Add cache to composer install in integration-tests.yml --- .github/workflows/integration-tests.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 3f1e1792a..b66d56a35 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -4,7 +4,7 @@ on: pull_request: paths-ignore: - "docs/**" - - ".github/**" + # - ".github/**" workflow_dispatch: schedule: - cron: "0 0 * * *" @@ -59,20 +59,21 @@ jobs: os: [ubuntu-latest] php: [8.5] database: [sqlite, mysql, postgres] - stability: [prefer-stable] + dependencies: [highest] include: - os: windows-latest php: 8.5 database: sqlite - stability: prefer-stable + dependencies: highest + - os: ubuntu-latest php: 8.5 database: sqlite - stability: prefer-lowest + dependencies: lowest env: POSTGRES_USER: ${{ matrix.os == 'windows-latest' && 'postgres' || 'runner' }} - name: "Run tests: PHP ${{ matrix.php }} - ${{ matrix.database }} - ${{ matrix.stability }} - ${{ matrix.os }}" + name: "Run tests: PHP ${{ matrix.php }} - ${{ matrix.database }} - ${{ matrix.dependencies }} - ${{ matrix.os }}" steps: - name: Checkout code @@ -91,7 +92,10 @@ jobs: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: Install dependencies - run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --ignore-platform-reqs + uses: ramsey/composer-install@v4 + with: + dependency-versions: ${{ matrix.dependencies }} + composer-options: ""--prefer-dist --ignore-platform-reqs" - name: "Setup Redis" if: ${{ matrix.os != 'windows-latest' }} From ade0d5be11eaefad94168397ce584938a1fd0042 Mon Sep 17 00:00:00 2001 From: "aidan.casey" Date: Thu, 3 Sep 2026 22:10:33 -0400 Subject: [PATCH 3/4] Fix formatting. --- .github/workflows/coding-conventions.yml | 6 ++++++ .github/workflows/integration-tests.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/coding-conventions.yml b/.github/workflows/coding-conventions.yml index f2ec89b07..5faf3514b 100644 --- a/.github/workflows/coding-conventions.yml +++ b/.github/workflows/coding-conventions.yml @@ -3,7 +3,13 @@ name: Coding Conventions on: push: branches: [3.x] + paths-ignore: + - "docs/**" + - ".github/**" pull_request: + paths-ignore: + - "docs/**" + - ".github/**" workflow_dispatch: concurrency: diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index b66d56a35..7b3286867 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -95,7 +95,7 @@ jobs: uses: ramsey/composer-install@v4 with: dependency-versions: ${{ matrix.dependencies }} - composer-options: ""--prefer-dist --ignore-platform-reqs" + composer-options: "--prefer-dist --ignore-platform-reqs" - name: "Setup Redis" if: ${{ matrix.os != 'windows-latest' }} From ffeb094977f2f99ce659afc2c9c327485bd11bba Mon Sep 17 00:00:00 2001 From: "aidan.casey" Date: Thu, 3 Sep 2026 22:23:25 -0400 Subject: [PATCH 4/4] Add composer cache to isolated tests. --- .github/workflows/isolated-tests.yml | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/.github/workflows/isolated-tests.yml b/.github/workflows/isolated-tests.yml index 2ba1b33b4..c5b65eea5 100644 --- a/.github/workflows/isolated-tests.yml +++ b/.github/workflows/isolated-tests.yml @@ -4,7 +4,7 @@ on: pull_request: paths-ignore: - "docs/**" - - ".github/**" +# - ".github/**" workflow_dispatch: schedule: - cron: "0 0 * * *" @@ -48,10 +48,10 @@ jobs: package: ${{ fromJson(needs.get_packages.outputs.matrix) }} php: - 8.5 - stability: - - prefer-stable - - prefer-lowest - name: "Run tests: ${{ matrix.package.name }} - PHP ${{ matrix.php }} - ${{ matrix.stability }}" + dependencies: + - highest + - lowest + name: "Run tests: ${{ matrix.package.name }} - PHP ${{ matrix.php }} - ${{ matrix.dependencies }}" steps: - name: Checkout code uses: actions/checkout@v4 @@ -77,11 +77,18 @@ jobs: echo "::add-matcher::${{ runner.tool_cache }}/php.json" echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" + - name: Build Packages + run: ./bin/build-packages + - name: Install dependencies - run: | - ./bin/build-packages - cd "packages/${{ matrix.package.basename }}" - composer update --${{ matrix.stability }} --prefer-dist --no-interaction --ignore-platform-reqs + uses: ramsey/composer-install@v4 + with: + dependency-versions: ${{ matrix.dependencies }} + composer-options: >- + --prefer-dist + --ignore-platform-reqs + --prefer-stable + --working-dir=packages/${{ matrix.package.basename }} - name: Execute tests run: phpunit -c "packages/${{ matrix.package.basename }}/phpunit.xml"