Skip to content

Commit 4005457

Browse files
Add Symfony 8 support (#1001)
1 parent 4918731 commit 4005457

3 files changed

Lines changed: 19 additions & 22 deletions

File tree

composer.json

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,17 @@
2525
"cocur/slugify": "^4.0",
2626
"doctrine/collections": "^1.6 || ^2.0",
2727
"doctrine/persistence": "^3.0.2 || ^4.0",
28-
"sonata-project/doctrine-extensions": "^2.0",
29-
"sonata-project/form-extensions": "^2.0",
30-
"symfony/config": "^6.4 || ^7.3",
31-
"symfony/console": "^6.4 || ^7.3",
32-
"symfony/dependency-injection": "^6.4 || ^7.3",
33-
"symfony/form": "^6.4 || ^7.3",
34-
"symfony/framework-bundle": "^6.4 || ^7.3",
35-
"symfony/http-foundation": "^6.4 || ^7.3",
36-
"symfony/http-kernel": "^6.4 || ^7.3",
37-
"symfony/options-resolver": "^6.4 || ^7.3",
38-
"symfony/routing": "^6.4 || ^7.3",
39-
"symfony/translation": "^6.4 || ^7.3",
40-
"symfony/validator": "^6.4 || ^7.3",
28+
"symfony/config": "^6.4 || ^7.3 || ^8.0",
29+
"symfony/console": "^6.4 || ^7.3 || ^8.0",
30+
"symfony/dependency-injection": "^6.4 || ^7.3 || ^8.0",
31+
"symfony/form": "^6.4 || ^7.3 || ^8.0",
32+
"symfony/framework-bundle": "^6.4 || ^7.3 || ^8.0",
33+
"symfony/http-foundation": "^6.4 || ^7.3 || ^8.0",
34+
"symfony/http-kernel": "^6.4 || ^7.3 || ^8.0",
35+
"symfony/options-resolver": "^6.4 || ^7.3 || ^8.0",
36+
"symfony/routing": "^6.4 || ^7.3 || ^8.0",
37+
"symfony/translation": "^6.4 || ^7.3 || ^8.0",
38+
"symfony/validator": "^6.4 || ^7.3 || ^8.0",
4139
"twig/twig": "^3.0"
4240
},
4341
"require-dev": {
@@ -62,13 +60,13 @@
6260
"sonata-project/admin-bundle": "^4.39",
6361
"sonata-project/block-bundle": "^5.0",
6462
"sonata-project/doctrine-orm-admin-bundle": "^4.0",
65-
"symfony/asset": "^6.4 || ^7.3",
66-
"symfony/browser-kit": "^6.4 || ^7.3",
67-
"symfony/filesystem": "^6.4 || ^7.3",
68-
"symfony/security-bundle": "^6.4 || ^7.3",
69-
"symfony/security-csrf": "^6.4 || ^7.3",
70-
"symfony/twig-bundle": "^6.4 || ^7.3",
71-
"symfony/yaml": "^6.4 || ^7.3"
63+
"symfony/asset": "^6.4 || ^7.3 || ^8.0",
64+
"symfony/browser-kit": "^6.4 || ^7.3 || ^8.0",
65+
"symfony/filesystem": "^6.4 || ^7.3 || ^8.0",
66+
"symfony/security-bundle": "^6.4 || ^7.3 || ^8.0",
67+
"symfony/security-csrf": "^6.4 || ^7.3 || ^8.0",
68+
"symfony/twig-bundle": "^6.4 || ^7.3 || ^8.0",
69+
"symfony/yaml": "^6.4 || ^7.3 || ^8.0"
7270
},
7371
"conflict": {
7472
"doctrine/mongodb-odm": "<2.4",

src/Form/Type/CategorySelectorType.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public function configureOptions(OptionsResolver $resolver): void
4848
* context: ContextInterface|null,
4949
* category: CategoryInterface|null,
5050
* }> $options
51-
* @psalm-param Options $options
5251
*/
5352
public function getChoices(Options $options): array
5453
{

src/Resources/views/CategoryAdmin/tree.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ file that was distributed with this source code.
5858
<div class="box-header">
5959
<h1 class="box-title">
6060
{{ 'tree_catalog_title'|trans({}, admin.translationdomain) }}
61-
{% if not app.request.get('hide_context') and current_context is not empty %}
61+
{% if not app.request.query.get('hide_context') and current_context is not empty %}
6262
<div class="btn-group">
6363
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
6464
<strong class="text-info">{{ current_context.name }}</strong> <span class="caret"></span>

0 commit comments

Comments
 (0)