Merge branch '4.2'

neos · Mar 17, 2020 · c511353 · c511353
2 parents 048f040 + 46458de
commit c511353
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/Classes/Core/Model/ProcessingRule.php b/Classes/Core/Model/ProcessingRule.php
@@ -30,13 +30,11 @@ class ProcessingRule
     protected $dataType;
 
     /**
-     * @Flow\Inject
      * @var \Neos\Flow\Property\PropertyMappingConfiguration
      */
     protected $propertyMappingConfiguration;
 
     /**
-     * @Flow\Inject
      * @var \Neos\Flow\Validation\Validator\ConjunctionValidator
      */
     protected $validator;
@@ -58,6 +56,8 @@ class ProcessingRule
      */
     public function __construct()
     {
+        $this->propertyMappingConfiguration = new \Neos\Flow\Property\PropertyMappingConfiguration();
+        $this->validator = new \Neos\Flow\Validation\Validator\ConjunctionValidator();
         $this->processingMessages = new Result();
     }
 

diff --git a/Classes/Finishers/RedirectFinisher.php b/Classes/Finishers/RedirectFinisher.php
@@ -74,7 +74,11 @@ public function executeInternal()
 
         $uriParts = parse_url($uri);
         if (!isset($uriParts['scheme']) || $uriParts['scheme'] === '') {
-            $uri = $this->baseUriProvider->getConfiguredBaseUriOrFallbackToCurrentRequest() . $uri;
+            $uri = sprintf(
+                '%s/%s',
+                rtrim($this->baseUriProvider->getConfiguredBaseUriOrFallbackToCurrentRequest(, '/'),
+                ltrim($uri, '/')
+            );
         }
 
         $escapedUri = htmlentities($uri, ENT_QUOTES, 'utf-8');

diff --git a/Tests/Unit/Core/Model/ProcessingRuleTest.php b/Tests/Unit/Core/Model/ProcessingRuleTest.php
@@ -40,13 +40,10 @@ class ProcessingRuleTest extends UnitTestCase
     public function setUp(): void
     {
         $this->mockPropertyMapper = $this->getMockBuilder(PropertyMapper::class)->getMock();
-        $this->processingRule = $this->getAccessibleMock(ProcessingRule::class, ['dummy']);
-        /** @noinspection PhpUndefinedMethodInspection */
-        $this->processingRule->_set('propertyMapper', $this->mockPropertyMapper);
-        /** @noinspection PhpUndefinedMethodInspection */
-        $this->processingRule->_set('validator', new ConjunctionValidator());
-        /** @noinspection PhpUndefinedMethodInspection */
-        $this->processingRule->_set('processingMessages', new Result());
+
+        $this->processingRule = new ProcessingRule();
+
+        $this->inject($this->processingRule, 'propertyMapper', $this->mockPropertyMapper);
     }
 
     /**
@@ -126,11 +123,9 @@ public function processDoesNotConvertValueIfTargetTypeIsNotSpecified()
     public function processConvertsValueIfDataTypeIsSpecified()
     {
         $this->processingRule->setDataType('SomeDataType');
-        $mockPropertyMappingConfiguration = $this->getMockBuilder(PropertyMappingConfiguration::class)->getMock();
-        /** @noinspection PhpUndefinedMethodInspection */
-        $this->processingRule->_set('propertyMappingConfiguration', $mockPropertyMappingConfiguration);
+        $propertyMappingConfiguration = $this->processingRule->getPropertyMappingConfiguration();
 
-        $this->mockPropertyMapper->expects($this->once())->method('convert')->with('Some Value', 'SomeDataType', $mockPropertyMappingConfiguration)->will($this->returnValue('Converted Value'));
+        $this->mockPropertyMapper->expects($this->once())->method('convert')->with('Some Value', 'SomeDataType', $propertyMappingConfiguration)->will($this->returnValue('Converted Value'));
         $this->mockPropertyMapper->expects($this->any())->method('getMessages')->will($this->returnValue(new Result()));
         Assert::assertEquals('Converted Value', $this->processingRule->process('Some Value'));
     }