Skip to content

Commit

Permalink
[TASK] Raise typo3fluid/fluid:^2.7.2
Browse files Browse the repository at this point in the history
Raising from 2.7.1 brings:
* A couple of bug fixes, especially ternary should
  work much better when cached
* Basic PHP 8.2 support
* A couple of minor additions and more relaxed
  handling. Some of these will materialize in v12
  with upcoming patches

> composer req typo3fluid/fluid:^2.7.2
> composer req typo3fluid/fluid:^2.7.2 -d typo3/sysext/fluid --no-update
> composer req typo3fluid/fluid:^2.7.2 -d typo3/sysext/adminpanel --no-update
> composer req typo3fluid/fluid:^2.7.2 -d typo3/sysext/redirects --no-update
> composer req typo3fluid/fluid:^2.7.2 -d typo3/sysext/core --no-update
> Build/Scripts/runTests.sh -s phpstanGenerateBaseline

Resolves: #98048
Releases: main, 11.5
Change-Id: Ibc94b02823913347465245201442277f048c5c0b
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/75327
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Benni Mack <benni@typo3.org>
  • Loading branch information
lolli42 authored and bmack committed Jul 28, 2022
1 parent 7bff0f4 commit 89ac4f1
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 27 deletions.
10 changes: 0 additions & 10 deletions Build/phpstan/phpstan-baseline.neon
Expand Up @@ -3475,16 +3475,6 @@ parameters:
count: 1
path: ../../typo3/sysext/fluid/Classes/View/TemplatePaths.php

-
message: "#^Else branch is unreachable because previous condition is always true\\.$#"
count: 1
path: ../../typo3/sysext/fluid/Classes/ViewHelpers/Asset/CssViewHelper.php

-
message: "#^Else branch is unreachable because previous condition is always true\\.$#"
count: 1
path: ../../typo3/sysext/fluid/Classes/ViewHelpers/Asset/ScriptViewHelper.php

-
message: "#^Call to an undefined method TYPO3Fluid\\\\Fluid\\\\Core\\\\Rendering\\\\RenderingContextInterface\\:\\:getRequest\\(\\)\\.$#"
count: 1
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -99,7 +99,7 @@
"typo3/html-sanitizer": "^2.0.14",
"typo3/phar-stream-wrapper": "^3.1.7",
"typo3/symfony-psr-event-dispatcher-adapter": "^1.0 || ^2.0",
"typo3fluid/fluid": "^2.7.1"
"typo3fluid/fluid": "^2.7.2"
},
"require-dev": {
"bnf/phpstan-psr-container": "^1.0.1",
Expand Down
30 changes: 18 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion typo3/sysext/adminpanel/composer.json
Expand Up @@ -27,7 +27,7 @@
"typo3/cms-core": "11.5.*@dev",
"typo3/cms-fluid": "11.5.*@dev",
"typo3/cms-frontend": "11.5.*@dev",
"typo3fluid/fluid": "^2.7.1"
"typo3fluid/fluid": "^2.7.2"
},
"conflict": {
"typo3/cms": "*"
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/core/composer.json
Expand Up @@ -76,7 +76,7 @@
"typo3/html-sanitizer": "^2.0.14",
"typo3/phar-stream-wrapper": "^3.1.7",
"typo3/symfony-psr-event-dispatcher-adapter": "^1.0 || ^2.0",
"typo3fluid/fluid": "^2.7.1"
"typo3fluid/fluid": "^2.7.2"
},
"suggest": {
"ext-fileinfo": "Used for proper file type detection in the file abstraction layer",
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/fluid/composer.json
Expand Up @@ -22,7 +22,7 @@
"symfony/dependency-injection": "^5.4",
"typo3/cms-core": "11.5.*@dev",
"typo3/cms-extbase": "11.5.*@dev",
"typo3fluid/fluid": "^2.7.1"
"typo3fluid/fluid": "^2.7.2"
},
"conflict": {
"typo3/cms": "*"
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/redirects/composer.json
Expand Up @@ -25,7 +25,7 @@
"symfony/console": "^5.4",
"typo3/cms-backend": "11.5.*@dev",
"typo3/cms-core": "11.5.*@dev",
"typo3fluid/fluid": "^2.7.1"
"typo3fluid/fluid": "^2.7.2"
},
"conflict": {
"typo3/cms": "*"
Expand Down

0 comments on commit 89ac4f1

Please sign in to comment.