MERGE: Branch '4.3' into 'master'

Not a straight merge but includes reverts of changes done for 4.3
release that should not be in master.

Author: kitsunet

Neos.Flow/Classes/Mvc/Routing/RouterCachingService.php

@@ -146,7 +146,7 @@ public function storeResolvedUriConstraints(ResolveContext $resolveContext, UriC
         }
 
         $cacheIdentifier = $this->buildResolveCacheIdentifier($resolveContext, $routeValues);
-        $tags = $this->generateRouteTags($uriConstraints->getPathConstraint(), $resolveContext->getRouteValues());
+        $tags = $this->generateRouteTags($uriConstraints->getPathConstraint(), $routeValues);
         if ($resolvedTags !== null) {
             $tags = array_unique(array_merge($resolvedTags->getTags(), $tags));
         }

Neos.Flow/Documentation/TheDefinitiveGuide/PartV/ReleaseNotes/420.rst

@@ -0,0 +1,55 @@
+========
+Flow 4.2
+========
+
+Allow for dynamic label overrides
+=================================
+This replaces the previous physical file model with the file model defined by the XLIFF standard.
+Files IDs are no longer defined by their location in the file system but by their _product-name_ and _orginal_ XLIFF attributes. The location serves as a fallback to prevent this from being a breaking change.
+The XLIFF file provider therefore parses all registered packages and in addition the Data/Translations folder in search of file entries in .xlf files.
+
+The translation file monitor is now also registered for said Data/Translations folder to enable automatic cache clearing.
+In preparation for support of XLIFF version 2, the XLIFF parser has been created in a v12 namespace and the class for holding the file data is modeled as an adapter that should be able to handle both formats.
+Overriding labels is now be as easy as putting a valid XLIFF file with defined _product-name_ (Package) and _orginal_ (Source) in any translation folder.
+
+Add PSR-7 compatibility to HTTP stack
+=====================================
+This adds all missing methods and implementations to make our HTTP implementation PSR-7 compatible.
+Further adjustments to Flow are not included yet.
+
+Add Date.formatCldr helper
+==========================
+This change adds CLDR formatting capability to the Date Eel helper, to match
+the functionality of the `format.date` Fluid ViewHelper.
+
+Introduce ``ObjectAccess::instantiate``
+=======================================
+This static method allows instantiating a given class with
+and array of arguments in an efficient way.
+
+Most of this method was previously hidden in the ``ObjectManager``
+of Flow but as the same code is replicated in other packages it
+makes sense to open it as generic method for re-use.
+
+Add Eel String helper ``pregMatchAll``
+======================================
+This pull request add the Eel String helper `String.pregMatchAll`
+
+Allow Nullable action params to be annotated
+============================================
+This change allows action arguments to be annotated "|null" or "null|" when they are optional with default value `null`. Before the type conversion would fail because no matching type converter would be found.
+
+Add ``range`` method to Eel Array-helper
+========================================
+The range method is a wrapper around the php range function that creates a sequence of integers or characters as array. This is especially helpful to create paginations in pure fusion.
+
+Allow setting the package type when kickstarting a package
+==========================================================
+You can now do `./flow kickstart:package Foo.Bar --packageType neos-plugin`, like in the PackageCommandController.
+A question regarding the docs: Is the "Command Reference" part of the documentation autogenerated? If so, it seems to be outdated, because there are still some mentions of typo3 in there.
+
+ViewHelper compilation for increased speed
+==========================================
+Adds compilation and static rendering to a couple of ViewHelpers
+that were either easy to change or used quite a lot.
+The modified ViewHelpers should all render faster in all scenarios.

Neos.Flow/Documentation/TheDefinitiveGuide/PartV/ReleaseNotes/430.rst

@@ -0,0 +1,118 @@
+========
+Flow 4.3
+========
+
+====================
+Upgrade Instructions
+====================
+
+This section contains instructions for upgrading your Flow 4.2 based applications to Flow 4.3.
+
+In general just make sure to run the command::
+
+ ./flow flow:cache:flush --force
+
+If you are upgrading from a lower version than 4.2, be sure to read the upgrade instructions from
+the previous Release Notes first.
+
+What has changed
+----------------
+
+Flow 4.3 comes with a major change in the routing and numerous fixes. Here's a list of changes that
+might need special attention when upgrading.
+
+`!!! FEATURE: More extensible Routing <https://github.com/neos/flow-development-collection/pull/1126>`_
+-------------------------------------------------------------------------------------------------------
+
+The Flow-routing is improved and now allows the definition of RoutingParameters
+via HTTP-components that can later on be handled by custom RoutePartHandlers.
+That way the routing can react to influences other than the uri-path like the
+requested host-name or scheme or any other computable value.
+
+Attention: The signature of the internal Router implementation has changed.
+In the unlikely case that you replaced the flow-router with a custom-router
+you have to adjust your code accordingly.
+
+Routing Parameters
+^^^^^^^^^^^^^^^^^^
+
+Routing `Parameters` can be defined globally (via HTTP component) in order
+to allow custom RoutePart handler to react to influences that are outside of
+the incoming URI path (example: The requested host name or scheme)
+
+For a RoutePart handler to access the parameters they have to implement
+the new `ParameterAwareRoutePartInterface`.
+The `DynamicRoutePart` already implements the interface. For custom implementations
+extending `DynamicRoutePart` the parameters will be accessible via `$this->parameters`.
+
+Extended URI matching
+^^^^^^^^^^^^^^^^^^^^^
+
+RoutePart handlers can now return an instance of `MatchResult` when mapping
+incoming requests.
+This allows the handler to specify *Tags*  to be associated with the route.
+
+* Packages: ``Flow``
+
+`!!! FEATURE: Allow bypassing Flow class loader for performance <https://github.com/neos/flow-development-collection/pull/925>`_
+--------------------------------------------------------------------------------------------------------------------------------
+
+Currently the composer class loader is only used as a fallback to our own,
+but especially if the optimized loader is used the composer one is much
+faster.
+
+On systems in which all packages/classes are registered correctly via
+autoload statements in ``composer.json`` files using our own class loader
+only for proxy classes can bring an substantial boost in performance for
+every request.
+
+In order to enable this feature you need to set an environment variable
+``FLOW_ONLY_COMPOSER_LOADER=1``. Please test carefully if that breaks due
+to your autoload configuration not being fully composer ready.
+
+Additionally it is recommended to use the optimized composer loader by
+calling ``composer dumpautoload -o``.
+
+While not breaking in itself this change deprecates using our class loader
+for anything else than proxy classes. In practice this means you should
+always enable composer auto loader only by using above mentioned environment
+variable. At least make sure that your projects work with this
+enabled.
+
+We will drop the variable and make this the default behavior in the next
+major version of Flow (version 5.0) which means only classes that are
+correctly added to composer (loaded) packages with autoload configuration
+are being loaded correctly.
+
+* Packages: ``Flow``
+
+
+`TASK: Split Flow Log to separate package <https://github.com/neos/flow-development-collection/pull/216>`_
+----------------------------------------------------------------------------------------------------------
+
+The log-package was extracted from Flow to become a separate independent
+composer-package neos/flow-log that can be used outside of Neos or Flow
+projects. This continues our long-time-effort of extracting parts of our
+odebase that can be used separately and making them available to the
+whole php-community.
+
+The `SystemLoggerInterface` and `SecurityLoggerInterface` are kept
+in Flow as they have not much meaning in the Logger package. Additionally
+the `EarlyLogger` was not moved as it depends on those interfaces.
+
+* Packages: ``Flow`` ``Log``
+
+`FEATURE: Add cookie support on curl request <https://github.com/neos/flow-development-collection/pull/1099>`_
+--------------------------------------------------------------------------------------------------------------
+
+`Neos\\Flow\\Http\\Client\\CurlEngine` will now attach cookies to an outgoing request.
+
+* Packages: ``Flow``
+
+
+`FEATURE: PHP 7.2 compatibility`
+--------------------------------
+
+Flow framework now supports PHP 7.2 and all tests are executed for PHP versions 7.0, 7.1 and 7.2.
+
+

Neos.Flow/Resources/Private/Installer/Distribution/Essentials/Upgrading.rst

@@ -1,13 +1,21 @@
 Upgrading instructions
 ======================
 
-This file contains instructions for upgrading your Flow 4.1 based
-applications to Neos Flow 4.2
+This file contains instructions for upgrading your Flow 4.2 based
+applications to Neos Flow 4.3
 
 What has changed
 ----------------
 
-…
+- The Flow-routing is improved and now allows the definition of RoutingParameters
+via HTTP-components.
+
+- Flow now allows bypassing the custom class loader for performance.
+
+- The log-package was extracted from Flow to become a separate independent
+composer-package neos/flow-log.
+
+For further details see the ReleaseNotes and ChangeLogs.
 
 Upgrading your Packages
 -----------------------

Neos.Flow/Tests/Functional/Mvc/RoutingTest.php

@@ -46,7 +46,6 @@ public function setUp()
                 $foundRoute = true;
                 break;
             }
-            var_dump($route->getName());
         }
 
         if (!$foundRoute) {

Neos.Flow/Tests/Unit/Mvc/Routing/RouterCachingServiceTest.php

@@ -291,6 +291,24 @@ public function storeResolvedUriConstraintsConvertsObjectsToHashesToGenerateCach
         $this->routerCachingService->storeResolvedUriConstraints(new ResolveContext($this->mockUri, $routeValues, false), $resolvedUriConstraints);
     }
 
+    /**
+     * @test
+     */
+    public function storeResolvedUriConstraintsConvertsObjectsToHashesToGenerateRouteTags()
+    {
+        $mockUuid = '550e8400-e29b-11d4-a716-446655440000';
+        $mockObject = new \stdClass();
+        $routeValues = ['b' => 'route values', 'someObject' => $mockObject];
+        $cacheIdentifier = 'e56bffd69837730b19089d3cf1eb7af9';
+
+        $this->mockPersistenceManager->expects($this->once())->method('getIdentifierByObject')->with($mockObject)->will($this->returnValue($mockUuid));
+
+        $resolvedUriConstraints = UriConstraints::create()->withPath('path');
+        $this->mockResolveCache->expects($this->once())->method('set')->with($cacheIdentifier, $resolvedUriConstraints, [$mockUuid, md5('path')]);
+
+        $this->routerCachingService->storeResolvedUriConstraints(new ResolveContext($this->mockUri, $routeValues, false), $resolvedUriConstraints);
+    }
+
     /**
      * @test
      */