Rollback of the minimum php version to 7.3

mmasiukevich · mmasiukevich · commit 21f8587ea182 · 2019-12-04T01:39:40.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: php
 
 php:
+  - 7.3
   - 7.4snapshot
 
 cache:
@@ -19,10 +20,9 @@ install:
 
 script:
   - ./vendor/bin/phpunit --configuration ./phpunit.xml --coverage-clover=coverage.clover
-  - ./vendor/bin/psalm --config=psalm.xml
-  - ./vendor/bin/phpstan analyse src --level 7
-  - ./vendor/bin/php-cs-fixer fix --allow-risky=yes --dry-run
+  - if [ "$TRAVIS_PHP_VERSION" == "7.4snapshot"]; then ./vendor/bin/psalm --config=psalm.xml; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "7.4snapshot"]; then ./vendor/bin/php-cs-fixer fix --allow-risky=yes --dry-run; fi
 
 after_script:
-  - wget -c -nc --retry-connrefused --tries=0 https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+  - if [ "$TRAVIS_PHP_VERSION" == "7.4snapshot"]; then wget -c -nc --retry-connrefused --tries=0 https://scrutinizer-ci.com/ocular.phar; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "7.4snapshot"]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     }
   },
   "require": {
-    "php": ">=7.4",
+    "php": ">=7.3",
     "ext-json": "*",
     "ext-iconv": "*",
     "php-service-bus/common": "v4.0.*",
diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.0/phpunit.xsd"
+<phpunit bootstrap="vendor/autoload.php"
          backupGlobals="false"
+         backupStaticAttributes="false"
+         beStrictAboutTestsThatDoNotTestAnything="false"
          colors="true"
-         bootstrap="vendor/autoload.php"
+         verbose="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
          failOnRisky="true"
          failOnWarning="true"
-         beStrictAboutTestsThatDoNotTestAnything="false">
+         stopOnFailure="false">
     <php>
         <ini name="error_reporting" value="-1"/>
     </php>
diff --git a/src/Symfony/Extensions/EmptyDataNormalizer.php b/src/Symfony/Extensions/EmptyDataNormalizer.php
@@ -24,7 +24,7 @@ final class EmptyDataNormalizer implements NormalizerInterface, DenormalizerInte
     /**
      * @psalm-var array<string, array<array-key, string>>
      */
-    private array $localStorage = [];
+    private $localStorage = [];
 
     /**
      * {@inheritdoc}
@@ -41,11 +41,11 @@ public function normalize($object, string $format = null, array $context = [])
      */
     public function supportsNormalization($data, string $format = null): bool
     {
-        if (true === \is_object($data))
+        if ( \is_object($data) === true)
         {
             $class = \get_class($data);
 
-            if (false === isset($this->localStorage[$class]))
+            if (isset($this->localStorage[$class]) === false)
             {
                 $this->localStorage[$class] = \array_map(
                     static function (\ReflectionProperty $property): string
diff --git a/src/Symfony/Extensions/PropertyNameConverter.php b/src/Symfony/Extensions/PropertyNameConverter.php
@@ -24,7 +24,7 @@ final class PropertyNameConverter implements NameConverterInterface
      *
      * @psalm-var array<string, string>
      */
-    private array $localStorage;
+    private $localStorage;
 
     /**
      * {@inheritdoc}
@@ -39,7 +39,7 @@ public function normalize(string $propertyName): string
      */
     public function denormalize(string $propertyName): string
     {
-        if (false === isset($this->localStorage[$propertyName]))
+        if ( isset($this->localStorage[$propertyName]) === false)
         {
             $joinedString = \preg_replace_callback(
                 '/_(.?)/',
diff --git a/src/Symfony/Extensions/PropertyNormalizerWrapper.php b/src/Symfony/Extensions/PropertyNormalizerWrapper.php
@@ -24,7 +24,7 @@ final class PropertyNormalizerWrapper extends PropertyNormalizer
     /**
      * @psalm-var array<string, array<array-key, string>>
      */
-    private array $localStorage = [];
+    private $localStorage = [];
 
     /**
      * {@inheritdoc}
@@ -38,7 +38,8 @@ protected function instantiateObject(
         \ReflectionClass $reflectionClass,
         $allowedAttributes,
         string $format = null
-    ): object {
+    ): object
+    {
         return $reflectionClass->newInstanceWithoutConstructor();
     }
 
@@ -49,7 +50,7 @@ protected function extractAttributes(object $object, string $format = null, arra
     {
         $class = \get_class($object);
 
-        if (false === \array_key_exists($class, $this->localStorage))
+        if(\array_key_exists($class, $this->localStorage) === false)
         {
             $this->localStorage[$class] = parent::extractAttributes($object, $format, $context);
         }
@@ -64,7 +65,7 @@ protected function extractAttributes(object $object, string $format = null, arra
      */
     protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])
     {
-        if (true === isset($object->{$attribute}))
+        if(isset($object->{$attribute}) === true)
         {
             return $object->{$attribute};
         }
@@ -73,9 +74,9 @@ protected function getAttributeValue(object $object, string $attribute, string $
         {
             return parent::getAttributeValue($object, $attribute, $format, $context);
         }
-        catch (\Error $error)
+        catch(\Error $error)
         {
-            if (\strpos($error->getMessage(), 'must not be accessed before initialization') !== false)
+            if(\strpos($error->getMessage(), 'must not be accessed before initialization') !== false)
             {
                 return null;
             }
@@ -91,7 +92,7 @@ protected function getAttributeValue(object $object, string $attribute, string $
      */
     protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []): void
     {
-        if (true === isset($object->{$attribute}))
+        if(isset($object->{$attribute}) === true)
         {
             $object->{$attribute} = $value;
 
diff --git a/src/Symfony/Extractor/FailOverExtractor.php b/src/Symfony/Extractor/FailOverExtractor.php
@@ -23,12 +23,12 @@ final class FailOverExtractor implements PropertyTypeExtractorInterface
     /**
      * @psalm-var array<string, \Symfony\Component\PropertyInfo\Type[]|null>
      */
-    private array $localStorage;
+    private $localStorage = [];
 
     /**
      * @var PropertyTypeExtractorInterface[]
      */
-    private array $extractors;
+    private $extractors;
 
     public function __construct()
     {
@@ -42,15 +42,15 @@ public function getTypes(string $class, string $property, array $context = []):
     {
         $cacheKey = \sha1($class . $property);
 
-        if (\array_key_exists($cacheKey, $this->localStorage) === false)
+        if(\array_key_exists($cacheKey, $this->localStorage) === false)
         {
             $this->localStorage[$cacheKey] = null;
 
-            foreach ($this->extractors as $extractor)
+            foreach($this->extractors as $extractor)
             {
                 $types = $extractor->getTypes($class, $property, $context);
 
-                if (null !== $types)
+                if(null !== $types)
                 {
                     $this->localStorage[$cacheKey] = $types;
 
diff --git a/src/Symfony/SymfonyMessageSerializer.php b/src/Symfony/SymfonyMessageSerializer.php
@@ -34,13 +34,17 @@ final class SymfonyMessageSerializer implements MessageEncoder, MessageDecoder
 {
     /**
      * Symfony normalizer\denormalizer.
+     *
+     * @var SymfonySerializer\Serializer
      */
-    private SymfonySerializer\Serializer $normalizer;
+    private $normalizer;
 
     /**
      * Serializer implementation.
+     *
+     * @var Serializer
      */
-    private Serializer $serializer;
+    private $serializer;
 
     /**
      * @param SymfonySerializer\Normalizer\DenormalizerInterface[]|SymfonySerializer\Normalizer\NormalizerInterface[] $normalizers
@@ -72,7 +76,7 @@ public function encode(object $message): string
 
             return $this->serializer->serialize($data);
         }
-        catch (\Throwable $throwable)
+        catch(\Throwable $throwable)
         {
             throw new EncodeMessageFailed($throwable->getMessage(), (int) $throwable->getCode(), $throwable);
         }
@@ -95,7 +99,7 @@ public function decode(string $serializedMessage): object
 
             return $object;
         }
-        catch (\Throwable $throwable)
+        catch(\Throwable $throwable)
         {
             throw new DecodeMessageFailed($throwable->getMessage(), (int) $throwable->getCode(), $throwable);
         }
@@ -116,7 +120,7 @@ public function denormalize(array $payload, string $class): object
 
             return $object;
         }
-        catch (\Throwable $throwable)
+        catch(\Throwable $throwable)
         {
             throw new DenormalizeFailed($throwable->getMessage(), (int) $throwable->getCode(), $throwable);
         }
@@ -131,7 +135,7 @@ public function normalize(object $message): array
         {
             $data = $this->normalizer->normalize($message);
 
-            if (true === \is_array($data))
+            if(\is_array($data) === true)
             {
                 /** @psalm-var array<string, mixed> $data */
 
@@ -148,7 +152,7 @@ public function normalize(object $message): array
             );
             // @codeCoverageIgnoreEnd
         }
-        catch (\Throwable $throwable)
+        catch(\Throwable $throwable)
         {
             throw new NormalizationFailed($throwable->getMessage(), (int) $throwable->getCode(), $throwable);
         }
@@ -162,10 +166,11 @@ public function normalize(object $message): array
     private static function validateUnserializedData(array $data): void
     {
         /** Let's check if there are mandatory fields */
-        if (
-            false === isset($data['namespace']) ||
-            false === isset($data['message'])
-        ) {
+        if(
+            isset($data['namespace']) === false ||
+            isset($data['message']) === false
+        )
+        {
             throw new \UnexpectedValueException(
                 'The serialized data must contains a "namespace" field (indicates the message class) and "message" (indicates the message parameters)'
             );
@@ -176,7 +181,7 @@ private static function validateUnserializedData(array $data): void
          *
          * @psalm-suppress DocblockTypeContradiction
          */
-        if ('' === $data['namespace'] || false === \class_exists((string) $data['namespace']))
+        if($data['namespace'] === '' || \class_exists((string) $data['namespace']) === false)
         {
             throw new \UnexpectedValueException(
                 \sprintf('Class "%s" not found', $data['namespace'])
diff --git a/tests/Symfony/SymfonyMessageSerializerTest.php b/tests/Symfony/SymfonyMessageSerializerTest.php

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`}`
`29`	`29`	`},`
`30`	`30`	`"require": {`
`31`		`- "php": ">=7.4",`
	`31`	`+ "php": ">=7.3",`
`32`	`32`	`"ext-json": "*",`
`33`	`33`	`"ext-iconv": "*",`
`34`	`34`	`"php-service-bus/common": "v4.0.*",`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ final class PropertyNameConverter implements NameConverterInterface`
`24`	`24`	`*`
`25`	`25`	`* @psalm-var array<string, string>`
`26`	`26`	`*/`
`27`		`- private array $localStorage;`
	`27`	`+ private $localStorage;`
`28`	`28`
`29`	`29`	`/**`
`30`	`30`	`* {@inheritdoc}`
`@@ -39,7 +39,7 @@ public function normalize(string $propertyName): string`
`39`	`39`	`*/`
`40`	`40`	`public function denormalize(string $propertyName): string`
`41`	`41`	`{`
`42`		`- if (false === isset($this->localStorage[$propertyName]))`
	`42`	`+ if ( isset($this->localStorage[$propertyName]) === false)`
`43`	`43`	`{`
`44`	`44`	`$joinedString = \preg_replace_callback(`
`45`	`45`	`'/_(.?)/',`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@ final class FailOverExtractor implements PropertyTypeExtractorInterface`
`23`	`23`	`/**`
`24`	`24`	`* @psalm-var array<string, \Symfony\Component\PropertyInfo\Type[]\|null>`
`25`	`25`	`*/`
`26`		`- private array $localStorage;`
	`26`	`+ private $localStorage = [];`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* @var PropertyTypeExtractorInterface[]`
`30`	`30`	`*/`
`31`		`- private array $extractors;`
	`31`	`+ private $extractors;`
`32`	`32`
`33`	`33`	`public function __construct()`
`34`	`34`	`{`
`@@ -42,15 +42,15 @@ public function getTypes(string $class, string $property, array $context = []):`
`42`	`42`	`{`
`43`	`43`	`$cacheKey = \sha1($class . $property);`
`44`	`44`
`45`		`- if (\array_key_exists($cacheKey, $this->localStorage) === false)`
	`45`	`+ if(\array_key_exists($cacheKey, $this->localStorage) === false)`
`46`	`46`	`{`
`47`	`47`	`$this->localStorage[$cacheKey] = null;`
`48`	`48`
`49`		`- foreach ($this->extractors as $extractor)`
	`49`	`+ foreach($this->extractors as $extractor)`
`50`	`50`	`{`
`51`	`51`	`$types = $extractor->getTypes($class, $property, $context);`
`52`	`52`
`53`		`- if (null !== $types)`
	`53`	`+ if(null !== $types)`
`54`	`54`	`{`
`55`	`55`	`$this->localStorage[$cacheKey] = $types;`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,17 @@ final class SymfonyMessageSerializer implements MessageEncoder, MessageDecoder`
`34`	`34`	`{`
`35`	`35`	`/**`
`36`	`36`	`* Symfony normalizer\denormalizer.`
	`37`	`+ *`
	`38`	`+ * @var SymfonySerializer\Serializer`
`37`	`39`	`*/`
`38`		`- private SymfonySerializer\Serializer $normalizer;`
	`40`	`+ private $normalizer;`
`39`	`41`
`40`	`42`	`/**`
`41`	`43`	`* Serializer implementation.`
	`44`	`+ *`
	`45`	`+ * @var Serializer`
`42`	`46`	`*/`
`43`		`- private Serializer $serializer;`
	`47`	`+ private $serializer;`
`44`	`48`
`45`	`49`	`/**`
`46`	`50`	`* @param SymfonySerializer\Normalizer\DenormalizerInterface[]\|SymfonySerializer\Normalizer\NormalizerInterface[] $normalizers`
`@@ -72,7 +76,7 @@ public function encode(object $message): string`
`72`	`76`
`73`	`77`	`return $this->serializer->serialize($data);`
`74`	`78`	`}`
`75`		`- catch (\Throwable $throwable)`
	`79`	`+ catch(\Throwable $throwable)`
`76`	`80`	`{`
`77`	`81`	`throw new EncodeMessageFailed($throwable->getMessage(), (int) $throwable->getCode(), $throwable);`
`78`	`82`	`}`
`@@ -95,7 +99,7 @@ public function decode(string $serializedMessage): object`
`95`	`99`
`96`	`100`	`return $object;`
`97`	`101`	`}`
`98`		`- catch (\Throwable $throwable)`
	`102`	`+ catch(\Throwable $throwable)`
`99`	`103`	`{`
`100`	`104`	`throw new DecodeMessageFailed($throwable->getMessage(), (int) $throwable->getCode(), $throwable);`
`101`	`105`	`}`
`@@ -116,7 +120,7 @@ public function denormalize(array $payload, string $class): object`
`116`	`120`
`117`	`121`	`return $object;`
`118`	`122`	`}`
`119`		`- catch (\Throwable $throwable)`
	`123`	`+ catch(\Throwable $throwable)`
`120`	`124`	`{`
`121`	`125`	`throw new DenormalizeFailed($throwable->getMessage(), (int) $throwable->getCode(), $throwable);`
`122`	`126`	`}`
`@@ -131,7 +135,7 @@ public function normalize(object $message): array`
`131`	`135`	`{`
`132`	`136`	`$data = $this->normalizer->normalize($message);`
`133`	`137`
`134`		`- if (true === \is_array($data))`
	`138`	`+ if(\is_array($data) === true)`
`135`	`139`	`{`
`136`	`140`	`/** @psalm-var array<string, mixed> $data */`
`137`	`141`
`@@ -148,7 +152,7 @@ public function normalize(object $message): array`
`148`	`152`	`);`
`149`	`153`	`// @codeCoverageIgnoreEnd`
`150`	`154`	`}`
`151`		`- catch (\Throwable $throwable)`
	`155`	`+ catch(\Throwable $throwable)`
`152`	`156`	`{`
`153`	`157`	`throw new NormalizationFailed($throwable->getMessage(), (int) $throwable->getCode(), $throwable);`
`154`	`158`	`}`
`@@ -162,10 +166,11 @@ public function normalize(object $message): array`
`162`	`166`	`private static function validateUnserializedData(array $data): void`
`163`	`167`	`{`
`164`	`168`	`/** Let's check if there are mandatory fields */`
`165`		`- if (`
`166`		`- false === isset($data['namespace']) \|\|`
`167`		`- false === isset($data['message'])`
`168`		`- ) {`
	`169`	`+ if(`
	`170`	`+ isset($data['namespace']) === false \|\|`
	`171`	`+ isset($data['message']) === false`
	`172`	`+ )`
	`173`	`+ {`
`169`	`174`	`throw new \UnexpectedValueException(`
`170`	`175`	`'The serialized data must contains a "namespace" field (indicates the message class) and "message" (indicates the message parameters)'`
`171`	`176`	`);`
`@@ -176,7 +181,7 @@ private static function validateUnserializedData(array $data): void`
`176`	`181`	`*`
`177`	`182`	`* @psalm-suppress DocblockTypeContradiction`
`178`	`183`	`*/`
`179`		`- if ('' === $data['namespace'] \|\| false === \class_exists((string) $data['namespace']))`
	`184`	`+ if($data['namespace'] === '' \|\| \class_exists((string) $data['namespace']) === false)`
`180`	`185`	`{`
`181`	`186`	`throw new \UnexpectedValueException(`
`182`	`187`	`\sprintf('Class "%s" not found', $data['namespace'])`