From 3a87344cfb7d766ff1dbbe3594d83fdb34c2d5ac Mon Sep 17 00:00:00 2001 From: Trent Steel Date: Thu, 30 Nov 2023 13:41:56 +1000 Subject: [PATCH 1/4] Support Symfony 7 --- .github/workflows/test-application.yaml | 4 +++- composer.json | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index a215c5c..5fefe4b 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -38,6 +38,8 @@ jobs: - php-version: '8.0' - php-version: '8.0' symfony-version: '6.0.*' + - php-version: '8.2' + symfony-version: '7.0.*' steps: - name: Checkout project @@ -51,7 +53,7 @@ jobs: - name: Install Symfony Flex run: composer global require --no-progress --no-scripts --no-plugins symfony/flex - + - name: Allow Symfony Flex Plugin run: composer global config --no-plugins allow-plugins.symfony/flex true diff --git a/composer.json b/composer.json index caf153a..8f76002 100644 --- a/composer.json +++ b/composer.json @@ -11,19 +11,19 @@ "require": { "php": "^7.1|^8.0", "doctrine/data-fixtures": "^1.2", - "symfony/browser-kit": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0" + "symfony/browser-kit": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { "doctrine/doctrine-bundle": "^1.8 || ^2.0", "doctrine/phpcr-bundle": "^1.3 || ^2.0.0", - "symfony/console": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0", - "symfony/dependency-injection": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0", - "symfony/doctrine-bridge": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0", - "symfony/framework-bundle": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0", - "symfony/http-kernel": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0", + "symfony/console": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0", + "symfony/dependency-injection": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0", + "symfony/doctrine-bridge": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0", + "symfony/framework-bundle": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0", + "symfony/http-kernel": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0", "symfony/monolog-bundle": "^3.5", - "symfony/security-bundle": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0", - "symfony/twig-bundle": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0", + "symfony/security-bundle": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0", + "symfony/twig-bundle": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0", "symfony/phpunit-bridge": "^5.4" }, "autoload": { From 400b2fa6efd8256ca49320dff9f8fff5128324a5 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Mon, 5 Feb 2024 11:22:36 +0100 Subject: [PATCH 2/4] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8f76002..1e38bde 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "symfony/browser-kit": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { - "doctrine/doctrine-bundle": "^1.8 || ^2.0", + "doctrine/doctrine-bundle": "^1.8 || ^2.0 || ^3.0@beta", "doctrine/phpcr-bundle": "^1.3 || ^2.0.0", "symfony/console": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0", "symfony/dependency-injection": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0", From 6777744b00c81ef0228c6b4075993ed0e67f825b Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Mon, 5 Feb 2024 11:26:43 +0100 Subject: [PATCH 3/4] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1e38bde..385c70c 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "symfony/browser-kit": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { - "doctrine/doctrine-bundle": "^1.8 || ^2.0 || ^3.0@beta", + "doctrine/doctrine-bundle": "^1.8 || ^2.0 || 3.0.0-beta2", "doctrine/phpcr-bundle": "^1.3 || ^2.0.0", "symfony/console": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0", "symfony/dependency-injection": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0", From 4a270d73fdeb3200ffd7639f26cafb3e584d36e8 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Mon, 5 Feb 2024 11:28:55 +0100 Subject: [PATCH 4/4] allow beta of phpcr bundle --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 385c70c..df3de07 100644 --- a/composer.json +++ b/composer.json @@ -14,8 +14,8 @@ "symfony/browser-kit": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { - "doctrine/doctrine-bundle": "^1.8 || ^2.0 || 3.0.0-beta2", - "doctrine/phpcr-bundle": "^1.3 || ^2.0.0", + "doctrine/doctrine-bundle": "^1.8 || ^2.0", + "doctrine/phpcr-bundle": "^1.3 || ^2.0.0 || ^3.0@beta", "symfony/console": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0", "symfony/dependency-injection": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0", "symfony/doctrine-bridge": "^3.4.26 || ^4.3.8 || ^5.0 || ^6.0 || ^7.0",