From a22c98134460e8d67b6e11e411506780f1adfb3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 05:02:36 +0000 Subject: [PATCH 1/5] Update doctrine/coding-standard requirement from ^12.0 to ^12.0 || ^13.0 Updates the requirements on [doctrine/coding-standard](https://github.com/doctrine/coding-standard) to permit the latest version. - [Release notes](https://github.com/doctrine/coding-standard/releases) - [Commits](https://github.com/doctrine/coding-standard/compare/12.0.0...13.0.0) --- updated-dependencies: - dependency-name: doctrine/coding-standard dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 33751a0af7..15e98ee2bd 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ }, "require-dev": { "beberlei/porpaginas": "^2.0", - "doctrine/coding-standard": "^12.0", + "doctrine/coding-standard": "^12.0 || ^13.0", "ecodev/graphql-upload": "^7.0", "laminas/laminas-diactoros": "^3.5", "myclabs/php-enum": "^1.6.6", From 134a6e9a6107182ec264ada893cdf60e0c79cc35 Mon Sep 17 00:00:00 2001 From: Jacob Thomason Date: Tue, 25 Mar 2025 23:18:01 -0400 Subject: [PATCH 2/5] Run PHPCS on the target PHP version --- .github/workflows/continuous_integration.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index a64e09d68e..f4005f5429 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -75,7 +75,10 @@ jobs: run: "composer phpstan" - name: "Run coding standard checks with squizlabs/php_codesniffer" - run: "composer cs-check" + run: | + php_version=$(php -r 'echo PHP_MAJOR_VERSION * 10000 + PHP_MINOR_VERSION * 100 + PHP_RELEASE_VERSION;') + echo "Detected PHP version: $php_version" + phpcs --runtime-set php_version $php_version - name: "Archive code coverage results" uses: actions/upload-artifact@v4 From 3b055164745c1b4b61611132cafb387c9a5008b7 Mon Sep 17 00:00:00 2001 From: Jacob Thomason Date: Tue, 25 Mar 2025 23:24:41 -0400 Subject: [PATCH 3/5] Specify phpcs vendor/bin path --- .github/workflows/continuous_integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index f4005f5429..0a60d6df70 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -78,7 +78,7 @@ jobs: run: | php_version=$(php -r 'echo PHP_MAJOR_VERSION * 10000 + PHP_MINOR_VERSION * 100 + PHP_RELEASE_VERSION;') echo "Detected PHP version: $php_version" - phpcs --runtime-set php_version $php_version + vendor/bin/phpcs --runtime-set php_version $php_version - name: "Archive code coverage results" uses: actions/upload-artifact@v4 From 758b36e1505c228913361650a7cffffa2acbba12 Mon Sep 17 00:00:00 2001 From: Jacob Thomason Date: Tue, 25 Mar 2025 23:49:36 -0400 Subject: [PATCH 4/5] Only run CS checks on the minimum supported version --- .github/workflows/continuous_integration.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 0a60d6df70..5c063f5d38 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -75,10 +75,8 @@ jobs: run: "composer phpstan" - name: "Run coding standard checks with squizlabs/php_codesniffer" - run: | - php_version=$(php -r 'echo PHP_MAJOR_VERSION * 10000 + PHP_MINOR_VERSION * 100 + PHP_RELEASE_VERSION;') - echo "Detected PHP version: $php_version" - vendor/bin/phpcs --runtime-set php_version $php_version + if: matrix.php-version == '8.1' + run: composer cs-check - name: "Archive code coverage results" uses: actions/upload-artifact@v4 @@ -90,8 +88,8 @@ jobs: - uses: codecov/codecov-action@v5.1.2 # upload the coverage to codecov with: fail_ci_if_error: false # optional (default = false) - Need CODECOV_TOKEN - # Do not upload in forks, and only on php8.3, latest deps - if: ${{ github.repository == 'thecodingmachine/graphqlite' && matrix.php-version == '8.3' && matrix.install-args == '' }} + # Do not upload in forks, and only on php8.4, latest deps + if: ${{ github.repository == 'thecodingmachine/graphqlite' && matrix.php-version == '8.4' && matrix.install-args == '' }} examples: name: Check Examples From d0fb42f68aef393ccb2ade5ab621bbafa9250606 Mon Sep 17 00:00:00 2001 From: Jacob Thomason Date: Tue, 25 Mar 2025 23:53:59 -0400 Subject: [PATCH 5/5] Resolve duplicate code coverage artifact name collision --- .github/workflows/continuous_integration.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 5c063f5d38..84347e5540 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -74,14 +74,14 @@ jobs: - name: "Run static code analysis with phpstan/phpstan" run: "composer phpstan" - - name: "Run coding standard checks with squizlabs/php_codesniffer" + - name: "Run coding standard checks with squizlabs/php_codesniffer on minimum supported PHP version" if: matrix.php-version == '8.1' run: composer cs-check - name: "Archive code coverage results" uses: actions/upload-artifact@v4 with: - name: codeCoverage-${{ matrix.php-version }} + name: codeCoverage-${{ matrix.php-version }}-${{ github.run_id }} path: "build" overwrite: true @@ -104,7 +104,7 @@ jobs: - name: "Install PHP with extensions" uses: "shivammathur/setup-php@v2" with: - php-version: "8.2" + php-version: "8.4" tools: composer:v2 - name: "Install dependencies with composer" working-directory: "examples/${{ matrix.example }}"