From 5bf4b834f3af927a293c08802f5d0997db5065fd Mon Sep 17 00:00:00 2001 From: Matthias Pigulla Date: Fri, 5 Dec 2025 19:25:18 +0100 Subject: [PATCH 1/2] Allow Symfony 8 to be used, bump requirements to currently supported Symfony releases --- .github/workflows/tests.yml | 2 ++ composer.json | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 63c524e..f3bc1b3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,6 +18,8 @@ jobs: - { php-version: 8.3, symfony-version: 6.4.*, orm-version: '^3.0', dependency-version: '' } - { php-version: 8.4, symfony-version: 7.*, orm-version: '^2.20', dependency-version: '' } - { php-version: 8.4, symfony-version: 7.*, orm-version: '^3.0', dependency-version: '' } + - { php-version: 8.4, symfony-version: 8.*, orm-version: '^2.20', dependency-version: '' } + - { php-version: 8.4, symfony-version: 8.*, orm-version: '^3.0', dependency-version: '' } name: PHPUnit (PHP ${{matrix.php-version}}, Symfony version constraint ${{ matrix.symfony-version || 'none' }}, Doctrine ORM version constraint ${{ matrix.orm-version || 'none' }}, ${{ matrix.dependency-version || 'prefer-stable' }}) steps: - uses: actions/checkout@v4 diff --git a/composer.json b/composer.json index 13f0a63..3660748 100644 --- a/composer.json +++ b/composer.json @@ -19,17 +19,17 @@ "doctrine/dbal": "^3.0|^4.0", "doctrine/orm": "^2.8|^3.0", "doctrine/persistence": "^2.1|^3.0|^4.0", - "psr/container": "^1.0", - "psr/log": "^1|^2|^3", - "symfony/config": "^6.4|^7.0", + "psr/container": "^1.0|^2.0", + "psr/log": "^2.0|^3.0", + "symfony/config": "^6.4|^7.3|^8.0", "symfony/service-contracts": "^2.5|^3.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/filesystem": "^6.4|^7.0", - "symfony/finder": "^6.4|^7.0", - "symfony/http-foundation": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/lock": "^6.4|^7.0", - "symfony/twig-bundle": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.3|^8.0", + "symfony/filesystem": "^6.4|^7.3|^8.0", + "symfony/finder": "^6.4|^7.3|^8.0", + "symfony/http-foundation": "^6.4|^7.3|^8.0", + "symfony/http-kernel": "^6.4|^7.3|^8.0", + "symfony/lock": "^6.4|^7.3|^8.0", + "symfony/twig-bundle": "^6.4|^7.3|^8.0", "twig/twig": "^2.0|^3.0" }, @@ -38,12 +38,12 @@ }, "require-dev": { - "doctrine/doctrine-bundle": "^2.12", - "phpunit/phpunit": "^10.5.59", - "symfony/error-handler": "^6.4|^7.0", - "symfony/framework-bundle": "^6.4|^7.0", - "symfony/twig-bundle": "^6.4|^7.0", - "symfony/yaml": "^6.4|^7.0" + "doctrine/doctrine-bundle": "^2.12|^3.0", + "phpunit/phpunit": "^10.5.59|^11.5.45", + "symfony/error-handler": "^6.4|^7.3|^8.0", + "symfony/framework-bundle": "^6.4|^7.3|^8.0", + "symfony/twig-bundle": "^6.4|^7.3|^8.0", + "symfony/yaml": "^6.4|^7.3|^8.0" }, "autoload": { From 399c826b0d17f1470eac25415d94fed55c599130 Mon Sep 17 00:00:00 2001 From: Matthias Pigulla Date: Fri, 12 Dec 2025 11:14:49 +0100 Subject: [PATCH 2/2] Update functional test fixture configuration for Symfony 8 --- .github/workflows/tests.yml | 1 - tests/Fixtures/TestKernel.php | 33 +++++++++++++++++++++++++++++++- tests/Fixtures/config/config.yml | 22 --------------------- tests/bootstrap.php | 8 +++++++- 4 files changed, 39 insertions(+), 25 deletions(-) delete mode 100644 tests/Fixtures/config/config.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f3bc1b3..ce7c706 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,6 @@ jobs: - { php-version: 8.3, symfony-version: 6.4.*, orm-version: '^3.0', dependency-version: '' } - { php-version: 8.4, symfony-version: 7.*, orm-version: '^2.20', dependency-version: '' } - { php-version: 8.4, symfony-version: 7.*, orm-version: '^3.0', dependency-version: '' } - - { php-version: 8.4, symfony-version: 8.*, orm-version: '^2.20', dependency-version: '' } - { php-version: 8.4, symfony-version: 8.*, orm-version: '^3.0', dependency-version: '' } name: PHPUnit (PHP ${{matrix.php-version}}, Symfony version constraint ${{ matrix.symfony-version || 'none' }}, Doctrine ORM version constraint ${{ matrix.orm-version || 'none' }}, ${{ matrix.dependency-version || 'prefer-stable' }}) steps: diff --git a/tests/Fixtures/TestKernel.php b/tests/Fixtures/TestKernel.php index 5369857..c07ec22 100644 --- a/tests/Fixtures/TestKernel.php +++ b/tests/Fixtures/TestKernel.php @@ -3,6 +3,7 @@ namespace Webfactory\Bundle\WfdMetaBundle\Tests\Fixtures; use Symfony\Component\Config\Loader\LoaderInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel; class TestKernel extends Kernel @@ -19,7 +20,37 @@ public function registerBundles(): iterable public function registerContainerConfiguration(LoaderInterface $loader): void { - $loader->load(__DIR__.'/config/config.yml'); + $loader->load(static function (ContainerBuilder $container): void { + $container->loadFromExtension('framework', [ + 'secret' => 'dont-tell-mum', + 'test' => true, + 'http_method_override' => false, + 'handle_all_throwables' => true, + 'php_errors' => [ + 'log' => true, + ], + ] + (Kernel::VERSION_ID < 70000 ? ['annotations' => false] : [])); + + $container->loadFromExtension('doctrine', [ + 'dbal' => [ + 'driver' => 'pdo_sqlite', + 'memory' => true, + ], + 'orm' => [ + 'controller_resolver' => [ + 'auto_mapping' => false, + ], + 'mappings' => [ + 'Webfactory\Bundle\WfdMetaBundle\Tests\Fixtures\Entity' => [ + 'type' => 'attribute', + 'dir' => '%kernel.project_dir%/Entity', + 'is_bundle' => false, + 'prefix' => 'Webfactory\Bundle\WfdMetaBundle\Tests\Fixtures\Entity', + ], + ], + ], + ]); + }); } public function getProjectDir(): string diff --git a/tests/Fixtures/config/config.yml b/tests/Fixtures/config/config.yml deleted file mode 100644 index 82d6f68..0000000 --- a/tests/Fixtures/config/config.yml +++ /dev/null @@ -1,22 +0,0 @@ -framework: - secret: dont-tell-mum - test: true - annotations: false - http_method_override: false - handle_all_throwables: true - php_errors: - log: true - -doctrine: - dbal: - driver: pdo_sqlite - memory: true - orm: - controller_resolver: - auto_mapping: false - mappings: - Webfactory\Bundle\WfdMetaBundle\Tests\Fixtures\Entity: - type: attribute - dir: '%kernel.project_dir%/Entity' - is_bundle: false - prefix: Webfactory\Bundle\WfdMetaBundle\Tests\Fixtures\Entity diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 52fd27d..5d303ed 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,10 +1,16 @@ remove(__DIR__.'/Fixtures/var/cache/test'); +// Use DebugClassLoader to catch certain deprecations that can only be found through source code analysis DebugClassLoader::enable();