From 154437c56b7d3770902e5cabf9481e40c7e3dfc3 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Sun, 6 Sep 2026 14:45:29 +0200 Subject: [PATCH 1/8] [GHA] Updated GitHub Actions workflows to latest versions and standards - Removed the deprecated pr-assign.yaml workflow - All remaining workflows delegate to ibexa/gh-workflows reusable workflows tracked at @main, so no action bumps, runner or trigger changes were needed --- .github/workflows/pr-assign.yaml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .github/workflows/pr-assign.yaml diff --git a/.github/workflows/pr-assign.yaml b/.github/workflows/pr-assign.yaml deleted file mode 100644 index 302423e..0000000 --- a/.github/workflows/pr-assign.yaml +++ /dev/null @@ -1,10 +0,0 @@ -name: Assign Pull Request to maintainers - -on: - pull_request_target: - -jobs: - assign: - uses: ibexa/gh-workflows/.github/workflows/pr-assign.yml@main - secrets: - robot-token: ${{ secrets.EZROBOT_PAT }} From c1dee8b33f25a2e3e07c86a98bae78c5670f3783 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Sun, 6 Sep 2026 14:47:16 +0200 Subject: [PATCH 2/8] [GHA] Added missing workflows from bundle-generator skeleton MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - backend-ci.yaml: backport of the 5.0 Backend CI (D6) with the full standard applied — Backend CI name, bare workflow_dispatch, version-glob push trigger, checkout v7, ubuntu-26.04, shared composer-install with explicit php-version, pipefail guard; PHP 7.4 added to the cs-fix matrix; the 5.0 rector job was not backported (rector is not used on 4.6) --- .github/workflows/backend-ci.yaml | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/backend-ci.yaml diff --git a/.github/workflows/backend-ci.yaml b/.github/workflows/backend-ci.yaml new file mode 100644 index 0000000..2ec9e47 --- /dev/null +++ b/.github/workflows/backend-ci.yaml @@ -0,0 +1,34 @@ +name: Backend CI + +on: + push: + branches: + - '[0-9]+.[0-9]+' + pull_request: ~ + workflow_dispatch: ~ + +jobs: + cs-fix: + name: Run code style check + runs-on: "ubuntu-26.04" + strategy: + matrix: + php: + - '7.4' + - '8.3' + steps: + - uses: actions/checkout@v7 + + - uses: ibexa/gh-workflows/actions/composer-install@main + with: + php-version: ${{ matrix.php }} + gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }} + gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }} + satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }} + satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }} + + - name: Run code style check + shell: bash + run: | + set -euo pipefail + composer run-script check-cs -- --format=checkstyle | cs2pr From b9762459bbb8329925a5abefd7a81327bdef7de9 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Sun, 6 Sep 2026 14:47:16 +0200 Subject: [PATCH 3/8] [Composer] Added the check-cs script The backported cs-fix job runs `composer run-script check-cs`; 4.6 only had `fix-cs`, so mirror 5.0's `check-cs` (fix-cs in dry-run mode). --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 455807f..b9c3af1 100644 --- a/composer.json +++ b/composer.json @@ -39,6 +39,7 @@ "phpunit/phpunit": "^6.4 || ^7.0" }, "scripts": { + "check-cs": "@fix-cs --dry-run", "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots" }, "extra": { From 036ac58b0de167c27b7e3542cfd4c7957f8b5e95 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Sun, 6 Sep 2026 14:51:43 +0200 Subject: [PATCH 4/8] [Composer] Dropped the unused phpunit/phpunit dev requirement The 4.6 branch has no tests, yet require-dev pinned phpunit ^6.4 || ^7.0, every release of which is now blocked by Composer's security-advisory check (GHSA-vvj3-c3rp-c85p). That made the backported cs-fix job unable to install dependencies at all. 5.0 already has no phpunit requirement. --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index b9c3af1..3bce331 100644 --- a/composer.json +++ b/composer.json @@ -35,8 +35,7 @@ "require-dev": { "ibexa/code-style": "^1.0", "ibexa/doctrine-schema": "~4.6.0@dev", - "friendsofphp/php-cs-fixer": "^3.0", - "phpunit/phpunit": "^6.4 || ^7.0" + "friendsofphp/php-cs-fixer": "^3.0" }, "scripts": { "check-cs": "@fix-cs --dry-run", From 241d1a17c4fcb03a668b7fe1e15e5e3b7e3cc11d Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Sun, 6 Sep 2026 14:59:31 +0200 Subject: [PATCH 5/8] Fixed code style First run of check-cs on the 4.6 branch (ibexa/code-style ^1.0 now resolves to 1.3, which enforces single_blank_line_before_namespace); four files needed a blank line after the file docblock. --- src/bundle/DependencyInjection/Compiler/CronJobCompilerPass.php | 1 + src/bundle/DependencyInjection/IbexaCronExtension.php | 1 + src/bundle/IbexaCronBundle.php | 1 + src/bundle/Registry/CronJobsRegistry.php | 1 + 4 files changed, 4 insertions(+) diff --git a/src/bundle/DependencyInjection/Compiler/CronJobCompilerPass.php b/src/bundle/DependencyInjection/Compiler/CronJobCompilerPass.php index 9c5c447..d0af13e 100644 --- a/src/bundle/DependencyInjection/Compiler/CronJobCompilerPass.php +++ b/src/bundle/DependencyInjection/Compiler/CronJobCompilerPass.php @@ -4,6 +4,7 @@ * @copyright Copyright (C) Ibexa AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ + namespace Ibexa\Bundle\Cron\DependencyInjection\Compiler; use Ibexa\Bundle\Cron\Registry\CronJobsRegistry; diff --git a/src/bundle/DependencyInjection/IbexaCronExtension.php b/src/bundle/DependencyInjection/IbexaCronExtension.php index 06db718..f6f0e5f 100644 --- a/src/bundle/DependencyInjection/IbexaCronExtension.php +++ b/src/bundle/DependencyInjection/IbexaCronExtension.php @@ -4,6 +4,7 @@ * @copyright Copyright (C) Ibexa AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ + namespace Ibexa\Bundle\Cron\DependencyInjection; use Symfony\Component\Config\FileLocator; diff --git a/src/bundle/IbexaCronBundle.php b/src/bundle/IbexaCronBundle.php index 839d4a0..b993ae7 100644 --- a/src/bundle/IbexaCronBundle.php +++ b/src/bundle/IbexaCronBundle.php @@ -4,6 +4,7 @@ * @copyright Copyright (C) Ibexa AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ + namespace Ibexa\Bundle\Cron; use Ibexa\Bundle\Cron\DependencyInjection\Compiler\CronJobCompilerPass; diff --git a/src/bundle/Registry/CronJobsRegistry.php b/src/bundle/Registry/CronJobsRegistry.php index a40cd95..6c8db44 100644 --- a/src/bundle/Registry/CronJobsRegistry.php +++ b/src/bundle/Registry/CronJobsRegistry.php @@ -4,6 +4,7 @@ * @copyright Copyright (C) Ibexa AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ + namespace Ibexa\Bundle\Cron\Registry; use Cron\Job\ShellJob; From 004a8f6bdc37a9bdc50fb9bb01761e3bee0c4761 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Sun, 6 Sep 2026 15:10:44 +0200 Subject: [PATCH 6/8] [GHA] Ran the backported cs-fix job on PHP 8.1 The 5.0 job uses PHP 8.3, but on 4.6 ibexa/code-style ^1.0 resolves to a php-cs-fixer build that supports PHP 8.2 at most. 8.1 matches the cs-fix jobs of the other 4.6 packages. --- .github/workflows/backend-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-ci.yaml b/.github/workflows/backend-ci.yaml index 2ec9e47..26efbc0 100644 --- a/.github/workflows/backend-ci.yaml +++ b/.github/workflows/backend-ci.yaml @@ -15,7 +15,7 @@ jobs: matrix: php: - '7.4' - - '8.3' + - '8.1' steps: - uses: actions/checkout@v7 From b3ebcfe9dc7c10830c65f8d933f5b9b04868e98a Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Tue, 8 Sep 2026 11:41:21 +0200 Subject: [PATCH 7/8] [GHA] Pinned the code style check to a single PHP version The backported cs-fix job ran on both 7.4 and 8.1. php-cs-fixer can report different results per PHP version, so a matrix makes the check ambiguous. Kept 7.4, the lowest version this branch supports, which is the php-cs-fixer recommendation. --- .github/workflows/backend-ci.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/backend-ci.yaml b/.github/workflows/backend-ci.yaml index 26efbc0..50baca3 100644 --- a/.github/workflows/backend-ci.yaml +++ b/.github/workflows/backend-ci.yaml @@ -13,9 +13,11 @@ jobs: runs-on: "ubuntu-26.04" strategy: matrix: + # one PHP version only: php-cs-fixer can report different + # results per version, so a matrix makes the check ambiguous. + # Lowest supported version for this branch. php: - '7.4' - - '8.1' steps: - uses: actions/checkout@v7 From aa0c0e31e103e15b82564f7c066aec05493eb59f Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Tue, 8 Sep 2026 12:16:16 +0200 Subject: [PATCH 8/8] [GHA] Dropped the redundant comment on the code style matrix --- .github/workflows/backend-ci.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/backend-ci.yaml b/.github/workflows/backend-ci.yaml index 50baca3..baf8c1f 100644 --- a/.github/workflows/backend-ci.yaml +++ b/.github/workflows/backend-ci.yaml @@ -13,9 +13,6 @@ jobs: runs-on: "ubuntu-26.04" strategy: matrix: - # one PHP version only: php-cs-fixer can report different - # results per version, so a matrix makes the check ambiguous. - # Lowest supported version for this branch. php: - '7.4' steps: