From 1db7266117bbb26a1e43a7ac789f04065d826203 Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Wed, 4 Dec 2024 13:06:21 +0100 Subject: [PATCH 1/3] [TMP] Added temporary symfony6 ibexa branches --- composer.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index aa7b263d..6712f701 100644 --- a/composer.json +++ b/composer.json @@ -11,10 +11,10 @@ "ext-libxml": "*", "ext-pdo": "*", "ext-xsl": "*", - "ibexa/content-forms": "~5.0.x-dev", - "ibexa/core": "~5.0.x-dev", - "ibexa/http-cache": "~5.0.x-dev", - "ibexa/rest": "~5.0.x-dev", + "ibexa/content-forms": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/core": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/http-cache": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/rest": "dev-ibx-8470-symfony-6 as 5.0.x-dev", "symfony/asset": "^5.1", "symfony/cache": "^5.0", "symfony/config": "^5.0", @@ -32,16 +32,16 @@ }, "require-dev": { "dama/doctrine-test-bundle": "^6.7.5", - "ibexa/admin-ui": "~5.0.x-dev", + "ibexa/admin-ui": "dev-ibx-8470-symfony-6 as 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", - "ibexa/notifications": "~5.0.x-dev", - "ibexa/search": "~5.0.x-dev", - "ibexa/solr": "~5.0.x-dev", - "ibexa/test-core": "~5.0.x-dev", - "ibexa/user": "~5.0.x-dev", + "ibexa/design-engine": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/doctrine-schema": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/notifications": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/search": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/solr": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/test-core": "dev-ibx-8470-symfony-6 as 5.0.x-dev", + "ibexa/user": "dev-ibx-8470-symfony-6 as 5.0.x-dev", "matthiasnoback/symfony-config-test": "^4.1", "matthiasnoback/symfony-dependency-injection-test": "^4.1", "phpstan/phpstan": "^1.9", From c2b9acea5871be5215d77d179801acca3f141ec9 Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Fri, 6 Dec 2024 15:06:35 +0100 Subject: [PATCH 2/3] IBX-8570: Bump symfony dependencies --- composer.json | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index 6712f701..1b187477 100644 --- a/composer.json +++ b/composer.json @@ -15,25 +15,24 @@ "ibexa/core": "dev-ibx-8470-symfony-6 as 5.0.x-dev", "ibexa/http-cache": "dev-ibx-8470-symfony-6 as 5.0.x-dev", "ibexa/rest": "dev-ibx-8470-symfony-6 as 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": "dev-ibx-8470-symfony-6 as 5.0.x-dev", - "ibexa/ci-scripts": "^0.2@dev", "ibexa/code-style": "~2.0.0", "ibexa/design-engine": "dev-ibx-8470-symfony-6 as 5.0.x-dev", "ibexa/doctrine-schema": "dev-ibx-8470-symfony-6 as 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": { From 23d41d95a3410ab9a7e783f384b782e17f623322 Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Fri, 6 Dec 2024 15:09:36 +0100 Subject: [PATCH 3/3] IBX-8570: Fixed phpstan issues that showed up after upgrade to symfony 6 --- phpstan-baseline.neon | 15 --------------- .../Validator/Constraints/RichTextValidator.php | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) 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 {