Upgrade to Symfony 5 #7137

yguedidi · 2023-12-24T23:29:44Z

requires those PRs to be merged first:

better be reviewed commit by commit

Production Changes	From	To	Compare
doctrine/annotations	1.14.3	2.0.1	...
doctrine/doctrine-bundle	2.7.2	2.11.1	...
doctrine/doctrine-migrations-bundle	3.2.5	3.3.0	...
enshrined/svg-sanitize	0.15.4	0.16.0	...
friendsofsymfony/rest-bundle	3.5.0	3.6.0	...
incenteev/composer-parameter-handler	v2.1.5	v2.2.0	...
jms/serializer-bundle	5.3.1	5.4.0	...
lcobucci/jwt	4.1.5	4.3.0	...
lexik/form-filter-bundle	v7.0.3	REMOVED
nelmio/api-doc-bundle	v4.11.1	v4.18.1	...
nelmio/cors-bundle	2.3.1	2.4.0	...
phpdocumentor/type-resolver	1.7.3	1.8.0	...
phpstan/phpdoc-parser	1.24.5	1.25.0	...
psr/http-message	1.1	2.0	...
stof/doctrine-extensions-bundle	v1.7.2	v1.10.1	...
symfony/asset	v4.4.46	v5.4.31	...
symfony/config	v4.4.44	v5.4.31	...
symfony/console	v4.4.49	v5.4.34	...
symfony/debug	v4.4.44	REMOVED
symfony/dependency-injection	v4.4.49	v5.4.34	...
symfony/doctrine-bridge	v4.4.48	v5.4.34	...
symfony/dom-crawler	v4.4.45	v5.4.32	...
symfony/error-handler	v4.4.44	v5.4.29	...
symfony/event-dispatcher	v4.4.44	v5.4.34	...
symfony/event-dispatcher-contracts	v1.10.0	v2.5.2	...
symfony/finder	v4.4.44	v5.4.27	...
symfony/form	v4.4.48	v5.4.33	...
symfony/framework-bundle	v4.4.51	v5.4.34	...
symfony/google-mailer	v4.4.41	v5.4.23	...
symfony/http-foundation	v4.4.49	v5.4.34	...
symfony/http-kernel	v4.4.51	v5.4.34	...
symfony/mailer	v4.4.49	v5.4.34	...
symfony/mime	v4.4.47	v5.4.26	...
symfony/monolog-bridge	v5.2.12	v5.4.31	...
symfony/monolog-bundle	v3.8.0	v3.10.0	...
symfony/options-resolver	v4.4.44	v5.4.21	...
symfony/proxy-manager-bridge	v4.4.39	v5.4.21	...
symfony/psr-http-message-bridge	v2.1.4	v2.3.1	...
symfony/routing	v4.4.44	v5.4.34	...
symfony/security-bundle	v4.4.50	v5.4.34	...
symfony/security-core	v4.4.48	v5.4.30	...
symfony/security-csrf	v5.2.12	v5.4.27	...
symfony/security-guard	v4.4.46	v5.4.27	...
symfony/security-http	v4.4.50	v5.4.31	...
symfony/templating	v4.4.44	v5.4.21	...
symfony/translation	v4.4.47	v5.4.31	...
symfony/twig-bridge	v4.4.51	v5.4.34	...
symfony/twig-bundle	v4.4.41	v5.4.31	...
symfony/validator	v4.4.48	v5.4.34	...
symfony/var-dumper	v4.4.47	v5.4.29	...
symfony/yaml	v5.3.14	v5.4.31	...
twig/extra-bundle	v3.7.0	v3.8.0	...
zircote/swagger-php	4.8.2	4.8.3	...
ezyang/htmlpurifier	NEW	v4.17.0
psr/event-dispatcher	NEW	1.0.0
spiriitlabs/form-filter-bundle	NEW	v10.0.0
symfony/password-hasher	NEW	v5.4.31
symfony/polyfill-intl-icu	NEW	v1.28.0

Dev Changes	From	To	Compare
composer/pcre	1.0.1	3.1.1	...
composer/xdebug-handler	2.0.5	3.0.3	...
dama/doctrine-test-bundle	v7.1.1	v8.0.1	...
doctrine/doctrine-fixtures-bundle	3.4.5	3.5.1	...
friendsofphp/php-cs-fixer	v3.4.0	v3.47.1	...
php-cs-fixer/diff	v2.0.2	REMOVED
phpstan/phpstan-doctrine	1.3.58	1.3.59	...
phpunit/phpunit	9.6.15	9.6.16	...
symfony/browser-kit	v4.4.44	v5.4.31	...
symfony/css-selector	v4.4.44	v5.4.26	...
symfony/debug-bundle	v4.4.37	v5.4.26	...
symfony/maker-bundle	v1.39.1	v1.43.0	...
symfony/phpunit-bridge	v6.4.2	v7.0.2	...
symfony/web-profiler-bundle	v4.4.47	v5.4.34	...

yguedidi · 2023-12-24T23:55:11Z

tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php

+            ['image/pjpeg', 'jpg'],
+            ['image/jpeg', 'jpg'],


I think is safe and BC because it seems this is used only to generate new image files, so no impact on previously generated ones I think, if someone can confirm :)

yguedidi · 2023-12-24T23:57:20Z

On my local the single failing test fails with the following error:

[2023-12-24T23:47:32.817187+00:00] request.CRITICAL: Uncaught PHP Exception PHPUnit\Framework\Error\Warning: "require(/var/www/html/var/cache/tes_/Container36H4AEP/RabbitMQConsumerTotalProxy_2d65184.php): Failed to open stream: No such file or directory" at /var/www/html/var/cache/tes_/Container36H4AEP/AppKernelTestDebugContainer.php line 892 {"exception":"[object] (PHPUnit\\Framework\\Error\\Warning(code: 2): require(/var/www/html/var/cache/tes_/Container36H4AEP/RabbitMQConsumerTotalProxy_2d65184.php): Failed to open stream: No such file or directory at /var/www/html/var/cache/tes_/Container36H4AEP/AppKernelTestDebugContainer.php:892)"} []

Will need to investigate how to resolve it.
Weird thing is that postgres tests works...

yguedidi · 2023-12-26T10:17:36Z

@j0k3r @Kdecherf @nicosomb found this on master https://github.com/wallabag/wallabag/blob/master/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php#L221-L229
seems we already skip a test because of a similar issue...
the failing test here works on my local using docker and sqlite database.
should I skip the failing test on mysql and sqlite?

yguedidi · 2024-01-01T20:44:21Z

@j0k3r @nicosomb @Kdecherf it looks like the remaining error was because RabbitMQConsumerTotalProxy being lazy...
Found in the doc of the bundle that lazy services are not supported

phpstan-baseline.neon

tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php

yguedidi · 2024-01-03T07:45:14Z

@j0k3r you can check this force-push diff for the fixes, I updated 220bcfd and 91c3f53

yguedidi · 2024-01-22T08:24:50Z

Thanks @j0k3r ! @Kdecherf @nicosomb would be great if one of you could check this also, would prefer to have at least 2 approves before merging on this key PR :)

It's not supported by the bundle, see https://github.com/php-amqplib/RabbitMqBundle/tree/2.13.2?tab=readme-ov-file#important-notice---lazy-connections

Kdecherf

Looks good

Kdecherf · 2024-01-25T19:24:39Z

Thanks @yguedidi 🎉

yguedidi force-pushed the upgrade-to-symfony-5 branch from e1cad46 to 9406548 Compare December 24, 2023 23:52

yguedidi commented Dec 24, 2023

View reviewed changes

yguedidi added this to the 2.7.0 milestone Dec 25, 2023

yguedidi force-pushed the upgrade-to-symfony-5 branch 2 times, most recently from fdb0914 to 268b140 Compare December 25, 2023 23:13

yguedidi force-pushed the upgrade-to-symfony-5 branch 9 times, most recently from 786f7ea to b9a1418 Compare January 1, 2024 20:34

yguedidi force-pushed the upgrade-to-symfony-5 branch 2 times, most recently from 174b3c0 to 7294f43 Compare January 2, 2024 07:46

j0k3r reviewed Jan 3, 2024

View reviewed changes

phpstan-baseline.neon Show resolved Hide resolved

tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php Outdated Show resolved Hide resolved

yguedidi force-pushed the upgrade-to-symfony-5 branch from 7294f43 to 2900adc Compare January 3, 2024 07:43

yguedidi mentioned this pull request Jan 3, 2024

Merge 2.6 in master #7152

Merged

2 tasks

yguedidi force-pushed the upgrade-to-symfony-5 branch 2 times, most recently from 22f9d60 to 383a9c3 Compare January 8, 2024 22:54

yguedidi marked this pull request as ready for review January 8, 2024 22:57

yguedidi requested review from j0k3r, nicosomb and Kdecherf January 8, 2024 22:58

yguedidi force-pushed the upgrade-to-symfony-5 branch from 383a9c3 to 918dc41 Compare January 9, 2024 22:16

yguedidi requested review from nicosomb and Kdecherf and removed request for nicosomb and Kdecherf January 19, 2024 22:11

j0k3r approved these changes Jan 22, 2024

View reviewed changes

yguedidi mentioned this pull request Jan 22, 2024

Move to one bundle #7151

Merged

1 task

yguedidi added 17 commits January 22, 2024 19:15

Regenerate PHPStan baseline

4e314dd

Upgrade to Symfony 5.4

33871b3

Use error routing from FrameworkBundle

2bef3e4

Fix JPEG images extension

f0360bc

Update PHP dependencies

7284e5d

Upgrade dama/doctrine-test-bundle

ac9473e

Upgrade enshrined/svg-sanitize

aa718c9

Upgrade lcobucci/jwt

17c9dbd

Upgrade from lexik/form-filter-bundle to spiriitlabs/form-filter-bundle

25474a7

Upgrade psr/http-message

2231d1b

Upgrade symfony/phpunit-bridge

8c87d10

Explicitly add Symfony polyfills for PHP 8.0 and 8.1

e938cc8

Apply PHP-CS-Fixer fixes

0a11795

Fix PHPStan configuration

083dc63

Fix PHPStan errors

0178c73

Make RabbitMQConsumerTotalProxy non-lazy

423f2f7

It's not supported by the bundle, see https://github.com/php-amqplib/RabbitMqBundle/tree/2.13.2?tab=readme-ov-file#important-notice---lazy-connections

Bump PHP dependencies

c34a259

yguedidi force-pushed the upgrade-to-symfony-5 branch from b8b17de to c34a259 Compare January 22, 2024 18:16

Kdecherf added the Ready for review label Jan 25, 2024

Kdecherf approved these changes Jan 25, 2024

View reviewed changes

Kdecherf merged commit eb36d69 into wallabag:master Jan 25, 2024
21 checks passed

yguedidi deleted the upgrade-to-symfony-5 branch January 25, 2024 19:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade to Symfony 5 #7137

Upgrade to Symfony 5 #7137

yguedidi commented Dec 24, 2023 •

edited

Loading

yguedidi Dec 24, 2023

yguedidi commented Dec 24, 2023

yguedidi commented Dec 26, 2023

yguedidi commented Jan 1, 2024

yguedidi commented Jan 3, 2024

yguedidi commented Jan 22, 2024

Kdecherf left a comment

Kdecherf commented Jan 25, 2024

Upgrade to Symfony 5 #7137

Upgrade to Symfony 5 #7137

Conversation

yguedidi commented Dec 24, 2023 • edited Loading

yguedidi Dec 24, 2023

Choose a reason for hiding this comment

yguedidi commented Dec 24, 2023

yguedidi commented Dec 26, 2023

yguedidi commented Jan 1, 2024

yguedidi commented Jan 3, 2024

yguedidi commented Jan 22, 2024

Kdecherf left a comment

Choose a reason for hiding this comment

Kdecherf commented Jan 25, 2024

yguedidi commented Dec 24, 2023 •

edited

Loading