drop PHP 8.1 and unmaintained Symfony versions

dmaicher · dmaicher · commit b54b3fe25d25 · 2025-12-16T17:32:32.000+01:00
diff --git a/composer.json b/composer.json
@@ -21,23 +21,23 @@
     ],
     "homepage": "https://docs.sonata-project.org/projects/SonataClassificationBundle",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "cocur/slugify": "^4.0",
         "doctrine/collections": "^1.6 || ^2.0",
         "doctrine/persistence": "^3.0.2 || ^4.0",
-        "sonata-project/doctrine-extensions": "^1.13 || ^2.0",
-        "sonata-project/form-extensions": "^1.4 || ^2.0",
-        "symfony/config": "^6.4 || ^7.1",
-        "symfony/console": "^6.4 || ^7.1",
-        "symfony/dependency-injection": "^6.4 || ^7.1",
-        "symfony/form": "^6.4 || ^7.1",
-        "symfony/framework-bundle": "^6.4 || ^7.1",
-        "symfony/http-foundation": "^6.4 || ^7.1",
-        "symfony/http-kernel": "^6.4 || ^7.1",
-        "symfony/options-resolver": "^6.4 || ^7.1",
-        "symfony/routing": "^6.4 || ^7.1",
-        "symfony/translation": "^6.4 || ^7.1",
-        "symfony/validator": "^6.4 || ^7.1",
+        "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",
         "twig/twig": "^3.0"
     },
     "require-dev": {
@@ -50,34 +50,31 @@
         "knplabs/knp-menu-bundle": "^3.0",
         "masterminds/html5": "^2.7",
         "matthiasnoback/symfony-config-test": "^6.1",
-        "matthiasnoback/symfony-dependency-injection-test": "^6.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^6.2",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpdoc-parser": "^1.0",
         "phpstan/phpstan": "^1.0 || ^2.0",
         "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
         "phpstan/phpstan-strict-rules": "^1.0 || ^2.0",
         "phpstan/phpstan-symfony": "^1.0 || ^2.0",
-        "phpunit/phpunit": "^10.5.54 || ^11.5.38 || ^12.3.10",
-        "psalm/plugin-phpunit": "^0.18 || ^0.19",
-        "psalm/plugin-symfony": "^5.0",
+        "phpunit/phpunit": "^11.5.38 || ^12.3.10",
         "rector/rector": "^1.1 || ^2.0",
-        "sonata-project/admin-bundle": "^4.35.4",
-        "sonata-project/block-bundle": "^4.11 || ^5.0",
+        "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.1",
-        "symfony/browser-kit": "^6.4 || ^7.1",
-        "symfony/filesystem": "^6.4 || ^7.1",
-        "symfony/security-bundle": "^6.4 || ^7.1",
-        "symfony/security-csrf": "^6.4 || ^7.1",
-        "symfony/twig-bundle": "^6.4 || ^7.1",
-        "symfony/yaml": "^6.4 || ^7.1",
-        "vimeo/psalm": "^5.0 || ^6.10"
+        "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"
     },
     "conflict": {
         "doctrine/mongodb-odm": "<2.4",
         "doctrine/orm": "<2.14",
         "sonata-project/admin-bundle": "<4.14",
-        "sonata-project/block-bundle": "<4.11",
+        "sonata-project/block-bundle": "<5.0",
         "sonata-project/doctrine-orm-admin-bundle": "<4.0"
     },
     "suggest": {
diff --git a/psalm.xml b/psalm.xml
diff --git a/src/Admin/Filter/CategoryFilter.php b/src/Admin/Filter/CategoryFilter.php
@@ -65,8 +65,6 @@ public function getFormOptions(): array
     }
 
     /**
-     * @psalm-suppress DeprecatedClass
-     *
      * NEXT_MAJOR: Remove this method.
      */
     public function getRenderSettings(): array
diff --git a/src/Admin/Filter/CollectionFilter.php b/src/Admin/Filter/CollectionFilter.php
@@ -64,8 +64,6 @@ public function getFormOptions(): array
     }
 
     /**
-     * @psalm-suppress DeprecatedClass
-     *
      * NEXT_MAJOR: Remove this method.
      */
     public function getRenderSettings(): array
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -42,11 +42,6 @@
  */
 final class Configuration implements ConfigurationInterface
 {
-    /**
-     * @psalm-suppress UndefinedInterfaceMethod
-     *
-     * @see https://github.com/psalm/psalm-plugin-symfony/issues/174
-     */
     public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('sonata_classification');
diff --git a/src/Form/Type/CategorySelectorType.php b/src/Form/Type/CategorySelectorType.php
@@ -25,8 +25,6 @@
 
 /**
  * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
- *
- * @psalm-suppress MissingTemplateParam https://github.com/phpstan/phpstan-symfony/issues/320
  */
 final class CategorySelectorType extends AbstractType
 {
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
@@ -27,12 +27,12 @@ final class AdminTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->contextManager = $this->createMock(ContextManagerInterface::class);
+        $this->contextManager = static::createStub(ContextManagerInterface::class);
     }
 
     public function testAbstractAdminChildren(): void
     {
-        $contextAwareAdmin = $this->createMock(ContextAwareAdmin::class);
+        $contextAwareAdmin = static::createStub(ContextAwareAdmin::class);
         static::assertInstanceOf(AbstractAdmin::class, $contextAwareAdmin);
         $contextAdmin = new ContextAdmin();
         static::assertInstanceOf(AbstractAdmin::class, $contextAdmin);
diff --git a/tests/App/Entity/Category.php b/tests/App/Entity/Category.php
@@ -17,9 +17,6 @@
 use Doctrine\ORM\Mapping as ORM;
 use Sonata\ClassificationBundle\Entity\BaseCategory;
 
-/**
- * @psalm-suppress ClassMustBeFinal
- */
 #[ORM\Entity]
 #[ORM\Table(name: 'classification__category')]
 class Category extends BaseCategory
diff --git a/tests/App/Entity/Collection.php b/tests/App/Entity/Collection.php
@@ -17,9 +17,6 @@
 use Doctrine\ORM\Mapping as ORM;
 use Sonata\ClassificationBundle\Entity\BaseCollection;
 
-/**
- * @psalm-suppress ClassMustBeFinal
- */
 #[ORM\Entity]
 #[ORM\Table(name: 'classification__collection')]
 class Collection extends BaseCollection
diff --git a/tests/App/Entity/Context.php b/tests/App/Entity/Context.php
@@ -17,9 +17,6 @@
 use Doctrine\ORM\Mapping as ORM;
 use Sonata\ClassificationBundle\Entity\BaseContext;
 
-/**
- * @psalm-suppress ClassMustBeFinal
- */
 #[ORM\Entity]
 #[ORM\Table(name: 'classification__context')]
 class Context extends BaseContext
diff --git a/tests/App/Entity/Tag.php b/tests/App/Entity/Tag.php
@@ -17,9 +17,6 @@
 use Doctrine\ORM\Mapping as ORM;
 use Sonata\ClassificationBundle\Entity\BaseTag;
 
-/**
- * @psalm-suppress ClassMustBeFinal
- */
 #[ORM\Entity]
 #[ORM\Table(name: 'classification__tag')]
 class Tag extends BaseTag
diff --git a/tests/App/config/config.yaml b/tests/App/config/config.yaml
@@ -23,7 +23,6 @@ security:
     access_control: null
 
 twig:
-    exception_controller: null
     strict_variables: true
 
 sonata_classification:
diff --git a/tests/App/config/routes.yaml b/tests/App/config/routes.yaml
@@ -1,5 +1,5 @@
 admin_area:
-    resource: '@SonataAdminBundle/Resources/config/routing/sonata_admin.xml'
+    resource: '@SonataAdminBundle/Resources/config/routing/sonata_admin.php'
     prefix: /admin
 
 _sonata_admin:
diff --git a/tests/Entity/CategoryManagerTest.php b/tests/Entity/CategoryManagerTest.php
@@ -64,7 +64,7 @@ public function testGetBySlug(): void
     private function prepareData(): CategoryInterface
     {
         $manager = self::getContainer()->get('doctrine.orm.entity_manager');
-        \assert($manager instanceof EntityManagerInterface);
+        static::assertInstanceOf(EntityManagerInterface::class, $manager);
 
         $context = new Context();
         $context->setId('1');
@@ -106,7 +106,7 @@ private function prepareData(): CategoryInterface
     private function getCategoryManager(): CategoryManagerInterface
     {
         $categoryManager = self::getContainer()->get('sonata.classification.manager.category');
-        \assert($categoryManager instanceof CategoryManagerInterface);
+        static::assertInstanceOf(CategoryManagerInterface::class, $categoryManager);
 
         return $categoryManager;
     }
diff --git a/tests/Entity/CollectionManagerTest.php b/tests/Entity/CollectionManagerTest.php
@@ -42,7 +42,7 @@ public function testGetByContext(): void
     private function prepareData(): void
     {
         $manager = self::getContainer()->get('doctrine.orm.entity_manager');
-        \assert($manager instanceof EntityManagerInterface);
+        static::assertInstanceOf(EntityManagerInterface::class, $manager);
 
         $context = new Context();
         $context->setId('1');
@@ -62,7 +62,7 @@ private function prepareData(): void
     private function getCollectionManager(): CollectionManagerInterface
     {
         $collectionManager = self::getContainer()->get('sonata.classification.manager.collection');
-        \assert($collectionManager instanceof CollectionManagerInterface);
+        static::assertInstanceOf(CollectionManagerInterface::class, $collectionManager);
 
         return $collectionManager;
     }
diff --git a/tests/Entity/TagManagerTest.php b/tests/Entity/TagManagerTest.php
@@ -42,7 +42,7 @@ public function testGetByContext(): void
     private function prepareData(): void
     {
         $manager = self::getContainer()->get('doctrine.orm.entity_manager');
-        \assert($manager instanceof EntityManagerInterface);
+        static::assertInstanceOf(EntityManagerInterface::class, $manager);
 
         $context = new Context();
         $context->setId('1');
@@ -62,7 +62,7 @@ private function prepareData(): void
     private function getTagManager(): TagManagerInterface
     {
         $tagManager = self::getContainer()->get('sonata.classification.manager.tag');
-        \assert($tagManager instanceof TagManagerInterface);
+        static::assertInstanceOf(TagManagerInterface::class, $tagManager);
 
         return $tagManager;
     }
diff --git a/tests/Functional/Admin/CategoryAdminTest.php b/tests/Functional/Admin/CategoryAdminTest.php
@@ -117,7 +117,7 @@ public function testCreateFirstCategory(): void
     private function prepareData(): void
     {
         $manager = self::getContainer()->get('doctrine.orm.entity_manager');
-        \assert($manager instanceof EntityManagerInterface);
+        static::assertInstanceOf(EntityManagerInterface::class, $manager);
 
         $context = new Context();
         $context->setId('default');
@@ -136,7 +136,7 @@ private function prepareData(): void
     private function countCategories(): int
     {
         $manager = static::getContainer()->get('doctrine.orm.entity_manager');
-        \assert($manager instanceof EntityManagerInterface);
+        static::assertInstanceOf(EntityManagerInterface::class, $manager);
 
         return $manager->getRepository(Category::class)->count([]);
     }
diff --git a/tests/Functional/Admin/CollectionAdminTest.php b/tests/Functional/Admin/CollectionAdminTest.php
@@ -85,7 +85,7 @@ public static function provideFormsUrlsCases(): iterable
     private function prepareData(): void
     {
         $manager = self::getContainer()->get('doctrine.orm.entity_manager');
-        \assert($manager instanceof EntityManagerInterface);
+        static::assertInstanceOf(EntityManagerInterface::class, $manager);
 
         $context = new Context();
         $context->setId('default');
diff --git a/tests/Functional/Admin/ContextAdminTest.php b/tests/Functional/Admin/ContextAdminTest.php
@@ -84,7 +84,7 @@ public static function provideFormsUrlsCases(): iterable
     private function prepareData(): void
     {
         $manager = self::getContainer()->get('doctrine.orm.entity_manager');
-        \assert($manager instanceof EntityManagerInterface);
+        static::assertInstanceOf(EntityManagerInterface::class, $manager);
 
         $context = new Context();
         $context->setId('default');
diff --git a/tests/Functional/Admin/TagAdminTest.php b/tests/Functional/Admin/TagAdminTest.php
@@ -85,7 +85,7 @@ public static function provideFormsUrlsCases(): iterable
     private function prepareData(): void
     {
         $manager = self::getContainer()->get('doctrine.orm.entity_manager');
-        \assert($manager instanceof EntityManagerInterface);
+        static::assertInstanceOf(EntityManagerInterface::class, $manager);
 
         $context = new Context();
         $context->setId('default');

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,6 @@ public function getFormOptions(): array`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/**`
`68`		`- * @psalm-suppress DeprecatedClass`
`69`		`- *`
`70`	`68`	`* NEXT_MAJOR: Remove this method.`
`71`	`69`	`*/`
`72`	`70`	`public function getRenderSettings(): array`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,6 @@ public function getFormOptions(): array`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/**`
`67`		`- * @psalm-suppress DeprecatedClass`
`68`		`- *`
`69`	`67`	`* NEXT_MAJOR: Remove this method.`
`70`	`68`	`*/`
`71`	`69`	`public function getRenderSettings(): array`
Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,6 @@`
`42`	`42`	`*/`
`43`	`43`	`final class Configuration implements ConfigurationInterface`
`44`	`44`	`{`
`45`		`- /**`
`46`		`- * @psalm-suppress UndefinedInterfaceMethod`
`47`		`- *`
`48`		`- * @see https://github.com/psalm/psalm-plugin-symfony/issues/174`
`49`		`- */`
`50`	`45`	`public function getConfigTreeBuilder(): TreeBuilder`
`51`	`46`	`{`
`52`	`47`	`$treeBuilder = new TreeBuilder('sonata_classification');`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@`
`25`	`25`
`26`	`26`	`/**`
`27`	`27`	`* @author Thomas Rabaix <thomas.rabaix@sonata-project.org>`
`28`		`- *`
`29`		`- * @psalm-suppress MissingTemplateParam https://github.com/phpstan/phpstan-symfony/issues/320`
`30`	`28`	`*/`
`31`	`29`	`final class CategorySelectorType extends AbstractType`
`32`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,12 @@ final class AdminTest extends TestCase`
`27`	`27`
`28`	`28`	`protected function setUp(): void`
`29`	`29`	`{`
`30`		`- $this->contextManager = $this->createMock(ContextManagerInterface::class);`
	`30`	`+ $this->contextManager = static::createStub(ContextManagerInterface::class);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public function testAbstractAdminChildren(): void`
`34`	`34`	`{`
`35`		`- $contextAwareAdmin = $this->createMock(ContextAwareAdmin::class);`
	`35`	`+ $contextAwareAdmin = static::createStub(ContextAwareAdmin::class);`
`36`	`36`	`static::assertInstanceOf(AbstractAdmin::class, $contextAwareAdmin);`
`37`	`37`	`$contextAdmin = new ContextAdmin();`
`38`	`38`	`static::assertInstanceOf(AbstractAdmin::class, $contextAdmin);`