diff --git a/composer.json b/composer.json index 3eca8170..dac540ba 100644 --- a/composer.json +++ b/composer.json @@ -25,19 +25,17 @@ "cocur/slugify": "^4.0", "doctrine/collections": "^1.6 || ^2.0", "doctrine/persistence": "^3.0.2 || ^4.0", - "sonata-project/doctrine-extensions": "^2.0", - "sonata-project/form-extensions": "^2.0", - "symfony/config": "^6.4 || ^7.3", - "symfony/console": "^6.4 || ^7.3", - "symfony/dependency-injection": "^6.4 || ^7.3", - "symfony/form": "^6.4 || ^7.3", - "symfony/framework-bundle": "^6.4 || ^7.3", - "symfony/http-foundation": "^6.4 || ^7.3", - "symfony/http-kernel": "^6.4 || ^7.3", - "symfony/options-resolver": "^6.4 || ^7.3", - "symfony/routing": "^6.4 || ^7.3", - "symfony/translation": "^6.4 || ^7.3", - "symfony/validator": "^6.4 || ^7.3", + "symfony/config": "^6.4 || ^7.3 || ^8.0", + "symfony/console": "^6.4 || ^7.3 || ^8.0", + "symfony/dependency-injection": "^6.4 || ^7.3 || ^8.0", + "symfony/form": "^6.4 || ^7.3 || ^8.0", + "symfony/framework-bundle": "^6.4 || ^7.3 || ^8.0", + "symfony/http-foundation": "^6.4 || ^7.3 || ^8.0", + "symfony/http-kernel": "^6.4 || ^7.3 || ^8.0", + "symfony/options-resolver": "^6.4 || ^7.3 || ^8.0", + "symfony/routing": "^6.4 || ^7.3 || ^8.0", + "symfony/translation": "^6.4 || ^7.3 || ^8.0", + "symfony/validator": "^6.4 || ^7.3 || ^8.0", "twig/twig": "^3.0" }, "require-dev": { @@ -62,13 +60,13 @@ "sonata-project/admin-bundle": "^4.39", "sonata-project/block-bundle": "^5.0", "sonata-project/doctrine-orm-admin-bundle": "^4.0", - "symfony/asset": "^6.4 || ^7.3", - "symfony/browser-kit": "^6.4 || ^7.3", - "symfony/filesystem": "^6.4 || ^7.3", - "symfony/security-bundle": "^6.4 || ^7.3", - "symfony/security-csrf": "^6.4 || ^7.3", - "symfony/twig-bundle": "^6.4 || ^7.3", - "symfony/yaml": "^6.4 || ^7.3" + "symfony/asset": "^6.4 || ^7.3 || ^8.0", + "symfony/browser-kit": "^6.4 || ^7.3 || ^8.0", + "symfony/filesystem": "^6.4 || ^7.3 || ^8.0", + "symfony/security-bundle": "^6.4 || ^7.3 || ^8.0", + "symfony/security-csrf": "^6.4 || ^7.3 || ^8.0", + "symfony/twig-bundle": "^6.4 || ^7.3 || ^8.0", + "symfony/yaml": "^6.4 || ^7.3 || ^8.0" }, "conflict": { "doctrine/mongodb-odm": "<2.4", diff --git a/src/Form/Type/CategorySelectorType.php b/src/Form/Type/CategorySelectorType.php index fe9edd32..46b6152b 100644 --- a/src/Form/Type/CategorySelectorType.php +++ b/src/Form/Type/CategorySelectorType.php @@ -48,7 +48,6 @@ public function configureOptions(OptionsResolver $resolver): void * context: ContextInterface|null, * category: CategoryInterface|null, * }> $options - * @psalm-param Options $options */ public function getChoices(Options $options): array { diff --git a/src/Resources/views/CategoryAdmin/tree.html.twig b/src/Resources/views/CategoryAdmin/tree.html.twig index 1f310b83..cbf7d02e 100644 --- a/src/Resources/views/CategoryAdmin/tree.html.twig +++ b/src/Resources/views/CategoryAdmin/tree.html.twig @@ -58,7 +58,7 @@ file that was distributed with this source code.

{{ 'tree_catalog_title'|trans({}, admin.translationdomain) }} - {% if not app.request.get('hide_context') and current_context is not empty %} + {% if not app.request.query.get('hide_context') and current_context is not empty %}