Merge 4.x into 5.x

Author: SonataCI

CHANGELOG.md

@@ -2,6 +2,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.11.0](https://github.com/sonata-project/SonataClassificationBundle/compare/4.10.0...4.11.0) - 2025-12-19
+### Added
+- [[#1001](https://github.com/sonata-project/SonataClassificationBundle/pull/1001)] Symfony 8 support ([@VincentLanglet](https://github.com/VincentLanglet))
+
+### Removed
+- [[#999](https://github.com/sonata-project/SonataClassificationBundle/pull/999)] Support for PHP 8.1 ([@dmaicher](https://github.com/dmaicher))
+- [[#999](https://github.com/sonata-project/SonataClassificationBundle/pull/999)] Support for Symfony 7.1 and 7.2 ([@dmaicher](https://github.com/dmaicher))
+- [[#999](https://github.com/sonata-project/SonataClassificationBundle/pull/999)] Support for `sonata-project/block-bundle` v4 ([@dmaicher](https://github.com/dmaicher))
+- [[#999](https://github.com/sonata-project/SonataClassificationBundle/pull/999)] Support for `sonata-project/form-extensions` v1 ([@dmaicher](https://github.com/dmaicher))
+- [[#999](https://github.com/sonata-project/SonataClassificationBundle/pull/999)] Support for `sonata-project/doctrine-extensions` v1 ([@dmaicher](https://github.com/dmaicher))
+
 ## [4.10.0](https://github.com/sonata-project/SonataClassificationBundle/compare/4.9.1...4.10.0) - 2025-09-23
 ### Added
 - [[#994](https://github.com/sonata-project/SonataClassificationBundle/pull/994)] Support for `doctrine/persistence` 4.0. ([@jordisala1991](https://github.com/jordisala1991))

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",

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
     {

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

@@ -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>