Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 876f186

Browse files
emodricemodric
committed
Upgrade Netgen Layouts and other packages to Symfony 7.3 and PHP 8.4
1 parent 0cd40ea commit 876f186

23 files changed

Lines changed: 123 additions & 129 deletions

‎.php-cs-fixer.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,37 @@
22

33
declare(strict_types=1);
44

5-
return (new PhpCsFixer\Config())
5+
return new PhpCsFixer\Config()
66
->setRiskyAllowed(true)
77
->setRules([
8-
'@PER' => true,
9-
'@PER:risky' => true,
8+
'@PER-CS' => true,
9+
'@PER-CS:risky' => true,
1010
'@PhpCsFixer' => true,
1111
'@PhpCsFixer:risky' => true,
1212

1313
// Overrides for rules included in PhpCsFixer rule sets
1414
'concat_space' => ['spacing' => 'one'],
1515
'fully_qualified_strict_types' => ['phpdoc_tags' => []],
1616
'method_chaining_indentation' => false,
17+
'multiline_promoted_properties' => true,
1718
'multiline_whitespace_before_semicolons' => false,
1819
'native_function_invocation' => ['include' => ['@all']],
1920
'no_superfluous_phpdoc_tags' => false,
2021
'no_unset_on_property' => false,
2122
'operator_linebreak' => false,
2223
'ordered_imports' => ['imports_order' => ['class', 'function', 'const'], 'sort_algorithm' => 'alpha'],
23-
'ordered_types' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'alpha'],
24+
'ordered_types' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
25+
'php_unit_data_provider_method_order' => false,
26+
'php_unit_data_provider_name' => false,
2427
'php_unit_internal_class' => false,
25-
'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
28+
'php_unit_test_case_static_method_calls' => false,
2629
'php_unit_test_class_requires_covers' => false,
2730
'phpdoc_align' => false,
2831
'phpdoc_order' => ['order' => ['param', 'throws', 'return']],
2932
'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
3033
'single_line_comment_style' => false,
3134
'trailing_comma_in_multiline' => ['elements' => ['arrays', 'arguments', 'match', 'parameters']],
32-
'yoda_style' => false,
35+
'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
3336

3437
// Additional rules
3538
'date_time_immutable' => true,

‎composer.json‎

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -36,50 +36,46 @@
3636
"symfony/runtime": "7.3.*",
3737
"symfony/yaml": "7.3.*",
3838

39-
"novactive/ezseobundle": "^7.0.4",
40-
"sentry/sentry-symfony": "^4.13",
41-
"twig/twig": "^3.9",
42-
"twig/intl-extra": "^3.9",
43-
"tanoconsulting/ibexa-migration-bundle": "^1.0",
39+
"novactive/ezseobundle": "^7.3",
40+
"sentry/sentry-symfony": "^5.8",
41+
"twig/intl-extra": "^3.22",
42+
"mrk-te/ibexa-migration-bundle2": "^3.0",
4443

45-
"netgen/media-site-data": "^3.3",
46-
"netgen/site-bundle": "^3.4",
47-
"netgen/site-installer-bundle": "^3.1",
48-
"netgen/ibexa-site-api": "^6.1.2",
49-
"netgen/ibexa-search-extra": "^3.2.1",
50-
"netgen/information-collection-bundle": "^3.0@alpha",
51-
"netgen/ibexa-fieldtype-enhanced-link": "^1.1.2",
52-
"netgen/ibexa-admin-ui-extra": "^1.3.0",
53-
"netgen/toolbar": "^1.0",
54-
"netgen/ibexa-scheduled-visibility": "^1.0",
44+
"netgen/media-site-data": "^4.0",
45+
"netgen/site-bundle": "^4.0",
46+
"netgen/site-installer-bundle": "^4.0",
47+
"netgen/ibexa-site-api": "^7.0",
48+
"netgen/ibexa-search-extra": "^4.0",
49+
"netgen/information-collection-bundle": "^4.0@alpha",
50+
"netgen/ibexa-fieldtype-enhanced-link": "^2.0",
51+
"netgen/ibexa-admin-ui-extra": "^2.0",
52+
"netgen/toolbar": "^2.0",
53+
"netgen/ibexa-scheduled-visibility": "^2.0",
5554

56-
"netgen/layouts-standard": "~1.4.0",
57-
"netgen/layouts-ibexa": "~1.4.0",
58-
"netgen/layouts-ibexa-site-api": "~1.4.0",
59-
"netgen/layouts-ibexa-relation-list-query": "^1.4",
60-
"netgen/layouts-ibexa-tags-query": "^1.4"
55+
"netgen/layouts-standard": "~2.0.0",
56+
"netgen/layouts-ibexa": "~2.0.0",
57+
"netgen/layouts-ibexa-site-api": "~2.0.0",
58+
"netgen/layouts-ibexa-relation-list-query": "^2.0",
59+
"netgen/layouts-ibexa-tags-query": "^2.0"
6160
},
6261
"require-dev": {
6362
"symfony/debug-bundle": "7.3.*",
6463
"symfony/stopwatch": "7.3.*",
6564
"symfony/web-profiler-bundle": "7.3.*",
6665

67-
"netgen/git-hooks": "^2.5",
66+
"netgen/git-hooks": "^3.0",
6867
"deployer/recipes": "^6.2",
69-
"phpstan/phpstan": "^1.10",
70-
"phpstan/extension-installer": "^1.3",
71-
"phpstan/phpstan-strict-rules": "^1.5",
72-
"phpstan/phpstan-symfony": "^1.3",
73-
"phpstan/phpstan-doctrine": "^1.3",
74-
"php-cs-fixer/shim": "^3.50",
75-
"phpunit/phpunit": "^9.5",
76-
"symfony/browser-kit": "5.4.*",
77-
"symfony/css-selector": "5.4.*",
78-
"symfony/phpunit-bridge": "5.4.*"
68+
"phpstan/phpstan": "^2.1",
69+
"phpstan/extension-installer": "^1.4",
70+
"phpstan/phpstan-strict-rules": "^2.0",
71+
"phpstan/phpstan-symfony": "^2.0",
72+
"phpstan/phpstan-doctrine": "^2.0",
73+
"php-cs-fixer/shim": "^3.91",
74+
"phpunit/phpunit": "^12.5",
75+
"symfony/browser-kit": "7.3.*",
76+
"symfony/css-selector": "7.3.*",
77+
"symfony/phpunit-bridge": "7.3.*"
7978
},
80-
"repositories": [
81-
{ "type": "vcs", "url": "https://github.com/netgen/NovaeZSEOBundle.git" }
82-
],
8379
"config": {
8480
"allow-plugins": {
8581
"composer/package-versions-deprecated": true,
@@ -128,7 +124,6 @@
128124
],
129125
"ibexa-assets": [
130126
"yarn ibexa-generate-tsconfig --use-relative-paths",
131-
"@php bin/console ibexa:encore:compile --config-name app",
132127
"@php bin/console bazinga:js-translation:dump public/assets --merge-domains",
133128
"@php bin/console ibexa:encore:compile --frontend-configs-name ibexa,internals,libs,richtext",
134129
"@php bin/console ibexa:encore:compile"

‎config/app/packages/opengraph.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,29 @@ netgen_open_graph:
1212
- { handler: ngsite/site_image, tag: "og:image" }
1313
ng_landing_page:
1414
- { handler: literal/text, tag: "og:type", params: [website] }
15-
- { handler: field_type/ezstring, tag: "og:title", params: [title] }
15+
- { handler: field_type/ibexa_string, tag: "og:title", params: [title] }
1616
- { handler: ngsite/site_image, tag: "og:image" }
1717
ng_category:
1818
- { handler: literal/text, tag: "og:type", params: [website] }
19-
- { handler: field_type/ezstring, tag: "og:title", params: [title] }
20-
- { handler: field_type/ezrichtext, tag: "og:description", params: [full_intro] }
19+
- { handler: field_type/ibexa_string, tag: "og:title", params: [title] }
20+
- { handler: field_type/ibexa_richtext, tag: "og:description", params: [full_intro] }
2121
ng_article:
2222
- { handler: literal/text, tag: "og:type", params: [article] }
23-
- { handler: field_type/ezstring, tag: "og:title", params: [title] }
24-
- { handler: field_type/ezrichtext, tag: "og:description", params: [full_intro] }
25-
- { handler: field_type/ezimage, tag: "og:image", params: [image, i1320] }
23+
- { handler: field_type/ibexa_string, tag: "og:title", params: [title] }
24+
- { handler: field_type/ibexa_richtext, tag: "og:description", params: [full_intro] }
25+
- { handler: field_type/ibexa_image, tag: "og:image", params: [image, i1320] }
2626
ng_news:
2727
- { handler: literal/text, tag: "og:type", params: [article] }
28-
- { handler: field_type/ezstring, tag: "og:title", params: [title] }
29-
- { handler: field_type/ezrichtext, tag: "og:description", params: [full_intro] }
30-
- { handler: field_type/ezimage, tag: "og:image", params: [image, i1320] }
28+
- { handler: field_type/ibexa_string, tag: "og:title", params: [title] }
29+
- { handler: field_type/ibexa_richtext, tag: "og:description", params: [full_intro] }
30+
- { handler: field_type/ibexa_image, tag: "og:image", params: [image, i1320] }
3131
ng_blog_post:
3232
- { handler: literal/text, tag: "og:type", params: [article] }
33-
- { handler: field_type/ezstring, tag: "og:title", params: [title] }
34-
- { handler: field_type/ezrichtext, tag: "og:description", params: [full_intro] }
35-
- { handler: field_type/ezimage, tag: "og:image", params: [image, i1320] }
33+
- { handler: field_type/ibexa_string, tag: "og:title", params: [title] }
34+
- { handler: field_type/ibexa_richtext, tag: "og:description", params: [full_intro] }
35+
- { handler: field_type/ibexa_image, tag: "og:image", params: [image, i1320] }
3636
ng_contact_form:
3737
- { handler: literal/text, tag: "og:type", params: [article] }
38-
- { handler: field_type/ezstring, tag: "og:title", params: [title] }
39-
- { handler: field_type/ezrichtext, tag: "og:description", params: [full_intro] }
38+
- { handler: field_type/ibexa_string, tag: "og:title", params: [title] }
39+
- { handler: field_type/ibexa_richtext, tag: "og:description", params: [full_intro] }
4040
- { handler: ngsite/site_image, tag: "og:image" }

‎config/bundles.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
99
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
1010
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
11-
Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
1211
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
1312
Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
1413
Bazinga\Bundle\JsTranslationBundle\BazingaJsTranslationBundle::class => ['all' => true],
@@ -56,7 +55,7 @@
5655
Lolautruche\EzCoreExtraBundle\EzCoreExtraBundle::class => ['all' => true],
5756
Sentry\SentryBundle\SentryBundle::class => ['all' => true],
5857
Novactive\Bundle\eZSEOBundle\NovaeZSEOBundle::class => ['all' => true],
59-
Kaliop\eZMigrationBundle\eZMigrationBundle::class => ['all' => true],
58+
Kaliop\IbexaMigrationBundle\KaliopMigrationBundle::class => ['all' => true],
6059
Netgen\Bundle\ContentBrowserUIBundle\NetgenContentBrowserUIBundle::class => ['all' => true],
6160
Netgen\Bundle\ContentBrowserBundle\NetgenContentBrowserBundle::class => ['all' => true],
6261
Netgen\Bundle\LayoutsUIBundle\NetgenLayoutsUIBundle::class => ['all' => true],

‎config/packages/messenger.yaml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
framework:
22
messenger:
3-
# reset services after consuming messages
4-
reset_on_message: true
5-
63
# Uncomment this (and the failed transport below) to send failed messages to this transport for later handling.
74
# failure_transport: failed
85

96
transports:
107
# https://symfony.com/doc/current/messenger.html#transport-configuration
118
# async: '%env(MESSENGER_TRANSPORT_DSN)%'
129
# failed: 'doctrine://default?queue_name=failed'
13-
# sync: 'sync://'
10+
sync: 'sync://'
1411

1512
routing:
1613
# Route your messages to the transports
1714
# 'App\Message\YourMessage': async
15+
16+
# when@test:
17+
# framework:
18+
# messenger:
19+
# transports:
20+
# # replace with your transport name here (e.g., my_transport: 'in-memory://')
21+
# # For more Messenger testing tools, see https://github.com/zenstruck/messenger-test
22+
# async: 'in-memory://'

‎config/packages/sentry.yaml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
sentry:
22
dsn: '%env(SENTRY_DSN)%'
33
options:
4-
integrations:
5-
- 'Sentry\Integration\IgnoreErrorsIntegration'
6-
7-
services:
8-
Sentry\Integration\IgnoreErrorsIntegration:
9-
arguments:
10-
$options:
11-
ignore_exceptions:
12-
- 'Symfony\Component\HttpKernel\Exception\NotFoundHttpException'
13-
- 'Ibexa\Core\MVC\Symfony\Security\Exception\UnauthorizedSiteAccessException'
4+
ignore_exceptions:
5+
- 'Symfony\Component\ErrorHandler\Error\FatalError'
6+
- 'Symfony\Component\HttpKernel\Exception\NotFoundHttpException'
7+
- 'Ibexa\Core\MVC\Symfony\Security\Exception\UnauthorizedSiteAccessException'

‎config/routes/netgen_content_browser.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
netgen_content_browser:
2-
resource: '@NetgenContentBrowserBundle/Resources/config/routing.yaml'
3-
prefix: '%netgen_content_browser.route_prefix%'
2+
resource: "@NetgenContentBrowserBundle/Resources/config/routing.yaml"
3+
prefix: "%netgen_content_browser.route_prefix%"

‎config/routes/netgen_layouts.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
netgen_layouts:
2-
resource: '@NetgenLayoutsBundle/Resources/config/routing.yaml'
3-
prefix: '%netgen_layouts.route_prefix%'
2+
resource: "@NetgenLayoutsBundle/Resources/config/routing.yaml"
3+
prefix: "%netgen_layouts.route_prefix%"

‎config/routes/netgen_layouts_ibexa.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
netgen_layouts_ibexa:
2-
resource: '@NetgenLayoutsIbexaBundle/Resources/config/routing.yaml'
2+
resource: "@NetgenLayoutsIbexaBundle/Resources/config/routing.yaml"

‎doc/netgen/IBEXA_MIGRATIONS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The command for running the migration is rather simple:
2828
php kaliop:migration:migrate
2929
```
3030

31-
For more instructions you can check [GitHub repository](https://github.com/tanoconsulting/ibexa-migration-bundle) and this [blog post](https://netgen.io/blog/ez-migrations-made-easy-kaliop-migration-bundle).
31+
For more instructions you can check [GitHub repository](https://github.com/mrk-te/ibexa-migration-bundle2) and this [blog post](https://netgen.io/blog/ez-migrations-made-easy-kaliop-migration-bundle).
3232

3333
Deployment
3434
----------

0 commit comments

Comments
 (0)