Skip to content

Commit 4ca6cd9

Browse files
authored
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
1 parent f0e5308 commit 4ca6cd9

File tree

3 files changed

+16
-32
lines changed

3 files changed

+16
-32
lines changed

composer.json

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,24 @@
1515
"ibexa/core": "~5.0.x-dev",
1616
"ibexa/http-cache": "~5.0.x-dev",
1717
"ibexa/rest": "~5.0.x-dev",
18-
"symfony/asset": "^5.1",
19-
"symfony/cache": "^5.0",
20-
"symfony/config": "^5.0",
21-
"symfony/dependency-injection": "^5.0",
22-
"symfony/form": "^5.0",
23-
"symfony/http-kernel": "^5.0",
24-
"symfony/options-resolver": "^5.0",
25-
"symfony/security-core": "^5.0",
26-
"symfony/templating": "^5.0",
27-
"symfony/translation": "^5.0",
18+
"symfony/asset": "^6.4",
19+
"symfony/cache": "^6.4",
20+
"symfony/config": "^6.4",
21+
"symfony/dependency-injection": "^6.4",
22+
"symfony/form": "^6.4",
23+
"symfony/http-kernel": "^6.4",
24+
"symfony/options-resolver": "^6.4",
25+
"symfony/security-core": "^6.4",
26+
"symfony/templating": "^6.4",
27+
"symfony/translation": "^6.4",
2828
"symfony/translation-contracts": "^2.0",
29-
"symfony/validator": "^5.0",
30-
"symfony/yaml": "^5.0",
29+
"symfony/validator": "^6.4",
30+
"symfony/yaml": "^6.4",
3131
"twig/twig": "^3.0"
3232
},
3333
"require-dev": {
3434
"dama/doctrine-test-bundle": "^6.7.5",
3535
"ibexa/admin-ui": "~5.0.x-dev",
36-
"ibexa/ci-scripts": "^0.2@dev",
3736
"ibexa/code-style": "~2.0.0",
3837
"ibexa/design-engine": "~5.0.x-dev",
3938
"ibexa/doctrine-schema": "~5.0.x-dev",
@@ -48,9 +47,9 @@
4847
"phpstan/phpstan-phpunit": "^1.3",
4948
"phpstan/phpstan-symfony": "^1.2",
5049
"phpunit/phpunit": "^9.5",
51-
"symfony/finder": "^5.0",
52-
"symfony/notifier": "^5.4",
53-
"symfony/proxy-manager-bridge": "^5.3"
50+
"symfony/finder": "^6.4",
51+
"symfony/notifier": "^6.4",
52+
"symfony/proxy-manager-bridge": "^6.4"
5453
},
5554
"autoload": {
5655
"psr-4": {

phpstan-baseline.neon

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
parameters:
22
ignoreErrors:
3-
-
4-
message: "#^Method Ibexa\\\\Bundle\\\\FieldTypeRichText\\\\DependencyInjection\\\\Compiler\\\\RichTextHtml5ConverterPass\\:\\:process\\(\\) has no return type specified\\.$#"
5-
count: 1
6-
path: src/bundle/DependencyInjection/Compiler/RichTextHtml5ConverterPass.php
7-
83
-
94
message: "#^Method Ibexa\\\\Bundle\\\\FieldTypeRichText\\\\DependencyInjection\\\\Compiler\\\\RichTextHtml5ConverterPass\\:\\:setConverterDefinitions\\(\\) has no return type specified\\.$#"
105
count: 1
@@ -110,11 +105,6 @@ parameters:
110105
count: 1
111106
path: src/bundle/DependencyInjection/IbexaFieldTypeRichTextExtension.php
112107

113-
-
114-
message: "#^Method Ibexa\\\\Bundle\\\\FieldTypeRichText\\\\DependencyInjection\\\\IbexaFieldTypeRichTextExtension\\:\\:prepend\\(\\) has no return type specified\\.$#"
115-
count: 1
116-
path: src/bundle/DependencyInjection/IbexaFieldTypeRichTextExtension.php
117-
118108
-
119109
message: "#^Method Ibexa\\\\Bundle\\\\FieldTypeRichText\\\\DependencyInjection\\\\IbexaFieldTypeRichTextExtension\\:\\:registerRichTextConfiguration\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#"
120110
count: 1
@@ -165,11 +155,6 @@ parameters:
165155
count: 2
166156
path: src/bundle/DependencyInjection/IbexaFieldTypeRichTextExtension.php
167157

168-
-
169-
message: "#^Method Ibexa\\\\Bundle\\\\FieldTypeRichText\\\\IbexaFieldTypeRichTextBundle\\:\\:build\\(\\) has no return type specified\\.$#"
170-
count: 1
171-
path: src/bundle/IbexaFieldTypeRichTextBundle.php
172-
173158
-
174159
message: "#^Method Ibexa\\\\Bundle\\\\FieldTypeRichText\\\\IbexaFieldTypeRichTextBundle\\:\\:getCoreExtension\\(\\) should return Ibexa\\\\Bundle\\\\Core\\\\DependencyInjection\\\\IbexaCoreExtension but returns Symfony\\\\Component\\\\DependencyInjection\\\\Extension\\\\ExtensionInterface\\.$#"
175160
count: 1

src/lib/Validator/Constraints/RichTextValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function __construct(InputHandlerInterface $inputHandler)
3232
/**
3333
* {@inheritdoc}
3434
*/
35-
public function validate($value, Constraint $constraint): void
35+
public function validate(mixed $value, Constraint $constraint): void
3636
{
3737
if (is_string($value)) {
3838
try {

0 commit comments

Comments
 (0)