Skip to content

Commit bbf9c22

Browse files
committed
Bump requirements to currently supported Symfony versions
1 parent fb3cc4a commit bbf9c22

File tree

3 files changed

+18
-22
lines changed

3 files changed

+18
-22
lines changed

CHANGELOG.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212

1313
## Version 2.0.0
1414

15-
### Removed
16-
1715
- The current request will no longer be passed to controllers generating the shortcode substitution (see #15). For shortcodes being handled `inline`, use the `RequestStack` directly in the substituting controller method to obtain the parent request. For `esi`-based renderers, there is no current solution provided by this bundle (see #14). Check your shortcode controllers for access to the request attribute named `request` to find affected places.
1816

19-
### Changed
20-
2117
- Logging will now by default be directed to the `shortcode` channel, instead of the `app` channel used previously.
18+
2219
- Slightly reduced the logging level in `EmbeddedShortcodeHandler`.

composer.json

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,26 @@
77
"php": ">=8.1",
88
"ext-json": "*",
99
"ext-mbstring": "*",
10-
"psr/log": "^1|^2|^3",
11-
"symfony/config": "^5.4|^6.0|^7.0",
12-
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
13-
"symfony/deprecation-contracts": "^2.5|^3.0",
14-
"symfony/form": "^5.4|^6.0|^7.0",
15-
"symfony/http-foundation": "^5.4|^6.0|^7.0",
16-
"symfony/http-kernel": "^5.4|^6.0|^7.0",
17-
"symfony/routing": "^5.4|^6.0|^7.0",
18-
"thunderer/shortcode": "^0.6.5|^0.7",
19-
"twig/twig": "^2.0|^3.0"
10+
"psr/log": "^2.0 || ^3.0",
11+
"symfony/config": "^6.4 || ^7.3 || ^8.0",
12+
"symfony/dependency-injection": "^6.4 || ^7.3 || ^8.0",
13+
"symfony/deprecation-contracts": "^2.5 || ^3.0",
14+
"symfony/form": "^6.4 || ^7.3 || ^8.0",
15+
"symfony/http-foundation": "^6.4 || ^7.3 || ^8.0",
16+
"symfony/http-kernel": "^6.4 || ^7.3 || ^8.0",
17+
"symfony/routing": "^6.4 || ^7.3 || ^8.0",
18+
"thunderer/shortcode": "^0.6.5 || ^0.7",
19+
"twig/twig": "^2.0 || ^3.0"
2020
},
2121

2222
"require-dev": {
2323
"phpunit/phpunit": "^10.5",
24-
"symfony/browser-kit": "^5.4|^6.0|^7.0",
25-
"symfony/error-handler": "^5.4|^6.0|^7.1",
26-
"symfony/expression-language": "^5.4|^6.0|^7.0",
27-
"symfony/framework-bundle": "^5.4|^6.0|^7.0",
28-
"symfony/phpunit-bridge": ">= 6.0",
29-
"symfony/twig-bundle": "^5.4|^6.0|^7.0",
30-
"symfony/yaml": "^5.4|^6.0|^7.0"
24+
"symfony/browser-kit": "^6.4 || ^7.3 || ^8.0",
25+
"symfony/error-handler": "^6.4 || ^7.3 || ^8.0",
26+
"symfony/expression-language": "^6.4 || ^7.3 || ^8.0",
27+
"symfony/framework-bundle": "^6.4 || ^7.3 || ^8.0",
28+
"symfony/twig-bundle": "^6.4 || ^7.3 || ^8.0",
29+
"symfony/yaml": "^6.4 || ^7.3 || ^8.0"
3130
},
3231

3332
"autoload": {

tests/Fixtures/TestKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
3232
'test' => true,
3333
'esi' => ['enabled' => true],
3434
'fragments' => ['enabled' => true],
35-
'router' => ['resource' => '%kernel.project_dir%/src/Resources/config/guide-routing.xml'],
35+
'router' => ['resource' => '%kernel.project_dir%/src/Resources/config/guide-routing.php'],
3636
] + (Kernel::VERSION_ID < 70000 ? ['annotations' => ['enabled' => false]] : []));
3737

3838
$container->loadFromExtension('twig', [

0 commit comments

Comments
 (0)