Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 18 additions & 20 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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",
Expand Down
1 change: 0 additions & 1 deletion src/Form/Type/CategorySelectorType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/views/CategoryAdmin/tree.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ file that was distributed with this source code.
<div class="box-header">
<h1 class="box-title">
{{ '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 %}
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<strong class="text-info">{{ current_context.name }}</strong> <span class="caret"></span>
Expand Down