hiddenIdentityFieldadditionalIdentityFieldshiddenReferrerFieldsemptyHiddenFieldstrustedPropertiesField' . '
' . chr(10) . 'formContent';
- $this->tagBuilder->expects(self::once())->method('setContent')->with($expectedResult);
+ $this->tagBuilder->expects($this->once())->method('setContent')->with($expectedResult);
$viewHelper->render('index');
}
- /**
- * @test
- */
+ #[Test]
public function renderAdditionalIdentityFieldsFetchesTheFieldsFromViewHelperVariableContainerAndBuildsHiddenFieldsForThem()
{
$identityProperties = [
@@ -325,11 +332,11 @@ public function renderAdditionalIdentityFieldsFetchesTheFieldsFromViewHelperVari
'object1[object2][subobject]' => '', 'bar', 'elephant > mouse']]);
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php
index 2d1f0abaef..2d78cabdc8 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php
@@ -1,6 +1,12 @@
viewHelper = $this->getMockBuilder(\Neos\FluidAdaptor\ViewHelpers\Format\Nl2brViewHelper::class)->setMethods(['renderChildren'])->getMock();
+ $this->viewHelper = $this->getMockBuilder(Nl2brViewHelper::class)->onlyMethods(['renderChildren'])->getMock();
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperDoesNotModifyTextWithoutLineBreaks()
{
- $this->viewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue('Some Text without line breaks
'));
+ $this->viewHelper->expects($this->once())->method('renderChildren')->willReturn(('Some Text without line breaks
'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, []);
$actualResult = $this->viewHelper->render();
self::assertEquals('Some Text without line breaks
', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperConvertsLineBreaksToBRTags()
{
- $this->viewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue('Line 1' . chr(10) . 'Line 2'));
+ $this->viewHelper->expects($this->once())->method('renderChildren')->willReturn(('Line 1' . chr(10) . 'Line 2'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, []);
$actualResult = $this->viewHelper->render();
self::assertEquals('Line 1
' . chr(10) . 'Line 2', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperConvertsWindowsLineBreaksToBRTags()
{
- $this->viewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue('Line 1' . chr(13) . chr(10) . 'Line 2'));
+ $this->viewHelper->expects($this->once())->method('renderChildren')->willReturn(('Line 1' . chr(13) . chr(10) . 'Line 2'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, []);
$actualResult = $this->viewHelper->render();
self::assertEquals('Line 1
' . chr(13) . chr(10) . 'Line 2', $actualResult);
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
index 66924dced2..4cafc57b5f 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
@@ -1,4 +1,7 @@
viewHelper = $this->getMockBuilder(\Neos\FluidAdaptor\ViewHelpers\Format\NumberViewHelper::class)->setMethods(['renderChildren'])->getMock();
+ $this->viewHelper = $this->getMockBuilder(NumberViewHelper::class)->onlyMethods(['renderChildren'])->getMock();
}
- /**
- * @test
- */
+ #[Test]
public function formatNumberDefaultsToEnglishNotationWithTwoDecimals()
{
- $this->viewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue(10000.0 / 3.0));
+ $this->viewHelper->expects($this->once())->method('renderChildren')->willReturn((10000.0 / 3.0));
$this->viewHelper = $this->prepareArguments($this->viewHelper, []);
$actualResult = $this->viewHelper->render();
self::assertEquals('3,333.33', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function formatNumberWithDecimalsDecimalPointAndSeparator()
{
- $this->viewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue(10000.0 / 3.0));
+ $this->viewHelper->expects($this->once())->method('renderChildren')->willReturn((10000.0 / 3.0));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['decimals' => 3, 'decimalSeparator' => ',', 'thousandsSeparator' => '.']);
$actualResult = $this->viewHelper->render();
self::assertEquals('3.333,333', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperUsesNumberFormatterOnGivenLocale()
{
- $mockNumberFormatter = $this->getMockBuilder(\Neos\Flow\I18n\Formatter\NumberFormatter::class)->setMethods(['formatDecimalNumber'])->getMock();
- $mockNumberFormatter->expects(self::once())->method('formatDecimalNumber');
+ $mockNumberFormatter = $this->getMockBuilder(NumberFormatter::class)->onlyMethods(['formatDecimalNumber'])->getMock();
+ $mockNumberFormatter->expects($this->once())->method('formatDecimalNumber');
$this->inject($this->viewHelper, 'numberFormatter', $mockNumberFormatter);
$this->viewHelper->setArguments([]);
@@ -65,43 +66,39 @@ public function viewHelperUsesNumberFormatterOnGivenLocale()
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperFetchesCurrentLocaleViaI18nService()
{
- $localizationConfiguration = new \Neos\Flow\I18n\Configuration('de_DE');
+ $localizationConfiguration = new Configuration('de_DE');
- $mockLocalizationService = $this->getMockBuilder(\Neos\Flow\I18n\Service::class)->setMethods(['getConfiguration'])->getMock();
- $mockLocalizationService->expects(self::once())->method('getConfiguration')->will(self::returnValue($localizationConfiguration));
+ $mockLocalizationService = $this->getMockBuilder(Service::class)->onlyMethods(['getConfiguration'])->getMock();
+ $mockLocalizationService->expects($this->once())->method('getConfiguration')->willReturn(($localizationConfiguration));
$this->inject($this->viewHelper, 'localizationService', $mockLocalizationService);
- $mockNumberFormatter = $this->getMockBuilder(\Neos\Flow\I18n\Formatter\NumberFormatter::class)->setMethods(['formatDecimalNumber'])->getMock();
- $mockNumberFormatter->expects(self::once())->method('formatDecimalNumber');
+ $mockNumberFormatter = $this->getMockBuilder(NumberFormatter::class)->onlyMethods(['formatDecimalNumber'])->getMock();
+ $mockNumberFormatter->expects($this->once())->method('formatDecimalNumber');
$this->inject($this->viewHelper, 'numberFormatter', $mockNumberFormatter);
- $this->viewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue(123.456));
+ $this->viewHelper->expects($this->once())->method('renderChildren')->willReturn((123.456));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['forceLocale' => true]);
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperConvertsI18nExceptionsIntoViewHelperExceptions()
{
$this->expectException(Exception::class);
- $localizationConfiguration = new \Neos\Flow\I18n\Configuration('de_DE');
+ $localizationConfiguration = new Configuration('de_DE');
- $mockLocalizationService = $this->getMockBuilder(\Neos\Flow\I18n\Service::class)->setMethods(['getConfiguration'])->getMock();
- $mockLocalizationService->expects(self::once())->method('getConfiguration')->will(self::returnValue($localizationConfiguration));
+ $mockLocalizationService = $this->getMockBuilder(Service::class)->onlyMethods(['getConfiguration'])->getMock();
+ $mockLocalizationService->expects($this->once())->method('getConfiguration')->willReturn(($localizationConfiguration));
$this->inject($this->viewHelper, 'localizationService', $mockLocalizationService);
- $mockNumberFormatter = $this->getMockBuilder(\Neos\Flow\I18n\Formatter\NumberFormatter::class)->setMethods(['formatDecimalNumber'])->getMock();
- $mockNumberFormatter->expects(self::once())->method('formatDecimalNumber')->will(self::throwException(new \Neos\Flow\I18n\Exception()));
+ $mockNumberFormatter = $this->getMockBuilder(NumberFormatter::class)->onlyMethods(['formatDecimalNumber'])->getMock();
+ $mockNumberFormatter->expects($this->once())->method('formatDecimalNumber')->willThrowException(new \Neos\Flow\I18n\Exception());
$this->inject($this->viewHelper, 'numberFormatter', $mockNumberFormatter);
- $this->viewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue(123.456));
+ $this->viewHelper->expects($this->once())->method('renderChildren')->willReturn((123.456));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['forceLocale' => true]);
$this->viewHelper->render();
}
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php
index 144b99ae86..afdcd8c81f 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php
@@ -1,6 +1,12 @@
viewHelper = $this->getMockBuilder(\Neos\FluidAdaptor\ViewHelpers\Format\PaddingViewHelper::class)->setMethods(['renderChildren'])->getMock();
+ $this->viewHelper = $this->getMockBuilder(PaddingViewHelper::class)->onlyMethods(['renderChildren'])->getMock();
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
- /**
- * @test
- */
+ #[Test]
public function stringsArePaddedWithBlanksByDefault()
{
- $this->viewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue('foo'));
+ $this->viewHelper->expects($this->once())->method('renderChildren')->willReturn(('foo'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['padLength' => 10]);
$actualResult = $this->viewHelper->render();
self::assertEquals('foo ', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function paddingStringCanBeSpecified()
{
- $this->viewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue('foo'));
+ $this->viewHelper->expects($this->once())->method('renderChildren')->willReturn(('foo'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['padLength' => 10, 'padString' => '-=']);
$actualResult = $this->viewHelper->render();
self::assertEquals('foo-=-=-=-', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function stringIsNotTruncatedIfPadLengthIsBelowStringLength()
{
- $this->viewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue('some long string'));
+ $this->viewHelper->expects($this->once())->method('renderChildren')->willReturn(('some long string'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['padLength' => 5]);
$actualResult = $this->viewHelper->render();
self::assertEquals('some long string', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function integersArePaddedCorrectly()
{
- $this->viewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue(123));
+ $this->viewHelper->expects($this->once())->method('renderChildren')->willReturn((123));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['padLength' => 5, 'padString' => '0']);
$actualResult = $this->viewHelper->render(5, '0');
self::assertEquals('12300', $actualResult);
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php
index 739bc96683..7b40d6acb7 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php
@@ -1,6 +1,14 @@
viewHelper = $this->getMockBuilder(\Neos\FluidAdaptor\ViewHelpers\Format\StripTagsViewHelper::class)->setMethods(['buildRenderChildrenClosure', 'renderChildren'])->getMock();
+ $this->viewHelper = $this->getMockBuilder(StripTagsViewHelper::class)->onlyMethods(['buildRenderChildrenClosure', 'renderChildren'])->getMock();
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperDeactivatesEscapingInterceptor()
{
self::assertFalse($this->viewHelper->isEscapingInterceptorEnabled());
}
- /**
- * @test
- */
+ #[Test]
public function renderUsesValueAsSourceIfSpecified()
{
$string = 'Some string';
- $this->viewHelper->expects(self::any())->method('buildRenderChildrenClosure')->willReturn(function () {
+ $this->viewHelper->method('buildRenderChildrenClosure')->willReturn(function () {
throw new \Exception('rendderChildrenClosure was invoked but should not have been');
});
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['value' => $string]);
@@ -58,13 +62,11 @@ public function renderUsesValueAsSourceIfSpecified()
self::assertEquals($string, $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function renderUsesChildnodesAsSourceIfSpecified()
{
$string = 'Some string';
- $this->viewHelper->expects(self::once())->method('renderChildren')->willReturn($string);
+ $this->viewHelper->expects($this->once())->method('renderChildren')->willReturn($string);
$this->viewHelper = $this->prepareArguments($this->viewHelper, []);
$actualResult = $this->viewHelper->render();
self::assertEquals($string, $actualResult);
@@ -73,24 +75,20 @@ public function renderUsesChildnodesAsSourceIfSpecified()
/**
* Data Provider for the render tests
*
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function stringsTestDataProvider()
+ public static function stringsTestDataProvider(): \Iterator
{
- return [
- ['This is a sample text without special characters.', 'This is a sample text without special characters.'],
- ['This is a sample text with some tags.', 'This is a sample text with some tags.'],
- ['This text contains some "Ümlaut".', 'This text contains some "Ümlaut".']
- ];
+ yield ['This is a sample text without special characters.', 'This is a sample text without special characters.'];
+ yield ['This is a sample text with some tags.', 'This is a sample text with some tags.'];
+ yield ['This text contains some "Ümlaut".', 'This text contains some "Ümlaut".'];
}
- /**
- * @test
- * @dataProvider stringsTestDataProvider
- */
+ #[DataProvider('stringsTestDataProvider')]
+ #[Test]
public function renderCorrectlyConvertsIntoPlaintext($source, $expectedResult)
{
- $this->viewHelper->expects(self::any())->method('buildRenderChildrenClosure')->willReturn(function () {
+ $this->viewHelper->method('buildRenderChildrenClosure')->willReturn(function () {
throw new \Exception('rendderChildrenClosure was invoked but should not have been');
});
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['value' => $source]);
@@ -98,13 +96,11 @@ public function renderCorrectlyConvertsIntoPlaintext($source, $expectedResult)
self::assertSame($expectedResult, $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function renderReturnsUnmodifiedSourceIfItIsANumber()
{
$source = 123.45;
- $this->viewHelper->expects(self::any())->method('buildRenderChildrenClosure')->willReturn(function () {
+ $this->viewHelper->method('buildRenderChildrenClosure')->willReturn(function () {
throw new \Exception('rendderChildrenClosure was invoked but should not have been');
});
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['value' => $source]);
@@ -112,14 +108,12 @@ public function renderReturnsUnmodifiedSourceIfItIsANumber()
self::assertSame($source, $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function renderConvertsObjectsToStrings()
{
$user = new UserWithToString('Xaver Cross-Site');
$expectedResult = 'Xaver Cross-Site';
- $this->viewHelper->expects(self::any())->method('buildRenderChildrenClosure')->willReturn(function () {
+ $this->viewHelper->method('buildRenderChildrenClosure')->willReturn(function () {
throw new \Exception('renderChildrenClosure was invoked but should not have been');
});
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['value' => $user]);
@@ -127,14 +121,12 @@ public function renderConvertsObjectsToStrings()
self::assertSame($expectedResult, $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function renderDoesNotModifySourceIfItIsAnObjectThatCantBeConvertedToAString()
{
$this->expectException(\InvalidArgumentException::class);
$user = new UserWithoutToString('Xaver Cross-Site');
- $this->viewHelper->expects(self::any())->method('buildRenderChildrenClosure')->willReturn(function () {
+ $this->viewHelper->method('buildRenderChildrenClosure')->willReturn(function () {
throw new \Exception('renderChildrenClosure was invoked but should not have been');
});
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['value' => $user]);
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php
index 66c02f47a6..238e90d369 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php
@@ -1,6 +1,11 @@
viewHelper = $this->getMockBuilder(UrlencodeViewHelper::class)->setMethods(['renderChildren'])->getMock();
+ $this->viewHelper = $this->getMockBuilder(UrlencodeViewHelper::class)->onlyMethods(['renderChildren'])->getMock();
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperDeactivatesEscapingInterceptor()
{
self::assertFalse($this->viewHelper->isEscapingInterceptorEnabled());
}
- /**
- * @test
- */
+ #[Test]
public function renderUsesValueAsSourceIfSpecified()
{
- $this->viewHelper->expects(self::never())->method('renderChildren');
+ $this->viewHelper->expects($this->never())->method('renderChildren');
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['value' => 'Source']);
$actualResult = $this->viewHelper->render();
self::assertEquals('Source', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function renderUsesChildnodesAsSourceIfSpecified()
{
- $this->viewHelper->expects(self::atLeastOnce())->method('renderChildren')->will(self::returnValue('Source'));
+ $this->viewHelper->expects($this->atLeastOnce())->method('renderChildren')->willReturn(('Source'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, []);
$actualResult = $this->viewHelper->render();
self::assertEquals('Source', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function renderDoesNotModifyValueIfItDoesNotContainSpecialCharacters()
{
$source = 'StringWithoutSpecialCharacters';
@@ -75,9 +72,7 @@ public function renderDoesNotModifyValueIfItDoesNotContainSpecialCharacters()
self::assertSame($source, $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function renderEncodesString()
{
$source = 'Foo @+%/ "';
@@ -87,9 +82,7 @@ public function renderEncodesString()
self::assertEquals($expectedResult, $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function renderThrowsExceptionIfItIsNoStringAndHasNoToStringMethod()
{
$this->expectException(\InvalidArgumentException::class);
@@ -98,9 +91,7 @@ public function renderThrowsExceptionIfItIsNoStringAndHasNoToStringMethod()
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderRendersObjectWithToStringMethod()
{
$source = new Uri('http://typo3.com/foo&bar=1');
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Link/ActionViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Link/ActionViewHelperTest.php
index e3b1ef50ac..bfa07b7d9a 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Link/ActionViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Link/ActionViewHelperTest.php
@@ -1,4 +1,7 @@
viewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Link\ActionViewHelper::class, ['renderChildren']);
+ $this->viewHelper = $this->getAccessibleMock(ActionViewHelper::class, ['renderChildren']);
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
- /**
- * @test
- */
+ #[Test]
public function renderCorrectlySetsTagNameAndAttributesAndContent()
{
- $mockTagBuilder = $this->createMock(\TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder::class, ['setTagName', 'addAttribute', 'setContent']);
- $mockTagBuilder->expects(self::any())->method('setTagName')->with('a');
- $mockTagBuilder->expects(self::once())->method('addAttribute')->with('href', 'someUri');
- $mockTagBuilder->expects(self::once())->method('setContent')->with('some content');
+ $mockTagBuilder = $this->createMock(TagBuilder::class, ['setTagName', 'addAttribute', 'setContent']);
+ $mockTagBuilder->method('setTagName')->with('a');
+ $mockTagBuilder->expects($this->once())->method('addAttribute')->with('href', 'someUri');
+ $mockTagBuilder->expects($this->once())->method('setContent')->with('some content');
$this->viewHelper->injectTagBuilder($mockTagBuilder);
- $this->uriBuilder->expects(self::any())->method('uriFor')->will(self::returnValue('someUri'));
+ $this->uriBuilder->method('uriFor')->willReturn(('someUri'));
- $this->viewHelper->expects(self::any())->method('renderChildren')->will(self::returnValue('some content'));
+ $this->viewHelper->method('renderChildren')->willReturn(('some content'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['action' => 'index']);
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderCorrectlyPassesDefaultArgumentsToUriBuilder()
{
- $this->uriBuilder->expects(self::once())->method('setSection')->with('');
- $this->uriBuilder->expects(self::once())->method('setArguments')->with([]);
- $this->uriBuilder->expects(self::once())->method('setAddQueryString')->with(false);
- $this->uriBuilder->expects(self::once())->method('setArgumentsToBeExcludedFromQueryString')->with([]);
- $this->uriBuilder->expects(self::once())->method('setFormat')->with('');
- $this->uriBuilder->expects(self::once())->method('uriFor')->with('theActionName', [], null, null, null);
+ $this->uriBuilder->expects($this->once())->method('setSection')->with('');
+ $this->uriBuilder->expects($this->once())->method('setArguments')->with([]);
+ $this->uriBuilder->expects($this->once())->method('setAddQueryString')->with(false);
+ $this->uriBuilder->expects($this->once())->method('setArgumentsToBeExcludedFromQueryString')->with([]);
+ $this->uriBuilder->expects($this->once())->method('setFormat')->with('');
+ $this->uriBuilder->expects($this->once())->method('uriFor')->with('theActionName', [], null, null, null);
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['action' => 'theActionName']);
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderCorrectlyPassesAllArgumentsToUriBuilder()
{
- $this->uriBuilder->expects(self::once())->method('setSection')->with('someSection');
- $this->uriBuilder->expects(self::once())->method('setArguments')->with(['additional' => 'RouteParameters']);
- $this->uriBuilder->expects(self::once())->method('setAddQueryString')->with(true);
- $this->uriBuilder->expects(self::once())->method('setArgumentsToBeExcludedFromQueryString')->with(['arguments' => 'toBeExcluded']);
- $this->uriBuilder->expects(self::once())->method('setFormat')->with('someFormat');
- $this->uriBuilder->expects(self::once())->method('uriFor')->with('someAction', ['some' => 'argument'], 'someController', 'somePackage', 'someSubpackage');
+ $this->uriBuilder->expects($this->once())->method('setSection')->with('someSection');
+ $this->uriBuilder->expects($this->once())->method('setArguments')->with(['additional' => 'RouteParameters']);
+ $this->uriBuilder->expects($this->once())->method('setAddQueryString')->with(true);
+ $this->uriBuilder->expects($this->once())->method('setArgumentsToBeExcludedFromQueryString')->with(['arguments' => 'toBeExcluded']);
+ $this->uriBuilder->expects($this->once())->method('setFormat')->with('someFormat');
+ $this->uriBuilder->expects($this->once())->method('uriFor')->with('someAction', ['some' => 'argument'], 'someController', 'somePackage', 'someSubpackage');
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['action' => 'someAction', 'arguments' => ['some' => 'argument'], 'controller' => 'someController', 'package' => 'somePackage', 'subpackage' => 'someSubpackage', 'section' => 'someSection', 'format' => 'someFormat', 'additionalParams' => ['additional' => 'RouteParameters'], 'addQueryString' => true, 'argumentsToBeExcludedFromQueryString' => ['arguments' => 'toBeExcluded']]);
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderThrowsViewHelperExceptionIfUriBuilderThrowsFlowException()
{
- $this->uriBuilder->expects(self::any())->method('uriFor')->will(self::throwException(new \Neos\Flow\Exception('Mock Exception', 12345)));
+ $this->uriBuilder->method('uriFor')->willThrowException(new \Neos\Flow\Exception('Mock Exception', 12345));
try {
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['action' => 'someAction']);
$this->viewHelper->render();
- } catch (\Neos\FluidAdaptor\Core\ViewHelper\Exception $exception) {
+ } catch (Exception $exception) {
}
self::assertEquals(12345, $exception->getPrevious()->getCode());
}
- /**
- * @test
- */
+ #[Test]
public function renderThrowsExceptionIfUseParentRequestIsSetAndTheCurrentRequestHasNoParentRequest()
{
$this->expectException(Exception::class);
@@ -106,24 +104,22 @@ public function renderThrowsExceptionIfUseParentRequestIsSetAndTheCurrentRequest
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderUsesParentRequestIfUseParentRequestIsSet()
{
- $viewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Link\ActionViewHelper::class, ['renderChildren']);
+ $viewHelper = $this->getAccessibleMock(ActionViewHelper::class, ['renderChildren']);
- $parentRequest = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
+ $parentRequest = $this->createStub(ActionRequest::class);
- $this->request = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
- $this->request->expects(self::atLeastOnce())->method('isMainRequest')->will(self::returnValue(false));
- $this->request->expects(self::atLeastOnce())->method('getParentRequest')->will(self::returnValue($parentRequest));
+ $this->request = $this->createMock(ActionRequest::class);
+ $this->request->expects($this->atLeastOnce())->method('isMainRequest')->willReturn((false));
+ $this->request->expects($this->atLeastOnce())->method('getParentRequest')->willReturn(($parentRequest));
- $this->controllerContext = $this->getMockBuilder(\Neos\Flow\Mvc\Controller\ControllerContext::class)->disableOriginalConstructor()->getMock();
- $this->controllerContext->expects(self::any())->method('getUriBuilder')->will(self::returnValue($this->uriBuilder));
- $this->controllerContext->expects(self::any())->method('getRequest')->will(self::returnValue($this->request));
+ $this->controllerContext = $this->createMock(ControllerContext::class);
+ $this->controllerContext->method('getUriBuilder')->willReturn(($this->uriBuilder));
+ $this->controllerContext->method('getRequest')->willReturn(($this->request));
- $this->uriBuilder->expects(self::atLeastOnce())->method('setRequest')->with($parentRequest);
+ $this->uriBuilder->expects($this->atLeastOnce())->method('setRequest')->with($parentRequest);
$this->renderingContext->setControllerContext($this->controllerContext);
$this->injectDependenciesIntoViewHelper($viewHelper);
@@ -132,22 +128,20 @@ public function renderUsesParentRequestIfUseParentRequestIsSet()
$viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderCreatesAbsoluteUrisByDefault()
{
- $viewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Link\ActionViewHelper::class, ['renderChildren']);
+ $viewHelper = $this->getAccessibleMock(ActionViewHelper::class, ['renderChildren']);
- $parentRequest = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
+ $parentRequest = $this->createStub(ActionRequest::class);
- $this->request = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
+ $this->request = $this->createMock(ActionRequest::class);
- $this->controllerContext = $this->getMockBuilder(\Neos\Flow\Mvc\Controller\ControllerContext::class)->disableOriginalConstructor()->getMock();
- $this->controllerContext->expects(self::any())->method('getUriBuilder')->will(self::returnValue($this->uriBuilder));
- $this->controllerContext->expects(self::any())->method('getRequest')->will(self::returnValue($this->request));
+ $this->controllerContext = $this->createMock(ControllerContext::class);
+ $this->controllerContext->method('getUriBuilder')->willReturn(($this->uriBuilder));
+ $this->controllerContext->method('getRequest')->willReturn(($this->request));
- $this->uriBuilder->expects(self::atLeastOnce())->method('setCreateAbsoluteUri')->with(true);
+ $this->uriBuilder->expects($this->atLeastOnce())->method('setCreateAbsoluteUri')->with(true);
$this->renderingContext->setControllerContext($this->controllerContext);
$this->injectDependenciesIntoViewHelper($viewHelper);
@@ -156,23 +150,21 @@ public function renderCreatesAbsoluteUrisByDefault()
}
- /**
- * @test
- */
+ #[Test]
public function renderCreatesRelativeUrisIfAbsoluteIsFalse()
{
/** @var $viewHelper \Neos\FluidAdaptor\ViewHelpers\Link\ActionViewHelper */
- $viewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Link\ActionViewHelper::class, ['renderChildren']);
+ $viewHelper = $this->getAccessibleMock(ActionViewHelper::class, ['renderChildren']);
- $parentRequest = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
+ $parentRequest = $this->createStub(ActionRequest::class);
- $this->request = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
+ $this->request = $this->createMock(ActionRequest::class);
- $this->controllerContext = $this->getMockBuilder(\Neos\Flow\Mvc\Controller\ControllerContext::class)->disableOriginalConstructor()->getMock();
- $this->controllerContext->expects(self::any())->method('getUriBuilder')->will(self::returnValue($this->uriBuilder));
- $this->controllerContext->expects(self::any())->method('getRequest')->will(self::returnValue($this->request));
+ $this->controllerContext = $this->createMock(ControllerContext::class);
+ $this->controllerContext->method('getUriBuilder')->willReturn(($this->uriBuilder));
+ $this->controllerContext->method('getRequest')->willReturn(($this->request));
- $this->uriBuilder->expects(self::atLeastOnce())->method('setCreateAbsoluteUri')->with(false);
+ $this->uriBuilder->expects($this->atLeastOnce())->method('setCreateAbsoluteUri')->with(false);
$this->renderingContext->setControllerContext($this->controllerContext);
$this->injectDependenciesIntoViewHelper($viewHelper);
@@ -181,24 +173,22 @@ public function renderCreatesRelativeUrisIfAbsoluteIsFalse()
$viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderUsesParentRequestIfUseMainRequestIsSet()
{
- $viewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Link\ActionViewHelper::class, ['renderChildren']);
+ $viewHelper = $this->getAccessibleMock(ActionViewHelper::class, ['renderChildren']);
- $mainRequest = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
+ $mainRequest = $this->createStub(ActionRequest::class);
- $this->request = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
- $this->request->expects(self::atLeastOnce())->method('isMainRequest')->will(self::returnValue(false));
- $this->request->expects(self::atLeastOnce())->method('getMainRequest')->will(self::returnValue($mainRequest));
+ $this->request = $this->createMock(ActionRequest::class);
+ $this->request->expects($this->atLeastOnce())->method('isMainRequest')->willReturn((false));
+ $this->request->expects($this->atLeastOnce())->method('getMainRequest')->willReturn(($mainRequest));
- $this->controllerContext = $this->getMockBuilder(\Neos\Flow\Mvc\Controller\ControllerContext::class)->disableOriginalConstructor()->getMock();
- $this->controllerContext->expects(self::any())->method('getUriBuilder')->will(self::returnValue($this->uriBuilder));
- $this->controllerContext->expects(self::any())->method('getRequest')->will(self::returnValue($this->request));
+ $this->controllerContext = $this->createMock(ControllerContext::class);
+ $this->controllerContext->method('getUriBuilder')->willReturn(($this->uriBuilder));
+ $this->controllerContext->method('getRequest')->willReturn(($this->request));
- $this->uriBuilder->expects(self::atLeastOnce())->method('setRequest')->with($mainRequest);
+ $this->uriBuilder->expects($this->atLeastOnce())->method('setRequest')->with($mainRequest);
$this->renderingContext->setControllerContext($this->controllerContext);
$this->injectDependenciesIntoViewHelper($viewHelper);
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
index c5fe2d0468..78155f49f6 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
@@ -1,6 +1,14 @@
viewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Link\EmailViewHelper::class, ['renderChildren']);
+ $this->viewHelper = $this->getAccessibleMock(EmailViewHelper::class, ['renderChildren']);
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
- /**
- * @test
- */
+ #[Test]
public function renderCorrectlySetsTagNameAndAttributesAndContent()
{
- $mockTagBuilder = $this->createMock(\TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder::class);
- $mockTagBuilder->expects(self::any())->method('setTagName')->with('a');
- $mockTagBuilder->expects(self::once())->method('addAttribute')->with('href', 'mailto:some@email.tld');
- $mockTagBuilder->expects(self::once())->method('setContent')->with('some content');
+ $mockTagBuilder = $this->createMock(TagBuilder::class);
+ $mockTagBuilder->method('setTagName')->with('a');
+ $mockTagBuilder->expects($this->once())->method('addAttribute')->with('href', 'mailto:some@email.tld');
+ $mockTagBuilder->expects($this->once())->method('setContent')->with('some content');
$this->viewHelper->injectTagBuilder($mockTagBuilder);
- $this->viewHelper->expects(self::any())->method('renderChildren')->will(self::returnValue('some content'));
+ $this->viewHelper->method('renderChildren')->willReturn(('some content'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['email' => 'some@email.tld']);
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderSetsTagContentToEmailIfRenderChildrenReturnNull()
{
- $mockTagBuilder = $this->createMock(\TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder::class);
- $mockTagBuilder->expects(self::once())->method('setContent')->with('some@email.tld');
+ $mockTagBuilder = $this->createMock(TagBuilder::class);
+ $mockTagBuilder->expects($this->once())->method('setContent')->with('some@email.tld');
$this->viewHelper->injectTagBuilder($mockTagBuilder);
- $this->viewHelper->expects(self::any())->method('renderChildren')->will(self::returnValue(null));
+ $this->viewHelper->method('renderChildren')->willReturn((null));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['email' => 'some@email.tld']);
$this->viewHelper->render();
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
index 34e474d32c..cc913839a4 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
@@ -1,4 +1,7 @@
viewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Link\ExternalViewHelper::class, ['renderChildren']);
+ $this->viewHelper = $this->getAccessibleMock(ExternalViewHelper::class, ['renderChildren']);
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
- /**
- * @test
- */
+ #[Test]
public function renderCorrectlySetsTagNameAndAttributesAndContent()
{
$mockTagBuilder = $this->createMock(TagBuilder::class, ['setTagName', 'addAttribute', 'setContent']);
- $mockTagBuilder->expects(self::any())->method('setTagName')->with('a');
- $mockTagBuilder->expects(self::once())->method('addAttribute')->with('href', 'http://www.some-domain.tld');
- $mockTagBuilder->expects(self::once())->method('setContent')->with('some content');
+ $mockTagBuilder->method('setTagName')->with('a');
+ $mockTagBuilder->expects($this->once())->method('addAttribute')->with('href', 'http://www.some-domain.tld');
+ $mockTagBuilder->expects($this->once())->method('setContent')->with('some content');
$this->viewHelper->_set('tag', $mockTagBuilder);
- $this->viewHelper->expects(self::any())->method('renderChildren')->will(self::returnValue('some content'));
+ $this->viewHelper->method('renderChildren')->willReturn(('some content'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['uri' => 'http://www.some-domain.tld']);
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderAddsHttpPrefixIfSpecifiedUriDoesNotContainScheme()
{
$mockTagBuilder = $this->createMock(TagBuilder::class, ['setTagName', 'addAttribute', 'setContent']);
- $mockTagBuilder->expects(self::any())->method('setTagName')->with('a');
- $mockTagBuilder->expects(self::once())->method('addAttribute')->with('href', 'http://www.some-domain.tld');
- $mockTagBuilder->expects(self::once())->method('setContent')->with('some content');
+ $mockTagBuilder->method('setTagName')->with('a');
+ $mockTagBuilder->expects($this->once())->method('addAttribute')->with('href', 'http://www.some-domain.tld');
+ $mockTagBuilder->expects($this->once())->method('setContent')->with('some content');
$this->viewHelper->_set('tag', $mockTagBuilder);
- $this->viewHelper->expects(self::any())->method('renderChildren')->will(self::returnValue('some content'));
+ $this->viewHelper->method('renderChildren')->willReturn(('some content'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['uri' => 'www.some-domain.tld']);
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderAddsSpecifiedSchemeIfUriDoesNotContainScheme()
{
$mockTagBuilder = $this->createMock(TagBuilder::class, ['setTagName', 'addAttribute', 'setContent']);
- $mockTagBuilder->expects(self::any())->method('setTagName')->with('a');
- $mockTagBuilder->expects(self::once())->method('addAttribute')->with('href', 'ftp://some-domain.tld');
- $mockTagBuilder->expects(self::once())->method('setContent')->with('some content');
+ $mockTagBuilder->method('setTagName')->with('a');
+ $mockTagBuilder->expects($this->once())->method('addAttribute')->with('href', 'ftp://some-domain.tld');
+ $mockTagBuilder->expects($this->once())->method('setContent')->with('some content');
$this->viewHelper->_set('tag', $mockTagBuilder);
- $this->viewHelper->expects(self::any())->method('renderChildren')->will(self::returnValue('some content'));
+ $this->viewHelper->method('renderChildren')->willReturn(('some content'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['uri' => 'some-domain.tld', 'defaultScheme' => 'ftp']);
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderDoesNotAddEmptyScheme()
{
$mockTagBuilder = $this->createMock(TagBuilder::class, ['setTagName', 'addAttribute', 'setContent']);
- $mockTagBuilder->expects(self::any())->method('setTagName')->with('a');
- $mockTagBuilder->expects(self::once())->method('addAttribute')->with('href', 'some-domain.tld');
- $mockTagBuilder->expects(self::once())->method('setContent')->with('some content');
+ $mockTagBuilder->method('setTagName')->with('a');
+ $mockTagBuilder->expects($this->once())->method('addAttribute')->with('href', 'some-domain.tld');
+ $mockTagBuilder->expects($this->once())->method('setContent')->with('some content');
$this->viewHelper->_set('tag', $mockTagBuilder);
- $this->viewHelper->expects(self::any())->method('renderChildren')->will(self::returnValue('some content'));
+ $this->viewHelper->method('renderChildren')->willReturn(('some content'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['uri' => 'some-domain.tld', 'defaultScheme' => '']);
$this->viewHelper->render();
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/RenderChildrenViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/RenderChildrenViewHelperTest.php
index a50add5795..0fbebfd7ed 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/RenderChildrenViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/RenderChildrenViewHelperTest.php
@@ -1,4 +1,7 @@
viewHelper = $this->getMockBuilder(RenderChildrenViewHelper::class)->setMethods(['renderChildren'])->getMock();
+ $this->viewHelper = $this->getMockBuilder(RenderChildrenViewHelper::class)->onlyMethods(['renderChildren'])->getMock();
}
- /**
- * @test
- */
+ #[Test]
public function renderCallsEvaluateOnTheRootNode(): void
{
$this->injectDependenciesIntoViewHelper($this->viewHelper);
- $renderingContext = $this->createMock(RenderingContextInterface::class);
+ $renderingContext = $this->createStub(RenderingContextInterface::class);
$rootNode = $this->createMock(RootNode::class);
$widgetContext = $this->createMock(WidgetContext::class);
- $this->request->expects(self::any())->method('getInternalArgument')->with('__widgetContext')->willReturn($widgetContext);
- $widgetContext->expects(self::any())->method('getViewHelperChildNodeRenderingContext')->willReturn($renderingContext);
- $widgetContext->expects(self::any())->method('getViewHelperChildNodes')->willReturn($rootNode);
+ $this->request->method('getInternalArgument')->with('__widgetContext')->willReturn($widgetContext);
+ $widgetContext->method('getViewHelperChildNodeRenderingContext')->willReturn($renderingContext);
+ $widgetContext->method('getViewHelperChildNodes')->willReturn($rootNode);
- $rootNode->expects(self::any())->method('evaluate')->with($renderingContext)->willReturn('Rendered Results');
+ $rootNode->method('evaluate')->with($renderingContext)->willReturn('Rendered Results');
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['k1' => 'v1', 'k2' => 'v2']);
$output = $this->viewHelper->render();
self::assertEquals('Rendered Results', $output);
}
- /**
- * @test
- */
+ #[Test]
public function renderThrowsExceptionIfTheRequestIsNotAWidgetRequest(): void
{
$this->expectException(WidgetContextNotFoundException::class);
@@ -74,9 +73,7 @@ public function renderThrowsExceptionIfTheRequestIsNotAWidgetRequest(): void
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderThrowsExceptionIfTheChildNodeRenderingContextIsNotThere(): void
{
$this->expectException(RenderingContextNotFoundException::class);
@@ -84,9 +81,9 @@ public function renderThrowsExceptionIfTheChildNodeRenderingContextIsNotThere():
$this->viewHelper->initializeArguments();
$widgetContext = $this->createMock(WidgetContext::class);
- $this->request->expects(self::any())->method('getInternalArgument')->with('__widgetContext')->willReturn($widgetContext);
- $widgetContext->expects(self::any())->method('getViewHelperChildNodeRenderingContext')->willReturn(null);
- $widgetContext->expects(self::any())->method('getViewHelperChildNodes')->willReturn(null);
+ $this->request->method('getInternalArgument')->with('__widgetContext')->willReturn($widgetContext);
+ $widgetContext->method('getViewHelperChildNodeRenderingContext')->willReturn(null);
+ $widgetContext->method('getViewHelperChildNodes')->willReturn(null);
$this->viewHelper->render();
}
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Security/CsrfTokenViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Security/CsrfTokenViewHelperTest.php
index a8c3328d0a..658f8a6de2 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Security/CsrfTokenViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Security/CsrfTokenViewHelperTest.php
@@ -1,4 +1,7 @@
viewHelper = $this->getMockBuilder(CsrfTokenViewHelper::class)->setMethods(['buildRenderChildrenClosure'])->getMock();
+ $this->viewHelper = $this->getMockBuilder(CsrfTokenViewHelper::class)->onlyMethods(['buildRenderChildrenClosure'])->getMock();
$this->injectDependenciesIntoViewHelper($this->viewHelper);
- $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)->getMock();
+ $this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
$this->renderingContext->injectObjectManager($this->objectManagerMock);
$this->viewHelper->initializeArguments();
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperRendersTheCsrfTokenReturnedFromTheSecurityContext()
{
- $mockSecurityContext = $this->createMock(\Neos\Flow\Security\Context::class);
- $mockSecurityContext->expects(self::once())->method('getCsrfProtectionToken')->will(self::returnValue('TheCsrfToken'));
- $this->objectManagerMock->expects(self::any())->method('get')->willReturn($mockSecurityContext);
+ $mockSecurityContext = $this->createMock(Context::class);
+ $mockSecurityContext->expects($this->once())->method('getCsrfProtectionToken')->willReturn(('TheCsrfToken'));
+ $this->objectManagerMock->method('get')->willReturn($mockSecurityContext);
$actualResult = $this->viewHelper->render();
self::assertEquals('TheCsrfToken', $actualResult);
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Security/IfAccessViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Security/IfAccessViewHelperTest.php
index fba97d5506..98000c02d2 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Security/IfAccessViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Security/IfAccessViewHelperTest.php
@@ -1,4 +1,7 @@
mockPrivilegeManager = $this->getMockBuilder(\Neos\Flow\Security\Authorization\PrivilegeManagerInterface::class)->disableOriginalConstructor()->getMock();
+ $this->mockPrivilegeManager = $this->createMock(PrivilegeManagerInterface::class);
- $objectManager = $this->getMockBuilder(ObjectManagerInterface::class)->disableOriginalConstructor()->getMock();
- $objectManager->expects(self::any())->method('get')->willReturnCallback(function ($objectName) {
+ $objectManager = $this->createMock(ObjectManagerInterface::class);
+ $objectManager->method('get')->willReturnCallback(function ($objectName) {
switch ($objectName) {
case PrivilegeManagerInterface::class:
return $this->mockPrivilegeManager;
@@ -46,20 +50,18 @@ protected function setUp(): void
}
});
- $renderingContext = $this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock();
- $renderingContext->expects(self::any())->method('getObjectManager')->willReturn($objectManager);
+ $renderingContext = $this->createMock(RenderingContext::class);
+ $renderingContext->method('getObjectManager')->willReturn($objectManager);
- $this->ifAccessViewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Security\IfAccessViewHelper::class, ['renderThenChild', 'renderElseChild']);
+ $this->ifAccessViewHelper = $this->getAccessibleMock(IfAccessViewHelper::class, ['renderThenChild', 'renderElseChild']);
$this->inject($this->ifAccessViewHelper, 'renderingContext', $renderingContext);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperRendersThenIfHasAccessToPrivilegeTargetReturnsTrue()
{
- $this->mockPrivilegeManager->expects(self::once())->method('isPrivilegeTargetGranted')->with('somePrivilegeTarget')->will(self::returnValue(true));
- $this->ifAccessViewHelper->expects(self::once())->method('renderThenChild')->will(self::returnValue('foo'));
+ $this->mockPrivilegeManager->expects($this->once())->method('isPrivilegeTargetGranted')->with('somePrivilegeTarget')->willReturn((true));
+ $this->ifAccessViewHelper->expects($this->once())->method('renderThenChild')->willReturn(('foo'));
$arguments = [
'privilegeTarget' => 'somePrivilegeTarget',
@@ -70,13 +72,11 @@ public function viewHelperRendersThenIfHasAccessToPrivilegeTargetReturnsTrue()
self::assertEquals('foo', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperRendersElseIfHasAccessToPrivilegeTargetReturnsFalse()
{
- $this->mockPrivilegeManager->expects(self::once())->method('isPrivilegeTargetGranted')->with('somePrivilegeTarget')->will(self::returnValue(false));
- $this->ifAccessViewHelper->expects(self::once())->method('renderElseChild')->will(self::returnValue('ElseViewHelperResults'));
+ $this->mockPrivilegeManager->expects($this->once())->method('isPrivilegeTargetGranted')->with('somePrivilegeTarget')->willReturn((false));
+ $this->ifAccessViewHelper->expects($this->once())->method('renderElseChild')->willReturn(('ElseViewHelperResults'));
$arguments = [
'privilegeTarget' => 'somePrivilegeTarget',
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Security/IfHasRoleViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Security/IfHasRoleViewHelperTest.php
index adb9f5760a..0ce00abb13 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Security/IfHasRoleViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Security/IfHasRoleViewHelperTest.php
@@ -1,4 +1,7 @@
mockViewHelper = $this->getMockBuilder(\Neos\FluidAdaptor\ViewHelpers\Security\IfHasRoleViewHelper::class)->setMethods([
+ $this->mockViewHelper = $this->getMockBuilder(IfHasRoleViewHelper::class)->onlyMethods([
'renderThenChild',
'renderElseChild'
])->getMock();
- $this->mockSecurityContext = $this->getMockBuilder(\Neos\Flow\Security\Context::class)->disableOriginalConstructor()->getMock();
- $this->mockSecurityContext->expects(self::any())->method('canBeInitialized')->willReturn(true);
+ $this->mockSecurityContext = $this->createMock(Context::class);
+ $this->mockSecurityContext->method('canBeInitialized')->willReturn(true);
- $this->mockPolicyService = $this->getMockBuilder(\Neos\Flow\Security\Policy\PolicyService::class)->disableOriginalConstructor()->getMock();
+ $this->mockPolicyService = $this->createMock(PolicyService::class);
- $reflectionService = $this->getMockBuilder(ReflectionService::class)->disableOriginalConstructor()->getMock();
- $reflectionService->expects(self::any())->method('getMethodParameters')->willReturn([]);
+ $reflectionService = $this->createMock(ReflectionService::class);
+ $reflectionService->method('getMethodParameters')->willReturn([]);
- $objectManager = $this->getMockBuilder(ObjectManagerInterface::class)->disableOriginalConstructor()->getMock();
- $objectManager->expects(self::any())->method('get')->willReturnCallback(function ($objectName) use ($reflectionService) {
+ $objectManager = $this->createMock(ObjectManagerInterface::class);
+ $objectManager->method('get')->willReturnCallback(function ($objectName) use ($reflectionService) {
switch ($objectName) {
case Context::class:
return $this->mockSecurityContext;
@@ -73,9 +80,9 @@ protected function setUp(): void
}
});
- $renderingContext = $this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock();
- $renderingContext->expects(self::any())->method('getObjectManager')->willReturn($objectManager);
- $renderingContext->expects(self::any())->method('getControllerContext')->willReturn($this->getMockControllerContext());
+ $renderingContext = $this->createMock(RenderingContext::class);
+ $renderingContext->method('getObjectManager')->willReturn($objectManager);
+ $renderingContext->method('getControllerContext')->willReturn($this->getMockControllerContext());
$this->inject($this->mockViewHelper, 'objectManager', $objectManager);
$this->inject($this->mockViewHelper, 'renderingContext', $renderingContext);
@@ -84,31 +91,29 @@ protected function setUp(): void
/**
* Create a mock controllerContext
*
- * @return \PHPUnit\Framework\MockObject\MockObject
+ * @return MockObject
*/
protected function getMockControllerContext()
{
$httpRequest = new ServerRequest('GET', 'http://robertlemke.com/blog');
- $mockRequest = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
- $mockRequest->expects(self::any())->method('getControllerPackageKey')->will(self::returnValue('Acme.Demo'));
+ $mockRequest = $this->createMock(ActionRequest::class);
+ $mockRequest->method('getControllerPackageKey')->willReturn(('Acme.Demo'));
- $mockControllerContext = $this->getMockBuilder(\Neos\Flow\Mvc\Controller\ControllerContext::class)->setMethods(['getRequest'])->disableOriginalConstructor()->getMock();
- $mockControllerContext->expects(self::any())->method('getRequest')->will(self::returnValue($mockRequest));
+ $mockControllerContext = $this->getMockBuilder(ControllerContext::class)->onlyMethods(['getRequest'])->disableOriginalConstructor()->getMock();
+ $mockControllerContext->method('getRequest')->willReturn(($mockRequest));
return $mockControllerContext;
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperRendersThenPartIfHasRoleReturnsTrue()
{
$role = new Role('Acme.Demo:SomeRole');
- $this->mockSecurityContext->expects(self::once())->method('hasRole')->with('Acme.Demo:SomeRole')->will(self::returnValue(true));
- $this->mockPolicyService->expects(self::once())->method('getRole')->with('Acme.Demo:SomeRole')->will(self::returnValue($role));
+ $this->mockSecurityContext->expects($this->once())->method('hasRole')->with('Acme.Demo:SomeRole')->willReturn((true));
+ $this->mockPolicyService->expects($this->once())->method('getRole')->with('Acme.Demo:SomeRole')->willReturn(($role));
- $this->mockViewHelper->expects(self::once())->method('renderThenChild')->will(self::returnValue('then-child'));
+ $this->mockViewHelper->expects($this->once())->method('renderThenChild')->willReturn(('then-child'));
$arguments = [
'role' => 'SomeRole',
@@ -119,22 +124,20 @@ public function viewHelperRendersThenPartIfHasRoleReturnsTrue()
self::assertEquals('then-child', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperHandlesPackageKeyAttributeCorrectly()
{
- $this->mockSecurityContext->expects(self::any())->method('hasRole')->will(self::returnCallBack(function ($role) {
+ $this->mockSecurityContext->method('hasRole')->willReturnCallback(function ($role) {
switch ($role) {
case 'Neos.FluidAdaptor:Administrator':
return true;
case 'Neos.FluidAdaptor:User':
return false;
}
- }));
+ });
- $this->mockViewHelper->expects(self::any())->method('renderThenChild')->will(self::returnValue('true'));
- $this->mockViewHelper->expects(self::any())->method('renderElseChild')->will(self::returnValue('false'));
+ $this->mockViewHelper->method('renderThenChild')->willReturn(('true'));
+ $this->mockViewHelper->method('renderElseChild')->willReturn(('false'));
$arguments = [
'role' => new Role('Neos.FluidAdaptor:Administrator'),
@@ -154,21 +157,19 @@ public function viewHelperHandlesPackageKeyAttributeCorrectly()
self::assertEquals('false', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperUsesSpecifiedAccountForCheck()
{
- $mockAccount = $this->createMock(\Neos\Flow\Security\Account::class);
- $mockAccount->expects(self::any())->method('hasRole')->will(self::returnCallBack(function (Role $role) {
+ $mockAccount = $this->createMock(Account::class);
+ $mockAccount->method('hasRole')->willReturnCallback(function (Role $role) {
switch ($role->getIdentifier()) {
case 'Neos.FluidAdaptor:Administrator':
return true;
}
- }));
+ });
- $this->mockViewHelper->expects(self::any())->method('renderThenChild')->will(self::returnValue('true'));
- $this->mockViewHelper->expects(self::any())->method('renderElseChild')->will(self::returnValue('false'));
+ $this->mockViewHelper->method('renderThenChild')->willReturn(('true'));
+ $this->mockViewHelper->method('renderElseChild')->willReturn(('false'));
$arguments = [
'role' => new Role('Neos.FluidAdaptor:Administrator'),
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/TranslateViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/TranslateViewHelperTest.php
index df3d2e94d8..cb4bf9d7ca 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/TranslateViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/TranslateViewHelperTest.php
@@ -1,4 +1,7 @@
translateViewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\TranslateViewHelper::class, ['renderChildren']);
+ $this->translateViewHelper = $this->getAccessibleMock(TranslateViewHelper::class, ['renderChildren']);
- $this->request->expects(self::any())->method('getControllerPackageKey')->will(self::returnValue('Neos.FluidAdaptor'));
+ $this->request->method('getControllerPackageKey')->willReturn(('Neos.FluidAdaptor'));
$this->dummyLocale = new Locale('de_DE');
- $this->mockTranslator = $this->getMockBuilder(\Neos\Flow\I18n\Translator::class)->disableOriginalConstructor()->getMock();
+ $this->mockTranslator = $this->createMock(Translator::class);
$this->inject($this->translateViewHelper, 'translator', $this->mockTranslator);
$this->injectDependenciesIntoViewHelper($this->translateViewHelper);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperTranslatesByOriginalLabel()
{
- $this->mockTranslator->expects(self::once())->method('translateByOriginalLabel', 'Untranslated Label', 'Main', 'Neos.Flow', [], null, $this->dummyLocale)->will(self::returnValue('Translated Label'));
+ $this->mockTranslator->expects($this->once())->method('translateByOriginalLabel', 'Untranslated Label', 'Main', 'Neos.Flow', [], null, $this->dummyLocale)->willReturn(('Translated Label'));
- $this->translateViewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue('Untranslated Label'));
+ $this->translateViewHelper->expects($this->once())->method('renderChildren')->willReturn(('Untranslated Label'));
$this->translateViewHelper = $this->prepareArguments($this->translateViewHelper, ['id' => null, 'value' => null, 'arguments' => [], 'source' => 'Main', 'package' => null, 'quantity' => null, 'locale' => 'de_DE']);
$result = $this->translateViewHelper->render();
self::assertEquals('Translated Label', $result);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperTranslatesById()
{
- $this->mockTranslator->expects(self::once())->method('translateById', 'some.label', 'Main', 'Neos.Flow', [], null, $this->dummyLocale)->will(self::returnValue('Translated Label'));
+ $this->mockTranslator->expects($this->once())->method('translateById', 'some.label', 'Main', 'Neos.Flow', [], null, $this->dummyLocale)->willReturn(('Translated Label'));
$this->translateViewHelper = $this->prepareArguments($this->translateViewHelper, ['id' => 'some.label', 'value' => null, 'arguments' => [], 'source' => 'Main', 'package' => null, 'quantity' => null, 'locale' => 'de_DE']);
$result = $this->translateViewHelper->render();
self::assertEquals('Translated Label', $result);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperUsesValueIfIdIsNotFound()
{
- $this->translateViewHelper->expects(self::never())->method('renderChildren');
+ $this->translateViewHelper->expects($this->never())->method('renderChildren');
$this->translateViewHelper = $this->prepareArguments($this->translateViewHelper, ['id' => 'some.label', 'value' => 'Default from value', 'arguments' => [], 'source' => 'Main', 'package' => null, 'quantity' => null, 'locale' => 'de_DE']);
$result = $this->translateViewHelper->render();
self::assertEquals('Default from value', $result);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperUsesRenderChildrenIfIdIsNotFound()
{
- $this->translateViewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue('Default from renderChildren'));
+ $this->translateViewHelper->expects($this->once())->method('renderChildren')->willReturn(('Default from renderChildren'));
$this->translateViewHelper = $this->prepareArguments($this->translateViewHelper, ['id' => 'some.label', 'value' => null, 'arguments' => [], 'source' => 'Main', 'package' => null, 'quantity' => null, 'locale' => 'de_DE']);
$result = $this->translateViewHelper->render();
self::assertEquals('Default from renderChildren', $result);
}
- /**
- * @test
- */
+ #[Test]
public function viewHelperReturnsIdWhenRenderChildrenReturnsEmptyResultIfIdIsNotFound()
{
- $this->mockTranslator->expects(self::once())->method('translateById', 'some.label', 'Main', 'Neos.Flow', [], null, $this->dummyLocale)->will(self::returnValue('some.label'));
+ $this->mockTranslator->expects($this->once())->method('translateById', 'some.label', 'Main', 'Neos.Flow', [], null, $this->dummyLocale)->willReturn(('some.label'));
- $this->translateViewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue(null));
+ $this->translateViewHelper->expects($this->once())->method('renderChildren')->willReturn((null));
$this->translateViewHelper = $this->prepareArguments($this->translateViewHelper, ['id' => 'some.label', 'value' => null, 'arguments' => [], 'source' => 'Main', 'package' => null, 'quantity' => null, 'locale' => 'de_DE']);
$result = $this->translateViewHelper->render();
self::assertEquals('some.label', $result);
}
- /**
- * @test
- */
+ #[Test]
public function renderThrowsExceptionIfGivenLocaleIdentifierIsInvalid()
{
$this->expectException(Exception::class);
@@ -129,16 +122,14 @@ public function renderThrowsExceptionIfGivenLocaleIdentifierIsInvalid()
$this->translateViewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderThrowsExceptionIfNoPackageCouldBeResolved()
{
$this->expectException(Exception::class);
- $mockRequest = $this->getMockBuilder(ActionRequest::class)->disableOriginalConstructor()->getMock();
+ $mockRequest = $this->createMock(ActionRequest::class);
$mockRequest->method('getControllerPackageKey')->willReturn('');
- $mockControllerContext = $this->getMockBuilder(ControllerContext::class)->disableOriginalConstructor()->getMock();
+ $mockControllerContext = $this->createMock(ControllerContext::class);
$mockControllerContext->method('getRequest')->willReturn($mockRequest);
$this->renderingContext->setControllerContext($mockControllerContext);
@@ -150,50 +141,45 @@ public function renderThrowsExceptionIfNoPackageCouldBeResolved()
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function translationFallbackDataProvider()
+ public static function translationFallbackDataProvider(): \Iterator
{
- return [
- # id & value specified with all 4 combinations of available translations for id/label
- ['id' => 'some.id', 'value' => 'Some label', 'translatedId' => 'Translated id', 'translatedLabel' => 'Translated label', 'expectedResult' => 'Translated id'],
- ['id' => 'some.id', 'value' => 'Some label', 'translatedId' => 'Translated id', 'translatedLabel' => null, 'expectedResult' => 'Translated id'],
- ['id' => 'some.id', 'value' => 'Some label', 'translatedId' => null, 'translatedLabel' => 'Translated label', 'expectedResult' => 'Some label'],
- ['id' => 'some.id', 'value' => 'Some label', 'translatedId' => null, 'translatedLabel' => null, 'expectedResult' => 'Some label'],
-
- # only value specified with all 4 combinations of available translations for id/label
- ['id' => null, 'value' => 'Some label', 'translatedId' => 'Translated id', 'translatedLabel' => 'Translated label', 'expectedResult' => 'Translated label'],
- ['id' => null, 'value' => 'Some label', 'translatedId' => 'Translated id', 'translatedLabel' => null, 'expectedResult' => ''],
- ['id' => null, 'value' => 'Some label', 'translatedId' => null, 'translatedLabel' => 'Translated label', 'expectedResult' => 'Translated label'],
- ['id' => null, 'value' => 'Some label', 'translatedId' => null, 'translatedLabel' => null, 'expectedResult' => ''],
-
- # only id specified with all 4 combinations of available translations for id/label
- ['id' => 'some.id', 'value' => null, 'translatedId' => 'Translated id', 'translatedLabel' => 'Translated label', 'expectedResult' => 'Translated id'],
- ['id' => 'some.id', 'value' => null, 'translatedId' => 'Translated id', 'translatedLabel' => null, 'expectedResult' => 'Translated id'],
- ['id' => 'some.id', 'value' => null, 'translatedId' => null, 'translatedLabel' => 'Translated label', 'expectedResult' => 'some.id'],
- ['id' => 'some.id', 'value' => null, 'translatedId' => null, 'translatedLabel' => null, 'expectedResult' => 'some.id'],
-
- # neither id nor value specified with all 4 combinations of available translations for id/label
- ['id' => null, 'value' => null, 'translatedId' => 'Translated id', 'translatedLabel' => 'Translated label', 'expectedResult' => 'Translated label'],
- ['id' => null, 'value' => null, 'translatedId' => 'Translated id', 'translatedLabel' => null, 'expectedResult' => ''],
- ['id' => null, 'value' => null, 'translatedId' => null, 'translatedLabel' => 'Translated label', 'expectedResult' => 'Translated label'],
- ['id' => null, 'value' => null, 'translatedId' => null, 'translatedLabel' => null, 'expectedResult' => ''],
- ];
+ # id & value specified with all 4 combinations of available translations for id/label
+ yield ['id' => 'some.id', 'value' => 'Some label', 'translatedId' => 'Translated id', 'translatedLabel' => 'Translated label', 'expectedResult' => 'Translated id'];
+ yield ['id' => 'some.id', 'value' => 'Some label', 'translatedId' => 'Translated id', 'translatedLabel' => null, 'expectedResult' => 'Translated id'];
+ yield ['id' => 'some.id', 'value' => 'Some label', 'translatedId' => null, 'translatedLabel' => 'Translated label', 'expectedResult' => 'Some label'];
+ yield ['id' => 'some.id', 'value' => 'Some label', 'translatedId' => null, 'translatedLabel' => null, 'expectedResult' => 'Some label'];
+ # only value specified with all 4 combinations of available translations for id/label
+ yield ['id' => null, 'value' => 'Some label', 'translatedId' => 'Translated id', 'translatedLabel' => 'Translated label', 'expectedResult' => 'Translated label'];
+ yield ['id' => null, 'value' => 'Some label', 'translatedId' => 'Translated id', 'translatedLabel' => null, 'expectedResult' => ''];
+ yield ['id' => null, 'value' => 'Some label', 'translatedId' => null, 'translatedLabel' => 'Translated label', 'expectedResult' => 'Translated label'];
+ yield ['id' => null, 'value' => 'Some label', 'translatedId' => null, 'translatedLabel' => null, 'expectedResult' => ''];
+ # only id specified with all 4 combinations of available translations for id/label
+ yield ['id' => 'some.id', 'value' => null, 'translatedId' => 'Translated id', 'translatedLabel' => 'Translated label', 'expectedResult' => 'Translated id'];
+ yield ['id' => 'some.id', 'value' => null, 'translatedId' => 'Translated id', 'translatedLabel' => null, 'expectedResult' => 'Translated id'];
+ yield ['id' => 'some.id', 'value' => null, 'translatedId' => null, 'translatedLabel' => 'Translated label', 'expectedResult' => 'some.id'];
+ yield ['id' => 'some.id', 'value' => null, 'translatedId' => null, 'translatedLabel' => null, 'expectedResult' => 'some.id'];
+ # neither id nor value specified with all 4 combinations of available translations for id/label
+ yield ['id' => null, 'value' => null, 'translatedId' => 'Translated id', 'translatedLabel' => 'Translated label', 'expectedResult' => 'Translated label'];
+ yield ['id' => null, 'value' => null, 'translatedId' => 'Translated id', 'translatedLabel' => null, 'expectedResult' => ''];
+ yield ['id' => null, 'value' => null, 'translatedId' => null, 'translatedLabel' => 'Translated label', 'expectedResult' => 'Translated label'];
+ yield ['id' => null, 'value' => null, 'translatedId' => null, 'translatedLabel' => null, 'expectedResult' => ''];
}
/**
- * @test
- * @dataProvider translationFallbackDataProvider
* @param string $id
* @param string $value
* @param string $translatedId
- * @param string $translatedValue
+ * @param string $translatedLabel
* @param string $expectedResult
*/
- public function translationFallbackTests($id, $value, $translatedId, $translatedValue, $expectedResult)
+ #[DataProvider('translationFallbackDataProvider')]
+ #[Test]
+ public function translationFallbackTests($id, $value, $translatedId, $translatedLabel, $expectedResult)
{
- $this->mockTranslator->expects(self::any())->method('translateById', $id)->will(self::returnValue($translatedId));
- $this->mockTranslator->expects(self::any())->method('translateByOriginalLabel', $value)->will(self::returnValue($translatedValue));
+ $this->mockTranslator->method('translateById')->with($id)->willReturn(($translatedId));
+ $this->mockTranslator->method('translateByOriginalLabel')->with($value)->willReturn(($translatedLabel));
$this->translateViewHelper = $this->prepareArguments($this->translateViewHelper, ['id' => $id, 'value' => $value]);
$actualResult = $this->translateViewHelper->render();
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/ActionViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/ActionViewHelperTest.php
index 31b0dec2cc..ee9a83a545 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/ActionViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/ActionViewHelperTest.php
@@ -1,4 +1,7 @@
viewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Uri\ActionViewHelper::class, ['renderChildren']);
+ $this->viewHelper = $this->getAccessibleMock(ActionViewHelper::class, ['renderChildren']);
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
- /**
- * @test
- */
+ #[Test]
public function renderReturnsUriReturnedFromUriBuilder()
{
- $this->uriBuilder->expects(self::any())->method('uriFor')->will(self::returnValue('some/uri'));
+ $this->uriBuilder->method('uriFor')->willReturn(('some/uri'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['action' => 'index']);
$actualResult = $this->viewHelper->render();
@@ -46,58 +51,50 @@ public function renderReturnsUriReturnedFromUriBuilder()
self::assertEquals('some/uri', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function renderCorrectlyPassesDefaultArgumentsToUriBuilder()
{
- $this->uriBuilder->expects(self::once())->method('setSection')->with('');
- $this->uriBuilder->expects(self::once())->method('setCreateAbsoluteUri')->with(false);
- $this->uriBuilder->expects(self::once())->method('setArguments')->with([]);
- $this->uriBuilder->expects(self::once())->method('setAddQueryString')->with(false);
- $this->uriBuilder->expects(self::once())->method('setArgumentsToBeExcludedFromQueryString')->with([]);
- $this->uriBuilder->expects(self::once())->method('setFormat')->with('');
- $this->uriBuilder->expects(self::once())->method('uriFor')->with('theActionName', [], null, null, null);
+ $this->uriBuilder->expects($this->once())->method('setSection')->with('');
+ $this->uriBuilder->expects($this->once())->method('setCreateAbsoluteUri')->with(false);
+ $this->uriBuilder->expects($this->once())->method('setArguments')->with([]);
+ $this->uriBuilder->expects($this->once())->method('setAddQueryString')->with(false);
+ $this->uriBuilder->expects($this->once())->method('setArgumentsToBeExcludedFromQueryString')->with([]);
+ $this->uriBuilder->expects($this->once())->method('setFormat')->with('');
+ $this->uriBuilder->expects($this->once())->method('uriFor')->with('theActionName', [], null, null, null);
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['action' => 'theActionName']);
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderCorrectlyPassesAllArgumentsToUriBuilder()
{
- $this->uriBuilder->expects(self::once())->method('setSection')->with('someSection');
- $this->uriBuilder->expects(self::once())->method('setCreateAbsoluteUri')->with(true);
- $this->uriBuilder->expects(self::once())->method('setArguments')->with(['additional' => 'RouteParameters']);
- $this->uriBuilder->expects(self::once())->method('setAddQueryString')->with(true);
- $this->uriBuilder->expects(self::once())->method('setArgumentsToBeExcludedFromQueryString')->with(['arguments' => 'toBeExcluded']);
- $this->uriBuilder->expects(self::once())->method('setFormat')->with('someFormat');
- $this->uriBuilder->expects(self::once())->method('uriFor')->with('someAction', ['some' => 'argument'], 'someController', 'somePackage', 'someSubpackage');
+ $this->uriBuilder->expects($this->once())->method('setSection')->with('someSection');
+ $this->uriBuilder->expects($this->once())->method('setCreateAbsoluteUri')->with(true);
+ $this->uriBuilder->expects($this->once())->method('setArguments')->with(['additional' => 'RouteParameters']);
+ $this->uriBuilder->expects($this->once())->method('setAddQueryString')->with(true);
+ $this->uriBuilder->expects($this->once())->method('setArgumentsToBeExcludedFromQueryString')->with(['arguments' => 'toBeExcluded']);
+ $this->uriBuilder->expects($this->once())->method('setFormat')->with('someFormat');
+ $this->uriBuilder->expects($this->once())->method('uriFor')->with('someAction', ['some' => 'argument'], 'someController', 'somePackage', 'someSubpackage');
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['action' => 'someAction', 'arguments' => ['some' => 'argument'], 'controller' => 'someController', 'package' => 'somePackage', 'subpackage' => 'someSubpackage', 'section' => 'someSection', 'format' => 'someFormat', 'additionalParams' => ['additional' => 'RouteParameters'], 'absolute' => true, 'addQueryString' => true, 'argumentsToBeExcludedFromQueryString' => ['arguments' => 'toBeExcluded']]);
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderThrowsViewHelperExceptionIfUriBuilderThrowsFlowException()
{
- $this->uriBuilder->expects(self::any())->method('uriFor')->will(self::throwException(new \Neos\Flow\Exception('Mock Exception', 12345)));
+ $this->uriBuilder->method('uriFor')->willThrowException(new \Neos\Flow\Exception('Mock Exception', 12345));
try {
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['action' => 'someAction']);
$this->viewHelper->render();
- } catch (\Neos\FluidAdaptor\Core\ViewHelper\Exception $exception) {
+ } catch (Exception $exception) {
}
self::assertEquals(12345, $exception->getPrevious()->getCode());
}
- /**
- * @test
- */
+ #[Test]
public function renderThrowsExceptionIfUseParentRequestIsSetAndTheCurrentRequestHasNoParentRequest()
{
$this->expectException(Exception::class);
@@ -105,24 +102,22 @@ public function renderThrowsExceptionIfUseParentRequestIsSetAndTheCurrentRequest
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderUsesParentRequestIfUseParentRequestIsSet()
{
- $viewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Uri\ActionViewHelper::class, ['renderChildren']);
+ $viewHelper = $this->getAccessibleMock(ActionViewHelper::class, ['renderChildren']);
- $parentRequest = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
+ $parentRequest = $this->createStub(ActionRequest::class);
- $this->request = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
- $this->request->expects(self::atLeastOnce())->method('isMainRequest')->will(self::returnValue(false));
- $this->request->expects(self::atLeastOnce())->method('getParentRequest')->will(self::returnValue($parentRequest));
+ $this->request = $this->createMock(ActionRequest::class);
+ $this->request->expects($this->atLeastOnce())->method('isMainRequest')->willReturn((false));
+ $this->request->expects($this->atLeastOnce())->method('getParentRequest')->willReturn(($parentRequest));
- $this->controllerContext = $this->getMockBuilder(\Neos\Flow\Mvc\Controller\ControllerContext::class)->disableOriginalConstructor()->getMock();
- $this->controllerContext->expects(self::any())->method('getUriBuilder')->will(self::returnValue($this->uriBuilder));
- $this->controllerContext->expects(self::any())->method('getRequest')->will(self::returnValue($this->request));
+ $this->controllerContext = $this->createMock(ControllerContext::class);
+ $this->controllerContext->method('getUriBuilder')->willReturn(($this->uriBuilder));
+ $this->controllerContext->method('getRequest')->willReturn(($this->request));
- $this->uriBuilder->expects(self::atLeastOnce())->method('setRequest')->with($parentRequest);
+ $this->uriBuilder->expects($this->atLeastOnce())->method('setRequest')->with($parentRequest);
$this->renderingContext->setControllerContext($this->controllerContext);
$this->injectDependenciesIntoViewHelper($viewHelper);
@@ -131,24 +126,22 @@ public function renderUsesParentRequestIfUseParentRequestIsSet()
$viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderUsesParentRequestIfUseMainRequestIsSet()
{
- $viewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Uri\ActionViewHelper::class, ['renderChildren']);
+ $viewHelper = $this->getAccessibleMock(ActionViewHelper::class, ['renderChildren']);
- $mainRequest = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
+ $mainRequest = $this->createStub(ActionRequest::class);
- $this->request = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
- $this->request->expects(self::atLeastOnce())->method('isMainRequest')->will(self::returnValue(false));
- $this->request->expects(self::atLeastOnce())->method('getMainRequest')->will(self::returnValue($mainRequest));
+ $this->request = $this->createMock(ActionRequest::class);
+ $this->request->expects($this->atLeastOnce())->method('isMainRequest')->willReturn((false));
+ $this->request->expects($this->atLeastOnce())->method('getMainRequest')->willReturn(($mainRequest));
- $this->controllerContext = $this->getMockBuilder(\Neos\Flow\Mvc\Controller\ControllerContext::class)->disableOriginalConstructor()->getMock();
- $this->controllerContext->expects(self::any())->method('getUriBuilder')->will(self::returnValue($this->uriBuilder));
- $this->controllerContext->expects(self::any())->method('getRequest')->will(self::returnValue($this->request));
+ $this->controllerContext = $this->createMock(ControllerContext::class);
+ $this->controllerContext->method('getUriBuilder')->willReturn(($this->uriBuilder));
+ $this->controllerContext->method('getRequest')->willReturn(($this->request));
- $this->uriBuilder->expects(self::atLeastOnce())->method('setRequest')->with($mainRequest);
+ $this->uriBuilder->expects($this->atLeastOnce())->method('setRequest')->with($mainRequest);
$this->renderingContext->setControllerContext($this->controllerContext);
$this->injectDependenciesIntoViewHelper($viewHelper);
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php
index a895fd4300..9d2ad8765f 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php
@@ -1,6 +1,13 @@
viewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Uri\EmailViewHelper::class, ['renderChildren']);
+ $this->viewHelper = $this->getAccessibleMock(EmailViewHelper::class, ['renderChildren']);
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
- /**
- * @test
- */
+ #[Test]
public function renderPrependsEmailWithMailto()
{
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['email' => 'some@email.tld']);
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/ExternalViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/ExternalViewHelperTest.php
index 1a716490df..1fea0e6e81 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/ExternalViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/ExternalViewHelperTest.php
@@ -1,6 +1,13 @@
viewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Uri\ExternalViewHelper::class, ['renderChildren']);
+ $this->viewHelper = $this->getAccessibleMock(ExternalViewHelper::class, ['renderChildren']);
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
- /**
- * @test
- */
+ #[Test]
public function renderReturnsSpecifiedUri()
{
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['uri' => 'http://www.some-domain.tld']);
@@ -42,9 +47,7 @@ public function renderReturnsSpecifiedUri()
self::assertEquals('http://www.some-domain.tld', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function renderAddsHttpPrefixIfSpecifiedUriDoesNotContainScheme()
{
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['uri' => 'www.some-domain.tld']);
@@ -53,9 +56,7 @@ public function renderAddsHttpPrefixIfSpecifiedUriDoesNotContainScheme()
self::assertEquals('http://www.some-domain.tld', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function renderAddsSpecifiedSchemeIfUriDoesNotContainScheme()
{
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['uri' => 'some-domain.tld', 'defaultScheme' => 'ftp']);
@@ -64,9 +65,7 @@ public function renderAddsSpecifiedSchemeIfUriDoesNotContainScheme()
self::assertEquals('ftp://some-domain.tld', $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function renderDoesNotAddEmptyScheme()
{
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['uri' => 'some-domain.tld', 'defaultScheme' => '']);
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/ResourceViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/ResourceViewHelperTest.php
index 5470b12955..dd072879f0 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/ResourceViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Uri/ResourceViewHelperTest.php
@@ -1,4 +1,7 @@
mockI18nService = $this->createMock(Service::class);
$this->mockResourceManager = $this->createMock(ResourceManager::class);
- $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)->getMock();
- $this->objectManagerMock->expects(self::any())->method('get')->will($this->returnValueMap([
+ $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+ $objectManagerMock->method('get')->willReturnMap([
[Service::class, $this->mockI18nService],
[ResourceManager::class, $this->mockResourceManager]
- ]));
+ ]);
$this->viewHelper = $this->getAccessibleMock(ResourceViewHelper::class, ['renderChildren'], [], '', false);
$this->injectDependenciesIntoViewHelper($this->viewHelper);
- $this->renderingContext->injectObjectManager($this->objectManagerMock);
+ $this->renderingContext->injectObjectManager($objectManagerMock);
}
- /**
- * @test
- */
+ #[Test]
public function renderUsesCurrentControllerPackageKeyToBuildTheResourceUri()
{
- $this->mockResourceManager->expects(self::atLeastOnce())->method('getPublicPackageResourceUri')->with('ThePackageKey', 'Styles/Main.css')->will(self::returnValue('TheCorrectResourceUri'));
- $this->request->expects(self::atLeastOnce())->method('getControllerPackageKey')->will(self::returnValue('ThePackageKey'));
+ $this->mockResourceManager->expects($this->atLeastOnce())->method('getPublicPackageResourceUri')->with('ThePackageKey', 'Styles/Main.css')->willReturn(('TheCorrectResourceUri'));
+ $this->request->expects($this->atLeastOnce())->method('getControllerPackageKey')->willReturn(('ThePackageKey'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, [
'path' => 'Styles/Main.css',
'package' => null,
@@ -79,12 +77,10 @@ public function renderUsesCurrentControllerPackageKeyToBuildTheResourceUri()
self::assertEquals('TheCorrectResourceUri', $resourceUri);
}
- /**
- * @test
- */
+ #[Test]
public function renderUsesCustomPackageKeyIfSpecified()
{
- $this->mockResourceManager->expects(self::atLeastOnce())->method('getPublicPackageResourceUri')->with('ThePackageKey', 'Styles/Main.css')->will(self::returnValue('TheCorrectResourceUri'));
+ $this->mockResourceManager->expects($this->atLeastOnce())->method('getPublicPackageResourceUri')->with('ThePackageKey', 'Styles/Main.css')->willReturn(('TheCorrectResourceUri'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, [
'path' => 'Styles/Main.css',
'package' => 'ThePackageKey',
@@ -95,13 +91,11 @@ public function renderUsesCustomPackageKeyIfSpecified()
self::assertEquals('TheCorrectResourceUri', $resourceUri);
}
- /**
- * @test
- */
+ #[Test]
public function renderUsesProvidedPersistentResourceInsteadOfPackageAndPath()
{
$resource = new PersistentResource();
- $this->mockResourceManager->expects(self::atLeastOnce())->method('getPublicPersistentResourceUri')->with($resource)->will(self::returnValue('TheCorrectResourceUri'));
+ $this->mockResourceManager->expects($this->atLeastOnce())->method('getPublicPersistentResourceUri')->with($resource)->willReturn(('TheCorrectResourceUri'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, [
'path' => null,
'package' => null,
@@ -112,13 +106,11 @@ public function renderUsesProvidedPersistentResourceInsteadOfPackageAndPath()
self::assertEquals('TheCorrectResourceUri', $resourceUri);
}
- /**
- * @test
- */
+ #[Test]
public function renderCreatesASpecialBrokenResourceUriIfTheResourceCouldNotBePublished()
{
$resource = new PersistentResource();
- $this->mockResourceManager->expects(self::atLeastOnce())->method('getPublicPersistentResourceUri')->with($resource)->will(self::returnValue(false));
+ $this->mockResourceManager->expects($this->atLeastOnce())->method('getPublicPersistentResourceUri')->with($resource)->willReturn((false));
$this->viewHelper = $this->prepareArguments($this->viewHelper, [
'path' => null,
'package' => null,
@@ -129,13 +121,11 @@ public function renderCreatesASpecialBrokenResourceUriIfTheResourceCouldNotBePub
self::assertEquals('404-Resource-Not-Found', $resourceUri);
}
- /**
- * @test
- */
+ #[Test]
public function renderLocalizesResource()
{
- $this->mockI18nService->expects(self::once())->method('getLocalizedFilename')->with('resource://ThePackageKey/Public/Styles/Main.css')->will(self::returnValue(['resource://ThePackageKey/Public/Styles/Main.css.de', new Locale('de')]));
- $this->mockResourceManager->expects(self::atLeastOnce())->method('getPublicPackageResourceUri')->with('ThePackageKey', 'Styles/Main.css.de')->will(self::returnValue('TheCorrectResourceUri'));
+ $this->mockI18nService->expects($this->once())->method('getLocalizedFilename')->with('resource://ThePackageKey/Public/Styles/Main.css')->willReturn((['resource://ThePackageKey/Public/Styles/Main.css.de', new Locale('de')]));
+ $this->mockResourceManager->expects($this->atLeastOnce())->method('getPublicPackageResourceUri')->with('ThePackageKey', 'Styles/Main.css.de')->willReturn(('TheCorrectResourceUri'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, [
'path' => 'Styles/Main.css',
'package' => 'ThePackageKey'
@@ -144,22 +134,20 @@ public function renderLocalizesResource()
self::assertEquals('TheCorrectResourceUri', $resourceUri);
}
- /**
- * @test
- */
+ #[Test]
public function renderLocalizesResourceGivenAsResourceUri()
{
$this->mockResourceManager
- ->expects(self::once())
+ ->expects($this->once())
->method('getPackageAndPathByPublicPath')
->with('resource://ThePackageKey/Public/Styles/Main.css')
- ->will(self::returnValue(['ThePackageKey', 'Styles/Main.css']));
+ ->willReturn((['ThePackageKey', 'Styles/Main.css']));
$this->mockI18nService
- ->expects(self::once())
+ ->expects($this->once())
->method('getLocalizedFilename')
->with('resource://ThePackageKey/Public/Styles/Main.css')
- ->will(self::returnValue(['resource://ThePackageKey/Public/Styles/Main.de.css', new Locale('de')]));
- $this->mockResourceManager->expects(self::atLeastOnce())->method('getPublicPackageResourceUri')->with('ThePackageKey', 'Styles/Main.de.css')->will(self::returnValue('TheCorrectResourceUri'));
+ ->willReturn((['resource://ThePackageKey/Public/Styles/Main.de.css', new Locale('de')]));
+ $this->mockResourceManager->expects($this->atLeastOnce())->method('getPublicPackageResourceUri')->with('ThePackageKey', 'Styles/Main.de.css')->willReturn(('TheCorrectResourceUri'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, [
'path' => 'resource://ThePackageKey/Public/Styles/Main.css',
'package' => null,
@@ -170,12 +158,10 @@ public function renderLocalizesResourceGivenAsResourceUri()
self::assertEquals('TheCorrectResourceUri', $resourceUri);
}
- /**
- * @test
- */
+ #[Test]
public function renderSkipsLocalizationIfRequested()
{
- $this->mockI18nService->expects(self::never())->method('getLocalizedFilename');
+ $this->mockI18nService->expects($this->never())->method('getLocalizedFilename');
$this->viewHelper = $this->prepareArguments($this->viewHelper, [
'path' => 'foo',
'package' => 'SomePackage',
@@ -185,12 +171,10 @@ public function renderSkipsLocalizationIfRequested()
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderSkipsLocalizationForResourcesGivenAsResourceUriIfRequested()
{
- $this->mockI18nService->expects(self::never())->method('getLocalizedFilename');
+ $this->mockI18nService->expects($this->never())->method('getLocalizedFilename');
$this->viewHelper = $this->prepareArguments($this->viewHelper, [
'path' => 'resource://SomePackage/Public/Images/foo.jpg',
'package' => null,
@@ -200,9 +184,7 @@ public function renderSkipsLocalizationForResourcesGivenAsResourceUriIfRequested
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderThrowsExceptionIfNeitherResourceNorPathWereGiven()
{
$this->expectException(InvalidVariableException::class);
@@ -214,14 +196,12 @@ public function renderThrowsExceptionIfNeitherResourceNorPathWereGiven()
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderThrowsExceptionIfResourceUriNotPointingToPublicWasGivenAsPath()
{
$this->expectException(InvalidVariableException::class);
$this->mockResourceManager
- ->expects(self::once())
+ ->expects($this->once())
->method('getPackageAndPathByPublicPath')
->with('resource://Some.Package/Private/foobar.txt')
->willThrowException(new Exception());
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Validation/IfHasErrorsViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Validation/IfHasErrorsViewHelperTest.php
index 5be021afb5..4aba430a7d 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Validation/IfHasErrorsViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Validation/IfHasErrorsViewHelperTest.php
@@ -1,4 +1,7 @@
viewHelper = $this->getAccessibleMock(\Neos\FluidAdaptor\ViewHelpers\Validation\IfHasErrorsViewHelper::class, ['renderThenChild', 'renderElseChild']);
+ $this->viewHelper = $this->getAccessibleMock(IfHasErrorsViewHelper::class, ['renderThenChild', 'renderElseChild']);
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
- /**
- * @test
- */
+ #[Test]
public function returnsAndRendersThenChildIfResultsHaveErrors()
{
$result = new Result;
$result->addError(new Error('I am an error', 1386163707));
- $this->request->expects(self::once())->method('getInternalArgument')->with('__submittedArgumentValidationResults')->will(self::returnValue($result));
- $this->viewHelper->expects(self::once())->method('renderThenChild')->will(self::returnValue('ThenChild'));
+ $this->request->expects($this->once())->method('getInternalArgument')->with('__submittedArgumentValidationResults')->willReturn(($result));
+ $this->viewHelper->expects($this->once())->method('renderThenChild')->willReturn(('ThenChild'));
self::assertEquals('ThenChild', $this->viewHelper->render());
}
- /**
- * @test
- */
+ #[Test]
public function returnsAndRendersElseChildIfNoValidationResultsArePresentAtAll()
{
- $this->viewHelper->expects(self::once())->method('renderElseChild')->will(self::returnValue('ElseChild'));
+ $this->viewHelper->expects($this->once())->method('renderElseChild')->willReturn(('ElseChild'));
self::assertEquals('ElseChild', $this->viewHelper->render());
}
- /**
- * @test
- */
+ #[Test]
public function queriesResultForPropertyIfPropertyPathIsGiven()
{
- $resultMock = $this->createMock(\Neos\Error\Messages\Result::class);
- $resultMock->expects(self::once())->method('forProperty')->with('foo.bar.baz')->will(self::returnValue(new Result()));
+ $resultMock = $this->createMock(Result::class);
+ $resultMock->expects($this->once())->method('forProperty')->with('foo.bar.baz')->willReturn((new Result()));
- $this->request->expects(self::once())->method('getInternalArgument')->with('__submittedArgumentValidationResults')->will(self::returnValue($resultMock));
+ $this->request->expects($this->once())->method('getInternalArgument')->with('__submittedArgumentValidationResults')->willReturn(($resultMock));
$this->viewHelper->setArguments(['for' => 'foo.bar.baz']);
$this->viewHelper->render();
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Validation/ResultsViewHelperTest.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Validation/ResultsViewHelperTest.php
index 64e83dc400..501259e9ed 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Validation/ResultsViewHelperTest.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/Validation/ResultsViewHelperTest.php
@@ -1,4 +1,7 @@
viewHelper = $this->getMockBuilder(ResultsViewHelper::class)
- ->setMethods(['renderChildren'])
+ ->onlyMethods(['renderChildren'])
->getMock();
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
- /**
- * @test
- */
+ #[Test]
public function renderOutputsChildNodesByDefault()
{
- $this->request->expects(self::atLeastOnce())->method('getInternalArgument')->with('__submittedArgumentValidationResults')->will(self::returnValue(null));
- $this->viewHelper->expects(self::once())->method('renderChildren')->will(self::returnValue('child nodes'));
+ $this->request->expects($this->atLeastOnce())->method('getInternalArgument')->with('__submittedArgumentValidationResults')->willReturn((null));
+ $this->viewHelper->expects($this->once())->method('renderChildren')->willReturn(('child nodes'));
$this->viewHelper = $this->prepareArguments($this->viewHelper, []);
self::assertSame('child nodes', $this->viewHelper->render());
}
- /**
- * @test
- */
+ #[Test]
public function renderAddsValidationResultsToTemplateVariableContainer()
{
- $mockValidationResults = $this->getMockBuilder(\Neos\Error\Messages\Result::class)->getMock();
- $this->request->expects(self::atLeastOnce())->method('getInternalArgument')->with('__submittedArgumentValidationResults')->will(self::returnValue($mockValidationResults));
- $this->templateVariableContainer->expects(self::once())->method('add')->with('validationResults', $mockValidationResults);
- $this->viewHelper->expects(self::once())->method('renderChildren');
- $this->templateVariableContainer->expects(self::once())->method('remove')->with('validationResults');
+ $mockValidationResults = $this->createStub(Result::class);
+ $this->request->expects($this->atLeastOnce())->method('getInternalArgument')->with('__submittedArgumentValidationResults')->willReturn(($mockValidationResults));
+ $this->templateVariableContainer->expects($this->once())->method('add')->with('validationResults', $mockValidationResults);
+ $this->viewHelper->expects($this->once())->method('renderChildren');
+ $this->templateVariableContainer->expects($this->once())->method('remove')->with('validationResults');
$this->viewHelper = $this->prepareArguments($this->viewHelper, []);
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderAddsValidationResultsToTemplateVariableContainerWithCustomVariableNameIfSpecified()
{
- $mockValidationResults = $this->getMockBuilder(\Neos\Error\Messages\Result::class)->getMock();
- $this->request->expects(self::atLeastOnce())->method('getInternalArgument')->with('__submittedArgumentValidationResults')->will(self::returnValue($mockValidationResults));
- $this->templateVariableContainer->expects(self::once())->method('add')->with('customName', $mockValidationResults);
- $this->viewHelper->expects(self::once())->method('renderChildren');
- $this->templateVariableContainer->expects(self::once())->method('remove')->with('customName');
+ $mockValidationResults = $this->createStub(Result::class);
+ $this->request->expects($this->atLeastOnce())->method('getInternalArgument')->with('__submittedArgumentValidationResults')->willReturn(($mockValidationResults));
+ $this->templateVariableContainer->expects($this->once())->method('add')->with('customName', $mockValidationResults);
+ $this->viewHelper->expects($this->once())->method('renderChildren');
+ $this->templateVariableContainer->expects($this->once())->method('remove')->with('customName');
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['for' => '', 'as' => 'customName']);
$this->viewHelper->render();
}
- /**
- * @test
- */
+ #[Test]
public function renderAddsValidationResultsForOnePropertyIfForArgumentIsNotEmpty()
{
- $mockPropertyValidationResults = $this->getMockBuilder(\Neos\Error\Messages\Result::class)->getMock();
- $mockValidationResults = $this->getMockBuilder(\Neos\Error\Messages\Result::class)->getMock();
- $mockValidationResults->expects(self::once())->method('forProperty')->with('somePropertyName')->will(self::returnValue($mockPropertyValidationResults));
- $this->request->expects(self::atLeastOnce())->method('getInternalArgument')->with('__submittedArgumentValidationResults')->will(self::returnValue($mockValidationResults));
- $this->templateVariableContainer->expects(self::once())->method('add')->with('validationResults', $mockPropertyValidationResults);
- $this->viewHelper->expects(self::once())->method('renderChildren');
- $this->templateVariableContainer->expects(self::once())->method('remove')->with('validationResults');
+ $mockPropertyValidationResults = $this->createStub(Result::class);
+ $mockValidationResults = $this->createMock(Result::class);
+ $mockValidationResults->expects($this->once())->method('forProperty')->with('somePropertyName')->willReturn(($mockPropertyValidationResults));
+ $this->request->expects($this->atLeastOnce())->method('getInternalArgument')->with('__submittedArgumentValidationResults')->willReturn(($mockValidationResults));
+ $this->templateVariableContainer->expects($this->once())->method('add')->with('validationResults', $mockPropertyValidationResults);
+ $this->viewHelper->expects($this->once())->method('renderChildren');
+ $this->templateVariableContainer->expects($this->once())->method('remove')->with('validationResults');
$this->viewHelper = $this->prepareArguments($this->viewHelper, ['for' => 'somePropertyName']);
$this->viewHelper->render();
diff --git a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/ViewHelperBaseTestcase.php b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/ViewHelperBaseTestcase.php
index 9a9f65a670..79592a6719 100644
--- a/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/ViewHelperBaseTestcase.php
+++ b/Neos.FluidAdaptor/Tests/Unit/ViewHelpers/ViewHelperBaseTestcase.php
@@ -1,4 +1,7 @@
viewHelperVariableContainer = $this->createMock(\TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer::class);
- $this->viewHelperVariableContainer->expects($this->any())->method('exists')->will($this->returnCallback([$this, 'viewHelperVariableContainerExistsCallback']));
- $this->viewHelperVariableContainer->expects($this->any())->method('get')->will($this->returnCallback([$this, 'viewHelperVariableContainerGetCallback']));
- $this->viewHelperVariableContainer->expects($this->any())->method('addOrUpdate')->will($this->returnCallback([$this, 'viewHelperVariableContainerAddOrUpdateCallback']));
+ $this->tagBuilder = $this->createMock(TagBuilder::class);
$this->templateVariableContainer = $this->createMock(TemplateVariableContainer::class);
- $this->uriBuilder = $this->createMock(\Neos\Flow\Mvc\Routing\UriBuilder::class);
- $this->uriBuilder->expects($this->any())->method('reset')->will(self::returnValue($this->uriBuilder));
- $this->uriBuilder->expects($this->any())->method('setArguments')->will(self::returnValue($this->uriBuilder));
- $this->uriBuilder->expects($this->any())->method('setSection')->will(self::returnValue($this->uriBuilder));
- $this->uriBuilder->expects($this->any())->method('setFormat')->will(self::returnValue($this->uriBuilder));
- $this->uriBuilder->expects($this->any())->method('setCreateAbsoluteUri')->will(self::returnValue($this->uriBuilder));
- $this->uriBuilder->expects($this->any())->method('setAddQueryString')->will(self::returnValue($this->uriBuilder));
- $this->uriBuilder->expects($this->any())->method('setArgumentsToBeExcludedFromQueryString')->will(self::returnValue($this->uriBuilder));
+ $this->viewHelperVariableContainer = $this->createMock(ViewHelperVariableContainer::class);
+ $this->viewHelperVariableContainer->method('exists')->willReturnCallback([$this, 'viewHelperVariableContainerExistsCallback']);
+ $this->viewHelperVariableContainer->method('get')->willReturnCallback([$this, 'viewHelperVariableContainerGetCallback']);
+ $this->viewHelperVariableContainer->method('addOrUpdate')->willReturnCallback([$this, 'viewHelperVariableContainerAddOrUpdateCallback']);
+ $this->uriBuilder = $this->createMock(UriBuilder::class);
+ $this->uriBuilder->method('reset')->willReturn(($this->uriBuilder));
+ $this->uriBuilder->method('setArguments')->willReturn(($this->uriBuilder));
+ $this->uriBuilder->method('setSection')->willReturn(($this->uriBuilder));
+ $this->uriBuilder->method('setFormat')->willReturn(($this->uriBuilder));
+ $this->uriBuilder->method('setCreateAbsoluteUri')->willReturn(($this->uriBuilder));
+ $this->uriBuilder->method('setAddQueryString')->willReturn(($this->uriBuilder));
+ $this->uriBuilder->method('setArgumentsToBeExcludedFromQueryString')->willReturn(($this->uriBuilder));
$httpRequestFactory = new ServerRequestFactory(new UriFactory());
$httpRequest = $httpRequestFactory->createServerRequest('GET', new Uri('http://localhost/foo'));
- $this->request = $this->getMockBuilder(\Neos\Flow\Mvc\ActionRequest::class)->disableOriginalConstructor()->getMock();
- $this->request->expects($this->any())->method('isMainRequest')->will(self::returnValue(true));
- $this->controllerContext = $this->getMockBuilder(\Neos\Flow\Mvc\Controller\ControllerContext::class)->disableOriginalConstructor()->getMock();
- $this->controllerContext->expects($this->any())->method('getUriBuilder')->will(self::returnValue($this->uriBuilder));
- $this->controllerContext->expects($this->any())->method('getRequest')->will(self::returnValue($this->request));
- $this->tagBuilder = $this->createMock(TagBuilder::class);
+ $this->request = $this->createMock(ActionRequest::class);
+ $this->request->method('isMainRequest')->willReturn((true));
+ $this->controllerContext = $this->createMock(ControllerContext::class);
+ $this->controllerContext->method('getUriBuilder')->willReturn(($this->uriBuilder));
+ $this->controllerContext->method('getRequest')->willReturn(($this->request));
$this->arguments = [];
- $this->renderingContext = new \Neos\FluidAdaptor\Core\Rendering\RenderingContext([]);
+ $this->renderingContext = new RenderingContext([]);
$this->renderingContext->setVariableProvider($this->templateVariableContainer);
$this->renderingContext->setViewHelperVariableContainer($this->viewHelperVariableContainer);
$this->renderingContext->setControllerContext($this->controllerContext);
diff --git a/Neos.Kickstarter/Tests/Unit/Service/GeneratorServiceTest.php b/Neos.Kickstarter/Tests/Unit/Service/GeneratorServiceTest.php
index 31d67645d1..ca17cdb07a 100644
--- a/Neos.Kickstarter/Tests/Unit/Service/GeneratorServiceTest.php
+++ b/Neos.Kickstarter/Tests/Unit/Service/GeneratorServiceTest.php
@@ -1,6 +1,13 @@
getAccessibleMock(\Neos\Kickstarter\Service\GeneratorService::class, array('dummy'));
+ $service = $this->getAccessibleMock(GeneratorService::class);
$fieldDefinitions = array(
'field' => array(
'type' => 'bool'
@@ -32,12 +36,10 @@ public function normalizeFieldDefinitionsConvertsBoolTypeToBoolean()
self::assertEquals('boolean', $normalizedFieldDefinitions['field']['type']);
}
- /**
- * @test
- */
+ #[Test]
public function normalizeFieldDefinitionsPrefixesGlobalClassesWithBackslash()
{
- $service = $this->getAccessibleMock(\Neos\Kickstarter\Service\GeneratorService::class, array('dummy'));
+ $service = $this->getAccessibleMock(GeneratorService::class);
$fieldDefinitions = array(
'field' => array(
'type' => 'DateTime'
@@ -47,13 +49,11 @@ public function normalizeFieldDefinitionsPrefixesGlobalClassesWithBackslash()
self::assertEquals('\DateTime', $normalizedFieldDefinitions['field']['type']);
}
- /**
- * @test
- */
+ #[Test]
public function normalizeFieldDefinitionsPrefixesLocalTypesWithNamespaceIfNeeded()
{
$uniqueClassName = uniqid('Class');
- $service = $this->getAccessibleMock(\Neos\Kickstarter\Service\GeneratorService::class, array('dummy'));
+ $service = $this->getAccessibleMock(GeneratorService::class);
$fieldDefinitions = array(
'field' => array(
'type' => $uniqueClassName
diff --git a/Neos.Kickstarter/Tests/Unit/Utility/InflectorTest.php b/Neos.Kickstarter/Tests/Unit/Utility/InflectorTest.php
index 48b82c453e..c93a47d26d 100644
--- a/Neos.Kickstarter/Tests/Unit/Utility/InflectorTest.php
+++ b/Neos.Kickstarter/Tests/Unit/Utility/InflectorTest.php
@@ -1,6 +1,13 @@
humanizeCamelCase('BlogAuthor');
self::assertEquals('Blog author', $humanized);
}
- /**
- * @test
- */
+ #[Test]
public function pluralizePluralizesWords()
{
- $inflector = new \Neos\Kickstarter\Utility\Inflector();
+ $inflector = new Inflector();
self::assertEquals('boxes', $inflector->pluralize('box'));
self::assertEquals('foos', $inflector->pluralize('foo'));
}
diff --git a/Neos.Utility.Arrays/Tests/Unit/ArraysTest.php b/Neos.Utility.Arrays/Tests/Unit/ArraysTest.php
index 27c8e672fa..5bcc3f44be 100644
--- a/Neos.Utility.Arrays/Tests/Unit/ArraysTest.php
+++ b/Neos.Utility.Arrays/Tests/Unit/ArraysTest.php
@@ -1,4 +1,7 @@
'the value'];
self::assertSame('the value', Arrays::getValueByPath($array, ['Foo']));
}
- /**
- * @test
- */
+ #[Test]
public function getValueByPathReturnsTheValueOfANestedArrayByFollowingTheGivenPath()
{
$array = ['Foo' => ['Bar' => ['Baz' => [2 => 'the value']]]];
self::assertSame('the value', Arrays::getValueByPath($array, ['Foo', 'Bar', 'Baz', 2]));
}
- /**
- * @test
- */
+ #[Test]
public function getValueByPathReturnsTheValueOfANestedArrayByFollowingTheGivenPathIfPathIsString()
{
$path = 'Foo.Bar.Baz.2';
@@ -80,9 +71,7 @@ public function getValueByPathReturnsTheValueOfANestedArrayByFollowingTheGivenPa
self::assertSame($expectedResult, $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function getValueByPathThrowsExceptionIfPathIsNoArrayOrString()
{
$this->expectException(\TypeError::class);
@@ -90,54 +79,42 @@ public function getValueByPathThrowsExceptionIfPathIsNoArrayOrString()
Arrays::getValueByPath($array, null);
}
- /**
- * @test
- */
+ #[Test]
public function getValueByPathReturnsNullIfTheSegementsOfThePathDontExist()
{
$array = ['Foo' => ['Bar' => ['Baz' => [2 => 'the value']]]];
self::assertNull(Arrays::getValueByPath($array, ['Foo', 'Bar', 'Bax', 2]));
}
- /**
- * @test
- */
+ #[Test]
public function getValueByPathReturnsNullIfThePathHasMoreSegmentsThanTheGivenArray()
{
$array = ['Foo' => ['Bar' => ['Baz' => 'the value']]];
self::assertNull(Arrays::getValueByPath($array, ['Foo', 'Bar', 'Baz', 'Bux']));
}
- /**
- * @test
- */
+ #[Test]
public function getAccessorByPathReturnsTheValueOfANestedArrayByFollowingTheGivenSimplePath()
{
$array = ['Foo' => 'the value'];
self::assertSame('the value', Arrays::getAccessorByPath($array, ['Foo'])->string());
}
- /**
- * @test
- */
+ #[Test]
public function getAccessorByPathReturnsTheValueOfANestedArrayByFollowingTheGivenPath()
{
$array = ['Foo' => ['Bar' => ['Baz' => [2 => 'the value']]]];
self::assertSame('the value', Arrays::getAccessorByPath($array, ['Foo', 'Bar', 'Baz', 2])->string());
}
- /**
- * @test
- */
+ #[Test]
public function getAccessorByPathReturnsTheValueOfANestedArrayByFollowingTheGivenPathIfPathIsString()
{
$array = ['Foo' => ['Bar' => ['Baz' => [2 => 'the value']]]];
self::assertSame('the value', Arrays::getAccessorByPath($array, 'Foo.Bar.Baz.2')->string());
}
- /**
- * @test
- */
+ #[Test]
public function getAccessorByPathThrowsExceptionIfPathIsNoArrayOrString()
{
$this->expectException(\TypeError::class);
@@ -145,27 +122,21 @@ public function getAccessorByPathThrowsExceptionIfPathIsNoArrayOrString()
Arrays::getAccessorByPath($array, null);
}
- /**
- * @test
- */
+ #[Test]
public function getAccessorByPathReturnsNullIfTheSegementsOfThePathDontExist()
{
$array = ['Foo' => ['Bar' => ['Baz' => [2 => 'the value']]]];
self::assertNull(Arrays::getAccessorByPath($array, ['Foo', 'Bar', 'Bax', 2])->intOrNull());
}
- /**
- * @test
- */
+ #[Test]
public function getAccessorByPathReturnsNullIfThePathHasMoreSegmentsThanTheGivenArray()
{
$array = ['Foo' => ['Bar' => ['Baz' => 'the value']]];
self::assertNull(Arrays::getAccessorByPath($array, ['Foo', 'Bar', 'Baz', 'Bux'])->intOrNull());
}
- /**
- * @test
- */
+ #[Test]
public function getAccessorByPathUnexpectedValueExceptionContainsPathForNonMatchingTypes()
{
$array = ['Foo' => ['Bar' => ['Baz' => 'the value']]];
@@ -174,9 +145,7 @@ public function getAccessorByPathUnexpectedValueExceptionContainsPathForNonMatch
Arrays::getAccessorByPath($array, ['Foo', 'Bar', 'Baz'])->int();
}
- /**
- * @test
- */
+ #[Test]
public function getAccessorByPathUnexpectedValueExceptionContainsPathForNonMatchingTypesOnRoot()
{
$array = ['Foo' => 'string'];
@@ -185,9 +154,7 @@ public function getAccessorByPathUnexpectedValueExceptionContainsPathForNonMatch
Arrays::getAccessorByPath($array, ['Foo'])->int();
}
- /**
- * @test
- */
+ #[Test]
public function getAccessorByPathUnexpectedValueExceptionContainsPathForNonExistingPathes()
{
$array = ['Foo' => ['Bar' => ['Baz' => 'the value']]];
@@ -196,9 +163,7 @@ public function getAccessorByPathUnexpectedValueExceptionContainsPathForNonExist
Arrays::getAccessorByPath($array, ['Foo', 'Bar', 'Bax'])->int();
}
- /**
- * @test
- */
+ #[Test]
public function convertObjectToArrayConvertsNestedObjectsToArray()
{
$object = new \stdClass();
@@ -224,9 +189,7 @@ public function convertObjectToArrayConvertsNestedObjectsToArray()
self::assertEquals($expected, $array);
}
- /**
- * @test
- */
+ #[Test]
public function setValueByPathSetsValueRecursivelyIfPathIsArray()
{
$array = [];
@@ -236,9 +199,7 @@ public function setValueByPathSetsValueRecursivelyIfPathIsArray()
self::assertEquals($expectedValue, $actualValue);
}
- /**
- * @test
- */
+ #[Test]
public function setValueByPathSetsValueRecursivelyIfPathIsString()
{
$array = [];
@@ -248,9 +209,7 @@ public function setValueByPathSetsValueRecursivelyIfPathIsString()
self::assertEquals($expectedValue, $actualValue);
}
- /**
- * @test
- */
+ #[Test]
public function setValueByPathRecursivelyMergesAnArray()
{
$array = ['foo' => ['bar' => 'should be overriden'], 'bar' => 'Baz'];
@@ -260,9 +219,7 @@ public function setValueByPathRecursivelyMergesAnArray()
self::assertEquals($expectedValue, $actualValue);
}
- /**
- * @test
- */
+ #[Test]
public function setValueByPathThrowsExceptionIfPathIsNoArrayOrString()
{
$this->expectException(\InvalidArgumentException::class);
@@ -270,9 +227,7 @@ public function setValueByPathThrowsExceptionIfPathIsNoArrayOrString()
Arrays::setValueByPath($array, null, 'Some Value');
}
- /**
- * @test
- */
+ #[Test]
public function setValueByPathThrowsExceptionIfSubjectIsNoArray()
{
$this->expectException(\InvalidArgumentException::class);
@@ -280,9 +235,7 @@ public function setValueByPathThrowsExceptionIfSubjectIsNoArray()
Arrays::setValueByPath($subject, 'foo', 'bar');
}
- /**
- * @test
- */
+ #[Test]
public function setValueByPathThrowsExceptionIfSubjectIsNoArrayAccess()
{
$this->expectException(\InvalidArgumentException::class);
@@ -290,31 +243,25 @@ public function setValueByPathThrowsExceptionIfSubjectIsNoArrayAccess()
Arrays::setValueByPath($subject, 'foo', 'bar');
}
- /**
- * @test
- */
+ #[Test]
public function setValueByLeavesInputArrayUnchanged()
{
$subject = $subjectBackup = ['foo' => 'bar'];
Arrays::setValueByPath($subject, 'foo', 'baz');
- self::assertEquals($subject, $subjectBackup);
+ self::assertSame($subject, $subjectBackup);
}
- /**
- * @test
- */
+ #[Test]
public function unsetValueByPathDoesNotModifyAnArrayIfThePathWasNotFound()
{
$array = ['foo' => ['bar' => ['baz' => 'Some Value']], 'bar' => 'Baz'];
$path = ['foo', 'bar', 'nonExistingKey'];
$expectedValue = $array;
$actualValue = Arrays::unsetValueByPath($array, $path);
- self::assertEquals($expectedValue, $actualValue);
+ self::assertSame($expectedValue, $actualValue);
}
- /**
- * @test
- */
+ #[Test]
public function unsetValueByPathRemovesSpecifiedKey()
{
$array = ['foo' => ['bar' => ['baz' => 'Some Value']], 'bar' => 'Baz'];
@@ -322,12 +269,10 @@ public function unsetValueByPathRemovesSpecifiedKey()
$expectedValue = ['foo' => ['bar' => []], 'bar' => 'Baz'];
;
$actualValue = Arrays::unsetValueByPath($array, $path);
- self::assertEquals($expectedValue, $actualValue);
+ self::assertSame($expectedValue, $actualValue);
}
- /**
- * @test
- */
+ #[Test]
public function unsetValueByPathRemovesSpecifiedKeyIfPathIsString()
{
$array = ['foo' => ['bar' => ['baz' => 'Some Value']], 'bar' => 'Baz'];
@@ -335,12 +280,10 @@ public function unsetValueByPathRemovesSpecifiedKeyIfPathIsString()
$expectedValue = ['foo' => ['bar' => []], 'bar' => 'Baz'];
;
$actualValue = Arrays::unsetValueByPath($array, $path);
- self::assertEquals($expectedValue, $actualValue);
+ self::assertSame($expectedValue, $actualValue);
}
- /**
- * @test
- */
+ #[Test]
public function unsetValueByPathRemovesSpecifiedBranch()
{
$array = ['foo' => ['bar' => ['baz' => 'Some Value']], 'bar' => 'Baz'];
@@ -348,12 +291,10 @@ public function unsetValueByPathRemovesSpecifiedBranch()
$expectedValue = ['bar' => 'Baz'];
;
$actualValue = Arrays::unsetValueByPath($array, $path);
- self::assertEquals($expectedValue, $actualValue);
+ self::assertSame($expectedValue, $actualValue);
}
- /**
- * @test
- */
+ #[Test]
public function unsetValueByPathThrowsExceptionIfPathIsNoArrayOrString()
{
$this->expectException(\InvalidArgumentException::class);
@@ -361,243 +302,225 @@ public function unsetValueByPathThrowsExceptionIfPathIsNoArrayOrString()
Arrays::unsetValueByPath($array, null);
}
- /**
- * @test
- */
+ #[Test]
public function removeEmptyElementsRecursivelyRemovesNullValues()
{
$array = ['EmptyElement' => null, 'Foo' => ['Bar' => ['Baz' => ['NotNull' => '', 'AnotherEmptyElement' => null]]]];
$expectedResult = ['Foo' => ['Bar' => ['Baz' => ['NotNull' => '']]]];
$actualResult = Arrays::removeEmptyElementsRecursively($array);
- self::assertEquals($expectedResult, $actualResult);
+ self::assertSame($expectedResult, $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function removeEmptyElementsRecursivelyRemovesEmptySubArrays()
{
$array = ['EmptyElement' => [], 'Foo' => ['Bar' => ['Baz' => ['AnotherEmptyElement' => null]]], 'NotNull' => 123];
$expectedResult = ['NotNull' => 123];
$actualResult = Arrays::removeEmptyElementsRecursively($array);
- self::assertEquals($expectedResult, $actualResult);
+ self::assertSame($expectedResult, $actualResult);
}
- public function arrayMergeRecursiveOverruleData()
+ public static function arrayMergeRecursiveOverruleData(): \Iterator
{
- return [
- 'simple usage' => [
- 'inputArray1' => [
- 'k1' => 'v1',
- 'k2' => 'v2',
- ],
- 'inputArray2' => [
- 'k2' => 'v2a',
- 'k3' => 'v3'
- ],
- 'dontAddNewKeys' => false, // default
- 'emptyValuesOverride' => true, // default
- 'expected' => [
- 'k1' => 'v1',
- 'k2' => 'v2a',
- 'k3' => 'v3'
- ]
+ yield 'simple usage' => [
+ 'inputArray1' => [
+ 'k1' => 'v1',
+ 'k2' => 'v2',
],
-
- 'simple usage with recursion' => [
- 'inputArray1' => [
- 'k1' => 'v1',
- 'k2' => [
- 'k2.1' => 'v2.1',
- 'k2.2' => 'v2.2'
- ],
+ 'inputArray2' => [
+ 'k2' => 'v2a',
+ 'k3' => 'v3'
+ ],
+ 'dontAddNewKeys' => false, // default
+ 'emptyValuesOverride' => true, // default
+ 'expected' => [
+ 'k1' => 'v1',
+ 'k2' => 'v2a',
+ 'k3' => 'v3'
+ ]
+ ];
+ yield 'simple usage with recursion' => [
+ 'inputArray1' => [
+ 'k1' => 'v1',
+ 'k2' => [
+ 'k2.1' => 'v2.1',
+ 'k2.2' => 'v2.2'
],
- 'inputArray2' => [
- 'k2' => [
- 'k2.2' => 'v2.2a',
- 'k2.3' => 'v2.3'
- ],
- 'k3' => 'v3'
+ ],
+ 'inputArray2' => [
+ 'k2' => [
+ 'k2.2' => 'v2.2a',
+ 'k2.3' => 'v2.3'
],
- 'dontAddNewKeys' => false, // default
- 'emptyValuesOverride' => true, // default
- 'expected' => [
- 'k1' => 'v1',
- 'k2' => [
- 'k2.1' => 'v2.1',
- 'k2.2' => 'v2.2a',
- 'k2.3' => 'v2.3'
- ],
- 'k3' => 'v3'
- ]
+ 'k3' => 'v3'
],
-
- 'nested array with recursion' => [
- 'inputArray1' => [
- 'k1' => 'v1',
- 'k2' => [
- 'k2.1' => 'v2.1',
- 'k2.2' => 'v2.2',
- 'k2.4' => [
- 'k2.4.1' => 'v2.4.1'
- ]
- ],
+ 'dontAddNewKeys' => false, // default
+ 'emptyValuesOverride' => true, // default
+ 'expected' => [
+ 'k1' => 'v1',
+ 'k2' => [
+ 'k2.1' => 'v2.1',
+ 'k2.2' => 'v2.2a',
+ 'k2.3' => 'v2.3'
],
- 'inputArray2' => [
- 'k2' => [
- 'k2.2' => 'v2.2a',
- 'k2.3' => 'v2.3',
- 'k2.4' => [
- 'k2.4.2' => 'v2.4.2'
- ]
- ],
- 'k3' => 'v3'
+ 'k3' => 'v3'
+ ]
+ ];
+ yield 'nested array with recursion' => [
+ 'inputArray1' => [
+ 'k1' => 'v1',
+ 'k2' => [
+ 'k2.1' => 'v2.1',
+ 'k2.2' => 'v2.2',
+ 'k2.4' => [
+ 'k2.4.1' => 'v2.4.1'
+ ]
],
- 'dontAddNewKeys' => false, // default
- 'emptyValuesOverride' => true, // default
- 'expected' => [
- 'k1' => 'v1',
- 'k2' => [
- 'k2.1' => 'v2.1',
- 'k2.2' => 'v2.2a',
- 'k2.4' => [
- 'k2.4.1' => 'v2.4.1',
- 'k2.4.2' => 'v2.4.2'
- ],
- 'k2.3' => 'v2.3'
- ],
- 'k3' => 'v3'
- ]
],
-
- 'simple type should override array (k2)' => [
- 'inputArray1' => [
- 'k1' => 'v1',
- 'k2' => [
- 'k2.1' => 'v2.1'
- ],
- ],
- 'inputArray2' => [
- 'k2' => 'v2a',
- 'k3' => 'v3'
+ 'inputArray2' => [
+ 'k2' => [
+ 'k2.2' => 'v2.2a',
+ 'k2.3' => 'v2.3',
+ 'k2.4' => [
+ 'k2.4.2' => 'v2.4.2'
+ ]
],
- 'dontAddNewKeys' => false, // default
- 'emptyValuesOverride' => true, // default
- 'expected' => [
- 'k1' => 'v1',
- 'k2' => 'v2a',
- 'k3' => 'v3'
- ]
+ 'k3' => 'v3'
],
-
- 'null should override array (k2)' => [
- 'inputArray1' => [
- 'k1' => 'v1',
- 'k2' => [
- 'k2.1' => 'v2.1'
+ 'dontAddNewKeys' => false, // default
+ 'emptyValuesOverride' => true, // default
+ 'expected' => [
+ 'k1' => 'v1',
+ 'k2' => [
+ 'k2.1' => 'v2.1',
+ 'k2.2' => 'v2.2a',
+ 'k2.4' => [
+ 'k2.4.1' => 'v2.4.1',
+ 'k2.4.2' => 'v2.4.2'
],
+ 'k2.3' => 'v2.3'
],
- 'inputArray2' => [
- 'k2' => null,
- 'k3' => 'v3'
+ 'k3' => 'v3'
+ ]
+ ];
+ yield 'simple type should override array (k2)' => [
+ 'inputArray1' => [
+ 'k1' => 'v1',
+ 'k2' => [
+ 'k2.1' => 'v2.1'
],
- 'dontAddNewKeys' => false, // default
- 'emptyValuesOverride' => true, // default
- 'expected' => [
- 'k1' => 'v1',
- 'k2' => null,
- 'k3' => 'v3'
- ]
],
-
- 'empty array should override array (k2)' => [
- 'inputArray1' => [
- 'k2' => [
- 'k2.1' => 'v2.1'
- ],
- ],
- 'inputArray2' => [
- 'k2' => [],
+ 'inputArray2' => [
+ 'k2' => 'v2a',
+ 'k3' => 'v3'
+ ],
+ 'dontAddNewKeys' => false, // default
+ 'emptyValuesOverride' => true, // default
+ 'expected' => [
+ 'k1' => 'v1',
+ 'k2' => 'v2a',
+ 'k3' => 'v3'
+ ]
+ ];
+ yield 'null should override array (k2)' => [
+ 'inputArray1' => [
+ 'k1' => 'v1',
+ 'k2' => [
+ 'k2.1' => 'v2.1'
],
- 'dontAddNewKeys' => false, // default
- 'emptyValuesOverride' => true, // default
- 'expected' => [
- 'k2' => []
- ]
],
-
- 'empty array without emptyValuesOverride should not override array (k2)' => [
- 'inputArray1' => [
- 'k2' => [
- 'k2.1' => 'v2.1'
- ],
+ 'inputArray2' => [
+ 'k2' => null,
+ 'k3' => 'v3'
+ ],
+ 'dontAddNewKeys' => false, // default
+ 'emptyValuesOverride' => true, // default
+ 'expected' => [
+ 'k1' => 'v1',
+ 'k2' => null,
+ 'k3' => 'v3'
+ ]
+ ];
+ yield 'empty array should override array (k2)' => [
+ 'inputArray1' => [
+ 'k2' => [
+ 'k2.1' => 'v2.1'
],
- 'inputArray2' => [
- 'k2' => [],
+ ],
+ 'inputArray2' => [
+ 'k2' => [],
+ ],
+ 'dontAddNewKeys' => false, // default
+ 'emptyValuesOverride' => true, // default
+ 'expected' => [
+ 'k2' => []
+ ]
+ ];
+ yield 'empty array without emptyValuesOverride should not override array (k2)' => [
+ 'inputArray1' => [
+ 'k2' => [
+ 'k2.1' => 'v2.1'
],
- 'dontAddNewKeys' => false, // default
- 'emptyValuesOverride' => false,
- 'expected' => [
- 'k2' => [
- 'k2.1' => 'v2.1'
- ]
+ ],
+ 'inputArray2' => [
+ 'k2' => [],
+ ],
+ 'dontAddNewKeys' => false, // default
+ 'emptyValuesOverride' => false,
+ 'expected' => [
+ 'k2' => [
+ 'k2.1' => 'v2.1'
]
+ ]
+ ];
+ yield 'empty array without emptyValuesOverride should add new key (k3)' => [
+ 'inputArray1' => [
+ 'k2' => [
+ 'k2.1' => 'v2.1'
+ ],
],
-
- 'empty array without emptyValuesOverride should add new key (k3)' => [
- 'inputArray1' => [
- 'k2' => [
- 'k2.1' => 'v2.1'
- ],
+ 'inputArray2' => [
+ 'k3' => [],
+ ],
+ 'dontAddNewKeys' => false, // default
+ 'emptyValuesOverride' => false,
+ 'expected' => [
+ 'k2' => [
+ 'k2.1' => 'v2.1'
],
- 'inputArray2' => [
- 'k3' => [],
+ 'k3' => []
+ ]
+ ];
+ yield 'empty array without emptyValuesOverride should not override existing key (k3)' => [
+ 'inputArray1' => [
+ 'k2' => [
+ 'k2.1' => 'v2.1'
],
- 'dontAddNewKeys' => false, // default
- 'emptyValuesOverride' => false,
- 'expected' => [
- 'k2' => [
- 'k2.1' => 'v2.1'
- ],
- 'k3' => []
- ]
+ 'k3' => 'v3'
],
-
- 'empty array without emptyValuesOverride should not override existing key (k3)' => [
- 'inputArray1' => [
- 'k2' => [
- 'k2.1' => 'v2.1'
- ],
- 'k3' => 'v3'
- ],
- 'inputArray2' => [
- 'k3' => [],
+ 'inputArray2' => [
+ 'k3' => [],
+ ],
+ 'dontAddNewKeys' => false, // default
+ 'emptyValuesOverride' => false,
+ 'expected' => [
+ 'k2' => [
+ 'k2.1' => 'v2.1'
],
- 'dontAddNewKeys' => false, // default
- 'emptyValuesOverride' => false,
- 'expected' => [
- 'k2' => [
- 'k2.1' => 'v2.1'
- ],
- 'k3' => 'v3'
- ]
+ 'k3' => 'v3'
]
];
}
- /**
- * @dataProvider arrayMergeRecursiveOverruleData
- * @test
- */
+ #[DataProvider('arrayMergeRecursiveOverruleData')]
+ #[Test]
public function arrayMergeRecursiveOverruleMergesSimpleArrays(array $inputArray1, array $inputArray2, bool $dontAddNewKeys, bool $emptyValuesOverride, array $expected)
{
$actual = Arrays::arrayMergeRecursiveOverrule($inputArray1, $inputArray2, $dontAddNewKeys, $emptyValuesOverride);
self::assertSame($expected, $actual);
}
- /**
- * @test
- */
+ #[Test]
public function arrayMergeRecursiveCallbackConvertsSimpleValuesWithGivenClosure()
{
$inputArray1 = [
@@ -625,9 +548,7 @@ public function arrayMergeRecursiveCallbackConvertsSimpleValuesWithGivenClosure(
self::assertSame($expected, $actual);
}
- /**
- * @test
- */
+ #[Test]
public function arrayMergeRecursiveCallbackConvertsSimpleValuesWithGivenClosureAndReturnedSimpleTypesOverwrite()
{
$inputArray1 = [
@@ -661,9 +582,7 @@ public function arrayMergeRecursiveCallbackConvertsSimpleValuesWithGivenClosureA
self::assertSame($expected, $actual);
}
- /**
- * @test
- */
+ #[Test]
public function arrayMergeRecursiveCallbackOverrideFirstArrayValuesGivenClosure()
{
$inputArray1 = [
diff --git a/Neos.Utility.Arrays/Tests/Unit/PositionalArraySorterTest.php b/Neos.Utility.Arrays/Tests/Unit/PositionalArraySorterTest.php
index 6e81f68f42..bd564b444e 100644
--- a/Neos.Utility.Arrays/Tests/Unit/PositionalArraySorterTest.php
+++ b/Neos.Utility.Arrays/Tests/Unit/PositionalArraySorterTest.php
@@ -1,4 +1,7 @@
'foo', 1 => 'bar', 'z' => 'baz', 'a' => 'quux'];
@@ -33,26 +36,24 @@ public function toArraySortsNumericKeysIfNoPositionMetaDataIsSet()
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function invalidPositions()
+ public static function invalidPositions(): \Iterator
{
- return [
- ['subject' => ['foo' => ['position' => 'invalid'], 'first' => []]],
- ['subject' => ['foo' => ['position' => 'start123'], 'first' => []]],
- ['subject' => ['foo' => ['position' => 'start 12 34'], 'first' => []]],
- ['subject' => ['foo' => ['position' => 'after 12 34 56'], 'first' => []]],
- ['subject' => ['third' => ['position' => 'before nonexisting'], 'first' => []]],
- ['subject' => ['third' => ['position' => 'after nonexisting'], 'first' => []]],
- ];
+ yield ['subject' => ['foo' => ['position' => 'invalid'], 'first' => []]];
+ yield ['subject' => ['foo' => ['position' => 'start123'], 'first' => []]];
+ yield ['subject' => ['foo' => ['position' => 'start 12 34'], 'first' => []]];
+ yield ['subject' => ['foo' => ['position' => 'after 12 34 56'], 'first' => []]];
+ yield ['subject' => ['third' => ['position' => 'before nonexisting'], 'first' => []]];
+ yield ['subject' => ['third' => ['position' => 'after nonexisting'], 'first' => []]];
}
/**
- * @test
- * @dataProvider invalidPositions
*
* @param array $subject
*/
+ #[DataProvider('invalidPositions')]
+ #[Test]
public function toArrayThrowsExceptionForInvalidPositions(array $subject)
{
$this->expectException(InvalidPositionException::class);
@@ -61,117 +62,115 @@ public function toArrayThrowsExceptionForInvalidPositions(array $subject)
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function sampleArrays()
+ public static function sampleArrays(): \Iterator
{
- return [
- [
- 'message' => 'Position end should put element to end',
- 'subject' => ['second' => ['__meta' => ['position' => 'end']], 'first' => []],
- 'positionPropertyPath' => '__meta.position',
- 'expectedArrayKeys' => ['first', 'second']
- ],
- [
- 'message' => 'Position start should put element to start',
- 'subject' => ['second' => [], 'first' => ['__meta' => ['position' => 'start']]],
- 'positionPropertyPath' => '__meta.position',
- 'expectedArrayKeys' => ['first', 'second']
- ],
- [
- 'message' => 'Position start should respect priority',
- 'subject' => ['second' => ['__meta' => ['position' => 'start 50']], 'first' => ['__meta' => ['position' => 'start 52']]],
- 'positionPropertyPath' => '__meta.position',
- 'expectedArrayKeys' => ['first', 'second']
- ],
- [
- 'message' => 'Position end should respect priority',
- 'subject' => ['second' => ['__meta' => ['position' => 'end 17']], 'first' => ['__meta' => ['position' => 'end']]],
- 'positionPropertyPath' => '__meta.position',
- 'expectedArrayKeys' => ['first', 'second']
- ],
- [
- 'Positional numbers are in the middle',
- 'subject' => ['last' => ['__meta' => ['position' => 'end']], 'second' => ['__meta' => ['position' => '17']], 'first' => ['__meta' => ['position' => '5']], 'third' => ['__meta' => ['position' => '18']]],
- 'positionPropertyPath' => '__meta.position',
- 'expectedArrayKeys' => ['first', 'second', 'third', 'last']
- ],
- [
- 'message' => 'Position before adds before named element if present',
- 'subject' => ['second' => [], 'first' => ['__meta' => ['position' => 'before second']]],
- 'positionPropertyPath' => '__meta.position',
- 'expectedArrayKeys' => ['first', 'second']
- ],
- [
- 'message' => 'Position before uses priority when referencing the same element; The higher the priority the closer before the element gets added.',
- 'subject' => ['third' => [], 'second' => ['__meta' => ['position' => 'before third']], 'first' => ['__meta' => ['position' => 'before third 12']]],
- 'positionPropertyPath' => '__meta.position',
- 'expectedArrayKeys' => ['second', 'first', 'third']
- ],
- [
- 'message' => 'Position before works recursively',
- 'subject' => ['third' => [], 'second' => ['__meta' => ['position' => 'before third']], 'first' => ['__meta' => ['position' => 'before second']]],
- 'positionPropertyPath' => '__meta.position',
- 'expectedArrayKeys' => ['first', 'second', 'third']
- ],
- [
- 'Position after adds after named element if present',
- 'subject' => ['second' => ['__meta' => ['position' => 'after first']], 'first' => []],
- 'positionPropertyPath' => '__meta.position',
- 'expectedArrayKeys' => ['first', 'second']
- ],
- [
- 'message' => 'Position after uses priority when referencing the same element; The higher the priority the closer after the element gets added.',
- 'subject' => ['third' => ['__meta' => ['position' => 'after first']], 'second' => ['__meta' => ['position' => 'after first 12']], 'first' => []],
- 'positionPropertyPath' => '__meta.position',
- 'expectedArrayKeys' => ['first', 'second', 'third']
- ],
- [
- 'message' => 'Position after works recursively',
- 'subject' => ['third' => ['__meta' => ['position' => 'after second']], 'second' => ['__meta' => ['position' => 'after first']], 'first' => []],
- 'positionPropertyPath' => '__meta.position',
- 'expectedArrayKeys' => ['first', 'second', 'third']
- ],
- [
- 'message' => 'Array keys may contain special characters',
- 'subject' => ['thi:rd' => ['position' => 'end'], 'sec.ond' => ['position' => 'before thi:rd'], 'fir-st' => ['position' => 'before sec.ond']],
- 'positionPropertyPath' => 'position',
- 'expectedArrayKeys' => ['fir-st', 'sec.ond', 'thi:rd']
- ],
+ yield [
+ 'message' => 'Position end should put element to end',
+ 'subject' => ['second' => ['__meta' => ['position' => 'end']], 'first' => []],
+ 'positionPropertyPath' => '__meta.position',
+ 'expectedArrayKeys' => ['first', 'second']
+ ];
+ yield [
+ 'message' => 'Position start should put element to start',
+ 'subject' => ['second' => [], 'first' => ['__meta' => ['position' => 'start']]],
+ 'positionPropertyPath' => '__meta.position',
+ 'expectedArrayKeys' => ['first', 'second']
+ ];
+ yield [
+ 'message' => 'Position start should respect priority',
+ 'subject' => ['second' => ['__meta' => ['position' => 'start 50']], 'first' => ['__meta' => ['position' => 'start 52']]],
+ 'positionPropertyPath' => '__meta.position',
+ 'expectedArrayKeys' => ['first', 'second']
+ ];
+ yield [
+ 'message' => 'Position end should respect priority',
+ 'subject' => ['second' => ['__meta' => ['position' => 'end 17']], 'first' => ['__meta' => ['position' => 'end']]],
+ 'positionPropertyPath' => '__meta.position',
+ 'expectedArrayKeys' => ['first', 'second']
+ ];
+ yield [
+ "message" => 'Positional numbers are in the middle',
+ 'subject' => ['last' => ['__meta' => ['position' => 'end']], 'second' => ['__meta' => ['position' => '17']], 'first' => ['__meta' => ['position' => '5']], 'third' => ['__meta' => ['position' => '18']]],
+ 'positionPropertyPath' => '__meta.position',
+ 'expectedArrayKeys' => ['first', 'second', 'third', 'last']
+ ];
+ yield [
+ 'message' => 'Position before adds before named element if present',
+ 'subject' => ['second' => [], 'first' => ['__meta' => ['position' => 'before second']]],
+ 'positionPropertyPath' => '__meta.position',
+ 'expectedArrayKeys' => ['first', 'second']
+ ];
+ yield [
+ 'message' => 'Position before uses priority when referencing the same element; The higher the priority the closer before the element gets added.',
+ 'subject' => ['third' => [], 'second' => ['__meta' => ['position' => 'before third']], 'first' => ['__meta' => ['position' => 'before third 12']]],
+ 'positionPropertyPath' => '__meta.position',
+ 'expectedArrayKeys' => ['second', 'first', 'third']
+ ];
+ yield [
+ 'message' => 'Position before works recursively',
+ 'subject' => ['third' => [], 'second' => ['__meta' => ['position' => 'before third']], 'first' => ['__meta' => ['position' => 'before second']]],
+ 'positionPropertyPath' => '__meta.position',
+ 'expectedArrayKeys' => ['first', 'second', 'third']
+ ];
+ yield [
+ "message" => 'Position after adds after named element if present',
+ 'subject' => ['second' => ['__meta' => ['position' => 'after first']], 'first' => []],
+ 'positionPropertyPath' => '__meta.position',
+ 'expectedArrayKeys' => ['first', 'second']
+ ];
+ yield [
+ 'message' => 'Position after uses priority when referencing the same element; The higher the priority the closer after the element gets added.',
+ 'subject' => ['third' => ['__meta' => ['position' => 'after first']], 'second' => ['__meta' => ['position' => 'after first 12']], 'first' => []],
+ 'positionPropertyPath' => '__meta.position',
+ 'expectedArrayKeys' => ['first', 'second', 'third']
+ ];
+ yield [
+ 'message' => 'Position after works recursively',
+ 'subject' => ['third' => ['__meta' => ['position' => 'after second']], 'second' => ['__meta' => ['position' => 'after first']], 'first' => []],
+ 'positionPropertyPath' => '__meta.position',
+ 'expectedArrayKeys' => ['first', 'second', 'third']
+ ];
+ yield [
+ 'message' => 'Array keys may contain special characters',
+ 'subject' => ['thi:rd' => ['position' => 'end'], 'sec.ond' => ['position' => 'before thi:rd'], 'fir-st' => ['position' => 'before sec.ond']],
+ 'positionPropertyPath' => 'position',
+ 'expectedArrayKeys' => ['fir-st', 'sec.ond', 'thi:rd']
];
}
/**
- * @test
- * @dataProvider sampleArrays
*
* @param string $message
* @param array $subject
* @param string $positionPropertyPath
- * @param array $expectedKeyOrder
+ * @param array $expectedArrayKeys
*/
- public function toArrayTests($message, array $subject, $positionPropertyPath, array $expectedKeyOrder)
+ #[DataProvider('sampleArrays')]
+ #[Test]
+ public function toArrayTests($message, array $subject, $positionPropertyPath, array $expectedArrayKeys)
{
$positionalArraySorter = new PositionalArraySorter($subject, $positionPropertyPath);
$result = $positionalArraySorter->toArray();
- self::assertSame($expectedKeyOrder, array_keys($result), $message);
+ self::assertSame($expectedArrayKeys, array_keys($result), $message);
}
/**
- * @test
- * @dataProvider sampleArrays
*
* @param string $message
* @param array $subject
* @param string $positionPropertyPath
- * @param array $expectedKeyOrder
+ * @param array $expectedArrayKeys
*/
- public function getSortedKeysTests($message, array $subject, $positionPropertyPath, array $expectedKeyOrder)
+ #[DataProvider('sampleArrays')]
+ #[Test]
+ public function getSortedKeysTests($message, array $subject, $positionPropertyPath, array $expectedArrayKeys)
{
$positionalArraySorter = new PositionalArraySorter($subject, $positionPropertyPath);
$result = $positionalArraySorter->getSortedKeys();
- self::assertSame($expectedKeyOrder, $result, $message);
+ self::assertSame($expectedArrayKeys, $result, $message);
}
}
diff --git a/Neos.Utility.Arrays/Tests/Unit/ValueAccessorTest.php b/Neos.Utility.Arrays/Tests/Unit/ValueAccessorTest.php
index f5cafc4132..46d062b515 100644
--- a/Neos.Utility.Arrays/Tests/Unit/ValueAccessorTest.php
+++ b/Neos.Utility.Arrays/Tests/Unit/ValueAccessorTest.php
@@ -1,5 +1,7 @@
testAccessor([...$acceptableValues, null], $inacceptableValues, 'intOrNull');
}
- /**
- * @test
- */
+ #[Test]
public function floatAccessorWorks()
{
$acceptableValues = [0.000001, 1.000001];
@@ -44,9 +43,7 @@ public function floatAccessorWorks()
$this->testAccessor([...$acceptableValues, null], $inacceptableValues, 'floatOrNull');
}
- /**
- * @test
- */
+ #[Test]
public function numberAccessorWorks()
{
$acceptableValues = [0.000001, 1.000001, 0, 1, 99999, -1, -99999];
@@ -56,9 +53,7 @@ public function numberAccessorWorks()
$this->testAccessor([...$acceptableValues, null], $inacceptableValues, 'numberOrNull');
}
- /**
- * @test
- */
+ #[Test]
public function stringAccessorWorks()
{
$acceptableValues = ['string', ''];
@@ -68,9 +63,7 @@ public function stringAccessorWorks()
$this->testAccessor([...$acceptableValues, null], $inacceptableValues, 'stringOrNull');
}
- /**
- * @test
- */
+ #[Test]
public function arrayAccessorWorks()
{
$acceptableValues = [[], [1,2,3], ['foo'=>'bar']];
@@ -80,9 +73,7 @@ public function arrayAccessorWorks()
$this->testAccessor([...$acceptableValues, null], $inacceptableValues, 'arrayOrNull');
}
- /**
- * @test
- */
+ #[Test]
public function classstringAccessorWorks()
{
$acceptableValues = [\DateTime::class, \DateTimeImmutable::class];
@@ -92,9 +83,7 @@ public function classstringAccessorWorks()
$this->testAccessor([...$acceptableValues, null], $inacceptableValues, 'classStringOrNull');
}
- /**
- * @test
- */
+ #[Test]
public function instanceOfAccessorWorks()
{
$acceptableAsDateTimeInterface = [new \DateTime(), new \DateTimeImmutable()];
diff --git a/Neos.Utility.Arrays/composer.json b/Neos.Utility.Arrays/composer.json
index 3aefe6e797..bce08928f5 100644
--- a/Neos.Utility.Arrays/composer.json
+++ b/Neos.Utility.Arrays/composer.json
@@ -9,8 +9,8 @@
"neos/utility-objecthandling": "self.version"
},
"require-dev": {
- "mikey179/vfsstream": "^1.6.10",
- "phpunit/phpunit": "~9.1"
+ "mikey179/vfsstream": "^1.6.12",
+ "phpunit/phpunit": "~11.5"
},
"autoload": {
"psr-4": {
diff --git a/Neos.Utility.Files/Tests/Unit/FilesTest.php b/Neos.Utility.Files/Tests/Unit/FilesTest.php
index a19f8d8c31..85de2d1a5c 100644
--- a/Neos.Utility.Files/Tests/Unit/FilesTest.php
+++ b/Neos.Utility.Files/Tests/Unit/FilesTest.php
@@ -1,4 +1,7 @@
temporaryDirectory, 'FlowFilesTestFile');
@@ -209,9 +182,7 @@ public function is_linkReturnsFalseForExistingFileThatIsNoSymlink()
self::assertFalse(Files::is_link($targetPathAndFilename));
}
- /**
- * @test
- */
+ #[Test]
public function is_linkReturnsTrueForExistingSymlink()
{
$targetPathAndFilename = tempnam($this->temporaryDirectory, 'FlowFilesTestFile');
@@ -224,9 +195,7 @@ public function is_linkReturnsTrueForExistingSymlink()
self::assertTrue(Files::is_link($linkPathAndFilename));
}
- /**
- * @test
- */
+ #[Test]
public function is_linkReturnsFalseForExistingDirectoryThatIsNoSymlink()
{
$targetPath = Files::concatenatePaths([dirname(tempnam($this->temporaryDirectory, '')), 'FlowFilesTestDirectory']) . '/';
@@ -236,9 +205,7 @@ public function is_linkReturnsFalseForExistingDirectoryThatIsNoSymlink()
self::assertFalse(Files::is_link($targetPath));
}
- /**
- * @test
- */
+ #[Test]
public function is_linkReturnsTrueForExistingSymlinkDirectory()
{
$targetPath = Files::concatenatePaths([dirname(tempnam($this->temporaryDirectory, '')), 'FlowFilesTestDirectory']);
@@ -253,9 +220,7 @@ public function is_linkReturnsTrueForExistingSymlinkDirectory()
self::assertTrue(Files::is_link($linkPath));
}
- /**
- * @test
- */
+ #[Test]
public function is_linkReturnsFalseForStreamWrapperPaths()
{
$targetPath = 'vfs://Foo/Bar';
@@ -265,89 +230,73 @@ public function is_linkReturnsFalseForStreamWrapperPaths()
self::assertFalse(Files::is_link($targetPath));
}
- /**
- * @test
- */
+ #[Test]
public function emptyDirectoryRecursivelyThrowsExceptionIfSpecifiedPathDoesNotExist()
{
$this->expectException(FilesException::class);
Files::emptyDirectoryRecursively('NonExistingPath');
}
- /**
- * @test
- */
+ #[Test]
public function removeDirectoryRecursivelyThrowsExceptionIfSpecifiedPathDoesNotExist()
{
$this->expectException(FilesException::class);
Files::removeDirectoryRecursively('NonExistingPath');
}
- /**
- * @test
- */
+ #[Test]
public function removeEmptyDirectoriesOnPathRemovesAllDirectoriesOnPathIfTheyAreEmpty()
{
Files::createDirectoryRecursively('vfs://Foo/Bar/Baz/Quux');
Files::removeEmptyDirectoriesOnPath('vfs://Foo/Bar/Baz/Quux');
- self::assertFalse(file_exists('vfs://Foo'));
+ self::assertFileDoesNotExist('vfs://Foo');
}
- /**
- * @test
- */
+ #[Test]
public function removeEmptyDirectoriesOnPathRemovesOnlyDirectoriesWhichAreEmpty()
{
Files::createDirectoryRecursively('vfs://Foo/Bar/Baz/Quux');
file_put_contents('vfs://Foo/Bar/someFile.txt', 'x');
Files::removeEmptyDirectoriesOnPath('vfs://Foo/Bar/Baz/Quux');
- self::assertTrue(file_exists('vfs://Foo/Bar/someFile.txt'));
- self::assertFalse(file_exists('vfs://Foo/Bar/Baz'));
+ self::assertFileExists('vfs://Foo/Bar/someFile.txt');
+ self::assertFileDoesNotExist('vfs://Foo/Bar/Baz');
}
- /**
- * @test
- */
+ #[Test]
public function removeEmptyDirectoriesOnPathDoesNotRemoveAnythingIfTopLevelPathContainsFile()
{
Files::createDirectoryRecursively('vfs://Foo/Bar/Baz/Quux');
file_put_contents('vfs://Foo/Bar/Baz/Quux/someFile.txt', 'x');
Files::removeEmptyDirectoriesOnPath('vfs://Foo/Bar/Baz/Quux');
- self::assertTrue(file_exists('vfs://Foo/Bar/Baz/Quux/someFile.txt'));
+ self::assertFileExists('vfs://Foo/Bar/Baz/Quux/someFile.txt');
}
- /**
- * @test
- */
+ #[Test]
public function removeEmptyDirectoriesOnPathAlsoRemovesOSXFinderFilesIfNecessary()
{
Files::createDirectoryRecursively('vfs://Foo/Bar/Baz/Quux');
file_put_contents('vfs://Foo/Bar/someFile.txt', 'x');
file_put_contents('vfs://Foo/Bar/Baz/.DS_Store', 'x');
Files::removeEmptyDirectoriesOnPath('vfs://Foo/Bar/Baz/Quux');
- self::assertTrue(file_exists('vfs://Foo/Bar/someFile.txt'));
- self::assertFalse(file_exists('vfs://Foo/Bar/Baz'));
+ self::assertFileExists('vfs://Foo/Bar/someFile.txt');
+ self::assertFileDoesNotExist('vfs://Foo/Bar/Baz');
}
- /**
- * @test
- */
+ #[Test]
public function removeEmptyDirectoriesOnPathRemovesOnlyDirectoriesBelowTheGivenBasePath()
{
Files::createDirectoryRecursively('vfs://Foo/Bar/Baz/Quux');
Files::removeEmptyDirectoriesOnPath('vfs://Foo/Bar/Baz/Quux', 'vfs://Foo/Bar');
- self::assertFalse(file_exists('vfs://Foo/Bar/Baz'));
- self::assertTrue(file_exists('vfs://Foo/Bar'));
+ self::assertFileDoesNotExist('vfs://Foo/Bar/Baz');
+ self::assertFileExists('vfs://Foo/Bar');
Files::createDirectoryRecursively('vfs://Foo/Bar/Baz/Quux');
Files::removeEmptyDirectoriesOnPath('vfs://Foo/Bar/Baz/Quux', 'vfs://Foo/Bar/');
- self::assertFalse(file_exists('vfs://Foo/Bar/Baz'));
- self::assertTrue(file_exists('vfs://Foo/Bar'));
+ self::assertFileDoesNotExist('vfs://Foo/Bar/Baz');
+ self::assertFileExists('vfs://Foo/Bar');
}
- /**
- * @test
- */
+ #[Test]
public function removeEmptyDirectoriesOnPathThrowsExceptionIfBasePathIsNotParentOfPath()
{
$this->expectException(FilesException::class);
@@ -355,9 +304,7 @@ public function removeEmptyDirectoriesOnPathThrowsExceptionIfBasePathIsNotParent
Files::removeEmptyDirectoriesOnPath('vfs://Foo/Bar/Baz/Quux', 'vfs://Other/Bar');
}
- /**
- * @test
- */
+ #[Test]
public function unlinkProperlyRemovesSymlinksPointingToFiles()
{
$targetPathAndFilename = tempnam($this->temporaryDirectory, 'FlowFilesTestFile');
@@ -368,13 +315,11 @@ public function unlinkProperlyRemovesSymlinksPointingToFiles()
}
$this->trySymlink($targetPathAndFilename, $linkPathAndFilename);
self::assertTrue(Files::unlink($linkPathAndFilename));
- self::assertTrue(file_exists($targetPathAndFilename));
- self::assertFalse(file_exists($linkPathAndFilename));
+ self::assertFileExists($targetPathAndFilename);
+ self::assertFileDoesNotExist($linkPathAndFilename);
}
- /**
- * @test
- */
+ #[Test]
public function unlinkProperlyRemovesSymlinksPointingToDirectories()
{
$targetPath = Files::concatenatePaths([dirname(tempnam($this->temporaryDirectory, '')), 'FlowFilesTestDirectory']);
@@ -387,23 +332,21 @@ public function unlinkProperlyRemovesSymlinksPointingToDirectories()
}
$this->trySymlink($targetPath, $linkPath);
self::assertTrue(Files::unlink($linkPath));
- self::assertTrue(file_exists($targetPath));
- self::assertFalse(file_exists($linkPath));
+ self::assertFileExists($targetPath);
+ self::assertFileDoesNotExist($linkPath);
}
/**
- * @test
* @outputBuffering enabled
* ... because the chmod call in ResourceManager emits a warning making this fail in strict mode
*/
+ #[Test]
public function unlinkReturnsTrueIfSpecifiedPathDoesNotExist()
{
self::assertTrue(Files::unlink('NonExistingPath'));
}
- /**
- * @test
- */
+ #[Test]
public function copyDirectoryRecursivelyCreatesTargetAsExpected()
{
Files::createDirectoryRecursively('vfs://Foo/source/bar/baz');
@@ -411,14 +354,12 @@ public function copyDirectoryRecursivelyCreatesTargetAsExpected()
Files::copyDirectoryRecursively('vfs://Foo/source', 'vfs://Foo/target');
- self::assertTrue(is_dir('vfs://Foo/target/bar/baz'));
+ self::assertDirectoryExists('vfs://Foo/target/bar/baz');
self::assertTrue(is_file('vfs://Foo/target/bar/baz/file.txt'));
- self::assertEquals('source content', file_get_contents('vfs://Foo/target/bar/baz/file.txt'));
+ self::assertSame('source content', file_get_contents('vfs://Foo/target/bar/baz/file.txt'));
}
- /**
- * @test
- */
+ #[Test]
public function copyDirectoryRecursivelyCopiesDotFilesIfRequested()
{
Files::createDirectoryRecursively('vfs://Foo/source/bar/baz');
@@ -426,14 +367,12 @@ public function copyDirectoryRecursivelyCopiesDotFilesIfRequested()
Files::copyDirectoryRecursively('vfs://Foo/source', 'vfs://Foo/target', false, true);
- self::assertTrue(is_dir('vfs://Foo/target/bar/baz'));
+ self::assertDirectoryExists('vfs://Foo/target/bar/baz');
self::assertTrue(is_file('vfs://Foo/target/bar/baz/.file.txt'));
- self::assertEquals('source content', file_get_contents('vfs://Foo/target/bar/baz/.file.txt'));
+ self::assertSame('source content', file_get_contents('vfs://Foo/target/bar/baz/.file.txt'));
}
- /**
- * @test
- */
+ #[Test]
public function copyDirectoryRecursivelyOverwritesTargetFiles()
{
Files::createDirectoryRecursively('vfs://Foo/source/bar/baz');
@@ -443,12 +382,10 @@ public function copyDirectoryRecursivelyOverwritesTargetFiles()
file_put_contents('vfs://Foo/target/bar/baz/file.txt', 'target content');
Files::copyDirectoryRecursively('vfs://Foo/source', 'vfs://Foo/target');
- self::assertEquals('source content', file_get_contents('vfs://Foo/target/bar/baz/file.txt'));
+ self::assertSame('source content', file_get_contents('vfs://Foo/target/bar/baz/file.txt'));
}
- /**
- * @test
- */
+ #[Test]
public function copyDirectoryRecursivelyKeepsExistingTargetFilesIfRequested()
{
Files::createDirectoryRecursively('vfs://Foo/source/bar/baz');
@@ -458,110 +395,106 @@ public function copyDirectoryRecursivelyKeepsExistingTargetFilesIfRequested()
file_put_contents('vfs://Foo/target/bar/baz/file.txt', 'target content');
Files::copyDirectoryRecursively('vfs://Foo/source', 'vfs://Foo/target', true);
- self::assertEquals('target content', file_get_contents('vfs://Foo/target/bar/baz/file.txt'));
+ self::assertSame('target content', file_get_contents('vfs://Foo/target/bar/baz/file.txt'));
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function bytesToSizeStringDataProvider()
- {
- return [
-
- // invalid values
- [
- 'bytes' => 'invalid',
- 'decimals' => null,
- 'decimalSeparator' => null,
- 'thousandsSeparator' => null,
- 'expected' => '0 B'
- ],
- [
- 'bytes' => '-100',
- 'decimals' => 2,
- 'decimalSeparator' => null,
- 'thousandsSeparator' => null,
- 'expected' => '0.00 B'
- ],
- [
- 'bytes' => -100,
- 'decimals' => 2,
- 'decimalSeparator' => null,
- 'thousandsSeparator' => null,
- 'expected' => '0.00 B'
- ],
- [
- 'bytes' => '',
- 'decimals' => 2,
- 'decimalSeparator' => null,
- 'thousandsSeparator' => null,
- 'expected' => '0.00 B'
- ],
- [
- 'bytes' => [],
- 'decimals' => 2,
- 'decimalSeparator' => ',',
- 'thousandsSeparator' => null,
- 'expected' => '0,00 B'
- ],
-
- // valid values
- [
- 'bytes' => 123,
- 'decimals' => null,
- 'decimalSeparator' => null,
- 'thousandsSeparator' => null,
- 'expected' => '123 B'
- ],
- [
- 'bytes' => '43008',
- 'decimals' => 1,
- 'decimalSeparator' => null,
- 'thousandsSeparator' => null,
- 'expected' => '42.0 KB'
- ],
- [
- 'bytes' => 1024,
- 'decimals' => 1,
- 'decimalSeparator' => null,
- 'thousandsSeparator' => null,
- 'expected' => '1.0 KB'
- ],
- [
- 'bytes' => 1023,
- 'decimals' => 2,
- 'decimalSeparator' => null,
- 'thousandsSeparator' => null,
- 'expected' => '1,023.00 B'
- ],
- [
- 'bytes' => 1073741823,
- 'decimals' => null,
- 'decimalSeparator' => null,
- 'thousandsSeparator' => null,
- 'expected' => '1,024 MB'
- ],
- [
- 'bytes' => 1073741823,
- 'decimals' => 1,
- 'decimalSeparator' => null,
- 'thousandsSeparator' => '.',
- 'expected' => '1.024.0 MB'
- ],
- [
- 'bytes' => pow(1024, 5),
- 'decimals' => 1,
- 'decimalSeparator' => null,
- 'thousandsSeparator' => null,
- 'expected' => '1.0 PB'
- ],
- [
- 'bytes' => pow(1024, 8),
- 'decimals' => 1,
- 'decimalSeparator' => null,
- 'thousandsSeparator' => null,
- 'expected' => '1.0 YB'
- ]
+ public static function bytesToSizeStringDataProvider(): \Iterator
+ {
+ // invalid values
+ yield [
+ 'bytes' => 'invalid',
+ 'decimals' => null,
+ 'decimalSeparator' => null,
+ 'thousandsSeparator' => null,
+ 'expected' => '0 B'
+ ];
+ yield [
+ 'bytes' => '-100',
+ 'decimals' => 2,
+ 'decimalSeparator' => null,
+ 'thousandsSeparator' => null,
+ 'expected' => '0.00 B'
+ ];
+ yield [
+ 'bytes' => -100,
+ 'decimals' => 2,
+ 'decimalSeparator' => null,
+ 'thousandsSeparator' => null,
+ 'expected' => '0.00 B'
+ ];
+ yield [
+ 'bytes' => '',
+ 'decimals' => 2,
+ 'decimalSeparator' => null,
+ 'thousandsSeparator' => null,
+ 'expected' => '0.00 B'
+ ];
+ yield [
+ 'bytes' => [],
+ 'decimals' => 2,
+ 'decimalSeparator' => ',',
+ 'thousandsSeparator' => null,
+ 'expected' => '0,00 B'
+ ];
+ // valid values
+ yield [
+ 'bytes' => 123,
+ 'decimals' => null,
+ 'decimalSeparator' => null,
+ 'thousandsSeparator' => null,
+ 'expected' => '123 B'
+ ];
+ yield [
+ 'bytes' => '43008',
+ 'decimals' => 1,
+ 'decimalSeparator' => null,
+ 'thousandsSeparator' => null,
+ 'expected' => '42.0 KB'
+ ];
+ yield [
+ 'bytes' => 1024,
+ 'decimals' => 1,
+ 'decimalSeparator' => null,
+ 'thousandsSeparator' => null,
+ 'expected' => '1.0 KB'
+ ];
+ yield [
+ 'bytes' => 1023,
+ 'decimals' => 2,
+ 'decimalSeparator' => null,
+ 'thousandsSeparator' => null,
+ 'expected' => '1,023.00 B'
+ ];
+ yield [
+ 'bytes' => 1073741823,
+ 'decimals' => null,
+ 'decimalSeparator' => null,
+ 'thousandsSeparator' => null,
+ 'expected' => '1,024 MB'
+ ];
+ yield [
+ 'bytes' => 1073741823,
+ 'decimals' => 1,
+ 'decimalSeparator' => null,
+ 'thousandsSeparator' => '.',
+ 'expected' => '1.024.0 MB'
+ ];
+ yield [
+ 'bytes' => pow(1024, 5),
+ 'decimals' => 1,
+ 'decimalSeparator' => null,
+ 'thousandsSeparator' => null,
+ 'expected' => '1.0 PB'
+ ];
+ yield [
+ 'bytes' => pow(1024, 8),
+ 'decimals' => 1,
+ 'decimalSeparator' => null,
+ 'thousandsSeparator' => null,
+ 'expected' => '1.0 YB'
];
}
@@ -571,9 +504,9 @@ public function bytesToSizeStringDataProvider()
* @param $decimalSeparator
* @param $thousandsSeparator
* @param $expected
- * @test
- * @dataProvider bytesToSizeStringDataProvider
*/
+ #[DataProvider('bytesToSizeStringDataProvider')]
+ #[Test]
public function bytesToSizeStringTests($bytes, $decimals, $decimalSeparator, $thousandsSeparator, $expected)
{
$actualResult = Files::bytesToSizeString($bytes, $decimals, $decimalSeparator, $thousandsSeparator);
@@ -581,81 +514,71 @@ public function bytesToSizeStringTests($bytes, $decimals, $decimalSeparator, $th
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function sizeStringToBytesDataProvider()
- {
- return [
-
- // invalid values
- [
- 'sizeString' => 'invalid',
- 'expected' => 0.0
- ],
- [
- 'sizeString' => '',
- 'expected' => 0.0
- ],
- [
- 'sizeString' => false,
- 'expected' => 0.0
- ],
-
- // valid values
- [
- 'sizeString' => '12345',
- 'expected' => 12345.0
- ],
- [
- 'sizeString' => '54321 b',
- 'expected' => 54321.0
- ],
- [
- 'sizeString' => '1024M',
- 'expected' => 1073741824.0
- ],
- [
- 'sizeString' => '1024.0 MB',
- 'expected' => 1073741824.0
- ],
- [
- 'sizeString' => '500 MB',
- 'expected' => 524288000.0
- ],
- [
- 'sizeString' => '500m',
- 'expected' => 524288000.0
- ],
- [
- 'sizeString' => '1.0 KB',
- 'expected' => 1024.0
- ],
- [
- 'sizeString' => '1 GB',
- 'expected' => (float)pow(1024, 3)
- ],
- [
- 'sizeString' => '1 Z',
- 'expected' => (float)pow(1024, 7)
- ]
+ public static function sizeStringToBytesDataProvider(): \Iterator
+ {
+ // invalid values
+ yield [
+ 'sizeString' => 'invalid',
+ 'expected' => 0.0
+ ];
+ yield [
+ 'sizeString' => '',
+ 'expected' => 0.0
+ ];
+ // valid values
+ yield [
+ 'sizeString' => '12345',
+ 'expected' => 12345.0
+ ];
+ yield [
+ 'sizeString' => '54321 b',
+ 'expected' => 54321.0
+ ];
+ yield [
+ 'sizeString' => '1024M',
+ 'expected' => 1073741824.0
+ ];
+ yield [
+ 'sizeString' => '1024.0 MB',
+ 'expected' => 1073741824.0
+ ];
+ yield [
+ 'sizeString' => '500 MB',
+ 'expected' => 524288000.0
+ ];
+ yield [
+ 'sizeString' => '500m',
+ 'expected' => 524288000.0
+ ];
+ yield [
+ 'sizeString' => '1.0 KB',
+ 'expected' => 1024.0
+ ];
+ yield [
+ 'sizeString' => '1 GB',
+ 'expected' => (float)pow(1024, 3)
+ ];
+ yield [
+ 'sizeString' => '1 Z',
+ 'expected' => (float)pow(1024, 7)
];
}
/**
* @param string $sizeString
* @param float $expected
- * @test
- * @dataProvider sizeStringToBytesDataProvider
*/
+ #[DataProvider('sizeStringToBytesDataProvider')]
+ #[Test]
public function sizeStringToBytesTests($sizeString, $expected)
{
$actualResult = Files::sizeStringToBytes($sizeString);
self::assertSame($expected, $actualResult);
}
- /**
- * @test
- */
+ #[Test]
public function sizeStringThrowsExceptionIfTheSpecifiedUnitIsUnknown()
{
$this->expectException(FilesException::class);
diff --git a/Neos.Utility.Files/composer.json b/Neos.Utility.Files/composer.json
index 8e7fde3e23..4df2d16bb2 100644
--- a/Neos.Utility.Files/composer.json
+++ b/Neos.Utility.Files/composer.json
@@ -9,8 +9,8 @@
"neos/error-messages": "self.version"
},
"require-dev": {
- "mikey179/vfsstream": "^1.6.10",
- "phpunit/phpunit": "~9.1"
+ "mikey179/vfsstream": "^1.6.12",
+ "phpunit/phpunit": "~11.5"
},
"autoload": {
"psr-4": {
diff --git a/Neos.Utility.MediaTypes/Tests/Unit/MediaTypesTest.php b/Neos.Utility.MediaTypes/Tests/Unit/MediaTypesTest.php
index e71c8a78ba..5254f0f9ca 100644
--- a/Neos.Utility.MediaTypes/Tests/Unit/MediaTypesTest.php
+++ b/Neos.Utility.MediaTypes/Tests/Unit/MediaTypesTest.php
@@ -1,4 +1,7 @@
'text', 'subtype' => 'html', 'parameters' => []]],
- ['application/json; charset=UTF-8', ['type' => 'application', 'subtype' => 'json', 'parameters' => ['charset' => 'UTF-8']]],
- ['application/vnd.org.flow.coffee+json; kind =Arabica;weight= 15g; sugar =none', ['type' => 'application', 'subtype' => 'vnd.org.flow.coffee+json', 'parameters' => ['kind' => 'Arabica', 'weight' => '15g', 'sugar' => 'none']]],
- ];
+ yield ['text/html', ['type' => 'text', 'subtype' => 'html', 'parameters' => []]];
+ yield ['application/json; charset=UTF-8', ['type' => 'application', 'subtype' => 'json', 'parameters' => ['charset' => 'UTF-8']]];
+ yield ['application/vnd.org.flow.coffee+json; kind =Arabica;weight= 15g; sugar =none', ['type' => 'application', 'subtype' => 'vnd.org.flow.coffee+json', 'parameters' => ['kind' => 'Arabica', 'weight' => '15g', 'sugar' => 'none']]];
}
- /**
- * @test
- * @dataProvider mediaTypesAndParsedPieces
- */
- public function parseMediaTypeReturnsAssociativeArrayWithIndividualPartsOfTheMediaType(string $mediaType, array $expectedPieces)
+ #[DataProvider('mediaTypesAndParsedPieces')]
+ #[Test]
+ public function parseMediaTypeReturnsAssociativeArrayWithIndividualPartsOfTheMediaType(string $mediaType, array $expectedPieces): void
{
$actualPieces = MediaTypes::parseMediaType($mediaType);
self::assertSame($expectedPieces, $actualPieces);
@@ -125,28 +112,24 @@ public function parseMediaTypeReturnsAssociativeArrayWithIndividualPartsOfTheMed
/**
* Data provider
*/
- public function mediaRangesAndMatchingOrNonMatchingMediaTypes()
+ public static function mediaRangesAndMatchingOrNonMatchingMediaTypes(): \Iterator
{
- return [
- ['invalid', 'text/html', false],
- ['text/html', 'text/html', true],
- ['text/html', 'text/plain', false],
- ['*/*', 'text/html', true],
- ['*/*', 'application/json', true],
- ['text/*', 'text/html', true],
- ['text/*', 'text/plain', true],
- ['text/*', 'application/xml', false],
- ['application/*', 'application/xml', true],
- ['text/x-dvi', 'text/x-dvi', true],
- ['-Foo.+/~Bar199', '-Foo.+/~Bar199', true],
- ];
+ yield ['invalid', 'text/html', false];
+ yield ['text/html', 'text/html', true];
+ yield ['text/html', 'text/plain', false];
+ yield ['*/*', 'text/html', true];
+ yield ['*/*', 'application/json', true];
+ yield ['text/*', 'text/html', true];
+ yield ['text/*', 'text/plain', true];
+ yield ['text/*', 'application/xml', false];
+ yield ['application/*', 'application/xml', true];
+ yield ['text/x-dvi', 'text/x-dvi', true];
+ yield ['-Foo.+/~Bar199', '-Foo.+/~Bar199', true];
}
- /**
- * @test
- * @dataProvider mediaRangesAndMatchingOrNonMatchingMediaTypes
- */
- public function mediaRangeMatchesChecksIfTheGivenMediaRangeMatchesTheGivenMediaType(string $mediaRange, string $mediaType, bool $expectedResult)
+ #[DataProvider('mediaRangesAndMatchingOrNonMatchingMediaTypes')]
+ #[Test]
+ public function mediaRangeMatchesChecksIfTheGivenMediaRangeMatchesTheGivenMediaType(string $mediaRange, string $mediaType, bool $expectedResult): void
{
$actualResult = MediaTypes::mediaRangeMatches($mediaRange, $mediaType);
self::assertSame($expectedResult, $actualResult);
@@ -155,22 +138,18 @@ public function mediaRangeMatchesChecksIfTheGivenMediaRangeMatchesTheGivenMediaT
/**
* Data provider with media types and their trimmed versions
*/
- public function mediaTypesWithAndWithoutParameters()
+ public static function mediaTypesWithAndWithoutParameters(): \Iterator
{
- return [
- ['text/html', 'text/html'],
- ['application/json; charset=UTF-8', 'application/json'],
- ['application/vnd.org.flow.coffee+json; kind =Arabica;weight= 15g; sugar =none', 'application/vnd.org.flow.coffee+json'],
- ['invalid', null],
- ['invalid/', null],
- ];
+ yield ['text/html', 'text/html'];
+ yield ['application/json; charset=UTF-8', 'application/json'];
+ yield ['application/vnd.org.flow.coffee+json; kind =Arabica;weight= 15g; sugar =none', 'application/vnd.org.flow.coffee+json'];
+ yield ['invalid', null];
+ yield ['invalid/', null];
}
- /**
- * @test
- * @dataProvider mediaTypesWithAndWithoutParameters
- */
- public function trimMediaTypeReturnsJustTheTypeAndSubTypeWithoutParameters(string $mediaType, ?string $expectedResult = null)
+ #[DataProvider('mediaTypesWithAndWithoutParameters')]
+ #[Test]
+ public function trimMediaTypeReturnsJustTheTypeAndSubTypeWithoutParameters(string $mediaType, ?string $expectedResult = null): void
{
$actualResult = MediaTypes::trimMediaType($mediaType);
self::assertSame($expectedResult, $actualResult);
diff --git a/Neos.Utility.MediaTypes/composer.json b/Neos.Utility.MediaTypes/composer.json
index d79ab08073..86e44a3eea 100644
--- a/Neos.Utility.MediaTypes/composer.json
+++ b/Neos.Utility.MediaTypes/composer.json
@@ -8,8 +8,8 @@
"php": "^8.0"
},
"require-dev": {
- "mikey179/vfsstream": "^1.6.10",
- "phpunit/phpunit": "~9.1"
+ "mikey179/vfsstream": "^1.6.12",
+ "phpunit/phpunit": "~11.5"
},
"autoload": {
"psr-4": {
diff --git a/Neos.Utility.ObjectHandling/Tests/Unit/ObjectAccessTest.php b/Neos.Utility.ObjectHandling/Tests/Unit/ObjectAccessTest.php
index 1ed54a7d1f..22a5d23ade 100644
--- a/Neos.Utility.ObjectHandling/Tests/Unit/ObjectAccessTest.php
+++ b/Neos.Utility.ObjectHandling/Tests/Unit/ObjectAccessTest.php
@@ -1,4 +1,7 @@
dummyObject->shouldNotBePickedUp = true;
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyReturnsExpectedValueForGetterProperty()
{
$property = ObjectAccess::getProperty($this->dummyObject, 'property');
- self::assertEquals($property, 'string1');
+ self::assertEquals('string1', $property);
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyReturnsExpectedValueForPublicProperty()
{
$property = ObjectAccess::getProperty($this->dummyObject, 'publicProperty2');
- self::assertEquals($property, 42, 'A property of a given object was not returned correctly.');
+ self::assertEquals(42, $property, 'A property of a given object was not returned correctly.');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyReturnsExpectedValueForUnexposedPropertyIfForceDirectAccessIsTrue()
{
$property = ObjectAccess::getProperty($this->dummyObject, 'unexposedProperty', true);
- self::assertEquals($property, 'unexposed', 'A property of a given object was not returned correctly.');
+ self::assertEquals('unexposed', $property, 'A property of a given object was not returned correctly.');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyReturnsExpectedValueForUnknownPropertyIfForceDirectAccessIsTrue()
{
$this->dummyObject->unknownProperty = 'unknown';
$property = ObjectAccess::getProperty($this->dummyObject, 'unknownProperty', true);
- self::assertEquals($property, 'unknown', 'A property of a given object was not returned correctly.');
+ self::assertEquals('unknown', $property, 'A property of a given object was not returned correctly.');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyReturnsPropertyNotAccessibleExceptionForNotExistingPropertyIfForceDirectAccessIsTrue()
{
$this->expectException(PropertyNotAccessibleException::class);
ObjectAccess::getProperty($this->dummyObject, 'notExistingProperty', true);
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyReturnsThrowsExceptionIfPropertyDoesNotExist()
{
$this->expectException(PropertyNotAccessibleException::class);
ObjectAccess::getProperty($this->dummyObject, 'notExistingProperty');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyReturnsThrowsExceptionIfArrayKeyDoesNotExist()
{
$this->expectException(PropertyNotAccessibleException::class);
ObjectAccess::getProperty([], 'notExistingProperty');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyTriesToCallABooleanIsGetterMethodIfItExists()
{
$property = ObjectAccess::getProperty($this->dummyObject, 'booleanProperty');
self::assertSame('method called 1', $property);
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyTriesToCallABooleanHasGetterMethodIfItExists()
{
$property = ObjectAccess::getProperty($this->dummyObject, 'anotherBooleanProperty');
- self::assertSame(false, $property);
+ self::assertFalse($property);
$this->dummyObject->setAnotherBooleanProperty(true);
$property = ObjectAccess::getProperty($this->dummyObject, 'anotherBooleanProperty');
- self::assertSame(true, $property);
+ self::assertTrue($property);
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyThrowsExceptionIfThePropertyNameIsNotAString()
{
$this->expectException(\InvalidArgumentException::class);
ObjectAccess::getProperty($this->dummyObject, new \ArrayObject());
}
- /**
- * @test
- */
+ #[Test]
public function setPropertyThrowsExceptionIfThePropertyNameIsNotAString()
{
$this->expectException(\InvalidArgumentException::class);
ObjectAccess::setProperty($this->dummyObject, new \ArrayObject(), 42);
}
- /**
- * @test
- */
+ #[Test]
public function setPropertyWorksIfThePropertyNameIsAnInteger()
{
$array = new \ArrayObject();
@@ -159,17 +139,13 @@ public function setPropertyWorksIfThePropertyNameIsAnInteger()
self::assertSame('Test', $array[42]);
}
- /**
- * @test
- */
+ #[Test]
public function setPropertyReturnsFalseIfPropertyIsNotAccessible()
{
self::assertFalse(ObjectAccess::setProperty($this->dummyObject, 'protectedProperty', 42));
}
- /**
- * @test
- */
+ #[Test]
public function setPropertySetsValueIfPropertyIsNotAccessibleWhenForceDirectAccessIsTrue()
{
self::assertTrue(ObjectAccess::setProperty($this->dummyObject, 'unexposedProperty', 'was set anyway', true));
@@ -179,36 +155,28 @@ public function setPropertySetsValueIfPropertyIsNotAccessibleWhenForceDirectAcce
self::assertEquals('was set anyway', $propertyReflection->getValue($this->dummyObject));
}
- /**
- * @test
- */
+ #[Test]
public function setPropertySetsValueIfPropertyDoesNotExistWhenForceDirectAccessIsTrue()
{
self::assertTrue(ObjectAccess::setProperty($this->dummyObject, 'unknownProperty', 'was set anyway', true));
self::assertEquals('was set anyway', $this->dummyObject->unknownProperty);
}
- /**
- * @test
- */
+ #[Test]
public function setPropertyCallsASetterMethodToSetThePropertyValueIfOneIsAvailable()
{
ObjectAccess::setProperty($this->dummyObject, 'property', 4242);
- self::assertEquals($this->dummyObject->getProperty(), 4242, 'setProperty does not work with setter.');
+ self::assertEquals(4242, $this->dummyObject->getProperty(), 'setProperty does not work with setter.');
}
- /**
- * @test
- */
+ #[Test]
public function setPropertyWorksWithPublicProperty()
{
ObjectAccess::setProperty($this->dummyObject, 'publicProperty', 4242);
- self::assertEquals($this->dummyObject->publicProperty, 4242, 'setProperty does not work with public property.');
+ self::assertEquals(4242, $this->dummyObject->publicProperty, 'setProperty does not work with public property.');
}
- /**
- * @test
- */
+ #[Test]
public function setPropertyCanDirectlySetValuesInAnArrayObjectOrArray()
{
$arrayObject = new \ArrayObject();
@@ -221,9 +189,7 @@ public function setPropertyCanDirectlySetValuesInAnArrayObjectOrArray()
self::assertEquals('value', $array['key']);
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyCanAccessPropertiesOfAnArrayObject()
{
$arrayObject = new \ArrayObject(['key' => 'value']);
@@ -232,9 +198,7 @@ public function getPropertyCanAccessPropertiesOfAnArrayObject()
self::assertEquals($expectedResult, $actualResult, 'getProperty does not work with ArrayObject property.');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyCallsCustomGettersOfObjectsImplementingArrayAccess()
{
$arrayObject = new \ArrayObject();
@@ -243,9 +207,7 @@ public function getPropertyCallsCustomGettersOfObjectsImplementingArrayAccess()
self::assertEquals($expectedResult, $actualResult, 'getProperty does not call existing getter of object implementing ArrayAccess.');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyCallsGettersBeforeCheckingViaArrayAccess()
{
$arrayObject = new \ArrayObject(['iteratorClass' => 'This should be ignored']);
@@ -254,9 +216,7 @@ public function getPropertyCallsGettersBeforeCheckingViaArrayAccess()
self::assertEquals($expectedResult, $actualResult, 'getProperty does not call existing getter of object implementing ArrayAccess.');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyThrowsExceptionIfArrayObjectDoesNotContainMatchingKeyNorGetter()
{
$this->expectException(PropertyNotAccessibleException::class);
@@ -264,9 +224,7 @@ public function getPropertyThrowsExceptionIfArrayObjectDoesNotContainMatchingKey
ObjectAccess::getProperty($arrayObject, 'nonExistingProperty');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyDoesNotTryArrayAccessOnSplObjectStorageSubject()
{
$this->expectException(PropertyNotAccessibleException::class);
@@ -274,9 +232,7 @@ public function getPropertyDoesNotTryArrayAccessOnSplObjectStorageSubject()
ObjectAccess::getProperty($splObjectStorage, 'something');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyCanAccessPropertiesOfAnObjectImplementingArrayAccess()
{
$arrayAccessInstance = new ArrayAccessClass(['key' => 'value']);
@@ -285,9 +241,7 @@ public function getPropertyCanAccessPropertiesOfAnObjectImplementingArrayAccess(
self::assertEquals($expectedResult, $actualResult, 'getPropertyPath does not work with Array Access property.');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyRespectsForceDirectAccessForArrayAccess()
{
$arrayAccessInstance = new ArrayAccessClass(['key' => 'value']);
@@ -295,9 +249,7 @@ public function getPropertyRespectsForceDirectAccessForArrayAccess()
self::assertEquals('access through forceDirectAccess', $actualResult, 'getPropertyPath does not respect ForceDirectAccess for ArrayAccess implementations.');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyCanAccessPropertiesOfAnArray()
{
$array = ['key' => 'value'];
@@ -305,9 +257,7 @@ public function getPropertyCanAccessPropertiesOfAnArray()
self::assertEquals('value', $actualResult, 'getProperty does not work with Array property.');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyCanAccessNullPropertyOfAnArray()
{
$array = ['key' => null];
@@ -315,9 +265,7 @@ public function getPropertyCanAccessNullPropertyOfAnArray()
self::assertNull($actualResult, 'getProperty should allow access to NULL properties.');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyPathCanAccessPropertiesOfAnArray()
{
$array = ['parent' => ['key' => 'value']];
@@ -325,9 +273,7 @@ public function getPropertyPathCanAccessPropertiesOfAnArray()
self::assertEquals('value', $actualResult, 'getPropertyPath does not work with Array property.');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyPathCanAccessPropertiesOfAnObjectImplementingArrayAccess()
{
$array = ['parent' => new \ArrayObject(['key' => 'value'])];
@@ -335,29 +281,23 @@ public function getPropertyPathCanAccessPropertiesOfAnObjectImplementingArrayAcc
self::assertEquals('value', $actualResult, 'getPropertyPath does not work with Array Access property.');
}
- /**
- * @test
- */
+ #[Test]
public function getGettablePropertyNamesReturnsAllPropertiesWhichAreAvailable()
{
$expectedPropertyNames = ['anotherBooleanProperty', 'anotherProperty', 'booleanProperty', 'property', 'property2', 'publicProperty', 'publicProperty2'];
$actualPropertyNames = ObjectAccess::getGettablePropertyNames($this->dummyObject);
- self::assertEquals($expectedPropertyNames, $actualPropertyNames, 'getGettablePropertyNames returns not all gettable properties.');
+ self::assertSame($expectedPropertyNames, $actualPropertyNames, 'getGettablePropertyNames returns not all gettable properties.');
}
- /**
- * @test
- */
+ #[Test]
public function getSettablePropertyNamesReturnsAllPropertiesWhichAreAvailable()
{
$expectedPropertyNames = ['anotherBooleanProperty', 'anotherProperty', 'property', 'property2', 'publicProperty', 'publicProperty2', 'writeOnlyMagicProperty'];
$actualPropertyNames = ObjectAccess::getSettablePropertyNames($this->dummyObject);
- self::assertEquals($expectedPropertyNames, $actualPropertyNames, 'getSettablePropertyNames returns not all settable properties.');
+ self::assertSame($expectedPropertyNames, $actualPropertyNames, 'getSettablePropertyNames returns not all settable properties.');
}
- /**
- * @test
- */
+ #[Test]
public function getSettablePropertyNamesReturnsPropertyNamesOfStdClass()
{
$stdClassObject = new \stdClass();
@@ -366,12 +306,10 @@ public function getSettablePropertyNamesReturnsPropertyNamesOfStdClass()
$expectedPropertyNames = ['property', 'property2'];
$actualPropertyNames = ObjectAccess::getSettablePropertyNames($stdClassObject);
- self::assertEquals($expectedPropertyNames, $actualPropertyNames, 'getSettablePropertyNames returns not all settable properties.');
+ self::assertSame($expectedPropertyNames, $actualPropertyNames, 'getSettablePropertyNames returns not all settable properties.');
}
- /**
- * @test
- */
+ #[Test]
public function getGettablePropertiesReturnsTheCorrectValuesForAllProperties()
{
$expectedProperties = [
@@ -387,9 +325,7 @@ public function getGettablePropertiesReturnsTheCorrectValuesForAllProperties()
self::assertEquals($expectedProperties, $actualProperties, 'expectedProperties did not return the right values for the properties.');
}
- /**
- * @test
- */
+ #[Test]
public function getGettablePropertiesReturnsPropertiesOfStdClass()
{
$stdClassObject = new \stdClass();
@@ -405,21 +341,17 @@ public function getGettablePropertiesReturnsPropertiesOfStdClass()
self::assertEquals($expectedProperties, $actualProperties, 'expectedProperties did not return the right values for the properties.');
}
- /**
- * @test
- */
+ #[Test]
public function getGettablePropertiesHandlesDoctrineProxy()
{
$proxyObject = new EntityWithDoctrineProxy();
$expectedProperties = [];
$actualProperties = ObjectAccess::getGettableProperties($proxyObject);
- self::assertEquals($expectedProperties, $actualProperties, 'expectedProperties did not return the right values for the properties.');
+ self::assertSame($expectedProperties, $actualProperties, 'expectedProperties did not return the right values for the properties.');
}
- /**
- * @test
- */
+ #[Test]
public function isPropertySettableTellsIfAPropertyCanBeSet()
{
self::assertTrue(ObjectAccess::isPropertySettable($this->dummyObject, 'writeOnlyMagicProperty'));
@@ -430,9 +362,7 @@ public function isPropertySettableTellsIfAPropertyCanBeSet()
self::assertFalse(ObjectAccess::isPropertySettable($this->dummyObject, 'shouldNotBePickedUp'));
}
- /**
- * @test
- */
+ #[Test]
public function isPropertySettableWorksOnStdClass()
{
$stdClassObject = new \stdClass();
@@ -443,9 +373,7 @@ public function isPropertySettableWorksOnStdClass()
self::assertFalse(ObjectAccess::isPropertySettable($stdClassObject, 'undefinedProperty'));
}
- /**
- * @test
- */
+ #[Test]
public function isPropertyGettableTellsIfAPropertyCanBeRetrieved()
{
self::assertTrue(ObjectAccess::isPropertyGettable($this->dummyObject, 'publicProperty'));
@@ -458,9 +386,7 @@ public function isPropertyGettableTellsIfAPropertyCanBeRetrieved()
self::assertFalse(ObjectAccess::isPropertyGettable($this->dummyObject, 'shouldNotBePickedUp'));
}
- /**
- * @test
- */
+ #[Test]
public function isPropertyGettableWorksOnArrayAccessObjects()
{
$arrayObject = new \ArrayObject();
@@ -470,9 +396,7 @@ public function isPropertyGettableWorksOnArrayAccessObjects()
self::assertFalse(ObjectAccess::isPropertyGettable($arrayObject, 'undefinedKey'));
}
- /**
- * @test
- */
+ #[Test]
public function isPropertyGettableWorksOnStdClass()
{
$stdClassObject = new \stdClass();
@@ -483,9 +407,7 @@ public function isPropertyGettableWorksOnStdClass()
self::assertFalse(ObjectAccess::isPropertyGettable($stdClassObject, 'undefinedProperty'));
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyPathCanRecursivelyGetPropertiesOfAnObject()
{
$alternativeObject = new DummyClassWithGettersAndSetters();
@@ -497,9 +419,7 @@ public function getPropertyPathCanRecursivelyGetPropertiesOfAnObject()
self::assertEquals($expected, $actual);
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyPathReturnsNullForNonExistingPropertyPath()
{
$alternativeObject = new DummyClassWithGettersAndSetters();
@@ -509,9 +429,7 @@ public function getPropertyPathReturnsNullForNonExistingPropertyPath()
self::assertNull(ObjectAccess::getPropertyPath($this->dummyObject, 'property2.property.not.existing'));
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyPathReturnsNullIfSubjectIsNoObject()
{
$string = 'Hello world';
@@ -519,9 +437,7 @@ public function getPropertyPathReturnsNullIfSubjectIsNoObject()
self::assertNull(ObjectAccess::getPropertyPath($string, 'property2'));
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyPathReturnsNullIfSubjectOnPathIsNoObject()
{
$object = new \stdClass();
@@ -530,9 +446,7 @@ public function getPropertyPathReturnsNullIfSubjectOnPathIsNoObject()
self::assertNull(ObjectAccess::getPropertyPath($object, 'foo.bar'));
}
- /**
- * @test
- */
+ #[Test]
public function accessorCacheIsNotUsedForStdClass()
{
$this->expectException(PropertyNotAccessibleException::class);
@@ -544,9 +458,7 @@ public function accessorCacheIsNotUsedForStdClass()
ObjectAccess::getProperty($object2, 'property');
}
- /**
- * @test
- */
+ #[Test]
public function getPropertyUsingDirectAccessWorksOnPrivatePropertyOfProxyParent()
{
$proxyObject = new ProxiedClassWithPrivateProperty();
@@ -554,9 +466,7 @@ public function getPropertyUsingDirectAccessWorksOnPrivatePropertyOfProxyParent(
self::assertEquals('original', ObjectAccess::getProperty($proxyObject, 'property', true));
}
- /**
- * @test
- */
+ #[Test]
public function setPropertyUsingDirectAccessWorksOnPrivatePropertyOfProxyParent()
{
$proxyObject = new ProxiedClassWithPrivateProperty();
diff --git a/Neos.Utility.ObjectHandling/Tests/Unit/TypeHandlingTest.php b/Neos.Utility.ObjectHandling/Tests/Unit/TypeHandlingTest.php
index cd80b337b2..d33d08439a 100644
--- a/Neos.Utility.ObjectHandling/Tests/Unit/TypeHandlingTest.php
+++ b/Neos.Utility.ObjectHandling/Tests/Unit/TypeHandlingTest.php
@@ -1,4 +1,7 @@
expectException(InvalidTypeException::class);
TypeHandling::parseType('$something');
}
- /**
- * @test
- */
+ #[Test]
public function parseTypeThrowsExceptionOnInvalidElementTypeHint()
{
$this->expectException(InvalidTypeException::class);
@@ -40,35 +41,30 @@ public function parseTypeThrowsExceptionOnInvalidElementTypeHint()
/**
* data provider for parseTypeReturnsArrayWithInformation
*/
- public function types()
+ public static function types(): \Iterator
{
- return [
- ['null', ['type' => 'null', 'elementType' => null, 'nullable' => true]],
- ['int', ['type' => 'integer', 'elementType' => null, 'nullable' => false]],
- ['string', ['type' => 'string', 'elementType' => null, 'nullable' => false]],
- ['DateTime', ['type' => 'DateTime', 'elementType' => null, 'nullable' => false]],
- ['DateTimeImmutable', ['type' => 'DateTimeImmutable', 'elementType' => null, 'nullable' => false]],
- ['Neos\Foo\Bar', ['type' => 'Neos\Foo\Bar', 'elementType' => null, 'nullable' => false]],
- ['\Neos\Foo\Bar', ['type' => 'Neos\Foo\Bar', 'elementType' => null, 'nullable' => false]],
- ['\stdClass', ['type' => 'stdClass', 'elementType' => null, 'nullable' => false]],
- ['array', ['type' => 'array', 'elementType' => 'integer', 'nullable' => false]],
- ['ArrayObject', ['type' => 'ArrayObject', 'elementType' => 'string', 'nullable' => false]],
- ['SplObjectStorage', ['type' => 'SplObjectStorage', 'elementType' => 'Neos\Foo\Bar', 'nullable' => false]],
- ['SplObjectStorage<\Neos\Foo\Bar>', ['type' => 'SplObjectStorage', 'elementType' => 'Neos\Foo\Bar', 'nullable' => false]],
- ['Doctrine\Common\Collections\Collection<\Neos\Foo\Bar>', ['type' => 'Doctrine\Common\Collections\Collection', 'elementType' => 'Neos\Foo\Bar', 'nullable' => false]],
- ['Doctrine\Common\Collections\ArrayCollection<\Neos\Foo\Bar>', ['type' => 'Doctrine\Common\Collections\ArrayCollection', 'elementType' => 'Neos\Foo\Bar', 'nullable' => false]],
- ['\SomeClass with appendix', ['type' => 'SomeClass', 'elementType' => null, 'nullable' => false]],
-
- // Types might also contain underscores at various points.
- ['Doctrine\Common\Collections\Special_Class_With_Underscores', ['type' => 'Doctrine\Common\Collections\Special_Class_With_Underscores', 'elementType' => null, 'nullable' => false]],
- ['Doctrine\Common\Collections\ArrayCollection<\Neos\Foo_\Bar>', ['type' => 'Doctrine\Common\Collections\ArrayCollection', 'elementType' => 'Neos\Foo_\Bar', 'nullable' => false]],
- ];
+ yield ['null', ['type' => 'null', 'elementType' => null, 'nullable' => true]];
+ yield ['int', ['type' => 'integer', 'elementType' => null, 'nullable' => false]];
+ yield ['string', ['type' => 'string', 'elementType' => null, 'nullable' => false]];
+ yield ['DateTime', ['type' => 'DateTime', 'elementType' => null, 'nullable' => false]];
+ yield ['DateTimeImmutable', ['type' => 'DateTimeImmutable', 'elementType' => null, 'nullable' => false]];
+ yield ['Neos\Foo\Bar', ['type' => 'Neos\Foo\Bar', 'elementType' => null, 'nullable' => false]];
+ yield ['\Neos\Foo\Bar', ['type' => 'Neos\Foo\Bar', 'elementType' => null, 'nullable' => false]];
+ yield ['\stdClass', ['type' => 'stdClass', 'elementType' => null, 'nullable' => false]];
+ yield ['array', ['type' => 'array', 'elementType' => 'integer', 'nullable' => false]];
+ yield ['ArrayObject', ['type' => 'ArrayObject', 'elementType' => 'string', 'nullable' => false]];
+ yield ['SplObjectStorage', ['type' => 'SplObjectStorage', 'elementType' => 'Neos\Foo\Bar', 'nullable' => false]];
+ yield ['SplObjectStorage<\Neos\Foo\Bar>', ['type' => 'SplObjectStorage', 'elementType' => 'Neos\Foo\Bar', 'nullable' => false]];
+ yield ['Doctrine\Common\Collections\Collection<\Neos\Foo\Bar>', ['type' => 'Doctrine\Common\Collections\Collection', 'elementType' => 'Neos\Foo\Bar', 'nullable' => false]];
+ yield ['Doctrine\Common\Collections\ArrayCollection<\Neos\Foo\Bar>', ['type' => 'Doctrine\Common\Collections\ArrayCollection', 'elementType' => 'Neos\Foo\Bar', 'nullable' => false]];
+ yield ['\SomeClass with appendix', ['type' => 'SomeClass', 'elementType' => null, 'nullable' => false]];
+ // Types might also contain underscores at various points.
+ yield ['Doctrine\Common\Collections\Special_Class_With_Underscores', ['type' => 'Doctrine\Common\Collections\Special_Class_With_Underscores', 'elementType' => null, 'nullable' => false]];
+ yield ['Doctrine\Common\Collections\ArrayCollection<\Neos\Foo_\Bar>', ['type' => 'Doctrine\Common\Collections\ArrayCollection', 'elementType' => 'Neos\Foo_\Bar', 'nullable' => false]];
}
- /**
- * @test
- * @dataProvider types
- */
+ #[DataProvider('types')]
+ #[Test]
public function parseTypeReturnsArrayWithInformation(string $type, array $expectedResult)
{
self::assertEquals(
@@ -81,34 +77,29 @@ public function parseTypeReturnsArrayWithInformation(string $type, array $expect
/**
* data provider for extractCollectionTypeReturnsOnlyTheMainType
*/
- public function compositeTypes()
+ public static function compositeTypes(): \Iterator
{
- return [
- ['integer', 'integer'],
- ['int', 'int'],
- ['array', 'array'],
- ['ArrayObject', 'ArrayObject'],
- ['SplObjectStorage', 'SplObjectStorage'],
- ['Doctrine\Common\Collections\Collection', 'Doctrine\Common\Collections\Collection'],
- ['Doctrine\Common\Collections\ArrayCollection', 'Doctrine\Common\Collections\ArrayCollection'],
- ['array<\Some\Other\Class>', 'array'],
- ['ArrayObject', 'ArrayObject'],
- ['SplObjectStorage<\object>', 'SplObjectStorage'],
- ['Doctrine\Common\Collections\Collection', 'Doctrine\Common\Collections\Collection'],
- ['Doctrine\Common\Collections\ArrayCollection<>', 'Doctrine\Common\Collections\ArrayCollection'],
-
- // Types might also contain underscores at various points.
- ['Doctrine\Common\Collections\Array_Collection<>', 'Doctrine\Common\Collections\Array_Collection'],
- ];
+ yield ['integer', 'integer'];
+ yield ['int', 'int'];
+ yield ['array', 'array'];
+ yield ['ArrayObject', 'ArrayObject'];
+ yield ['SplObjectStorage', 'SplObjectStorage'];
+ yield ['Doctrine\Common\Collections\Collection', 'Doctrine\Common\Collections\Collection'];
+ yield ['Doctrine\Common\Collections\ArrayCollection', 'Doctrine\Common\Collections\ArrayCollection'];
+ yield ['array<\Some\Other\Class>', 'array'];
+ yield ['ArrayObject', 'ArrayObject'];
+ yield ['SplObjectStorage<\object>', 'SplObjectStorage'];
+ yield ['Doctrine\Common\Collections\Collection', 'Doctrine\Common\Collections\Collection'];
+ yield ['Doctrine\Common\Collections\ArrayCollection<>', 'Doctrine\Common\Collections\ArrayCollection'];
+ // Types might also contain underscores at various points.
+ yield ['Doctrine\Common\Collections\Array_Collection<>', 'Doctrine\Common\Collections\Array_Collection'];
}
- /**
- * @test
- * @dataProvider compositeTypes
- */
+ #[DataProvider('compositeTypes')]
+ #[Test]
public function extractCollectionTypeReturnsOnlyTheMainType(string $type, string $expectedResult)
{
- self::assertEquals(
+ self::assertSame(
$expectedResult,
TypeHandling::truncateElementType($type),
'Failed for ' . $type
@@ -118,44 +109,36 @@ public function extractCollectionTypeReturnsOnlyTheMainType(string $type, string
/**
* data provider for normalizeTypesReturnsNormalizedType
*/
- public function normalizeTypes()
+ public static function normalizeTypes(): \Iterator
{
- return [
- ['int', 'integer'],
- ['double', 'float'],
- ['bool', 'boolean'],
- ['string', 'string']
- ];
+ yield ['int', 'integer'];
+ yield ['double', 'float'];
+ yield ['bool', 'boolean'];
+ yield ['string', 'string'];
}
- /**
- * @test
- * @dataProvider normalizeTypes
- */
+ #[DataProvider('normalizeTypes')]
+ #[Test]
public function normalizeTypesReturnsNormalizedType(string $type, string $normalized)
{
- self::assertEquals(TypeHandling::normalizeType($type), $normalized);
+ self::assertSame(TypeHandling::normalizeType($type), $normalized);
}
/**
* data provider for isLiteralReturnsFalseForNonLiteralTypes
*/
- public function nonLiteralTypes()
+ public static function nonLiteralTypes(): \Iterator
{
- return [
- ['null'],
- ['DateTime'],
- ['\Foo\Bar'],
- ['array'],
- ['ArrayObject'],
- ['stdClass']
- ];
+ yield ['null'];
+ yield ['DateTime'];
+ yield ['\Foo\Bar'];
+ yield ['array'];
+ yield ['ArrayObject'];
+ yield ['stdClass'];
}
- /**
- * @test
- * @dataProvider nonliteralTypes
- */
+ #[DataProvider('nonliteralTypes')]
+ #[Test]
public function isLiteralReturnsFalseForNonLiteralTypes(string $type)
{
self::assertFalse(TypeHandling::isLiteral($type), 'Failed for ' . $type);
@@ -164,23 +147,19 @@ public function isLiteralReturnsFalseForNonLiteralTypes(string $type)
/**
* data provider for isLiteralReturnsTrueForLiterals
*/
- public function literals()
+ public static function literals(): \Iterator
{
- return [
- ['integer'],
- ['int'],
- ['float'],
- ['double'],
- ['boolean'],
- ['bool'],
- ['string']
- ];
+ yield ['integer'];
+ yield ['int'];
+ yield ['float'];
+ yield ['double'];
+ yield ['boolean'];
+ yield ['bool'];
+ yield ['string'];
}
- /**
- * @test
- * @dataProvider literals
- */
+ #[DataProvider('literals')]
+ #[Test]
public function isLiteralReturnsTrueForLiterals(string $type)
{
self::assertTrue(TypeHandling::isLiteral($type), 'Failed for ' . $type);
@@ -189,40 +168,36 @@ public function isLiteralReturnsTrueForLiterals(string $type)
/**
* data provider for isSimpleTypeReturnsTrueForSimpleType
*/
- public function simpleTypes()
+ public static function simpleTypes(): \Iterator
{
- return [
- ['null', true],
- ['integer', true],
- ['int', true],
- ['float', true],
- ['double', true],
- ['boolean', true],
- ['bool', true],
- ['string', true],
- ['true', true],
- ['false', true],
- ['SomeClassThatIsUnknownToPhpAtThisPoint', false],
- ['array', true],
- ['ArrayObject', false],
- ['SplObjectStorage', false],
- ['Doctrine\Common\Collections\Collection', false],
- ['Doctrine\Common\Collections\ArrayCollection', false],
- ['IteratorAggregate', false],
- ['Iterator', false],
- ['resource', false],
- ['parent', false],
- ['static', false],
- ['self', false],
- ['void', false],
- ['never', false]
- ];
+ yield ['null', true];
+ yield ['integer', true];
+ yield ['int', true];
+ yield ['float', true];
+ yield ['double', true];
+ yield ['boolean', true];
+ yield ['bool', true];
+ yield ['string', true];
+ yield ['true', true];
+ yield ['false', true];
+ yield ['SomeClassThatIsUnknownToPhpAtThisPoint', false];
+ yield ['array', true];
+ yield ['ArrayObject', false];
+ yield ['SplObjectStorage', false];
+ yield ['Doctrine\Common\Collections\Collection', false];
+ yield ['Doctrine\Common\Collections\ArrayCollection', false];
+ yield ['IteratorAggregate', false];
+ yield ['Iterator', false];
+ yield ['resource', false];
+ yield ['parent', false];
+ yield ['static', false];
+ yield ['self', false];
+ yield ['void', false];
+ yield ['never', false];
}
- /**
- * @test
- * @dataProvider simpleTypes
- */
+ #[DataProvider('simpleTypes')]
+ #[Test]
public function isSimpleTypeReturnsTrueForSimpleType(string $type, bool $expected)
{
self::assertSame($expected, TypeHandling::isSimpleType($type), 'Failed for ' . $type);
@@ -231,34 +206,30 @@ public function isSimpleTypeReturnsTrueForSimpleType(string $type, bool $expecte
/**
* data provider for isCollectionTypeReturnsTrueForCollectionType
*/
- public function collectionTypes()
+ public static function collectionTypes(): \Iterator
{
- return [
- ['null', false],
- ['integer', false],
- ['int', false],
- ['float', false],
- ['double', false],
- ['boolean', false],
- ['bool', false],
- ['string', false],
- ['true', false],
- ['false', false],
- ['SomeClassThatIsUnknownToPhpAtThisPoint', false],
- ['array', true],
- ['ArrayObject', true],
- ['SplObjectStorage', true],
- ['Doctrine\Common\Collections\Collection', true],
- ['Doctrine\Common\Collections\ArrayCollection', true],
- ['IteratorAggregate', true],
- ['Iterator', true]
- ];
+ yield ['null', false];
+ yield ['integer', false];
+ yield ['int', false];
+ yield ['float', false];
+ yield ['double', false];
+ yield ['boolean', false];
+ yield ['bool', false];
+ yield ['string', false];
+ yield ['true', false];
+ yield ['false', false];
+ yield ['SomeClassThatIsUnknownToPhpAtThisPoint', false];
+ yield ['array', true];
+ yield ['ArrayObject', true];
+ yield ['SplObjectStorage', true];
+ yield ['Doctrine\Common\Collections\Collection', true];
+ yield ['Doctrine\Common\Collections\ArrayCollection', true];
+ yield ['IteratorAggregate', true];
+ yield ['Iterator', true];
}
- /**
- * @test
- * @dataProvider collectionTypes
- */
+ #[DataProvider('collectionTypes')]
+ #[Test]
public function isCollectionTypeReturnsTrueForCollectionType(string $type, bool $expected)
{
self::assertSame($expected, TypeHandling::isCollectionType($type), 'Failed for ' . $type);
@@ -267,38 +238,32 @@ public function isCollectionTypeReturnsTrueForCollectionType(string $type, bool
/**
* data provider for isUnionTypeReturnsTrueForUnionType
*/
- public function unionAndIntersectionTypes()
+ public static function unionAndIntersectionTypes(): \Iterator
{
- return [
- ['null', false, false],
- ['integer', false, false],
- ['int', false, false],
- ['float', false, false],
- ['double', false, false],
- ['boolean', false, false],
- ['integer|null', true, false],
- ['integer|string', true, false],
- ['integer|false', true, false],
- ['SomeClassThatIsUnknownToPhpAtThisPoint|false', true, false],
- ['SomeClassThatIsUnknownToPhpAtThisPoint', false, false],
- ['ArrayObject', false, false],
- ['Iterator&Traversable', false, true]
- ];
+ yield ['null', false, false];
+ yield ['integer', false, false];
+ yield ['int', false, false];
+ yield ['float', false, false];
+ yield ['double', false, false];
+ yield ['boolean', false, false];
+ yield ['integer|null', true, false];
+ yield ['integer|string', true, false];
+ yield ['integer|false', true, false];
+ yield ['SomeClassThatIsUnknownToPhpAtThisPoint|false', true, false];
+ yield ['SomeClassThatIsUnknownToPhpAtThisPoint', false, false];
+ yield ['ArrayObject', false, false];
+ yield ['Iterator&Traversable', false, true];
}
- /**
- * @test
- * @dataProvider unionAndIntersectionTypes
- */
+ #[DataProvider('unionAndIntersectionTypes')]
+ #[Test]
public function isUnionTypeReturnsTrueForUnionType(string $type, bool $expectUnionType, bool $expectIntersectionType)
{
self::assertSame($expectUnionType, TypeHandling::isUnionType($type), 'Failed for ' . $type);
}
- /**
- * @test
- * @dataProvider unionAndIntersectionTypes
- */
+ #[DataProvider('unionAndIntersectionTypes')]
+ #[Test]
public function isIntersectionTypeReturnsTrueForIntersectionTypes(string $type, bool $expectUnionType, bool $expectIntersectionType)
{
self::assertSame($expectIntersectionType, TypeHandling::isIntersectionType($type), 'Failed for ' . $type);
@@ -307,41 +272,34 @@ public function isIntersectionTypeReturnsTrueForIntersectionTypes(string $type,
/**
* data provider for stripNullableTypesReturnsOnlyTheType
*/
- public function nullableTypes()
+ public static function nullableTypes(): \Iterator
{
- return [
- ['integer|null', 'integer'],
- ['null|int', 'int'],
- ['?int', 'int'],
- ['array|null', 'array'],
- ['?array', 'array'],
- ['ArrayObject|null', 'ArrayObject'],
- ['null|SplObjectStorage', 'SplObjectStorage'],
- ['Doctrine\Common\Collections\Collection|null', 'Doctrine\Common\Collections\Collection'],
- ['Doctrine\Common\Collections\ArrayCollection|null', 'Doctrine\Common\Collections\ArrayCollection'],
- ['array<\Some\Other\Class>|null', 'array<\Some\Other\Class>'],
- ['ArrayObject|null', 'ArrayObject'],
- ['?ArrayObject', 'ArrayObject'],
- ['SplObjectStorage<\object>|null', 'SplObjectStorage<\object>'],
- ['Doctrine\Common\Collections\Collection|null', 'Doctrine\Common\Collections\Collection'],
- ['Doctrine\Common\Collections\ArrayCollection|null', 'Doctrine\Common\Collections\ArrayCollection'],
-
- // This is not even a use case for Flow and is bad API design, but we still should handle it correctly.
- ['integer|null|bool', 'integer|bool'],
- ['?int|null', 'int'],
-
- // Types might also contain underscores at various points.
- ['null|Doctrine\Common\Collections\Array_Collection', 'Doctrine\Common\Collections\Array_Collection'],
-
- // This is madness. This... is... NULL!
- ['null', 'null']
- ];
+ yield ['integer|null', 'integer'];
+ yield ['null|int', 'int'];
+ yield ['?int', 'int'];
+ yield ['array|null', 'array'];
+ yield ['?array', 'array'];
+ yield ['ArrayObject|null', 'ArrayObject'];
+ yield ['null|SplObjectStorage', 'SplObjectStorage'];
+ yield ['Doctrine\Common\Collections\Collection|null', 'Doctrine\Common\Collections\Collection'];
+ yield ['Doctrine\Common\Collections\ArrayCollection|null', 'Doctrine\Common\Collections\ArrayCollection'];
+ yield ['array<\Some\Other\Class>|null', 'array<\Some\Other\Class>'];
+ yield ['ArrayObject|null', 'ArrayObject'];
+ yield ['?ArrayObject', 'ArrayObject'];
+ yield ['SplObjectStorage<\object>|null', 'SplObjectStorage<\object>'];
+ yield ['Doctrine\Common\Collections\Collection|null', 'Doctrine\Common\Collections\Collection'];
+ yield ['Doctrine\Common\Collections\ArrayCollection|null', 'Doctrine\Common\Collections\ArrayCollection'];
+ // This is not even a use case for Flow and is bad API design, but we still should handle it correctly.
+ yield ['integer|null|bool', 'integer|bool'];
+ yield ['?int|null', 'int'];
+ // Types might also contain underscores at various points.
+ yield ['null|Doctrine\Common\Collections\Array_Collection', 'Doctrine\Common\Collections\Array_Collection'];
+ // This is madness. This... is... NULL!
+ yield ['null', 'null'];
}
- /**
- * @test
- * @dataProvider nullableTypes
- */
+ #[DataProvider('nullableTypes')]
+ #[Test]
public function stripNullableTypesReturnsOnlyTheType($type, $expectedResult)
{
self::assertEquals(
@@ -351,10 +309,8 @@ public function stripNullableTypesReturnsOnlyTheType($type, $expectedResult)
);
}
- /**
- * @test
- * @dataProvider nullableTypes
- */
+ #[DataProvider('nullableTypes')]
+ #[Test]
public function parseTypeReturnsNullableHint($type, $expectedResult)
{
try {
diff --git a/Neos.Utility.ObjectHandling/composer.json b/Neos.Utility.ObjectHandling/composer.json
index fbba668e5e..b6619ce605 100644
--- a/Neos.Utility.ObjectHandling/composer.json
+++ b/Neos.Utility.ObjectHandling/composer.json
@@ -8,7 +8,7 @@
"php": "^8.0"
},
"require-dev": {
- "phpunit/phpunit": "~9.1",
+ "phpunit/phpunit": "~11.5",
"doctrine/orm": "^2.12.0",
"doctrine/common": "^2.13.1 || ^3.0"
},
diff --git a/Neos.Utility.Schema/Tests/Unit/SchemaGeneratorTest.php b/Neos.Utility.Schema/Tests/Unit/SchemaGeneratorTest.php
index 654930396b..6fab748300 100644
--- a/Neos.Utility.Schema/Tests/Unit/SchemaGeneratorTest.php
+++ b/Neos.Utility.Schema/Tests/Unit/SchemaGeneratorTest.php
@@ -1,4 +1,7 @@
*/
- public function schemaGenerationForSimpleTypesDataProvider()
+ public static function schemaGenerationForSimpleTypesDataProvider(): \Iterator
{
- return [
- ['string', ['type' => 'string']],
- [false, ['type' => 'boolean']],
- [true, ['type' => 'boolean']],
- [10.75, ['type' => 'number']],
- [1234, ['type' => 'integer']],
- [null, ['type' => 'null']]
- ];
+ yield ['string', ['type' => 'string']];
+ yield [false, ['type' => 'boolean']];
+ yield [true, ['type' => 'boolean']];
+ yield [10.75, ['type' => 'number']];
+ yield [1234, ['type' => 'integer']];
+ yield [null, ['type' => 'null']];
}
- /**
- * @dataProvider schemaGenerationForSimpleTypesDataProvider
- * @test
- */
+ #[DataProvider('schemaGenerationForSimpleTypesDataProvider')]
+ #[Test]
public function testSchemaGenerationForSimpleTypes($value, array $expectedSchema)
{
$schema = $this->configurationGenerator->generate($value);
@@ -54,21 +55,17 @@ public function testSchemaGenerationForSimpleTypes($value, array $expectedSchema
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function schemaGenerationForArrayOfTypesDataProvider()
+ public static function schemaGenerationForArrayOfTypesDataProvider(): \Iterator
{
- return [
- [['string'], ['type' => 'array', 'items' => ['type' => 'string']]],
- [['string', 'foo', 'bar'], ['type' => 'array', 'items' => ['type' => 'string']]],
- [['string', 'foo', 123], ['type' => 'array', 'items' => [['type' => 'string'], ['type' => 'integer']]]]
- ];
+ yield [['string'], ['type' => 'array', 'items' => ['type' => 'string']]];
+ yield [['string', 'foo', 'bar'], ['type' => 'array', 'items' => ['type' => 'string']]];
+ yield [['string', 'foo', 123], ['type' => 'array', 'items' => [['type' => 'string'], ['type' => 'integer']]]];
}
- /**
- * @dataProvider schemaGenerationForArrayOfTypesDataProvider
- * @test
- */
+ #[DataProvider('schemaGenerationForArrayOfTypesDataProvider')]
+ #[Test]
public function testSchemaGenerationForArrayOfTypes(array $value, array $expectedSchema)
{
$schema = $this->configurationGenerator->generate($value);
diff --git a/Neos.Utility.Schema/Tests/Unit/SchemaValidatorTest.php b/Neos.Utility.Schema/Tests/Unit/SchemaValidatorTest.php
index a06e0b8c3d..e025c9ad9f 100644
--- a/Neos.Utility.Schema/Tests/Unit/SchemaValidatorTest.php
+++ b/Neos.Utility.Schema/Tests/Unit/SchemaValidatorTest.php
@@ -1,4 +1,7 @@
configurationValidator = $this->getMockBuilder(SchemaValidator::class)->setMethods(['getError'])->getMock();
+ $this->configurationValidator = $this->getMockBuilder(SchemaValidator::class)->onlyMethods([])->getMock();
}
/**
@@ -36,7 +41,7 @@ protected function setUp(): void
* @param boolean $expectError
* @return void
*/
- protected function assertError(Error\Result $result, bool $expectError = true)
+ protected function assertError(Error\Result $result, bool $expectError = true): void
{
if ($expectError === true) {
self::assertTrue($result->hasErrors());
@@ -52,7 +57,7 @@ protected function assertError(Error\Result $result, bool $expectError = true)
* @param boolean $expectSuccess
* @return void
*/
- protected function assertSuccess(Error\Result $result, bool $expectSuccess = true)
+ protected function assertSuccess(Error\Result $result, bool $expectSuccess = true): void
{
if ($expectSuccess === true) {
self::assertFalse($result->hasErrors());
@@ -62,25 +67,21 @@ protected function assertSuccess(Error\Result $result, bool $expectSuccess = tru
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesRequiredPropertyDataProvider()
- {
- return [
- [['foo' => 'a string'], true],
- [['foo' => 'a string', 'bar' => 'a string'], true],
- [['foo' => 'a string', 'bar' => 123], false],
- [['foo' => 'a string', 'bar' => 'a string'], true],
- [['foo' => 123, 'bar' => 'a string'], false],
- [['foo' => null, 'bar' => 'a string'], false],
- [['bar' => 'string'], false]
- ];
+ public static function validateHandlesRequiredPropertyDataProvider(): \Iterator
+ {
+ yield [['foo' => 'a string'], true];
+ yield [['foo' => 'a string', 'bar' => 'a string'], true];
+ yield [['foo' => 'a string', 'bar' => 123], false];
+ yield [['foo' => 'a string', 'bar' => 'a string'], true];
+ yield [['foo' => 123, 'bar' => 'a string'], false];
+ yield [['foo' => null, 'bar' => 'a string'], false];
+ yield [['bar' => 'string'], false];
}
- /**
- * @test
- * @dataProvider validateHandlesRequiredPropertyDataProvider
- */
+ #[DataProvider('validateHandlesRequiredPropertyDataProvider')]
+ #[Test]
public function validateHandlesRequiredProperty(array $value, bool $expectSuccess)
{
$schema = [
@@ -97,21 +98,17 @@ public function validateHandlesRequiredProperty(array $value, bool $expectSucces
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesDisallowPropertyDataProvider()
+ public static function validateHandlesDisallowPropertyDataProvider(): \Iterator
{
- return [
- ['string', true],
- [123, false],
- [[1,2,3], false]
- ];
+ yield ['string', true];
+ yield [123, false];
+ yield [[1,2,3], false];
}
- /**
- * @test
- * @dataProvider validateHandlesDisallowPropertyDataProvider
- */
+ #[DataProvider('validateHandlesDisallowPropertyDataProvider')]
+ #[Test]
public function validateHandlesDisallowProperty($value, bool $expectSuccess)
{
$schema = [
@@ -121,23 +118,19 @@ public function validateHandlesDisallowProperty($value, bool $expectSuccess)
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesEnumPropertyDataProvider()
- {
- return [
- [1, true],
- [2, true],
- [null, false],
- [4, false],
- [[1,2,3], false]
- ];
+ public static function validateHandlesEnumPropertyDataProvider(): \Iterator
+ {
+ yield [1, true];
+ yield [2, true];
+ yield [null, false];
+ yield [4, false];
+ yield [[1,2,3], false];
}
- /**
- * @test
- * @dataProvider validateHandlesEnumPropertyDataProvider
- */
+ #[DataProvider('validateHandlesEnumPropertyDataProvider')]
+ #[Test]
public function validateHandlesEnumProperty($value, bool $expectSuccess)
{
$schema = [
@@ -146,9 +139,7 @@ public function validateHandlesEnumProperty($value, bool $expectSuccess)
$this->assertSuccess($this->configurationValidator->validate($value, $schema), $expectSuccess);
}
- /**
- * @test
- */
+ #[Test]
public function validateReturnsErrorPath()
{
$value = [
@@ -180,32 +171,28 @@ public function validateReturnsErrorPath()
$this->assertError($result);
$allErrors = $result->getFlattenedErrors();
- self::assertTrue(array_key_exists('foo.bar.baz', $allErrors));
+ self::assertArrayHasKey('foo.bar.baz', $allErrors);
$pathErrors = $result->forProperty('foo.bar.baz')->getErrors();
$firstPathError = $pathErrors[0];
- self::assertEquals($firstPathError->getCode(), 1328557141);
+ self::assertEquals(1328557141, $firstPathError->getCode());
self::assertEquals($firstPathError->getArguments(), ['type=number', 'type=string']);
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesMultipleTypesDataProvider()
- {
- return [
- [['property' => 'value'], true],
- ['value', true],
- [false, false],
- [123, false],
- [[1,2,3], false]
- ];
+ public static function validateHandlesMultipleTypesDataProvider(): \Iterator
+ {
+ yield [['property' => 'value'], true];
+ yield ['value', true];
+ yield [false, false];
+ yield [123, false];
+ yield [[1,2,3], false];
}
- /**
- * @test
- * @dataProvider validateHandlesMultipleTypesDataProvider
- */
+ #[DataProvider('validateHandlesMultipleTypesDataProvider')]
+ #[Test]
public function validateHandlesMultipleTypes($value, bool $expectSuccess)
{
$schema = ['dictionary', 'string'];
@@ -214,10 +201,8 @@ public function validateHandlesMultipleTypes($value, bool $expectSuccess)
$this->assertSuccess($result, $expectSuccess);
}
- /**
- * @test
- * @dataProvider validateHandlesMultipleTypesDataProvider
- */
+ #[DataProvider('validateHandlesMultipleTypesDataProvider')]
+ #[Test]
public function validateHandlesMultipleTypesInSchemaType($value, bool $expectSuccess)
{
$schema = [
@@ -227,10 +212,8 @@ public function validateHandlesMultipleTypesInSchemaType($value, bool $expectSuc
$this->assertSuccess($result, $expectSuccess);
}
- /**
- * @test
- * @dataProvider validateHandlesMultipleTypesDataProvider
- */
+ #[DataProvider('validateHandlesMultipleTypesDataProvider')]
+ #[Test]
public function validateHandlesMultipleTypesInSubProperty($value, bool $expectSuccess)
{
$schema = [
@@ -246,25 +229,20 @@ public function validateHandlesMultipleTypesInSubProperty($value, bool $expectSu
}
/// INTEGER ///
-
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesIntegerTypePropertyDataProvider()
- {
- return [
- [23, true],
- ['foo', false],
- [23.42, false],
- [[], false],
- [null, false],
- ];
+ public static function validateHandlesIntegerTypePropertyDataProvider(): \Iterator
+ {
+ yield [23, true];
+ yield ['foo', false];
+ yield [23.42, false];
+ yield [[], false];
+ yield [null, false];
}
- /**
- * @test
- * @dataProvider validateHandlesIntegerTypePropertyDataProvider
- */
+ #[DataProvider('validateHandlesIntegerTypePropertyDataProvider')]
+ #[Test]
public function validateHandlesIntegerTypeProperty($value, bool $expectSuccess)
{
$schema = [
@@ -274,24 +252,19 @@ public function validateHandlesIntegerTypeProperty($value, bool $expectSuccess)
}
/// NUMBER ///
-
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesNumberTypePropertyDataProvider()
+ public static function validateHandlesNumberTypePropertyDataProvider(): \Iterator
{
- return [
- [23.42, true],
- [42, true],
- ['foo', false],
- [null, false]
- ];
+ yield [23.42, true];
+ yield [42, true];
+ yield ['foo', false];
+ yield [null, false];
}
- /**
- * @test
- * @dataProvider validateHandlesNumberTypePropertyDataProvider
- */
+ #[DataProvider('validateHandlesNumberTypePropertyDataProvider')]
+ #[Test]
public function validateHandlesNumberTypeProperty($value, bool $expectSuccess)
{
$schema = [
@@ -301,23 +274,19 @@ public function validateHandlesNumberTypeProperty($value, bool $expectSuccess)
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesNumberTypePropertyWithMinimumAndMaximumConstraintDataProvider()
- {
- return [
- [33, true],
- [99, false],
- [1, false],
- [23, true],
- [42, true]
- ];
+ public static function validateHandlesNumberTypePropertyWithMinimumAndMaximumConstraintDataProvider(): \Iterator
+ {
+ yield [33, true];
+ yield [99, false];
+ yield [1, false];
+ yield [23, true];
+ yield [42, true];
}
- /**
- * @test
- * @dataProvider validateHandlesNumberTypePropertyWithMinimumAndMaximumConstraintDataProvider
- */
+ #[DataProvider('validateHandlesNumberTypePropertyWithMinimumAndMaximumConstraintDataProvider')]
+ #[Test]
public function validateHandlesNumberTypePropertyWithMinimumAndMaximumConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -328,10 +297,8 @@ public function validateHandlesNumberTypePropertyWithMinimumAndMaximumConstraint
$this->assertSuccess($this->configurationValidator->validate($value, $schema), $expectSuccess);
}
- /**
- * @test
- * @dataProvider validateHandlesNumberTypePropertyWithMinimumAndMaximumConstraintDataProvider
- */
+ #[DataProvider('validateHandlesNumberTypePropertyWithMinimumAndMaximumConstraintDataProvider')]
+ #[Test]
public function validateHandlesNumberTypePropertyWithNonExclusiveMinimumAndMaximumConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -345,24 +312,20 @@ public function validateHandlesNumberTypePropertyWithNonExclusiveMinimumAndMaxim
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesNumberTypePropertyWithExclusiveMinimumAndMaximumConstraintDataProvider()
- {
- return [
- [10, false],
- [22, false],
- [23, true],
- [42, true],
- [43, false],
- [99, false]
- ];
+ public static function validateHandlesNumberTypePropertyWithExclusiveMinimumAndMaximumConstraintDataProvider(): \Iterator
+ {
+ yield [10, false];
+ yield [22, false];
+ yield [23, true];
+ yield [42, true];
+ yield [43, false];
+ yield [99, false];
}
- /**
- * @test
- * @dataProvider validateHandlesNumberTypePropertyWithExclusiveMinimumAndMaximumConstraintDataProvider
- */
+ #[DataProvider('validateHandlesNumberTypePropertyWithExclusiveMinimumAndMaximumConstraintDataProvider')]
+ #[Test]
public function validateHandlesNumberTypePropertyWithExclusiveMinimumAndMaximumConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -376,23 +339,19 @@ public function validateHandlesNumberTypePropertyWithExclusiveMinimumAndMaximumC
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesNumberTypePropertyWithDivisibleByConstraintDataProvider()
- {
- return [
- [4, true],
- [3, false],
- [-3, false],
- [-4, true],
- [0, true],
- ];
+ public static function validateHandlesNumberTypePropertyWithDivisibleByConstraintDataProvider(): \Iterator
+ {
+ yield [4, true];
+ yield [3, false];
+ yield [-3, false];
+ yield [-4, true];
+ yield [0, true];
}
- /**
- * @test
- * @dataProvider validateHandlesNumberTypePropertyWithDivisibleByConstraintDataProvider
- */
+ #[DataProvider('validateHandlesNumberTypePropertyWithDivisibleByConstraintDataProvider')]
+ #[Test]
public function validateHandlesNumberTypePropertyWithDivisibleByConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -403,22 +362,17 @@ public function validateHandlesNumberTypePropertyWithDivisibleByConstraint($valu
}
/// STRING ///
-
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyDataProvider()
+ public static function validateHandlesStringTypePropertyDataProvider(): \Iterator
{
- return [
- ['FooBar', true],
- [123, false]
- ];
+ yield ['FooBar', true];
+ yield [123, false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyDataProvider')]
+ #[Test]
public function validateHandlesStringTypeProperty($value, bool $expectSuccess)
{
$schema = [
@@ -428,21 +382,17 @@ public function validateHandlesStringTypeProperty($value, bool $expectSuccess)
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyWithPatternConstraintDataProvider()
+ public static function validateHandlesStringTypePropertyWithPatternConstraintDataProvider(): \Iterator
{
- return [
- ['12a', true],
- ['1236', false],
- ['12c', false]
- ];
+ yield ['12a', true];
+ yield ['1236', false];
+ yield ['12c', false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyWithPatternConstraintDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyWithPatternConstraintDataProvider')]
+ #[Test]
public function validateHandlesStringTypePropertyWithPatternConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -453,23 +403,19 @@ public function validateHandlesStringTypePropertyWithPatternConstraint($value, b
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyWithDateTimeConstraintDataProvider()
- {
- return [
- ['01:25:00', false],
- ['1976-04-18', false],
- ['1976-04-18T01:25:00+00:00', true],
- ['foobar', false],
- [123, false]
- ];
+ public static function validateHandlesStringTypePropertyWithDateTimeConstraintDataProvider(): \Iterator
+ {
+ yield ['01:25:00', false];
+ yield ['1976-04-18', false];
+ yield ['1976-04-18T01:25:00+00:00', true];
+ yield ['foobar', false];
+ yield [123, false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyWithDateTimeConstraintDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyWithDateTimeConstraintDataProvider')]
+ #[Test]
public function validateHandlesStringTypePropertyWithDateTimeConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -480,23 +426,19 @@ public function validateHandlesStringTypePropertyWithDateTimeConstraint($value,
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyWithFormatDateConstraintDataProvider()
- {
- return [
- ['01:25:00', false],
- ['1976-04-18', true],
- ['1976-04-18T01:25:00+00:00', false],
- ['foobar', false],
- [123, false]
- ];
+ public static function validateHandlesStringTypePropertyWithFormatDateConstraintDataProvider(): \Iterator
+ {
+ yield ['01:25:00', false];
+ yield ['1976-04-18', true];
+ yield ['1976-04-18T01:25:00+00:00', false];
+ yield ['foobar', false];
+ yield [123, false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyWithFormatDateConstraintDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyWithFormatDateConstraintDataProvider')]
+ #[Test]
public function validateHandlesStringTypePropertyWithFormatDateConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -507,23 +449,19 @@ public function validateHandlesStringTypePropertyWithFormatDateConstraint($value
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyWithFormatTimeConstraintDataProvider()
- {
- return [
- ['01:25:00', true],
- ['1976-04-18', false],
- ['1976-04-18T01:25:00+00:00', false],
- ['foobar', false],
- [123, false]
- ];
+ public static function validateHandlesStringTypePropertyWithFormatTimeConstraintDataProvider(): \Iterator
+ {
+ yield ['01:25:00', true];
+ yield ['1976-04-18', false];
+ yield ['1976-04-18T01:25:00+00:00', false];
+ yield ['foobar', false];
+ yield [123, false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyWithFormatTimeConstraintDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyWithFormatTimeConstraintDataProvider')]
+ #[Test]
public function validateHandlesStringTypePropertyWithFormatTimeConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -534,22 +472,18 @@ public function validateHandlesStringTypePropertyWithFormatTimeConstraint($value
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyWithFormatUriPConstraintDataProvider()
+ public static function validateHandlesStringTypePropertyWithFormatUriPConstraintDataProvider(): \Iterator
{
- return [
- ['http://foo.bar.de', true],
- ['ftp://dasdas.de/foo/bar/?asds=123&dasdasd#dasdas', true],
- ['foo', false],
- [123, false],
- ];
+ yield ['http://foo.bar.de', true];
+ yield ['ftp://dasdas.de/foo/bar/?asds=123&dasdasd#dasdas', true];
+ yield ['foo', false];
+ yield [123, false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyWithFormatUriPConstraintDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyWithFormatUriPConstraintDataProvider')]
+ #[Test]
public function validateHandlesStringTypePropertyWithFormatUriPConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -560,22 +494,18 @@ public function validateHandlesStringTypePropertyWithFormatUriPConstraint($value
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyWithFormatHostnameConstraintDataProvider()
+ public static function validateHandlesStringTypePropertyWithFormatHostnameConstraintDataProvider(): \Iterator
{
- return [
- ['www.neos.io', true],
- ['this.is.an.invalid.hostname', false],
- ['foobar', false],
- [123, false]
- ];
+ yield ['www.neos.io', true];
+ yield ['this.is.an.invalid.hostname', false];
+ yield ['foobar', false];
+ yield [123, false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyWithFormatHostnameConstraintDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyWithFormatHostnameConstraintDataProvider')]
+ #[Test]
public function validateHandlesStringTypePropertyWithFormatHostnameConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -586,22 +516,18 @@ public function validateHandlesStringTypePropertyWithFormatHostnameConstraint($v
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyWithFormatIpv4ConstraintDataProvider()
+ public static function validateHandlesStringTypePropertyWithFormatIpv4ConstraintDataProvider(): \Iterator
{
- return [
- ['2001:0db8:85a3:08d3:1319:8a2e:0370:7344', false],
- ['123.132.123.132', true],
- ['foobar', false],
- [123, false]
- ];
+ yield ['2001:0db8:85a3:08d3:1319:8a2e:0370:7344', false];
+ yield ['123.132.123.132', true];
+ yield ['foobar', false];
+ yield [123, false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyWithFormatIpv4ConstraintDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyWithFormatIpv4ConstraintDataProvider')]
+ #[Test]
public function validateHandlesStringTypePropertyWithFormatIpv4Constraint($value, bool $expectSuccess)
{
$schema = [
@@ -612,22 +538,18 @@ public function validateHandlesStringTypePropertyWithFormatIpv4Constraint($value
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyWithFormatIpv6ConstraintDataProvider()
+ public static function validateHandlesStringTypePropertyWithFormatIpv6ConstraintDataProvider(): \Iterator
{
- return [
- ['2001:0db8:85a3:08d3:1319:8a2e:0370:7344', true],
- ['123.132.123.132', false],
- ['foobar', false],
- [123, false]
- ];
+ yield ['2001:0db8:85a3:08d3:1319:8a2e:0370:7344', true];
+ yield ['123.132.123.132', false];
+ yield ['foobar', false];
+ yield [123, false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyWithFormatIpv6ConstraintDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyWithFormatIpv6ConstraintDataProvider')]
+ #[Test]
public function validateHandlesStringTypePropertyWithFormatIpv6Constraint($value, bool $expectSuccess)
{
$schema = [
@@ -638,23 +560,19 @@ public function validateHandlesStringTypePropertyWithFormatIpv6Constraint($value
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyWithFormatIpAddressConstraintDataProvider()
- {
- return [
- ['2001:0db8:85a3:08d3:1319:8a2e:0370:7344', true],
- ['123.132.123.132', true],
- ['foobar', false],
- ['ab1', false],
- [123, false]
- ];
+ public static function validateHandlesStringTypePropertyWithFormatIpAddressConstraintDataProvider(): \Iterator
+ {
+ yield ['2001:0db8:85a3:08d3:1319:8a2e:0370:7344', true];
+ yield ['123.132.123.132', true];
+ yield ['foobar', false];
+ yield ['ab1', false];
+ yield [123, false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyWithFormatIpAddressConstraintDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyWithFormatIpAddressConstraintDataProvider')]
+ #[Test]
public function validateHandlesStringTypePropertyWithFormatIpAddressConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -665,25 +583,21 @@ public function validateHandlesStringTypePropertyWithFormatIpAddressConstraint($
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyWithFormatClassNameConstraintDataProvider()
- {
- return [
- [SchemaValidator::class, true],
- ['Neos\Flow\UnknownClass', false],
- ['foobar', false],
- ['foo bar', false],
- ['foo/bar', false],
- ['flow/welcome', false],
- [123, false]
- ];
+ public static function validateHandlesStringTypePropertyWithFormatClassNameConstraintDataProvider(): \Iterator
+ {
+ yield [SchemaValidator::class, true];
+ yield ['Neos\Flow\UnknownClass', false];
+ yield ['foobar', false];
+ yield ['foo bar', false];
+ yield ['foo/bar', false];
+ yield ['flow/welcome', false];
+ yield [123, false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyWithFormatClassNameConstraintDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyWithFormatClassNameConstraintDataProvider')]
+ #[Test]
public function validateHandlesStringTypePropertyWithFormatClassNameConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -694,25 +608,21 @@ public function validateHandlesStringTypePropertyWithFormatClassNameConstraint($
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyWithFormatInterfaceNameConstraintDataProvider()
- {
- return [
- [\Iterator::class, true],
- ['\Neos\Flow\UnknownClass', false],
- ['foobar', false],
- ['foo bar', false],
- ['foo/bar', false],
- ['flow/welcome', false],
- [123, false]
- ];
+ public static function validateHandlesStringTypePropertyWithFormatInterfaceNameConstraintDataProvider(): \Iterator
+ {
+ yield [\Iterator::class, true];
+ yield ['\Neos\Flow\UnknownClass', false];
+ yield ['foobar', false];
+ yield ['foo bar', false];
+ yield ['foo/bar', false];
+ yield ['flow/welcome', false];
+ yield [123, false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyWithFormatInterfaceNameConstraintDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyWithFormatInterfaceNameConstraintDataProvider')]
+ #[Test]
public function validateHandlesStringTypePropertyWithFormatInterfaceNameConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -723,21 +633,17 @@ public function validateHandlesStringTypePropertyWithFormatInterfaceNameConstrai
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyWithMinLengthConstraintDataProvider()
+ public static function validateHandlesStringTypePropertyWithMinLengthConstraintDataProvider(): \Iterator
{
- return [
- ['12356', true],
- ['1235', true],
- ['123', false],
- ];
+ yield ['12356', true];
+ yield ['1235', true];
+ yield ['123', false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyWithMinLengthConstraintDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyWithMinLengthConstraintDataProvider')]
+ #[Test]
public function validateHandlesStringTypePropertyWithMinLengthConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -748,21 +654,17 @@ public function validateHandlesStringTypePropertyWithMinLengthConstraint($value,
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesStringTypePropertyWithMaxLengthConstraintDataProvider()
+ public static function validateHandlesStringTypePropertyWithMaxLengthConstraintDataProvider(): \Iterator
{
- return [
- ['123', true],
- ['1234', true],
- ['12345', false]
- ];
+ yield ['123', true];
+ yield ['1234', true];
+ yield ['12345', false];
}
- /**
- * @test
- * @dataProvider validateHandlesStringTypePropertyWithMaxLengthConstraintDataProvider
- */
+ #[DataProvider('validateHandlesStringTypePropertyWithMaxLengthConstraintDataProvider')]
+ #[Test]
public function validateHandlesStringTypePropertyWithMaxLengthConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -774,26 +676,21 @@ public function validateHandlesStringTypePropertyWithMaxLengthConstraint($value,
/// BOOLEAN ///
-
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesBooleanTypeDataProvider()
- {
- return [
- [true, true],
- [false, true],
- ['foo', false],
- [123, false],
- [12.34, false],
- [[1,2,3], false]
- ];
+ public static function validateHandlesBooleanTypeDataProvider(): \Iterator
+ {
+ yield [true, true];
+ yield [false, true];
+ yield ['foo', false];
+ yield [123, false];
+ yield [12.34, false];
+ yield [[1,2,3], false];
}
- /**
- * @test
- * @dataProvider validateHandlesBooleanTypeDataProvider
- */
+ #[DataProvider('validateHandlesBooleanTypeDataProvider')]
+ #[Test]
public function validateHandlesBooleanType($value, bool $expectSuccess)
{
$schema = [
@@ -803,23 +700,18 @@ public function validateHandlesBooleanType($value, bool $expectSuccess)
}
/// ARRAY ///
-
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesArrayTypePropertyDataProvider()
+ public static function validateHandlesArrayTypePropertyDataProvider(): \Iterator
{
- return [
- [[1, 2, 3], true],
- ['foo', false],
- [['foo' => 'bar'], false]
- ];
+ yield [[1, 2, 3], true];
+ yield ['foo', false];
+ yield [['foo' => 'bar'], false];
}
- /**
- * @test
- * @dataProvider validateHandlesArrayTypePropertyDataProvider
- */
+ #[DataProvider('validateHandlesArrayTypePropertyDataProvider')]
+ #[Test]
public function validateHandlesArrayTypeProperty($value, bool $expectSuccess)
{
$schema = [
@@ -829,20 +721,16 @@ public function validateHandlesArrayTypeProperty($value, bool $expectSuccess)
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesArrayTypePropertyWithItemsConstraintDataProvider()
+ public static function validateHandlesArrayTypePropertyWithItemsConstraintDataProvider(): \Iterator
{
- return [
- [[1, 2, 3], true],
- [[1, 2, 'test string'], false]
- ];
+ yield [[1, 2, 3], true];
+ yield [[1, 2, 'test string'], false];
}
- /**
- * @test
- * @dataProvider validateHandlesArrayTypePropertyWithItemsConstraintDataProvider
- */
+ #[DataProvider('validateHandlesArrayTypePropertyWithItemsConstraintDataProvider')]
+ #[Test]
public function validateHandlesArrayTypePropertyWithItemsConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -853,20 +741,16 @@ public function validateHandlesArrayTypePropertyWithItemsConstraint($value, bool
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesArrayTypePropertyWithItemsSchemaConstraintDataProvider()
+ public static function validateHandlesArrayTypePropertyWithItemsSchemaConstraintDataProvider(): \Iterator
{
- return [
- [[1, 2, 3], true],
- [[1, 2, 'test string'], false]
- ];
+ yield [[1, 2, 3], true];
+ yield [[1, 2, 'test string'], false];
}
- /**
- * @test
- * @dataProvider validateHandlesArrayTypePropertyWithItemsSchemaConstraintDataProvider
- */
+ #[DataProvider('validateHandlesArrayTypePropertyWithItemsSchemaConstraintDataProvider')]
+ #[Test]
public function validateHandlesArrayTypePropertyWithItemsSchemaConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -879,20 +763,16 @@ public function validateHandlesArrayTypePropertyWithItemsSchemaConstraint($value
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesArrayTypePropertyWithItemsArrayConstraintDataProvider()
+ public static function validateHandlesArrayTypePropertyWithItemsArrayConstraintDataProvider(): \Iterator
{
- return [
- [[1, 2, 'test string'], true],
- [[1, 2, 'test string', 1.56], false]
- ];
+ yield [[1, 2, 'test string'], true];
+ yield [[1, 2, 'test string', 1.56], false];
}
- /**
- * @test
- * @dataProvider validateHandlesArrayTypePropertyWithItemsArrayConstraintDataProvider
- */
+ #[DataProvider('validateHandlesArrayTypePropertyWithItemsArrayConstraintDataProvider')]
+ #[Test]
public function validateHandlesArrayTypePropertyWithItemsArrayConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -906,22 +786,18 @@ public function validateHandlesArrayTypePropertyWithItemsArrayConstraint($value,
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesArrayUniqueItemsConstraintDataProvider()
+ public static function validateHandlesArrayUniqueItemsConstraintDataProvider(): \Iterator
{
- return [
- [[1,2,3], true],
- [[1,2,1], false],
- [[[1,2], [1,3]], true],
- [[[1,2], [1,3], [1,2]], false],
- ];
+ yield [[1,2,3], true];
+ yield [[1,2,1], false];
+ yield [[[1,2], [1,3]], true];
+ yield [[[1,2], [1,3], [1,2]], false];
}
- /**
- * @test
- * @dataProvider validateHandlesArrayUniqueItemsConstraintDataProvider
- */
+ #[DataProvider('validateHandlesArrayUniqueItemsConstraintDataProvider')]
+ #[Test]
public function validateHandlesArrayUniqueItemsConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -932,22 +808,17 @@ public function validateHandlesArrayUniqueItemsConstraint($value, bool $expectSu
}
/// DICTIONARY ///
-
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesDictionaryTypeDataProvider()
+ public static function validateHandlesDictionaryTypeDataProvider(): \Iterator
{
- return [
- [['A' => 1, 'B' => 2, 'C' => 3], true],
- [[1, 2, 3], false]
- ];
+ yield [['A' => 1, 'B' => 2, 'C' => 3], true];
+ yield [[1, 2, 3], false];
}
- /**
- * @test
- * @dataProvider validateHandlesDictionaryTypeDataProvider
- */
+ #[DataProvider('validateHandlesDictionaryTypeDataProvider')]
+ #[Test]
public function validateHandlesDictionaryType($value, bool $expectSuccess)
{
$schema = [
@@ -957,21 +828,17 @@ public function validateHandlesDictionaryType($value, bool $expectSuccess)
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesDictionaryTypeWithPropertiesConstraintDataProvider()
+ public static function validateHandlesDictionaryTypeWithPropertiesConstraintDataProvider(): \Iterator
{
- return [
- [['foo' => 123, 'bar' => 'baz'], true],
- [['foo' => 'baz', 'bar' => 'baz'], false],
- [['foo' => 123, 'bar' => 123], false]
- ];
+ yield [['foo' => 123, 'bar' => 'baz'], true];
+ yield [['foo' => 'baz', 'bar' => 'baz'], false];
+ yield [['foo' => 123, 'bar' => 123], false];
}
- /**
- * @test
- * @dataProvider validateHandlesDictionaryTypeWithPropertiesConstraintDataProvider
- */
+ #[DataProvider('validateHandlesDictionaryTypeWithPropertiesConstraintDataProvider')]
+ #[Test]
public function validateHandlesDictionaryTypeWithPropertiesConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -985,22 +852,18 @@ public function validateHandlesDictionaryTypeWithPropertiesConstraint($value, bo
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesDictionaryTypeWithPatternPropertiesConstraintDataProvider()
+ public static function validateHandlesDictionaryTypeWithPatternPropertiesConstraintDataProvider(): \Iterator
{
- return [
- [['ab1' => 'string'], true],
- [['bbb' => 123], false],
- [['ab' => 123], false],
- [['ad12' => 'string'], false],
- ];
+ yield [['ab1' => 'string'], true];
+ yield [['bbb' => 123], false];
+ yield [['ab' => 123], false];
+ yield [['ad12' => 'string'], false];
}
- /**
- * @test
- * @dataProvider validateHandlesDictionaryTypeWithPatternPropertiesConstraintDataProvider
- */
+ #[DataProvider('validateHandlesDictionaryTypeWithPatternPropertiesConstraintDataProvider')]
+ #[Test]
public function validateHandlesDictionaryTypeWithPatternPropertiesConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -1014,21 +877,17 @@ public function validateHandlesDictionaryTypeWithPatternPropertiesConstraint($va
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesDictionaryTypeWithFormatPropertiesConstraintDataProvider()
+ public static function validateHandlesDictionaryTypeWithFormatPropertiesConstraintDataProvider(): \Iterator
{
- return [
- [['127.0.0.1' => 'string'], true],
- [['string' => 123], false],
- [['127.0.0.1' => 123], false],
- ];
+ yield [['127.0.0.1' => 'string'], true];
+ yield [['string' => 123], false];
+ yield [['127.0.0.1' => 123], false];
}
- /**
- * @test
- * @dataProvider validateHandlesDictionaryTypeWithFormatPropertiesConstraintDataProvider
- */
+ #[DataProvider('validateHandlesDictionaryTypeWithFormatPropertiesConstraintDataProvider')]
+ #[Test]
public function validateHandlesDictionaryTypeWithFormatPropertiesConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -1042,21 +901,17 @@ public function validateHandlesDictionaryTypeWithFormatPropertiesConstraint($val
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesDictionaryTypeWithAdditionalPropertyFalseConstraintDataProvider()
+ public static function validateHandlesDictionaryTypeWithAdditionalPropertyFalseConstraintDataProvider(): \Iterator
{
- return [
- [['empty' => null], true],
- [['foo' => 123, 'bar' => 'baz'], true],
- [['foo' => 123, 'bar' => 'baz', 'baz' => 'blah'], false]
- ];
+ yield [['empty' => null], true];
+ yield [['foo' => 123, 'bar' => 'baz'], true];
+ yield [['foo' => 123, 'bar' => 'baz', 'baz' => 'blah'], false];
}
- /**
- * @test
- * @dataProvider validateHandlesDictionaryTypeWithAdditionalPropertyFalseConstraintDataProvider
- */
+ #[DataProvider('validateHandlesDictionaryTypeWithAdditionalPropertyFalseConstraintDataProvider')]
+ #[Test]
public function validateHandlesDictionaryTypeWithAdditionalPropertyFalseConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -1072,21 +927,17 @@ public function validateHandlesDictionaryTypeWithAdditionalPropertyFalseConstrai
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesDictionaryTypeWithAdditionalPropertySchemaConstraintDataProvider()
+ public static function validateHandlesDictionaryTypeWithAdditionalPropertySchemaConstraintDataProvider(): \Iterator
{
- return [
- [['foo' => 123, 'bar' => 'baz'], true],
- [['foo' => 123, 'bar' => 'baz', 'baz' => 123], true],
- [['foo' => 123, 'bar' => 123, 'baz' => 'string'], false]
- ];
+ yield [['foo' => 123, 'bar' => 'baz'], true];
+ yield [['foo' => 123, 'bar' => 'baz', 'baz' => 123], true];
+ yield [['foo' => 123, 'bar' => 123, 'baz' => 'string'], false];
}
- /**
- * @test
- * @dataProvider validateHandlesDictionaryTypeWithAdditionalPropertySchemaConstraintDataProvider
- */
+ #[DataProvider('validateHandlesDictionaryTypeWithAdditionalPropertySchemaConstraintDataProvider')]
+ #[Test]
public function validateHandlesDictionaryTypeWithAdditionalPropertySchemaConstraint($value, bool $expectSuccess)
{
$schema = [
@@ -1100,9 +951,7 @@ public function validateHandlesDictionaryTypeWithAdditionalPropertySchemaConstra
$this->assertSuccess($this->configurationValidator->validate($value, $schema), $expectSuccess);
}
- /**
- * @test
- */
+ #[Test]
public function validateHandlesDictionaryTypeWithAdditionalPropertyTrueSchemaConstraint()
{
$schema = [
@@ -1117,22 +966,17 @@ public function validateHandlesDictionaryTypeWithAdditionalPropertyTrueSchemaCon
}
/// NULL ///
-
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesNullTypeDataProvider()
+ public static function validateHandlesNullTypeDataProvider(): \Iterator
{
- return [
- [null, true],
- [123, false]
- ];
+ yield [null, true];
+ yield [123, false];
}
- /**
- * @test
- * @dataProvider validateHandlesNullTypeDataProvider
- */
+ #[DataProvider('validateHandlesNullTypeDataProvider')]
+ #[Test]
public function validateHandlesNullType($value, bool $expectSuccess)
{
$schema = [
@@ -1142,20 +986,16 @@ public function validateHandlesNullType($value, bool $expectSuccess)
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateHandlesUnknownTypeDataProvider()
+ public static function validateHandlesUnknownTypeDataProvider(): \Iterator
{
- return [
- [null, false],
- [123, false]
- ];
+ yield [null, false];
+ yield [123, false];
}
- /**
- * @test
- * @dataProvider validateHandlesUnknownTypeDataProvider
- */
+ #[DataProvider('validateHandlesUnknownTypeDataProvider')]
+ #[Test]
public function validateHandlesUnknownType($value, bool $expectSuccess)
{
$schema = [
@@ -1166,26 +1006,21 @@ public function validateHandlesUnknownType($value, bool $expectSuccess)
/// ANY ///
-
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateAnyTypeResultHasNoErrorsInAnyCaseDataProvider()
- {
- return [
- [23, true],
- [23.42, true],
- ['foo', true],
- [[1,2,3], true],
- [['A' => 1, 'B' => 2, 'C' => 3], true],
- [null, true],
- ];
+ public static function validateAnyTypeResultHasNoErrorsInAnyCaseDataProvider(): \Iterator
+ {
+ yield [23, true];
+ yield [23.42, true];
+ yield ['foo', true];
+ yield [[1,2,3], true];
+ yield [['A' => 1, 'B' => 2, 'C' => 3], true];
+ yield [null, true];
}
- /**
- * @test
- * @dataProvider validateAnyTypeResultHasNoErrorsInAnyCaseDataProvider
- */
+ #[DataProvider('validateAnyTypeResultHasNoErrorsInAnyCaseDataProvider')]
+ #[Test]
public function validateAnyTypeResultHasNoErrorsInAnyCase($value, bool $expectSuccess)
{
$schema = [
@@ -1195,25 +1030,20 @@ public function validateAnyTypeResultHasNoErrorsInAnyCase($value, bool $expectSu
}
/// CUSTOM ///
-
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateCustomTypeResultDataProvider()
- {
- return [
- [ ['property' => ['integer_property' => 1, 'string_property' => 'string' ] ], true ],
- [ ['property' => ['integer_property' => 'no_integer', 'string_property' => 123 ] ], false ],
- [ ['property' => 'some_value' ], false ],
- [ ['other_property' => ['integer_property' => 1, 'string_property' => 'string' ] ], false ],
- [ ['other_property' => 'some_value' ], false ]
- ];
+ public static function validateCustomTypeResultDataProvider(): \Iterator
+ {
+ yield [ ['property' => ['integer_property' => 1, 'string_property' => 'string' ] ], true ];
+ yield [ ['property' => ['integer_property' => 'no_integer', 'string_property' => 123 ] ], false ];
+ yield [ ['property' => 'some_value' ], false ];
+ yield [ ['other_property' => ['integer_property' => 1, 'string_property' => 'string' ] ], false ];
+ yield [ ['other_property' => 'some_value' ], false ];
}
- /**
- * @test
- * @dataProvider validateCustomTypeResultDataProvider
- */
+ #[DataProvider('validateCustomTypeResultDataProvider')]
+ #[Test]
public function validateCustomTypeResult($value, bool $expectSuccess)
{
$schema = [
@@ -1234,23 +1064,19 @@ public function validateCustomTypeResult($value, bool $expectSuccess)
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateCustomTypeWithSuperTypesDataProvider()
- {
- return [
- [ ['property' => ['supertype_property' => 1, 'type_property' => 'string' ] ], true ],
- [ ['property' => ['supertype_property' => 'no_integer', 'type_property' => 123 ] ], false ],
- [ ['property' => 'some_value' ], false ],
- [ ['other_property' => ['supertype_property' => 1, 'type_property' => 'string' ] ], false ],
- [ ['other_property' => 'some_value' ], false ]
- ];
+ public static function validateCustomTypeWithSuperTypesDataProvider(): \Iterator
+ {
+ yield [ ['property' => ['supertype_property' => 1, 'type_property' => 'string' ] ], true ];
+ yield [ ['property' => ['supertype_property' => 'no_integer', 'type_property' => 123 ] ], false ];
+ yield [ ['property' => 'some_value' ], false ];
+ yield [ ['other_property' => ['supertype_property' => 1, 'type_property' => 'string' ] ], false ];
+ yield [ ['other_property' => 'some_value' ], false ];
}
- /**
- * @test
- * @dataProvider validateCustomTypeWithSuperTypesDataProvider
- */
+ #[DataProvider('validateCustomTypeWithSuperTypesDataProvider')]
+ #[Test]
public function validateCustomTypeWithSuperTypes($value, bool $expectSuccess)
{
$schema = [
@@ -1277,24 +1103,19 @@ public function validateCustomTypeWithSuperTypes($value, bool $expectSuccess)
}
/**
- * @return array
+ * @return \Iterator<(int | string), mixed>
*/
- public function validateCustomTypeArrayDataProvider()
+ public static function validateCustomTypeArrayDataProvider(): \Iterator
{
- return [
- [ ['property' => ['custom_type_a_property' => 1]], true ],
- [ ['property' => ['custom_type_b_property' => 'string' ] ], true ],
- [ ['property' => ['custom_type_a_property' => 1, 'custom_type_b_property' => 'string' ] ], false ],
-
- [ ['property' => ['custom_type_a_property' => 'no_integer' ] ], false ],
- [ ['property' => ['custom_type_b_property' => 12324 ] ], false ],
- ];
+ yield [ ['property' => ['custom_type_a_property' => 1]], true ];
+ yield [ ['property' => ['custom_type_b_property' => 'string' ] ], true ];
+ yield [ ['property' => ['custom_type_a_property' => 1, 'custom_type_b_property' => 'string' ] ], false ];
+ yield [ ['property' => ['custom_type_a_property' => 'no_integer' ] ], false ];
+ yield [ ['property' => ['custom_type_b_property' => 12324 ] ], false ];
}
- /**
- * @test
- * @dataProvider validateCustomTypeArrayDataProvider
- */
+ #[DataProvider('validateCustomTypeArrayDataProvider')]
+ #[Test]
public function validateCustomTypeArray($value, bool $expectSuccess)
{
$schema = [
diff --git a/Neos.Utility.Schema/composer.json b/Neos.Utility.Schema/composer.json
index e5f13762e2..34f8901a20 100644
--- a/Neos.Utility.Schema/composer.json
+++ b/Neos.Utility.Schema/composer.json
@@ -9,8 +9,8 @@
"neos/error-messages": "self.version"
},
"require-dev": {
- "mikey179/vfsstream": "^1.6.10",
- "phpunit/phpunit": "~9.1"
+ "mikey179/vfsstream": "^1.6.12",
+ "phpunit/phpunit": "~11.5"
},
"autoload": {
"psr-4": {
diff --git a/Neos.Utility.Unicode/Tests/Unit/FunctionsTest.php b/Neos.Utility.Unicode/Tests/Unit/FunctionsTest.php
index 03a55e27fd..36bc569d6a 100644
--- a/Neos.Utility.Unicode/Tests/Unit/FunctionsTest.php
+++ b/Neos.Utility.Unicode/Tests/Unit/FunctionsTest.php
@@ -1,4 +1,7 @@
fail('Constructor did not reject invalid TextIterator type.');
- } catch (Unicode\Exception $exception) {
+ } catch (Exception $exception) {
self::assertStringContainsString('Invalid iterator type in TextIterator constructor', $exception->getMessage(), 'Wrong error message.');
}
}
/**
* Checks if character iteration basically works
- *
- * @test
*/
+ #[Test]
public function characterIterationBasicallyWorks()
{
$iterator = new TextIterator('This is a test string. Let\'s iterate it by character...', TextIterator::CHARACTER);
@@ -104,14 +102,13 @@ public function characterIterationBasicallyWorks()
foreach ($iterator as $currentCharacter) {
$result .= $currentCharacter;
}
- self::assertEquals('This is a test string. Let\'s iterate it by character...', $result, 'Character iteration didn\'t return the right values.');
+ self::assertSame('This is a test string. Let\'s iterate it by character...', $result, 'Character iteration didn\'t return the right values.');
}
/**
* Checks if word iteration basically works
- *
- * @test
*/
+ #[Test]
public function wordIterationBasicallyWorks()
{
$iterator = new TextIterator('This is a test string. Let\'s iterate it by word...', TextIterator::WORD);
@@ -120,14 +117,13 @@ public function wordIterationBasicallyWorks()
foreach ($iterator as $currentWord) {
$result .= $currentWord;
}
- self::assertEquals('This is a test string. Let\'s iterate it by word...', $result, 'Word iteration didn\'t return the right values.');
+ self::assertSame('This is a test string. Let\'s iterate it by word...', $result, 'Word iteration didn\'t return the right values.');
}
/**
* Checks if sentence iteration basically works
- *
- * @test
*/
+ #[Test]
public function sentenceIterationBasicallyWorks()
{
$iterator = new TextIterator('This is a test string. Let\'s iterate it by sentence...', TextIterator::SENTENCE);
@@ -136,14 +132,13 @@ public function sentenceIterationBasicallyWorks()
foreach ($iterator as $currentSentence) {
$result .= $currentSentence;
}
- self::assertEquals('This is a test string. Let\'s iterate it by sentence...', $result, 'Sentence iteration didn\'t return the right values.');
+ self::assertSame('This is a test string. Let\'s iterate it by sentence...', $result, 'Sentence iteration didn\'t return the right values.');
}
/**
* Checks if line iteration basically works
- *
- * @test
*/
+ #[Test]
public function lineIterationBasicallyWorks()
{
$iterator = new TextIterator("This is a test string. \nLet's iterate \nit by line...", TextIterator::LINE);
@@ -152,14 +147,13 @@ public function lineIterationBasicallyWorks()
foreach ($iterator as $currentLine) {
$result .= $currentLine;
}
- self::assertEquals("This is a test string. \nLet's iterate \nit by line...", $result, 'Line iteration didn\'t return the right values.');
+ self::assertSame("This is a test string. \nLet's iterate \nit by line...", $result, 'Line iteration didn\'t return the right values.');
}
/**
* Checks if the offset method basically works with character iteration
- *
- * @test
*/
+ #[Test]
public function offsetInCharacterIterationBasicallyWorks()
{
$iterator = new TextIterator('This is a test string. Let\'s iterate it by character...', TextIterator::CHARACTER);
@@ -168,14 +162,13 @@ public function offsetInCharacterIterationBasicallyWorks()
break;
}
}
- self::assertEquals($iterator->offset(), 23, 'Wrong offset returned in character iteration.');
+ self::assertSame(23, $iterator->offset(), 'Wrong offset returned in character iteration.');
}
/**
* Checks if the offset method basically works with word iteration
- *
- * @test
*/
+ #[Test]
public function offsetInWordIterationBasicallyWorks()
{
$iterator = new TextIterator('This is a test string. Let\'s iterate it by word...', TextIterator::WORD);
@@ -184,14 +177,13 @@ public function offsetInWordIterationBasicallyWorks()
break;
}
}
- self::assertEquals($iterator->offset(), 29, 'Wrong offset returned in word iteration.');
+ self::assertSame(29, $iterator->offset(), 'Wrong offset returned in word iteration.');
}
/**
* Checks if the offset method basically works with sentence iteration
- *
- * @test
*/
+ #[Test]
public function offsetInSentenceIterationBasicallyWorks()
{
$iterator = new TextIterator('This is a test string. Let\'s iterate it by word...', TextIterator::SENTENCE);
@@ -200,38 +192,35 @@ public function offsetInSentenceIterationBasicallyWorks()
break;
}
}
- self::assertEquals($iterator->offset(), 23, 'Wrong offset returned in sentence iteration.');
+ self::assertSame(23, $iterator->offset(), 'Wrong offset returned in sentence iteration.');
}
/**
* Checks if the "first" method basically works
- *
- * @test
*/
+ #[Test]
public function firstBasicallyWorks()
{
$iterator = new TextIterator('This is a test string. Let\'s iterate it by word...', TextIterator::WORD);
$iterator->next();
- self::assertEquals($iterator->first(), 'This', 'Wrong element returned by first().');
+ self::assertSame('This', $iterator->first(), 'Wrong element returned by first().');
}
/**
* Checks if the "last" method basically works
- *
- * @test
*/
+ #[Test]
public function lastBasicallyWorks()
{
$iterator = new TextIterator('This is a test string. Let\'s iterate it by word', TextIterator::WORD);
$iterator->rewind();
- self::assertEquals($iterator->last(), 'word', 'Wrong element returned by last().');
+ self::assertSame('word', $iterator->last(), 'Wrong element returned by last().');
}
/**
* Checks if the "getAll" method basically works
- *
- * @test
*/
+ #[Test]
public function getAllBasicallyWorks()
{
$iterator = new TextIterator('This is a test string.', TextIterator::WORD);
@@ -254,9 +243,8 @@ public function getAllBasicallyWorks()
/**
* Checks if the "isBoundary" method basically works with character iteration
- *
- * @test
*/
+ #[Test]
public function isBoundaryInCharacterIterationBasicallyWorks()
{
$iterator = new TextIterator('This is a test string. Let\'s iterate it by character', TextIterator::CHARACTER);
@@ -269,9 +257,8 @@ public function isBoundaryInCharacterIterationBasicallyWorks()
/**
* Checks if the "isBoundary" method basically works with word iteration
- *
- * @test
*/
+ #[Test]
public function isBoundaryInWordIterationBasicallyWorks()
{
$iterator = new TextIterator('This is a test string. Let\'s iterate it by word', TextIterator::WORD);
@@ -284,9 +271,8 @@ public function isBoundaryInWordIterationBasicallyWorks()
/**
* Checks if the "isBoundary" method basically works with sentence iteration
- *
- * @test
*/
+ #[Test]
public function isBoundaryInSentenceIterationBasicallyWorks()
{
$iterator = new TextIterator('This is a test string. Let\'s iterate it by sentence', TextIterator::SENTENCE);
@@ -299,9 +285,8 @@ public function isBoundaryInSentenceIterationBasicallyWorks()
/**
* Checks if the "isBoundary" method basically works with line iteration
- *
- * @test
*/
+ #[Test]
public function isBoundaryInLineIterationBasicallyWorks()
{
$iterator = new TextIterator("This is a test string. \nLet\'s iterate \nit by line", TextIterator::LINE);
@@ -314,25 +299,23 @@ public function isBoundaryInLineIterationBasicallyWorks()
/**
* Checks if the "following" method basically works with word iteration
- *
- * @test
*/
+ #[Test]
public function followingBasicallyWorks()
{
$iterator = new TextIterator('This is a test string. Let\'s iterate it by word', TextIterator::WORD);
- self::assertEquals($iterator->following(11), 14, 'Wrong offset for the following element returned.');
+ self::assertSame('14', $iterator->following(11), 'Wrong offset for the following element returned.');
}
/**
* Checks if the "preceding" method basically works with word iteration
- *
- * @test
*/
+ #[Test]
public function precedingBasicallyWorks()
{
$iterator = new TextIterator('This is a test string. Let\'s iterate it by word', TextIterator::WORD);
- self::assertEquals($iterator->preceding(11), 10, 'Wrong offset for the preceding element returned.' . $iterator->preceding(11));
+ self::assertSame('10', $iterator->preceding(11), 'Wrong offset for the preceding element returned.' . $iterator->preceding(11));
}
}
diff --git a/Neos.Utility.Unicode/composer.json b/Neos.Utility.Unicode/composer.json
index 1c3ddcdf54..8cd4e4c85b 100644
--- a/Neos.Utility.Unicode/composer.json
+++ b/Neos.Utility.Unicode/composer.json
@@ -12,8 +12,8 @@
"ext-mbstring": "*"
},
"require-dev": {
- "mikey179/vfsstream": "^1.6.10",
- "phpunit/phpunit": "~9.1"
+ "mikey179/vfsstream": "^1.6.12",
+ "phpunit/phpunit": "~11.5"
},
"replace": {
"symfony/polyfill-mbstring": "*"
diff --git a/composer.json b/composer.json
index 3e2250c4fa..7c142a4bac 100644
--- a/composer.json
+++ b/composer.json
@@ -136,8 +136,8 @@
}
},
"require-dev": {
- "mikey179/vfsstream": "^1.6.10",
- "phpunit/phpunit": "~9.1"
+ "mikey179/vfsstream": "^1.6.12",
+ "phpunit/phpunit": "~11.5"
},
"provide": {
"psr/cache-implementation": "2.0.0 || 3.0.0",