From 4ca6cd9ad9cb39bee3d9879225a74cbe0718f9bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= <dawid.parafinski@ez.no>
Date: Tue, 4 Feb 2025 15:13:18 +0100
Subject: [PATCH] IBX-8470: Upgraded codebase to Symfony 6 (#196)

* IBX-8570: Bump symfony dependencies
* IBX-8570: Fixed phpstan issues that showed up after upgrade to symfony 6
---
 composer.json                                 | 31 +++++++++----------
 phpstan-baseline.neon                         | 15 ---------
 .../Constraints/RichTextValidator.php         |  2 +-
 3 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/composer.json b/composer.json
index aa7b263d..9f406620 100644
--- a/composer.json
+++ b/composer.json
@@ -15,25 +15,24 @@
         "ibexa/core": "~5.0.x-dev",
         "ibexa/http-cache": "~5.0.x-dev",
         "ibexa/rest": "~5.0.x-dev",
-        "symfony/asset": "^5.1",
-        "symfony/cache": "^5.0",
-        "symfony/config": "^5.0",
-        "symfony/dependency-injection": "^5.0",
-        "symfony/form": "^5.0",
-        "symfony/http-kernel": "^5.0",
-        "symfony/options-resolver": "^5.0",
-        "symfony/security-core": "^5.0",
-        "symfony/templating": "^5.0",
-        "symfony/translation": "^5.0",
+        "symfony/asset": "^6.4",
+        "symfony/cache": "^6.4",
+        "symfony/config": "^6.4",
+        "symfony/dependency-injection": "^6.4",
+        "symfony/form": "^6.4",
+        "symfony/http-kernel": "^6.4",
+        "symfony/options-resolver": "^6.4",
+        "symfony/security-core": "^6.4",
+        "symfony/templating": "^6.4",
+        "symfony/translation": "^6.4",
         "symfony/translation-contracts": "^2.0",
-        "symfony/validator": "^5.0",
-        "symfony/yaml": "^5.0",
+        "symfony/validator": "^6.4",
+        "symfony/yaml": "^6.4",
         "twig/twig": "^3.0"
     },
     "require-dev": {
         "dama/doctrine-test-bundle": "^6.7.5",
         "ibexa/admin-ui": "~5.0.x-dev",
-        "ibexa/ci-scripts": "^0.2@dev",
         "ibexa/code-style": "~2.0.0",
         "ibexa/design-engine": "~5.0.x-dev",
         "ibexa/doctrine-schema": "~5.0.x-dev",
@@ -48,9 +47,9 @@
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/phpstan-symfony": "^1.2",
         "phpunit/phpunit": "^9.5",
-        "symfony/finder": "^5.0",
-        "symfony/notifier": "^5.4",
-        "symfony/proxy-manager-bridge": "^5.3"
+        "symfony/finder": "^6.4",
+        "symfony/notifier": "^6.4",
+        "symfony/proxy-manager-bridge": "^6.4"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 0d05fb20..9a6948e8 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,10 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\FieldTypeRichText\\\\DependencyInjection\\\\Compiler\\\\RichTextHtml5ConverterPass\\:\\:process\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/Compiler/RichTextHtml5ConverterPass.php
-
 		-
 			message: "#^Method Ibexa\\\\Bundle\\\\FieldTypeRichText\\\\DependencyInjection\\\\Compiler\\\\RichTextHtml5ConverterPass\\:\\:setConverterDefinitions\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -110,11 +105,6 @@ parameters:
 			count: 1
 			path: src/bundle/DependencyInjection/IbexaFieldTypeRichTextExtension.php
 
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\FieldTypeRichText\\\\DependencyInjection\\\\IbexaFieldTypeRichTextExtension\\:\\:prepend\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/bundle/DependencyInjection/IbexaFieldTypeRichTextExtension.php
-
 		-
 			message: "#^Method Ibexa\\\\Bundle\\\\FieldTypeRichText\\\\DependencyInjection\\\\IbexaFieldTypeRichTextExtension\\:\\:registerRichTextConfiguration\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -165,11 +155,6 @@ parameters:
 			count: 2
 			path: src/bundle/DependencyInjection/IbexaFieldTypeRichTextExtension.php
 
-		-
-			message: "#^Method Ibexa\\\\Bundle\\\\FieldTypeRichText\\\\IbexaFieldTypeRichTextBundle\\:\\:build\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/bundle/IbexaFieldTypeRichTextBundle.php
-
 		-
 			message: "#^Method Ibexa\\\\Bundle\\\\FieldTypeRichText\\\\IbexaFieldTypeRichTextBundle\\:\\:getCoreExtension\\(\\) should return Ibexa\\\\Bundle\\\\Core\\\\DependencyInjection\\\\IbexaCoreExtension but returns Symfony\\\\Component\\\\DependencyInjection\\\\Extension\\\\ExtensionInterface\\.$#"
 			count: 1
diff --git a/src/lib/Validator/Constraints/RichTextValidator.php b/src/lib/Validator/Constraints/RichTextValidator.php
index a63919f1..5422c1c7 100644
--- a/src/lib/Validator/Constraints/RichTextValidator.php
+++ b/src/lib/Validator/Constraints/RichTextValidator.php
@@ -32,7 +32,7 @@ public function __construct(InputHandlerInterface $inputHandler)
     /**
      * {@inheritdoc}
      */
-    public function validate($value, Constraint $constraint): void
+    public function validate(mixed $value, Constraint $constraint): void
     {
         if (is_string($value)) {
             try {