Skip to content

Commit

Permalink
[TASK] Pin fluid standalone dependency to ^2.6.10
Browse files Browse the repository at this point in the history
Various parts of TYPO3 Core are not ready yet
to be used with Fluid Engine 3.0-dev, which
people might accidentally install.

This change sets the fluid dependency back to
^2.6.10

Used commands:

- composer req "typo3fluid/fluid:^2.6.10"
- composer req "typo3fluid/fluid:^2.6.10" -d typo3/sysext/adminpanel --no-update
- composer req "typo3fluid/fluid:^2.6.10" -d typo3/sysext/core --no-update
- composer req "typo3fluid/fluid:^2.6.10" -d typo3/sysext/fluid --no-update
- composer req "typo3fluid/fluid:^2.6.10" -d typo3/sysext/redirects --no-update

Resolves: #91850
Releases: master, 10.4
Change-Id: If46475fd3fdbca3ce23a652a253c0ac28d9a6149
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/68919
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Benjamin Franzke <bfr@qbus.de>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Bartsch <bo@cedev.de>
Tested-by: Benjamin Franzke <bfr@qbus.de>
  • Loading branch information
bmack authored and bnf committed Apr 30, 2021
1 parent 2941553 commit 4ed1c06
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"typo3/cms-composer-installers": "^2.0 || ^3.0",
"typo3/phar-stream-wrapper": "^3.1.6",
"typo3/symfony-psr-event-dispatcher-adapter": "^1.0 || ^2.0",
"typo3fluid/fluid": "^2.6.10 || ^3"
"typo3fluid/fluid": "^2.6.10"
},
"require-dev": {
"composer-runtime-api": "^2.0",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

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

10 changes: 5 additions & 5 deletions typo3/sysext/adminpanel/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
"sort-packages": true
},
"require": {
"psr/http-message": "^1.0",
"psr/http-server-handler": "^1.0",
"psr/http-server-middleware": "^1.0",
"symfony/var-dumper": "^5.2",
"typo3/cms-backend": "11.2.*@dev",
"typo3/cms-core": "11.2.*@dev",
"typo3/cms-fluid": "11.2.*@dev",
"typo3/cms-frontend": "11.2.*@dev",
"typo3fluid/fluid": "^2.6.10 || ^3",
"psr/http-message": "^1.0",
"psr/http-server-handler": "^1.0",
"psr/http-server-middleware": "^1.0",
"symfony/var-dumper": "^5.2"
"typo3fluid/fluid": "^2.6.10"
},
"conflict": {
"typo3/cms": "*"
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"typo3/cms-composer-installers": "^2.0 || ^3.0",
"typo3/phar-stream-wrapper": "^3.1.6",
"typo3/symfony-psr-event-dispatcher-adapter": "^1.0 || ^2.0",
"typo3fluid/fluid": "^2.6.10 || ^3"
"typo3fluid/fluid": "^2.6.10"
},
"require-dev": {
"codeception/codeception": "^4.1.12",
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/fluid/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"symfony/dependency-injection": "^5.2",
"typo3/cms-core": "11.2.*@dev",
"typo3/cms-extbase": "11.2.*@dev",
"typo3fluid/fluid": "^2.6.10 || ^3"
"typo3fluid/fluid": "^2.6.10"
},
"conflict": {
"typo3/cms": "*"
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/redirects/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"symfony/console": "^5.2",
"typo3/cms-backend": "11.2.*@dev",
"typo3/cms-core": "11.2.*@dev",
"typo3fluid/fluid": "^2.6.10 || ^3"
"typo3fluid/fluid": "^2.6.10"
},
"conflict": {
"typo3/cms": "*"
Expand Down

0 comments on commit 4ed1c06

Please sign in to comment.