From f78dece4ab2cfeb30bf597cfc4cad92e045b4711 Mon Sep 17 00:00:00 2001 From: Fran Moreno Date: Sat, 16 Dec 2023 13:55:19 +0100 Subject: [PATCH] Allow to install symfony 7 packages --- .github/workflows/test.yaml | 5 +++++ composer.json | 16 ++++++++-------- tests/App/config/services.php | 11 ++++++++++- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 667bd681..eb1ea74b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -57,6 +57,11 @@ jobs: allowed-to-fail: false symfony-require: 6.4.* variant: symfony/symfony:"6.4.*" + - php-version: '8.2' + dependencies: highest + allowed-to-fail: false + symfony-require: 7.0.* + variant: symfony/symfony:"7.0.*" steps: - name: Checkout diff --git a/composer.json b/composer.json index e69508ce..21693f4b 100644 --- a/composer.json +++ b/composer.json @@ -40,9 +40,9 @@ "doctrine/persistence": "^3.0.2", "friendsofphp/php-cs-fixer": "^3.4", "gedmo/doctrine-extensions": "^3.11", - "knplabs/doctrine-behaviors": "^2.2", - "matthiasnoback/symfony-config-test": "^4.2", - "matthiasnoback/symfony-dependency-injection-test": "^4.0", + "knplabs/doctrine-behaviors": "^2.6.2", + "matthiasnoback/symfony-config-test": "^4.2 || ^5.0", + "matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.0", "phpstan/phpstan-doctrine": "^1.0", @@ -54,11 +54,11 @@ "psalm/plugin-symfony": "^5.0", "rector/rector": "^0.18", "sonata-project/doctrine-orm-admin-bundle": "^4.0", - "symfony/browser-kit": "^5.4 || ^6.2", - "symfony/css-selector": "^5.4 || ^6.2", - "symfony/doctrine-bridge": "^5.4 || ^6.2", - "symfony/filesystem": "^5.4 || ^6.2", - "symfony/phpunit-bridge": "^6.2", + "symfony/browser-kit": "^5.4 || ^6.2 || ^7.0", + "symfony/css-selector": "^5.4 || ^6.2 || ^7.0", + "symfony/doctrine-bridge": "^5.4 || ^6.2 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.2 || ^7.0", + "symfony/phpunit-bridge": "^7.0", "vimeo/psalm": "^5.8", "weirdan/doctrine-psalm-plugin": "^2.0" }, diff --git a/tests/App/config/services.php b/tests/App/config/services.php index de1b3f3a..609ca648 100644 --- a/tests/App/config/services.php +++ b/tests/App/config/services.php @@ -14,6 +14,7 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator; use Gedmo\Translatable\TranslatableListener; +use Knp\DoctrineBehaviors\EventSubscriber\TranslatableEventSubscriber; use Knp\DoctrineBehaviors\Provider\UserProvider; use Sonata\TranslationBundle\Tests\App\Admin\GedmoCategoryAdmin; use Sonata\TranslationBundle\Tests\App\Admin\KnpCategoryAdmin; @@ -55,5 +56,13 @@ // Temporary fix to decorate User Provider from KNP (see https://github.com/KnpLabs/DoctrineBehaviors/pull/727) ->set(DummyUserProvider::class) - ->decorate(UserProvider::class); + ->decorate(UserProvider::class) + + // Temporary fix to use event listeners instead of subscriber (see https://github.com/KnpLabs/DoctrineBehaviors/pull/738) + ->set('app.knplabs.translation_listener', TranslatableEventSubscriber::class) + ->arg('$translatableFetchMode', 'LAZY') + ->arg('$translationFetchMode', 'LAZY') + ->tag('doctrine.event_listener', ['event' => 'postLoad']) + ->tag('doctrine.event_listener', ['event' => 'loadClassMetadata']) + ->tag('doctrine.event_listener', ['event' => 'prePersist']); };