From 0f3dd703d32861ea922bacec23b242bb556c84a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20W=C3=B3js?= Date: Wed, 16 Sep 2020 09:11:52 +0200 Subject: [PATCH] EZP-31810: Adapted code for 6.13 requirements (#3063) --- .../AbstractPropertyWhitelistNormalizer.php | 4 +--- .../Serializer/CompoundMatcherNormalizer.php | 2 +- .../Serializer/HostElementNormalizer.php | 4 +--- .../Serializer/HostTextNormalizer.php | 4 +--- .../Component/Serializer/MapNormalizer.php | 2 -- .../Serializer/RegexHostNormalizer.php | 4 +--- .../Component/Serializer/RegexNormalizer.php | 4 +--- .../Serializer/RegexURINormalizer.php | 4 +--- .../Serializer/URIElementNormalizer.php | 4 +--- .../Component/Serializer/URITextNormalizer.php | 4 +--- .../CompoundMatcherNormalizerTest.php | 6 ++---- .../Serializer/HostElementNormalizerTest.php | 6 ++---- .../Serializer/HostTextNormalizerTest.php | 6 ++---- .../Tests/Serializer/MapNormalizerTest.php | 6 ++---- .../Serializer/RegexHostNormalizerTest.php | 6 ++---- .../Tests/Serializer/RegexNormalizerTest.php | 16 ++++------------ .../Serializer/RegexURINormalizerTest.php | 6 ++---- .../Tests/Serializer/Stubs/CompoundStub.php | 2 -- .../Tests/Serializer/Stubs/MatcherStub.php | 2 -- .../Tests/Serializer/Stubs/RegexMatcher.php | 18 ++++++++++++++++++ .../Tests/Serializer/Stubs/SerializerStub.php | 2 -- .../Serializer/URIElementNormalizerTest.php | 6 ++---- .../Tests/Serializer/URITextNormalizerTest.php | 6 ++---- .../Tests/MatcherSerializationTest.php | 6 +++--- 24 files changed, 50 insertions(+), 80 deletions(-) create mode 100644 eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/Stubs/RegexMatcher.php diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/AbstractPropertyWhitelistNormalizer.php b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/AbstractPropertyWhitelistNormalizer.php index 8f1b0eddc58..662a3e7d35b 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/AbstractPropertyWhitelistNormalizer.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/AbstractPropertyWhitelistNormalizer.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Serializer; use Symfony\Component\Serializer\Normalizer\PropertyNormalizer; @@ -27,5 +25,5 @@ public function normalize($object, $format = null, array $context = []) /** * @return string[] */ - abstract protected function getAllowedProperties(): array; + abstract protected function getAllowedProperties(); } diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/CompoundMatcherNormalizer.php b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/CompoundMatcherNormalizer.php index 6534e322c62..a166b7d70ee 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/CompoundMatcherNormalizer.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/CompoundMatcherNormalizer.php @@ -22,7 +22,7 @@ public function normalize($object, $format = null, array $context = []) return $data; } - protected function getAllowedProperties(): array + protected function getAllowedProperties() { return ['subMatchers']; } diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/HostElementNormalizer.php b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/HostElementNormalizer.php index 6a58a004e38..cad22286b6e 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/HostElementNormalizer.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/HostElementNormalizer.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Serializer; use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\HostElement; @@ -20,7 +18,7 @@ public function supportsNormalization($data, $format = null) /** * @see \eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\HostElement::__sleep */ - protected function getAllowedProperties(): array + protected function getAllowedProperties() { return ['elementNumber', 'hostElements']; } diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/HostTextNormalizer.php b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/HostTextNormalizer.php index 18450f01896..be75abdb064 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/HostTextNormalizer.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/HostTextNormalizer.php @@ -4,15 +4,13 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Serializer; use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\HostText; final class HostTextNormalizer extends AbstractPropertyWhitelistNormalizer { - protected function getAllowedProperties(): array + protected function getAllowedProperties() { return ['siteAccessesConfiguration']; } diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/MapNormalizer.php b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/MapNormalizer.php index f70499174eb..4c3fa5315b9 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/MapNormalizer.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/MapNormalizer.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Serializer; use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\Map; diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/RegexHostNormalizer.php b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/RegexHostNormalizer.php index b1f718199ca..6255ddf5361 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/RegexHostNormalizer.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/RegexHostNormalizer.php @@ -4,15 +4,13 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Serializer; use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\Regex\Host; final class RegexHostNormalizer extends AbstractPropertyWhitelistNormalizer { - protected function getAllowedProperties(): array + protected function getAllowedProperties() { return ['siteAccessesConfiguration']; } diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/RegexNormalizer.php b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/RegexNormalizer.php index c4532ba8b09..ad26856e59d 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/RegexNormalizer.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/RegexNormalizer.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Serializer; use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\Regex; @@ -20,7 +18,7 @@ public function supportsNormalization($data, $format = null) /** * @see \eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\Regex::__sleep */ - protected function getAllowedProperties(): array + protected function getAllowedProperties() { return ['regex', 'itemNumber', 'matchedSiteAccess']; } diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/RegexURINormalizer.php b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/RegexURINormalizer.php index f14c0b9fe03..dd2624b1816 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/RegexURINormalizer.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/RegexURINormalizer.php @@ -4,15 +4,13 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Serializer; use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\Regex\URI; final class RegexURINormalizer extends AbstractPropertyWhitelistNormalizer { - protected function getAllowedProperties(): array + protected function getAllowedProperties() { return ['siteAccessesConfiguration']; } diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/URIElementNormalizer.php b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/URIElementNormalizer.php index 794455517c0..1ad99e572f8 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/URIElementNormalizer.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/URIElementNormalizer.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Serializer; use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement; @@ -20,7 +18,7 @@ public function supportsNormalization($data, $format = null) /** * @see \eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement::__sleep */ - protected function getAllowedProperties(): array + protected function getAllowedProperties() { return ['elementNumber', 'uriElements']; } diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/URITextNormalizer.php b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/URITextNormalizer.php index 650153a50aa..bf5eec6e9a3 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Serializer/URITextNormalizer.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Serializer/URITextNormalizer.php @@ -4,15 +4,13 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Serializer; use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIText; final class URITextNormalizer extends AbstractPropertyWhitelistNormalizer { - protected function getAllowedProperties(): array + protected function getAllowedProperties() { return ['siteAccessesConfiguration']; } diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/CompoundMatcherNormalizerTest.php b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/CompoundMatcherNormalizerTest.php index b77380f6842..1559223f3c5 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/CompoundMatcherNormalizerTest.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/CompoundMatcherNormalizerTest.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Tests\Serializer; use eZ\Publish\Core\MVC\Symfony\Component\Serializer\CompoundMatcherNormalizer; @@ -18,7 +16,7 @@ final class CompoundMatcherNormalizerTest extends TestCase { - public function testNormalization(): void + public function testNormalization() { $matcher = new CompoundStub([]); $matcher->setSubMatchers([ @@ -44,7 +42,7 @@ public function testNormalization(): void ); } - public function testSupportsNormalization(): void + public function testSupportsNormalization() { $normalizer = new CompoundMatcherNormalizer(); diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/HostElementNormalizerTest.php b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/HostElementNormalizerTest.php index 1f5d02ecfb1..e03fc5547ac 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/HostElementNormalizerTest.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/HostElementNormalizerTest.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Tests\Serializer; use eZ\Publish\Core\MVC\Symfony\Component\Serializer\HostElementNormalizer; @@ -17,7 +15,7 @@ final class HostElementNormalizerTest extends TestCase { - public function testNormalization(): void + public function testNormalization() { $normalizer = new HostElementNormalizer(); $normalizer->setSerializer(new SerializerStub()); @@ -39,7 +37,7 @@ public function testNormalization(): void ); } - public function testSupportsNormalization(): void + public function testSupportsNormalization() { $normalizer = new HostElementNormalizer(); diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/HostTextNormalizerTest.php b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/HostTextNormalizerTest.php index 83340e3b9b5..adeaf3b1022 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/HostTextNormalizerTest.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/HostTextNormalizerTest.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Tests\Serializer; use eZ\Publish\Core\MVC\Symfony\Component\Serializer\HostTextNormalizer; @@ -16,7 +14,7 @@ final class HostTextNormalizerTest extends TestCase { - public function testNormalize(): void + public function testNormalize() { $normalizer = new HostTextNormalizer(); $normalizer->setSerializer(new SerializerStub()); @@ -37,7 +35,7 @@ public function testNormalize(): void ); } - public function testSupportsNormalization(): void + public function testSupportsNormalization() { $normalizer = new HostTextNormalizer(); diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/MapNormalizerTest.php b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/MapNormalizerTest.php index d1c4c448870..fc779ea4370 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/MapNormalizerTest.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/MapNormalizerTest.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Tests\Serializer; use eZ\Publish\Core\MVC\Symfony\Component\Serializer\MapNormalizer; @@ -15,7 +13,7 @@ final class MapNormalizerTest extends TestCase { - public function testNormalization(): void + public function testNormalization() { $normalizer = new MapNormalizer(); @@ -32,7 +30,7 @@ public function testNormalization(): void ); } - public function testSupportsNormalization(): void + public function testSupportsNormalization() { $normalizer = new MapNormalizer(); diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/RegexHostNormalizerTest.php b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/RegexHostNormalizerTest.php index 9c4d10dcedc..02e11b70fff 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/RegexHostNormalizerTest.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/RegexHostNormalizerTest.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Tests\Serializer; use eZ\Publish\Core\MVC\Symfony\Component\Serializer\RegexHostNormalizer; @@ -16,7 +14,7 @@ final class RegexHostNormalizerTest extends TestCase { - public function testNormalize(): void + public function testNormalize() { $normalizer = new RegexHostNormalizer(); $normalizer->setSerializer(new SerializerStub()); @@ -37,7 +35,7 @@ public function testNormalize(): void ); } - public function testSupportsNormalization(): void + public function testSupportsNormalization() { $normalizer = new RegexHostNormalizer(); diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/RegexNormalizerTest.php b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/RegexNormalizerTest.php index dd8efcbe30a..39cc823dd28 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/RegexNormalizerTest.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/RegexNormalizerTest.php @@ -4,28 +4,20 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Tests\Serializer; -use eZ\Publish\API\Repository\Exceptions\NotImplementedException; use eZ\Publish\Core\MVC\Symfony\Component\Serializer\RegexNormalizer; use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher; use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\Regex as RegexMatcher; +use eZ\Publish\Core\MVC\Symfony\Component\Tests\Serializer\Stubs\RegexMatcher as RegexMatcherStub; use PHPUnit\Framework\TestCase; final class RegexNormalizerTest extends TestCase { - public function testNormalize(): void + public function testNormalize() { $normalizer = new RegexNormalizer(); - - $matcher = new class('/^Foo(.*)/(.*)/', 2) extends RegexMatcher { - public function getName() - { - throw new NotImplementedException(__METHOD__); - } - }; + $matcher = new RegexMatcherStub('/^Foo(.*)/(.*)/', 2); $this->assertEquals( [ @@ -37,7 +29,7 @@ public function getName() ); } - public function testSupportsNormalization(): void + public function testSupportsNormalization() { $normalizer = new RegexNormalizer(); diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/RegexURINormalizerTest.php b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/RegexURINormalizerTest.php index b6b5b9741b3..bcf824de425 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/RegexURINormalizerTest.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/RegexURINormalizerTest.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Tests\Serializer; use eZ\Publish\Core\MVC\Symfony\Component\Serializer\RegexURINormalizer; @@ -16,7 +14,7 @@ final class RegexURINormalizerTest extends TestCase { - public function testNormalize(): void + public function testNormalize() { $normalizer = new RegexURINormalizer(); $normalizer->setSerializer(new SerializerStub()); @@ -37,7 +35,7 @@ public function testNormalize(): void ); } - public function testSupportsNormalization(): void + public function testSupportsNormalization() { $normalizer = new RegexURINormalizer(); diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/Stubs/CompoundStub.php b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/Stubs/CompoundStub.php index d2d8677dd8c..e788a947809 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/Stubs/CompoundStub.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/Stubs/CompoundStub.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Tests\Serializer\Stubs; use eZ\Publish\API\Repository\Exceptions\NotImplementedException; diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/Stubs/MatcherStub.php b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/Stubs/MatcherStub.php index 9f47b863682..d681c7a7fa8 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/Stubs/MatcherStub.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/Stubs/MatcherStub.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Tests\Serializer\Stubs; use eZ\Publish\API\Repository\Exceptions\NotImplementedException; diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/Stubs/RegexMatcher.php b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/Stubs/RegexMatcher.php new file mode 100644 index 00000000000..bdc1dd8ff63 --- /dev/null +++ b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/Stubs/RegexMatcher.php @@ -0,0 +1,18 @@ +setSerializer(new SerializerStub()); @@ -36,7 +34,7 @@ public function testNormalization(): void ); } - public function testSupportsNormalization(): void + public function testSupportsNormalization() { $normalizer = new URIElementNormalizer(); diff --git a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/URITextNormalizerTest.php b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/URITextNormalizerTest.php index acc9c357533..3a1a5980a7d 100644 --- a/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/URITextNormalizerTest.php +++ b/eZ/Publish/Core/MVC/Symfony/Component/Tests/Serializer/URITextNormalizerTest.php @@ -4,8 +4,6 @@ * @copyright Copyright (C) eZ Systems AS. All rights reserved. * @license For full copyright and license information view LICENSE file distributed with this source code. */ -declare(strict_types=1); - namespace eZ\Publish\Core\MVC\Symfony\Component\Tests\Serializer; use eZ\Publish\Core\MVC\Symfony\Component\Serializer\URITextNormalizer; @@ -16,7 +14,7 @@ final class URITextNormalizerTest extends TestCase { - public function testNormalize(): void + public function testNormalize() { $normalizer = new URITextNormalizer(); $normalizer->setSerializer(new SerializerStub()); @@ -37,7 +35,7 @@ public function testNormalize(): void ); } - public function testSupportsNormalization(): void + public function testSupportsNormalization() { $normalizer = new URITextNormalizer(); diff --git a/eZ/Publish/Core/MVC/Symfony/SiteAccess/Tests/MatcherSerializationTest.php b/eZ/Publish/Core/MVC/Symfony/SiteAccess/Tests/MatcherSerializationTest.php index 2e3cc0b8776..38ae1f32467 100644 --- a/eZ/Publish/Core/MVC/Symfony/SiteAccess/Tests/MatcherSerializationTest.php +++ b/eZ/Publish/Core/MVC/Symfony/SiteAccess/Tests/MatcherSerializationTest.php @@ -138,7 +138,7 @@ public function matcherProvider() ]; } - private function getMapPortMatcherTestCase(): array + private function getMapPortMatcherTestCase() { $matcherBeforeSerialization = new Matcher\Map\Port(['map' => ['key' => 'value']]); $matcherBeforeSerialization->setMapKey('map'); @@ -149,7 +149,7 @@ private function getMapPortMatcherTestCase(): array return [$matcherBeforeSerialization, $matcherAfterDeserialization]; } - private function getMapHostMatcherTestCase(): array + private function getMapHostMatcherTestCase() { $matcherBeforeSerialization = new Matcher\Map\Host(['map' => ['key' => 'value']]); $matcherBeforeSerialization->setMapKey('map'); @@ -160,7 +160,7 @@ private function getMapHostMatcherTestCase(): array return [$matcherBeforeSerialization, $matcherAfterDeserialization]; } - private function getMapURIMatcherTestCase(): array + private function getMapURIMatcherTestCase() { $matcherBeforeSerialization = new Matcher\Map\URI(['map' => ['key' => 'value']]); $matcherBeforeSerialization->setMapKey('map');