Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TMP] IBX-8470: Bump symfony dependencies to version 6 #195

Closed
wants to merge 4 commits into from
Closed

[TMP] IBX-8470: Bump symfony dependencies to version 6 #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1db7266
[TMP] Added temporary symfony6 ibexa branches
ViniTou Dec 4, 2024
c2b9ace
IBX-8570: Bump symfony dependencies
ViniTou Dec 6, 2024
ddff1ad
[TMP] Fake out admin-ui dependencies, so package is installable
ViniTou Dec 6, 2024
7865e2e
IBX-8570: Fixed phpstan issues that showed up after upgrade to symfony 6
ViniTou Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 30 additions & 28 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,51 +6,53 @@
"ezsystems/ezplatform-richtext": "*"
},
"require": {
"babdev/pagerfanta-bundle": "v4.5.0 as v2.11.0",
"jms/translation-bundle": "2.4.0 as 1.7.0",
"willdurand/js-translation-bundle": "6.1.0 as 4.0.2",
Comment on lines +9 to +11
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happened here?

Copy link
Contributor Author

@ViniTou ViniTou Dec 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not work in progress per se, but this just have to wait till admin-ui is upgraded to symfony6, as those are its dependencies that's need to be kinda mocked to make it instalable at this moment.

(thought that marking it in the specific commit will be enough, but I added the explenation in new PR as well).

"php": " >=8.3",
"ext-dom": "*",
"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",
"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",
"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": "^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/admin-ui": "dev-ibx-8470-symfony-6 as 5.0.x-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",
"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": {
Expand Down
15 changes: 0 additions & 15 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Validator/Constraints/RichTextValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading