From 719eb1df53ef36b1bd56a1a0265729d86ffff84c Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 23 Apr 2024 10:38:31 +0200 Subject: [PATCH] Allow Symfony 7 packages (Case 170245) (#33) --- .github/workflows/tests.yml | 2 ++ composer.json | 22 +++++++++++----------- tests/Fixtures/config/config.yml | 5 +++++ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 91dedc8..a6d3d95 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,6 +20,8 @@ jobs: - { php-version: 7.2, symfony-locked-version: none, dependency-version: prefer-lowest } - { php-version: 7.4, symfony-locked-version: 5.3.*, dependency-version: prefer-stable } - { php-version: 8.1, symfony-locked-version: none, dependency-version: prefer-stable } + - { php-version: 8.2, symfony-locked-version: none, dependency-version: prefer-stable } + - { php-version: 8.3, symfony-locked-version: none, dependency-version: prefer-stable } name: PHPUnit (PHP ${{matrix.php-version}}, Symfony Version Lock ${{ matrix.symfony-locked-version }}, ${{ matrix.dependency-version }}) steps: - uses: actions/checkout@v3 diff --git a/composer.json b/composer.json index 9275dcd..ff5afe7 100644 --- a/composer.json +++ b/composer.json @@ -8,25 +8,25 @@ "ext-json": "*", "ext-mbstring": "*", "psr/log": "^1.0.2", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/config": "^4.4|^5.0|^6.0|^7.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0|^7.0", "symfony/deprecation-contracts": "^2.5|^3.0", - "symfony/form": "^4.4|^5.0|^6.0", - "symfony/http-foundation": "^5.3|^6.0", - "symfony/http-kernel": "^4.4|^5.0|^6.0", + "symfony/form": "^4.4|^5.0|^6.0|^7.0", + "symfony/http-foundation": "^5.3|^6.0|^7.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0|^7.0", "thunderer/shortcode": "^0.6.5|^0.7", "twig/twig": "^1.34|^2.0|^3.0" }, "require-dev": { "phpunit/phpunit": "^8.5|^9.5", - "symfony/browser-kit": "^4.4|^5.4", - "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/framework-bundle": "^5.3|^6.0", + "symfony/browser-kit": "^4.4|^5.4|^6.0|^7.0", + "symfony/expression-language": "^4.4|^5.0|^6.0|^7.0", + "symfony/framework-bundle": "^5.3|^6.0|^7.0", "symfony/phpunit-bridge": ">= 6.0", - "symfony/routing": "^4.4|^5.0|^6.0", - "symfony/twig-bundle": "^4.4|^5.0|^6.0", - "symfony/yaml": "^4.4|^5.0|^6.0" + "symfony/routing": "^4.4|^5.0|^6.0|^7.0", + "symfony/twig-bundle": "^4.4|^5.0|^6.0|^7.0", + "symfony/yaml": "^4.4|^5.0|^6.0|^7.0" }, "autoload": { diff --git a/tests/Fixtures/config/config.yml b/tests/Fixtures/config/config.yml index 5478650..2f277fb 100644 --- a/tests/Fixtures/config/config.yml +++ b/tests/Fixtures/config/config.yml @@ -19,3 +19,8 @@ webfactory_shortcode: description: "Description for the 'test-shortcode-guide' shortcode" example: "test-shortcode-guide test=true" test-config-invalid-controller: 'Foo\Bar::baz' + +services: + Webfactory\ShortcodeBundle\Tests\Fixtures\Controller\: + resource: '../Controller/' + tags: [ 'controller.service_arguments' ]