Skip to content

Commit

Permalink
[TASK] Allow typo3fluid/fluid:^3 in composer manifests
Browse files Browse the repository at this point in the history
Pure metadata change - allows site admin to create a new
site which uses Fluid 3.0.

A separate change will come in TYPO3 v9.

Releases: master
Resolves: #90285
Change-Id: I5de150a4a8b7d99b12a50b2b5c9eb36462121f06
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/63132
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
  • Loading branch information
NamelessCoder authored and bmack committed Mar 23, 2020
1 parent e3d0d14 commit 774c0c7
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 11 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"typo3/cms-cli": "^2.0",
"typo3/cms-composer-installers": "^2.0",
"typo3/phar-stream-wrapper": "^3.1.3",
"typo3fluid/fluid": "^2.6.8"
"typo3fluid/fluid": "^2.6.8 || ^3"
},
"require-dev": {
"codeception/codeception": "^4.0",
Expand Down
13 changes: 7 additions & 6 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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"typo3/cms-core": "10.4.*@dev",
"typo3/cms-fluid": "10.4.*@dev",
"typo3/cms-frontend": "10.4.*@dev",
"typo3fluid/fluid": "^2.6.8",
"typo3fluid/fluid": "^2.6.8 || ^3",
"psr/http-message": "^1.0",
"psr/http-server-handler": "^1.0",
"psr/http-server-middleware": "^1.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
.. include:: ../../Includes.txt

================================================================================================
Important: #90285 - Fresh installs without constraint for typo3fluid/fluid will get version 3.0+
================================================================================================

See :issue:`90285`

Description
===========

Projects which have no dependencies that add a constraint on the maximum allowed version of Fluid
will in the future download and install ``typo3fluid/fluid:^3``.

The TYPO3 core is fully compatible with both major versions of Fluid and lets you choose between
version ``2.6+`` or ``3.0+`` by constraining your project dependencies. However, some projects based
on TYPO3 may contain Fluid templates or dependencies which are not compatible with Fluid 3.0, yet
neglect to declare a maximum version constraint for Fluid - since until the release of version 3.0,
the only/highest major version was 2.6 and ``composer install`` would therefore always select version
``^2.6`` as it was the only option.

If your project has no maximum version constraint and contains Fluid templates which are incompatible
with version ``3.0+`` you will therefore need to take one of the following two actions:

* Either declare a maximum version constraint for ``typo3fluid/fluid:^2`` in the root project
``composer.json`` or any dependency of the project that you control, and perform ``composer update``.
* Or execute ``composer req typo3fluid/fluid:^2`` in the project directory to make the project itself
declare the maximum version constraint.

.. index:: Fluid, ext:fluid
2 changes: 1 addition & 1 deletion typo3/sysext/core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"typo3/cms-cli": "^2.0",
"typo3/cms-composer-installers": "^2.0",
"typo3/phar-stream-wrapper": "^3.1.3",
"typo3fluid/fluid": "^2.6.8"
"typo3fluid/fluid": "^2.6.8 || ^3"
},
"require-dev": {
"codeception/codeception": "^4.0",
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": "^4.4 || ^5.0",
"typo3/cms-core": "10.4.*@dev",
"typo3/cms-extbase": "10.4.*@dev",
"typo3fluid/fluid": "^2.6.8"
"typo3fluid/fluid": "^2.6.8 || ^3"
},
"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 @@ -24,7 +24,7 @@
"psr/log": "^1.0",
"typo3/cms-backend": "10.4.*@dev",
"typo3/cms-core": "10.4.*@dev",
"typo3fluid/fluid": "^2.6.8"
"typo3fluid/fluid": "^2.6.8 || ^3"
},
"conflict": {
"typo3/cms": "*"
Expand Down

0 comments on commit 774c0c7

Please sign in to comment.