[TASK] Allow typo3fluid/fluid:^3 in composer manifests 32/63132/13
authorClaus Due <claus@namelesscoder.net>
Fri, 31 Jan 2020 19:50:45 +0000 (20:50 +0100)
committerBenni Mack <benni@typo3.org>
Mon, 23 Mar 2020 20:01:47 +0000 (21:01 +0100)
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>
composer.json
composer.lock
typo3/sysext/adminpanel/composer.json
typo3/sysext/core/Documentation/Changelog/master/Important-90285-FreshInstallsWithoutConstraintForTypo3fluidfluidWillGetVersion30.rst [new file with mode: 0644]
typo3/sysext/core/composer.json
typo3/sysext/fluid/composer.json
typo3/sysext/redirects/composer.json

index 740f5f7..0d285da 100644 (file)
@@ -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",
index dd38889..1d8d1fd 100644 (file)
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "14665839bbb3e7064201e4918c2748f4",
+    "content-hash": "94ae18647513c4fc9f99421d1e862fd2",
     "packages": [
         {
             "name": "cogpowered/finediff",
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "role": "lead",
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Utility class for timing",
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "role": "lead",
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
     "platform-dev": [],
     "platform-overrides": {
         "php": "7.2.5"
-    }
+    },
+    "plugin-api-version": "1.1.0"
 }
index af0a8e7..5bd9449 100644 (file)
@@ -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",
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Important-90285-FreshInstallsWithoutConstraintForTypo3fluidfluidWillGetVersion30.rst b/typo3/sysext/core/Documentation/Changelog/master/Important-90285-FreshInstallsWithoutConstraintForTypo3fluidfluidWillGetVersion30.rst
new file mode 100644 (file)
index 0000000..1c721c4
--- /dev/null
@@ -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
index 9bff5ef..774b105 100644 (file)
@@ -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",
index acda375..c00634b 100644 (file)
@@ -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": "*"
index 828110b..a8c20a5 100644 (file)
@@ -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": "*"