EZP-31810: Adapted code for 6.13 requirements (#3063)

ezsystems · Sep 16, 2020 · 0f3dd70 · 0f3dd70
1 parent d86c763
commit 0f3dd70
Show file tree

Hide file tree

Showing 24 changed files with 50 additions and 80 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+namespace eZ\Publish\Core\MVC\Symfony\Component\Tests\Serializer\Stubs;
+
+use eZ\Publish\API\Repository\Exceptions\NotImplementedException;
+use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\Regex as BaseRegex;
+
+final class RegexMatcher extends BaseRegex
+{
+    public function getName()
+    {
+        throw new NotImplementedException(__METHOD__);
+    }
+}