Merge branch '8.1' into 8.2

# Conflicts: # Neos.Cache/composer.json # Neos.Eel/composer.json # Neos.Flow/composer.json # Neos.FluidAdaptor/composer.json # Neos.Kickstarter/composer.json
neos · Jun 28, 2023 · b68a5fa · b68a5fa
2 parents 9ae9667 + 6998c69
commit b68a5fa
Show file tree

Hide file tree

Showing 17 changed files with 76 additions and 35 deletions.
diff --git a/Neos.Cache/composer.json b/Neos.Cache/composer.json
@@ -9,9 +9,9 @@
         "psr/simple-cache": "^2.0 || ^3.0",
         "psr/cache": "^2.0 || ^3.0",
         "psr/log": "^2.0 || ^3.0",
-        "neos/utility-files": "*",
-        "neos/utility-pdo": "*",
-        "neos/utility-opcodecache": "*"
+        "neos/utility-files": "self.version",
+        "neos/utility-pdo": "self.version",
+        "neos/utility-opcodecache": "self.version"
     },
     "require-dev": {
         "mikey179/vfsstream": "^1.6.10",

diff --git a/Neos.Eel/composer.json b/Neos.Eel/composer.json
@@ -5,10 +5,10 @@
     "description": "The Embedded Expression Language (Eel) is a building block for creating Domain Specific Languages",
     "require": {
         "php": "^8.0",
-        "neos/flow": "~8.2.0",
-        "neos/cache": "*",
-        "neos/utility-unicode": "*",
-        "neos/utility-objecthandling": "*"
+        "neos/flow": "self.version",
+        "neos/cache": "self.version",
+        "neos/utility-unicode": "self.version",
+        "neos/utility-objecthandling": "self.version"
     },
     "autoload": {
         "psr-4": {

diff --git a/Neos.Flow.Log/composer.json b/Neos.Flow.Log/composer.json
@@ -8,8 +8,8 @@
     ],
     "require": {
         "php": "^8.0",
-        "neos/utility-files": "*",
-        "psr/log": "^2.0 || ^3.0"
+        "psr/log": "^2.0 || ^3.0",
+        "neos/utility-files": "self.version"
     },
     "require-dev": {
         "phpunit/phpunit": "~9.1"

diff --git a/Neos.Flow/composer.json b/Neos.Flow/composer.json
@@ -14,18 +14,18 @@
         "ext-reflection": "*",
         "ext-xml": "*",
 
-        "neos/cache": "~8.2.0",
-        "neos/eel": "~8.2.0",
-        "neos/error-messages": "~8.2.0",
-        "neos/utility-arrays": "~8.2.0",
-        "neos/utility-files": "~8.2.0",
-        "neos/utility-mediatypes": "~8.2.0",
-        "neos/utility-objecthandling": "~8.2.0",
-        "neos/utility-opcodecache": "~8.2.0",
-        "neos/utility-schema": "~8.2.0",
-        "neos/utility-unicode": "~8.2.0",
-        "neos/flow-log": "~8.2.0",
-        "neos/http-factories": "~8.2.0",
+        "neos/cache": "self.version",
+        "neos/eel": "self.version",
+        "neos/error-messages": "self.version",
+        "neos/utility-arrays": "self.version",
+        "neos/utility-files": "self.version",
+        "neos/utility-mediatypes": "self.version",
+        "neos/utility-objecthandling": "self.version",
+        "neos/utility-opcodecache": "self.version",
+        "neos/utility-schema": "self.version",
+        "neos/utility-unicode": "self.version",
+        "neos/flow-log": "self.version",
+        "neos/http-factories": "self.version",
 
         "psr/http-message": "^1.0",
         "psr/http-factory": "^1.0",
@@ -52,7 +52,7 @@
         "neos/composer-plugin": "^2.0",
         "neos/utility-pdo": "~8.2.0",
 
-        "composer/composer": "^1.10.22 || ^2.0.13",
+        "composer/composer": "^2.2.8",
 
         "egulias/email-validator": "^2.1.17 || ^3.0"
     },

diff --git a/Neos.FluidAdaptor/Classes/Core/Widget/AbstractWidgetViewHelper.php b/Neos.FluidAdaptor/Classes/Core/Widget/AbstractWidgetViewHelper.php
@@ -17,6 +17,7 @@
 use Neos\Flow\Mvc\Exception\InfiniteLoopException;
 use Neos\Flow\Mvc\Exception\StopActionException;
 use Neos\Flow\ObjectManagement\DependencyInjection\DependencyProxy;
+use Neos\FluidAdaptor\Core\Rendering\RenderingContext;
 use Neos\FluidAdaptor\Core\ViewHelper\AbstractViewHelper;
 use Neos\FluidAdaptor\Core\ViewHelper\Facets\ChildNodeAccessInterface;
 use TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler;
@@ -118,9 +119,20 @@ public function initializeArgumentsAndRender()
      * Initialize the Widget Context, before the Render method is called.
      *
      * @return void
+     * @throws \Exception
      */
     private function initializeWidgetContext()
     {
+        /*
+         * We reset the state of the ViewHelper by generating a new WidgetContext to handle multiple occurrences of one instance (e.g. in a ForViewHelper).
+         *
+         * By only calling $this->resetState() we would end in a situation where the RenderChildrenViewHelper could not find its children therefore we move the original children to the new WidgetContext.
+         * We create new instances of RootNode and RenderingContext in case we got null because setViewHelperChildNodes requires its parameters to be corresponding instances.
+         */
+        $rootNode = $this->widgetContext->getViewHelperChildNodes() ?? new RootNode();
+        $renderingContext = $this->widgetContext->getViewHelperChildNodeRenderingContext() ?? new RenderingContext();
+        $this->resetState();
+        $this->widgetContext->setViewHelperChildNodes($rootNode, $renderingContext);
         if ($this->ajaxWidget === true) {
             if ($this->storeConfigurationInSession === true) {
                 $this->ajaxWidgetContextHolder->store($this->widgetContext);

diff --git a/...Adaptor/Resources/Private/Templates/Tests/Functional/Core/Fixtures/AjaxTest/ForIndex.html b/...Adaptor/Resources/Private/Templates/Tests/Functional/Core/Fixtures/AjaxTest/ForIndex.html
@@ -0,0 +1,3 @@
+{namespace test=Neos\FluidAdaptor\Tests\Functional\Core\Fixtures\ViewHelpers}<f:for each="{0: 0, 1: 1}" as="value">
+    <test:someAjax option1="first{value}" option2="second{value}" />
+</f:for>
diff --git a/...esources/Private/Templates/Tests/Functional/Core/Fixtures/ViewHelpers/SomeAjax/Index.html b/...esources/Private/Templates/Tests/Functional/Core/Fixtures/ViewHelpers/SomeAjax/Index.html
@@ -1,3 +1,3 @@
-SomeAjaxController::indexAction()
+SomeAjaxController::indexAction(option1: "{option1}", option2: "{option2}")
 {f:widget.uri(action: 'ajax', ajax: true, arguments: {option1: 'xyz'}) -> f:format.raw()}
 {f:widget.uri(action: 'ajaxWithCustomView', ajax: true, arguments: {option1: 'xyz'}) -> f:format.raw()}
diff --git a/Neos.FluidAdaptor/Tests/Functional/Core/Fixtures/Controller/AjaxTestController.php b/Neos.FluidAdaptor/Tests/Functional/Core/Fixtures/Controller/AjaxTestController.php
@@ -30,6 +30,10 @@ public function indexAction()
     {
     }
 
+    public function forIndexAction()
+    {
+    }
+
     /**
      * Renders and returns the URI pointing to the widget for an AJAX call.
      *

diff --git a/...FluidAdaptor/Tests/Functional/Core/Fixtures/ViewHelpers/Controller/SomeAjaxController.php b/...FluidAdaptor/Tests/Functional/Core/Fixtures/ViewHelpers/Controller/SomeAjaxController.php
@@ -34,6 +34,10 @@ class SomeAjaxController extends AbstractWidgetController
      */
     public function indexAction()
     {
+        $this->view->assignMultiple([
+            'option1' => $this->widgetConfiguration['option1'],
+            'option2' => $this->widgetConfiguration['option2'],
+        ]);
     }
 
     /**

diff --git a/Neos.FluidAdaptor/Tests/Functional/Core/WidgetTest.php b/Neos.FluidAdaptor/Tests/Functional/Core/WidgetTest.php
@@ -51,7 +51,7 @@ public function ifIncludedInATemplateTheWidgetReturnsResultOfItsOwnIndexAction()
     {
         $response = $this->browser->request('http://localhost/test/widget/ajaxtest');
         [$confirmation,] = explode(chr(10), $response->getBody()->getContents());
-        self::assertSame('SomeAjaxController::indexAction()', $confirmation);
+        self::assertSame('SomeAjaxController::indexAction(option1: "value1", option2: "value2")', $confirmation);
     }
 
     /**
@@ -73,6 +73,23 @@ public function theGeneratedUriLeadsToASpecificActionOfTheAjaxController(): void
         self::assertSame('SomeAjaxController::ajaxAction("value1", "value2")', trim($response->getBody()->getContents()));
     }
 
+    /**
+     * @test
+     */
+    public function ifIncludedInAForViewHelperTheWidgetsKeepTheirDifferentContext(): void
+    {
+        $response = $this->browser->request('http://localhost/test/widget/ajaxtest/forIndex');
+        [$_, $confirmation, $ajaxWidgetUri, $_, $_, $_, $secondConfirmation, $secondAjaxWidgetUri, ] = explode(chr(10), $response->getBody());
+        self::assertSame('SomeAjaxController::indexAction(option1: "first0", option2: "second0")', \trim($confirmation));
+        self::assertSame('SomeAjaxController::indexAction(option1: "first1", option2: "second1")', \trim($secondConfirmation));
+
+        self::assertNotEquals($ajaxWidgetUri, $secondAjaxWidgetUri);
+        $response = $this->browser->request('http://localhost/' . $ajaxWidgetUri);
+        self::assertSame('SomeAjaxController::ajaxAction("first0", "second0")', trim($response->getBody()->getContents()));
+        $response = $this->browser->request('http://localhost/' . $secondAjaxWidgetUri);
+        self::assertSame('SomeAjaxController::ajaxAction("first1", "second1")', trim($response->getBody()->getContents()));
+    }
+
     /**
      * @test
      */

diff --git a/Neos.FluidAdaptor/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
@@ -65,6 +65,7 @@ protected function setUp(): void
         $this->viewHelper->injectWidgetContext($this->widgetContext);
 
         $this->objectManager = $this->createMock(\Neos\Flow\ObjectManagement\ObjectManagerInterface::class);
+        $this->objectManager->expects(self::any())->method('get')->with(\Neos\FluidAdaptor\Core\Widget\WidgetContext::class)->will(self::returnValue($this->widgetContext));
         $this->viewHelper->injectObjectManager($this->objectManager);
 
         $this->controllerContext = $this->getMockBuilder(\Neos\Flow\Mvc\Controller\ControllerContext::class)->disableOriginalConstructor()->getMock();

diff --git a/Neos.FluidAdaptor/composer.json b/Neos.FluidAdaptor/composer.json
@@ -7,10 +7,10 @@
   ],
   "require": {
     "php": "^8.0",
-    "neos/flow": "~8.2.0",
-    "neos/cache": "*",
-    "neos/utility-files": "*",
-    "neos/utility-objecthandling": "*",
+    "neos/flow": "self.version",
+    "neos/cache": "self.version",
+    "neos/utility-files": "self.version",
+    "neos/utility-objecthandling": "self.version",
     "typo3fluid/fluid": "~2.7.0",
     "psr/log": "^2.0 || ^3.0"
   },

diff --git a/Neos.Kickstarter/composer.json b/Neos.Kickstarter/composer.json
@@ -5,9 +5,9 @@
     "license": "MIT",
     "require": {
         "php": "^8.0",
-        "neos/flow": "~8.2.0",
-        "neos/fluid-adaptor": "~8.2.0",
-        "neos/utility-arrays": "*"
+        "neos/flow": "self.version",
+        "neos/fluid-adaptor": "self.version",
+        "neos/utility-arrays": "self.version"
     },
     "autoload": {
         "psr-4": {

diff --git a/Neos.Utility.Arrays/composer.json b/Neos.Utility.Arrays/composer.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "require": {
     "php": "^8.0",
-    "neos/utility-objecthandling": "*"
+    "neos/utility-objecthandling": "self.version"
   },
   "require-dev": {
     "mikey179/vfsstream": "^1.6.10",

diff --git a/Neos.Utility.Files/composer.json b/Neos.Utility.Files/composer.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "require": {
     "php": "^8.0",
-    "neos/error-messages": "*"
+    "neos/error-messages": "self.version"
   },
   "require-dev": {
     "mikey179/vfsstream": "^1.6.10",

diff --git a/Neos.Utility.Schema/composer.json b/Neos.Utility.Schema/composer.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "require": {
     "php": "^8.0",
-    "neos/error-messages": "*"
+    "neos/error-messages": "self.version"
   },
   "require-dev": {
     "mikey179/vfsstream": "^1.6.10",

diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "symfony/dom-crawler": "^5.1",
         "symfony/console": "^5.1",
         "neos/composer-plugin": "^2.0",
-        "composer/composer": "^1.10.22 || ^2.0.13",
+        "composer/composer": "^2.2.8",
         "egulias/email-validator": "^2.1.17 || ^3.0",
         "typo3fluid/fluid": "~2.7.0",
         "guzzlehttp/psr7": "^1.8.4 || ^2.1.1",