From af04da0502d5cbff31a2bbc27039c2b3e49584f7 Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Sat, 1 Aug 2026 10:16:25 -0700 Subject: [PATCH 1/2] Use the consolidated PHP and JavaScript check workflows Replaces the single-purpose check workflows with the consolidated php-checks and js-checks workflows from happyprime/workflows. Co-Authored-By: Claude Opus 5 (1M context) --- .github/workflows/php-checks.yml | 35 ++++++++++++++++++++++++++++++++ .github/workflows/phpcs.yml | 21 ------------------- .github/workflows/phpstan.yml | 21 ------------------- .github/workflows/phpunit.yml | 16 --------------- 4 files changed, 35 insertions(+), 58 deletions(-) create mode 100644 .github/workflows/php-checks.yml delete mode 100644 .github/workflows/phpcs.yml delete mode 100644 .github/workflows/phpstan.yml delete mode 100644 .github/workflows/phpunit.yml diff --git a/.github/workflows/php-checks.yml b/.github/workflows/php-checks.yml new file mode 100644 index 0000000..89700a1 --- /dev/null +++ b/.github/workflows/php-checks.yml @@ -0,0 +1,35 @@ +# Run PHPCS, PHPStan, and PHPUnit in a single job. +# +# Each check runs only when the project is configured for it, so this file is +# safe to sync to a repository that has only some of them. A check the project +# is configured for but cannot run is reported on the pull request rather than +# failed. +# +# This file is managed in https://github.com/happyprime/projects +name: PHP checks + +on: + push: + branches: + - trunk + - develop + pull_request: + branches: + - trunk + - develop + +# The consolidated workflow comments on the pull request when a project is +# configured for a check it cannot run. A workflow level permissions block caps +# what a reusable workflow receives, so the write scope is granted here. +permissions: + contents: read + pull-requests: write + +jobs: + call-workflow: + uses: happyprime/workflows/.github/workflows/php-checks.yml@trunk + with: + php-version: '8.4' + wp-versions: 'latest trunk' + secrets: + composer-auth-token: ${{ secrets.COMPOSER_AUTH_TOKEN }} diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml deleted file mode 100644 index 9ffa406..0000000 --- a/.github/workflows/phpcs.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Run PHP Code Sniffer (PHPCS) and comment on the pull request with any issues. -# -# This file is managed in https://github.com/happyprime/projects -name: PHPCS (Default, PHP 8.3) - -on: pull_request - -# The GITHUB_TOKEN used by Dependabot has read-only permissions by default. We -# provide write permissions to this workflow so that comments can be left on -# the pull request. -# -# @see https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#changing-github_token-permissions -permissions: - contents: read - pull-requests: write - -jobs: - call-workflow: - uses: happyprime/workflows/.github/workflows/phpcs.yml@trunk - with: - php-version: '8.3' diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml deleted file mode 100644 index 191b169..0000000 --- a/.github/workflows/phpstan.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Run PHPStan and comment on the pull request with any issues. -# -# This file is managed in https://github.com/happyprime/projects -name: PHPStan (Default, PHP 8.3) - -on: pull_request - -# The GITHUB_TOKEN used by Dependabot has read-only permissions by default. We -# provide write permissions to this workflow so that comments can be left on -# the pull request. -# -# @see https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#changing-github_token-permissions -permissions: - contents: read - pull-requests: write - -jobs: - call-workflow: - uses: happyprime/workflows/.github/workflows/phpstan.yml@trunk - with: - php-version: '8.3' diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml deleted file mode 100644 index 00080ff..0000000 --- a/.github/workflows/phpunit.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Run PHPUnit. -# -# This file is managed in https://github.com/happyprime/projects -name: PHPUnit - -on: - push: - branches: - - trunk - pull_request: - branches: - - trunk - -jobs: - call-workflow: - uses: happyprime/workflows/.github/workflows/phpunit.yml@trunk From 168d9cd0c7f9eab13d9763447c5d81931ae844a1 Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Sat, 1 Aug 2026 12:07:44 -0700 Subject: [PATCH 2/2] Add package.json linting and refresh check tooling - coding-standards=0.0.6 phpstan=1.12.34 Co-Authored-By: Claude Opus 5 (1M context) --- composer.lock | 107 +++++++++++++++++++++----------------------------- 1 file changed, 45 insertions(+), 62 deletions(-) diff --git a/composer.lock b/composer.lock index 062b96c..2c4890c 100644 --- a/composer.lock +++ b/composer.lock @@ -280,20 +280,19 @@ }, { "name": "nikic/php-parser", - "version": "v5.7.0", + "version": "v5.8.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82" + "reference": "044a6a392ff8ad0d61f14370a5fbbd0a0107152f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dca41cd15c2ac9d055ad70dbfd011130757d1f82", - "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/044a6a392ff8ad0d61f14370a5fbbd0a0107152f", + "reference": "044a6a392ff8ad0d61f14370a5fbbd0a0107152f", "shasum": "" }, "require": { - "ext-ctype": "*", "ext-json": "*", "ext-tokenizer": "*", "php": ">=7.4" @@ -332,9 +331,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.7.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.8.0" }, - "time": "2025-12-06T11:56:16+00:00" + "time": "2026-07-04T14:30:18+00:00" }, { "name": "phar-io/manifest", @@ -508,20 +507,20 @@ }, { "name": "php-stubs/wordpress-tests-stubs", - "version": "v6.9.4", + "version": "v6.9.5", "source": { "type": "git", "url": "https://github.com/php-stubs/wordpress-tests-stubs.git", - "reference": "51ea75d9d0f29059bc89c522186dac66a8f66545" + "reference": "d044087c027834427b9564519fbcc8c51b920ec1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-stubs/wordpress-tests-stubs/zipball/51ea75d9d0f29059bc89c522186dac66a8f66545", - "reference": "51ea75d9d0f29059bc89c522186dac66a8f66545", + "url": "https://api.github.com/repos/php-stubs/wordpress-tests-stubs/zipball/d044087c027834427b9564519fbcc8c51b920ec1", + "reference": "d044087c027834427b9564519fbcc8c51b920ec1", "shasum": "" }, "require-dev": { - "php": "^7.3 || ^8.0", + "php": "^7.4 || ^8.0", "php-stubs/generator": "^0.8.0" }, "suggest": { @@ -542,9 +541,9 @@ ], "support": { "issues": "https://github.com/php-stubs/wordpress-tests-stubs/issues", - "source": "https://github.com/php-stubs/wordpress-tests-stubs/tree/v6.9.4" + "source": "https://github.com/php-stubs/wordpress-tests-stubs/tree/v6.9.5" }, - "time": "2026-05-25T08:18:54+00:00" + "time": "2026-07-23T13:01:54+00:00" }, { "name": "php-stubs/wp-cli-stubs", @@ -753,21 +752,21 @@ }, { "name": "phpcsstandards/phpcsextra", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHPCSExtra.git", - "reference": "b598aa890815b8df16363271b659d73280129101" + "reference": "39467533fdb742446d68c1d10ac33d625ee0311c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/b598aa890815b8df16363271b659d73280129101", - "reference": "b598aa890815b8df16363271b659d73280129101", + "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/39467533fdb742446d68c1d10ac33d625ee0311c", + "reference": "39467533fdb742446d68c1d10ac33d625ee0311c", "shasum": "" }, "require": { "php": ">=5.4", - "phpcsstandards/phpcsutils": "^1.2.0", + "phpcsstandards/phpcsutils": "^1.2.3", "squizlabs/php_codesniffer": "^3.13.5 || ^4.0.1" }, "require-dev": { @@ -831,20 +830,20 @@ "type": "thanks_dev" } ], - "time": "2025-11-12T23:06:57+00:00" + "time": "2026-07-27T11:13:17+00:00" }, { "name": "phpcsstandards/phpcsutils", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHPCSUtils.git", - "reference": "c216317e96c8b3f5932808f9b0f1f7a14e3bbf55" + "reference": "5f35d9408c54d7b529501f3c688b6eae562aea1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/c216317e96c8b3f5932808f9b0f1f7a14e3bbf55", - "reference": "c216317e96c8b3f5932808f9b0f1f7a14e3bbf55", + "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/5f35d9408c54d7b529501f3c688b6eae562aea1f", + "reference": "5f35d9408c54d7b529501f3c688b6eae562aea1f", "shasum": "" }, "require": { @@ -924,7 +923,7 @@ "type": "thanks_dev" } ], - "time": "2025-12-08T14:27:58+00:00" + "time": "2026-07-27T10:28:41+00:00" }, { "name": "phpstan/extension-installer", @@ -976,11 +975,11 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.33", + "version": "1.12.34", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/37982d6fc7cbb746dda7773530cda557cdf119e1", - "reference": "37982d6fc7cbb746dda7773530cda557cdf119e1", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4dd89ca7aa30fdc6760be21550d583bcc32e8476", + "reference": "4dd89ca7aa30fdc6760be21550d583bcc32e8476", "shasum": "" }, "require": { @@ -1025,7 +1024,7 @@ "type": "github" } ], - "time": "2026-02-28T20:30:03+00:00" + "time": "2026-07-28T10:04:39+00:00" }, { "name": "phpstan/phpstan-phpunit", @@ -1400,25 +1399,25 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.34", + "version": "9.6.35", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b36f02317466907a230d3aa1d34467041271ef4a" + "reference": "0edba2f3a0c48df3553cb9b640810b30df60302b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b36f02317466907a230d3aa1d34467041271ef4a", - "reference": "b36f02317466907a230d3aa1d34467041271ef4a", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0edba2f3a0c48df3553cb9b640810b30df60302b", + "reference": "0edba2f3a0c48df3553cb9b640810b30df60302b", "shasum": "" }, "require": { "doctrine/instantiator": "^1.5.0 || ^2", "ext-dom": "*", + "ext-filter": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", - "ext-xml": "*", "ext-xmlwriter": "*", "myclabs/deep-copy": "^1.13.4", "phar-io/manifest": "^2.0.4", @@ -1483,31 +1482,15 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.34" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.35" }, "funding": [ { - "url": "https://phpunit.de/sponsors.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - }, - { - "url": "https://liberapay.com/sebastianbergmann", - "type": "liberapay" - }, - { - "url": "https://thanks.dev/u/gh/sebastianbergmann", - "type": "thanks_dev" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", - "type": "tidelift" + "url": "https://phpunit.de/sponsoring.html", + "type": "other" } ], - "time": "2026-01-27T05:45:00+00:00" + "time": "2026-07-06T14:48:07+00:00" }, { "name": "sebastian/cli-parser", @@ -2850,16 +2833,16 @@ }, { "name": "wp-coding-standards/wpcs", - "version": "3.3.0", + "version": "3.4.1", "source": { "type": "git", "url": "https://github.com/WordPress/WordPress-Coding-Standards.git", - "reference": "7795ec6fa05663d716a549d0b44e47ffc8b0d4a6" + "reference": "ec2ff942335f33683a5957a85d138753876a05cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/7795ec6fa05663d716a549d0b44e47ffc8b0d4a6", - "reference": "7795ec6fa05663d716a549d0b44e47ffc8b0d4a6", + "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/ec2ff942335f33683a5957a85d138753876a05cf", + "reference": "ec2ff942335f33683a5957a85d138753876a05cf", "shasum": "" }, "require": { @@ -2868,9 +2851,9 @@ "ext-tokenizer": "*", "ext-xmlreader": "*", "php": ">=7.2", - "phpcsstandards/phpcsextra": "^1.5.0", - "phpcsstandards/phpcsutils": "^1.1.0", - "squizlabs/php_codesniffer": "^3.13.4" + "phpcsstandards/phpcsextra": "^1.5.1", + "phpcsstandards/phpcsutils": "^1.2.3", + "squizlabs/php_codesniffer": "^3.13.5" }, "require-dev": { "php-parallel-lint/php-console-highlighter": "^1.0.0", @@ -2912,7 +2895,7 @@ "type": "custom" } ], - "time": "2025-11-25T12:08:04+00:00" + "time": "2026-07-27T11:53:23+00:00" }, { "name": "yoast/phpunit-polyfills",