Skip to content

IBX-11853: Updated bundle-generator skeletons for 6.0 bundles #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
alongosz wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

IBX-11853: Updated bundle-generator skeletons for 6.0 bundles #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7469549
Updated skeleton dependencies for 6.0 bundles
alongosz Jul 17, 2026
ff50927
Updated skeleton PHPUnit configurations to PHPUnit 12 schema
alongosz Jul 17, 2026
a36c60a
Added pipefail to code style checks in CI workflows
alongosz Jul 17, 2026
075ea99
Bumped generator application to Symfony 8
alongosz Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/backend-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
fail-fast: false
matrix:
php:
- '8.3'
- '8.4'
- '8.5'

Expand All @@ -43,7 +42,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
2 changes: 1 addition & 1 deletion bin/ibexa-bundle-generator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 4 additions & 1 deletion skeleton/extension/.github/workflows/backend-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions skeleton/extension/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -59,7 +59,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "5.0.x-dev"
"dev-main": "6.0.x-dev"
}
},
"config": {
Expand Down
19 changes: 8 additions & 11 deletions skeleton/extension/phpunit.integration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
<?xml version="1.0"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
bootstrap="tests/integration/bootstrap.php"
beStrictAboutOutputDuringTests="true"
beStrictAboutTodoAnnotatedTests="true"
failOnWarning="true"
verbose="true">
cacheDirectory="var/.phpunit.cache">
<php>
<env name="KERNEL_CLASS" value="Ibexa\Tests\Integration\__BUNDLE_NAME__\TestKernel" />
<env name="SEARCH_ENGINE" value="legacy" />
<env name="DATABASE_URL" value="sqlite://i@i/var/test.db" />
<env name="KERNEL_CLASS" value="Ibexa\Tests\Integration\__BUNDLE_NAME__\TestKernel"/>
<env name="SEARCH_ENGINE" value="legacy"/>
<env name="DATABASE_URL" value="sqlite://i@i/var/test.db"/>
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0&amp;verbose=0"/>
<ini name="intl.default_locale" value="en_US" />
<ini name="intl.default_locale" value="en_US"/>
</php>
<testsuites>
<testsuite name="integration">
<directory>tests/integration</directory>
</testsuite>
</testsuites>
<extensions>
<extension class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension" />
<bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension"/>
</extensions>
<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
</listeners>
</phpunit>
18 changes: 7 additions & 11 deletions skeleton/extension/phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
failOnWarning="true"
colors="true">
<?xml version="1.0"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
bootstrap="vendor/autoload.php"
failOnWarning="true"
colors="true"
cacheDirectory="var/.phpunit.cache">
<testsuites>
<testsuite name="bundle">
<directory>tests/bundle</directory>
Expand Down
5 changes: 4 additions & 1 deletion skeleton/ibexa-ee/.github/workflows/backend-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions skeleton/ibexa-ee/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -70,7 +70,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "5.0.x-dev"
"dev-main": "6.0.x-dev"
}
},
"config": {
Expand Down
19 changes: 8 additions & 11 deletions skeleton/ibexa-ee/phpunit.integration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
<?xml version="1.0"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
bootstrap="tests/integration/bootstrap.php"
beStrictAboutOutputDuringTests="true"
beStrictAboutTodoAnnotatedTests="true"
failOnWarning="true"
verbose="true">
cacheDirectory="var/.phpunit.cache">
<php>
<env name="KERNEL_CLASS" value="Ibexa\Tests\Integration\__BUNDLE_NAME__\TestKernel" />
<env name="SEARCH_ENGINE" value="legacy" />
<env name="DATABASE_URL" value="sqlite://i@i/var/test.db" />
<env name="KERNEL_CLASS" value="Ibexa\Tests\Integration\__BUNDLE_NAME__\TestKernel"/>
<env name="SEARCH_ENGINE" value="legacy"/>
<env name="DATABASE_URL" value="sqlite://i@i/var/test.db"/>
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0&amp;verbose=0"/>
<ini name="intl.default_locale" value="en_US" />
<ini name="intl.default_locale" value="en_US"/>
</php>
<testsuites>
<testsuite name="integration">
<directory>tests/integration</directory>
</testsuite>
</testsuites>
<extensions>
<extension class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension" />
<bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension"/>
</extensions>
<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
</listeners>
</phpunit>
18 changes: 7 additions & 11 deletions skeleton/ibexa-ee/phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
failOnWarning="true"
colors="true">
<?xml version="1.0"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
bootstrap="vendor/autoload.php"
failOnWarning="true"
colors="true"
cacheDirectory="var/.phpunit.cache">
<testsuites>
<testsuite name="bundle">
<directory>tests/bundle</directory>
Expand Down
5 changes: 4 additions & 1 deletion skeleton/ibexa-oss/.github/workflows/backend-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions skeleton/ibexa-oss/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -64,7 +64,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "5.0.x-dev"
"dev-main": "6.0.x-dev"
}
},
"config": {
Expand Down
19 changes: 8 additions & 11 deletions skeleton/ibexa-oss/phpunit.integration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
<?xml version="1.0"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
bootstrap="tests/integration/bootstrap.php"
beStrictAboutOutputDuringTests="true"
beStrictAboutTodoAnnotatedTests="true"
failOnWarning="true"
verbose="true">
cacheDirectory="var/.phpunit.cache">
<php>
<env name="KERNEL_CLASS" value="Ibexa\Tests\Integration\__BUNDLE_NAME__\TestKernel" />
<env name="SEARCH_ENGINE" value="legacy" />
<env name="DATABASE_URL" value="sqlite://i@i/var/test.db" />
<env name="KERNEL_CLASS" value="Ibexa\Tests\Integration\__BUNDLE_NAME__\TestKernel"/>
<env name="SEARCH_ENGINE" value="legacy"/>
<env name="DATABASE_URL" value="sqlite://i@i/var/test.db"/>
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0&amp;verbose=0"/>
<ini name="intl.default_locale" value="en_US" />
<ini name="intl.default_locale" value="en_US"/>
</php>
<testsuites>
<testsuite name="integration">
<directory>tests/integration</directory>
</testsuite>
</testsuites>
<extensions>
<extension class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension" />
<bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension"/>
</extensions>
<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
</listeners>
</phpunit>
18 changes: 7 additions & 11 deletions skeleton/ibexa-oss/phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
failOnWarning="true"
colors="true">
<?xml version="1.0"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd"
bootstrap="vendor/autoload.php"
failOnWarning="true"
colors="true"
cacheDirectory="var/.phpunit.cache">
<testsuites>
<testsuite name="bundle">
<directory>tests/bundle</directory>
Expand Down