From 7469549b53caf7a699095abe9c744fd2607470a3 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Fri, 17 Jul 2026 14:29:02 +0200 Subject: [PATCH 1/4] Updated skeleton dependencies for 6.0 bundles Bumped all ibexa/* constraints and the dev-main branch alias from 5.0 to 6.0, and PHPUnit from ^9.5 to ^12.5, in line with current 6.0 bundles (e.g. ibexa/connector-ai-assistant). Co-Authored-By: Claude Fable 5 --- skeleton/extension/composer.json | 12 ++++++------ skeleton/ibexa-ee/composer.json | 14 +++++++------- skeleton/ibexa-oss/composer.json | 14 +++++++------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/skeleton/extension/composer.json b/skeleton/extension/composer.json index c6eb9cb..d85a881 100644 --- a/skeleton/extension/composer.json +++ b/skeleton/extension/composer.json @@ -7,7 +7,7 @@ ], "require": { "php": ">=8.3", - "ibexa/core": "~5.0.x-dev", + "ibexa/core": "~6.0.x-dev", "symfony/config": "^7.4", "symfony/dependency-injection": "^7.4", "symfony/event-dispatcher": "^7.4", @@ -19,14 +19,14 @@ "dama/doctrine-test-bundle": "^8.2", "deptrac/deptrac": "^3.0", "ibexa/code-style": "~2.3.0", - "ibexa/phpstan": "~5.0.x-dev", - "ibexa/rector": "~5.0.x-dev", - "ibexa/test-core": "~5.0.x-dev", + "ibexa/phpstan": "~6.0.x-dev", + "ibexa/rector": "~6.0.x-dev", + "ibexa/test-core": "~6.0.x-dev", "phpstan/phpstan": "^2.0", "phpstan/phpstan-phpunit": "^2.0", "phpstan/phpstan-strict-rules": "^2", "phpstan/phpstan-symfony": "^2.0", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^12.5", "symfony/phpunit-bridge": "^7.4" }, "autoload": { @@ -59,7 +59,7 @@ }, "extra": { "branch-alias": { - "dev-main": "5.0.x-dev" + "dev-main": "6.0.x-dev" } }, "config": { diff --git a/skeleton/ibexa-ee/composer.json b/skeleton/ibexa-ee/composer.json index 8632018..7324ff2 100644 --- a/skeleton/ibexa-ee/composer.json +++ b/skeleton/ibexa-ee/composer.json @@ -15,7 +15,7 @@ "prefer-stable": true, "require": { "php": ">=8.3", - "ibexa/core": "~5.0.x-dev", + "ibexa/core": "~6.0.x-dev", "symfony/config": "^7.4", "symfony/dependency-injection": "^7.4", "symfony/event-dispatcher": "^7.4", @@ -26,16 +26,16 @@ "require-dev": { "dama/doctrine-test-bundle": "^8.2", "deptrac/deptrac": "^3.0", - "ibexa/behat": "~5.0.x-dev", + "ibexa/behat": "~6.0.x-dev", "ibexa/code-style": "~2.3.0", - "ibexa/phpstan": "~5.0.x-dev", - "ibexa/rector": "~5.0.x-dev", - "ibexa/test-core": "~5.0.x-dev", + "ibexa/phpstan": "~6.0.x-dev", + "ibexa/rector": "~6.0.x-dev", + "ibexa/test-core": "~6.0.x-dev", "phpstan/phpstan": "^2.0", "phpstan/phpstan-phpunit": "^2.0", "phpstan/phpstan-strict-rules": "^2", "phpstan/phpstan-symfony": "^2.0", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^12.5", "symfony/phpunit-bridge": "^7.4" }, "autoload": { @@ -70,7 +70,7 @@ }, "extra": { "branch-alias": { - "dev-main": "5.0.x-dev" + "dev-main": "6.0.x-dev" } }, "config": { diff --git a/skeleton/ibexa-oss/composer.json b/skeleton/ibexa-oss/composer.json index 565f4cb..935cef2 100644 --- a/skeleton/ibexa-oss/composer.json +++ b/skeleton/ibexa-oss/composer.json @@ -9,7 +9,7 @@ "prefer-stable": true, "require": { "php": ">=8.3", - "ibexa/core": "~5.0.x-dev", + "ibexa/core": "~6.0.x-dev", "symfony/config": "^7.4", "symfony/dependency-injection": "^7.4", "symfony/event-dispatcher": "^7.4", @@ -20,16 +20,16 @@ "require-dev": { "dama/doctrine-test-bundle": "^8.2", "deptrac/deptrac": "^3.0", - "ibexa/behat": "~5.0.x-dev", + "ibexa/behat": "~6.0.x-dev", "ibexa/code-style": "~2.3.0", - "ibexa/phpstan": "~5.0.x-dev", - "ibexa/rector": "~5.0.x-dev", - "ibexa/test-core": "~5.0.x-dev", + "ibexa/phpstan": "~6.0.x-dev", + "ibexa/rector": "~6.0.x-dev", + "ibexa/test-core": "~6.0.x-dev", "phpstan/phpstan": "^2.0", "phpstan/phpstan-phpunit": "^2.0", "phpstan/phpstan-strict-rules": "^2", "phpstan/phpstan-symfony": "^2.0", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^12.5", "symfony/phpunit-bridge": "^7.4" }, "autoload": { @@ -64,7 +64,7 @@ }, "extra": { "branch-alias": { - "dev-main": "5.0.x-dev" + "dev-main": "6.0.x-dev" } }, "config": { From ff50927e1dcac7bee04cea210b37a5308ef5c950 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Fri, 17 Jul 2026 14:29:12 +0200 Subject: [PATCH 2/4] Updated skeleton PHPUnit configurations to PHPUnit 12 schema Dropped attributes and elements removed in PHPUnit 10+ (convert* attributes, verbose, beStrictAboutTodoAnnotatedTests, listeners), switched the DAMA extension to the bootstrap element, and added a cache directory. Co-Authored-By: Claude Fable 5 --- skeleton/extension/phpunit.integration.xml | 19 ++++++++----------- skeleton/extension/phpunit.xml.dist | 18 +++++++----------- skeleton/ibexa-ee/phpunit.integration.xml | 19 ++++++++----------- skeleton/ibexa-ee/phpunit.xml.dist | 18 +++++++----------- skeleton/ibexa-oss/phpunit.integration.xml | 19 ++++++++----------- skeleton/ibexa-oss/phpunit.xml.dist | 18 +++++++----------- 6 files changed, 45 insertions(+), 66 deletions(-) diff --git a/skeleton/extension/phpunit.integration.xml b/skeleton/extension/phpunit.integration.xml index 9324426..499edb0 100644 --- a/skeleton/extension/phpunit.integration.xml +++ b/skeleton/extension/phpunit.integration.xml @@ -1,16 +1,16 @@ + + cacheDirectory="var/.phpunit.cache"> - - - + + + - + @@ -18,9 +18,6 @@ - + - - - diff --git a/skeleton/extension/phpunit.xml.dist b/skeleton/extension/phpunit.xml.dist index f0529e8..beccb81 100644 --- a/skeleton/extension/phpunit.xml.dist +++ b/skeleton/extension/phpunit.xml.dist @@ -1,14 +1,10 @@ - + + tests/bundle diff --git a/skeleton/ibexa-ee/phpunit.integration.xml b/skeleton/ibexa-ee/phpunit.integration.xml index 9324426..499edb0 100644 --- a/skeleton/ibexa-ee/phpunit.integration.xml +++ b/skeleton/ibexa-ee/phpunit.integration.xml @@ -1,16 +1,16 @@ + + cacheDirectory="var/.phpunit.cache"> - - - + + + - + @@ -18,9 +18,6 @@ - + - - - diff --git a/skeleton/ibexa-ee/phpunit.xml.dist b/skeleton/ibexa-ee/phpunit.xml.dist index f0529e8..beccb81 100644 --- a/skeleton/ibexa-ee/phpunit.xml.dist +++ b/skeleton/ibexa-ee/phpunit.xml.dist @@ -1,14 +1,10 @@ - + + tests/bundle diff --git a/skeleton/ibexa-oss/phpunit.integration.xml b/skeleton/ibexa-oss/phpunit.integration.xml index 9324426..499edb0 100644 --- a/skeleton/ibexa-oss/phpunit.integration.xml +++ b/skeleton/ibexa-oss/phpunit.integration.xml @@ -1,16 +1,16 @@ + + cacheDirectory="var/.phpunit.cache"> - - - + + + - + @@ -18,9 +18,6 @@ - + - - - diff --git a/skeleton/ibexa-oss/phpunit.xml.dist b/skeleton/ibexa-oss/phpunit.xml.dist index f0529e8..beccb81 100644 --- a/skeleton/ibexa-oss/phpunit.xml.dist +++ b/skeleton/ibexa-oss/phpunit.xml.dist @@ -1,14 +1,10 @@ - + + tests/bundle From a36c60ab77725c207d6a1c8227e00df895de465f Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Fri, 17 Jul 2026 14:29:28 +0200 Subject: [PATCH 3/4] Added pipefail to code style checks in CI workflows Without pipefail the job result reflected the cs2pr exit code, so a failing check-cs run piped into a succeeding cs2pr passed the job. Co-Authored-By: Claude Fable 5 --- .github/workflows/backend-ci.yaml | 5 ++++- skeleton/extension/.github/workflows/backend-ci.yaml | 5 ++++- skeleton/ibexa-ee/.github/workflows/backend-ci.yaml | 5 ++++- skeleton/ibexa-oss/.github/workflows/backend-ci.yaml | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/backend-ci.yaml b/.github/workflows/backend-ci.yaml index 17c09ba..dd63dc7 100644 --- a/.github/workflows/backend-ci.yaml +++ b/.github/workflows/backend-ci.yaml @@ -43,7 +43,10 @@ jobs: run: composer run-script phpstan - name: Run code style check - run: composer run-script check-cs -- --format=checkstyle | cs2pr + shell: bash + run: | + set -euo pipefail + composer run-script check-cs -- --format=checkstyle | cs2pr - name: Run test suite run: composer run-script --timeout=600 test diff --git a/skeleton/extension/.github/workflows/backend-ci.yaml b/skeleton/extension/.github/workflows/backend-ci.yaml index a182431..847d139 100644 --- a/skeleton/extension/.github/workflows/backend-ci.yaml +++ b/skeleton/extension/.github/workflows/backend-ci.yaml @@ -31,7 +31,10 @@ jobs: dependency-versions: "highest" - name: Run code style check - run: composer run-script check-cs -- --format=checkstyle | cs2pr + shell: bash + run: | + set -euo pipefail + composer run-script check-cs -- --format=checkstyle | cs2pr deptrac: name: Deptrac diff --git a/skeleton/ibexa-ee/.github/workflows/backend-ci.yaml b/skeleton/ibexa-ee/.github/workflows/backend-ci.yaml index 6ec485d..4ec806b 100644 --- a/skeleton/ibexa-ee/.github/workflows/backend-ci.yaml +++ b/skeleton/ibexa-ee/.github/workflows/backend-ci.yaml @@ -25,7 +25,10 @@ jobs: satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }} - name: Run code style check - run: composer run-script check-cs -- --format=checkstyle | cs2pr + shell: bash + run: | + set -euo pipefail + composer run-script check-cs -- --format=checkstyle | cs2pr deptrac: name: Deptrac diff --git a/skeleton/ibexa-oss/.github/workflows/backend-ci.yaml b/skeleton/ibexa-oss/.github/workflows/backend-ci.yaml index 4eac8ba..25af6f6 100644 --- a/skeleton/ibexa-oss/.github/workflows/backend-ci.yaml +++ b/skeleton/ibexa-oss/.github/workflows/backend-ci.yaml @@ -23,7 +23,10 @@ jobs: gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }} - name: Run code style check - run: composer run-script check-cs -- --format=checkstyle | cs2pr + shell: bash + run: | + set -euo pipefail + composer run-script check-cs -- --format=checkstyle | cs2pr deptrac: name: Deptrac From 075ea9919f12478dbdfa12b8025ce6135af90a65 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Fri, 17 Jul 2026 14:29:47 +0200 Subject: [PATCH 4/4] Bumped generator application to Symfony 8 Replaced the Console Application::add() call with addCommand(), as add() was removed in Symfony 8. Symfony 8 requires PHP 8.4, so the PHP requirement was raised accordingly and PHP 8.3 dropped from the CI matrix. Generated bundles are unaffected. Co-Authored-By: Claude Fable 5 --- .github/workflows/backend-ci.yaml | 1 - bin/ibexa-bundle-generator | 2 +- composer.json | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/backend-ci.yaml b/.github/workflows/backend-ci.yaml index dd63dc7..a9f4210 100644 --- a/.github/workflows/backend-ci.yaml +++ b/.github/workflows/backend-ci.yaml @@ -17,7 +17,6 @@ jobs: fail-fast: false matrix: php: - - '8.3' - '8.4' - '8.5' diff --git a/bin/ibexa-bundle-generator b/bin/ibexa-bundle-generator index da85a59..45d5ba8 100755 --- a/bin/ibexa-bundle-generator +++ b/bin/ibexa-bundle-generator @@ -12,6 +12,6 @@ use Ibexa\BundleGenerator\Command\GenerateBundleCommand; use Symfony\Component\Console\Application; $application = new Application(); -$application->add(new GenerateBundleCommand()); +$application->addCommand(new GenerateBundleCommand()); $application->setDefaultCommand('generate-bundle', true); $application->run(); diff --git a/composer.json b/composer.json index 92cfbd9..0fc7e9e 100644 --- a/composer.json +++ b/composer.json @@ -7,9 +7,9 @@ "ibexa-dxp" ], "require": { - "php": ">=8.3", - "symfony/console": "^5.4", - "symfony/filesystem": "^5.4" + "php": ">=8.4", + "symfony/console": "^8.0", + "symfony/filesystem": "^8.0" }, "require-dev": { "composer/composer": "^2.1",