Merge remote-tracking branch 'origin/8.3' into 9.0

.composer.json

@@ -8,8 +8,9 @@
       "../../flow doctrine:migrate --quiet",
       "../../bin/behat -f progress -c Neos.Flow/Tests/Behavior/behat.yml"
     ],
+    "lint:phpstan": "../../bin/phpstan analyse",
     "lint": [
-      "../../bin/phpstan analyse"
+      "@lint:phpstan"
     ]
   },
   "require": {

Neos.Cache/Classes/Frontend/FrontendInterface.php

@@ -62,7 +62,7 @@ public function set(string $entryIdentifier, $data, array $tags = [], int $lifet
      * Finds and returns data from the cache.
      *
      * @param string $entryIdentifier Something which identifies the cache entry - depends on concrete cache
-     * @return mixed
+     * @return mixed The value or false if the cache entry could not be loaded
      * @api
      */
     public function get(string $entryIdentifier);

Neos.Cache/Classes/Frontend/StringFrontend.php

@@ -58,7 +58,7 @@ public function set(string $entryIdentifier, $string, array $tags = [], int $lif
      * Finds and returns a variable value from the cache.
      *
      * @param string $entryIdentifier Identifier of the cache entry to fetch
-     * @return string The value
+     * @return string|false The value or false if the cache entry could not be loaded
      * @throws \InvalidArgumentException
      * @api
      */

Neos.Flow/composer.json

@@ -56,8 +56,7 @@
 
         "composer/composer": "^2.2.8",
 
-        "egulias/email-validator": "^2.1.17 || ^3.0",
-        "enshrined/svg-sanitize": "^0.16.0"
+        "egulias/email-validator": "^2.1.17 || ^3.0"
     },
     "require-dev": {
         "mikey179/vfsstream": "^1.6.10",

Readme.rst

@@ -54,6 +54,7 @@ Contributing
 
 If you want to contribute to Flow Framework and want to set up a development environment, then follow these steps:
 
+Clone and install the flow dev distribution https://github.com/neos/flow-development-distribution via git and composer or use this shorthand:
 ``composer create-project neos/flow-development-distribution flow-development @dev --keep-vcs``
 
 Note the **-distribution** package you create a project from, instead of just checking out this repository.
@@ -65,8 +66,8 @@ Here you can do all Git-related work (``git add .``, ``git commit``, etc).
 
 Unit tests can be run here via ``../../bin/phpunit -c ../../Build/BuildEssentials/PhpUnit/UnitTests.xml``, functional tests via ``../../bin/phpunit -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml`` and static analysis via ``composer lint``.
 
-To switch the branch you intend to work on:
-``git checkout 6.3 && composer update``
+To switch the branch you intend to work on run this command in the root of the dev distribution:
+``git checkout 8.3 && composer update``
 
 .. note:: We use an upmerging strategy, so create all bugfixes to lowest maintained branch that
 contains the issue (typically the second last LTS release, check the diagram on

composer.json

@@ -10,8 +10,9 @@
             "../../flow doctrine:migrate --quiet",
             "../../bin/behat -f progress -c Neos.Flow/Tests/Behavior/behat.yml"
         ],
+        "lint:phpstan": "../../bin/phpstan analyse",
         "lint": [
-            "../../bin/phpstan analyse"
+            "@lint:phpstan"
         ]
     },
     "require": {
@@ -26,6 +27,7 @@
         "ext-reflection": "*",
         "ext-xml": "*",
         "ext-xmlreader": "*",
+        "neos/composer-plugin": "^2.0",
         "psr/http-message": "^1.0",
         "psr/http-factory": "^1.0",
         "psr/container": "^1.0",
@@ -42,7 +44,6 @@
         "symfony/yaml": "^5.1||^6.0",
         "symfony/dom-crawler": "^5.1||^6.0",
         "symfony/console": "^5.1||^6.0",
-        "neos/composer-plugin": "^2.0",
         "composer/composer": "^2.2.8",
         "egulias/email-validator": "^2.1.17 || ^3.0",
         "typo3fluid/fluid": "^2.8.0",
@@ -138,6 +139,11 @@
         "mikey179/vfsstream": "^1.6.10",
         "phpunit/phpunit": "~9.1"
     },
+    "provide": {
+        "psr/cache-implementation": "2.0.0 || 3.0.0",
+        "psr/simple-cache-implementation": "2.0.0 || 3.0.0",
+        "psr/log-implementation": "2.0.0 || 3.0.0"
+    },
     "autoload-dev": {
         "psr-4": {
             "Neos\\Cache\\Tests\\": [