add tests; fix cs

Author: mmasiukevich

src/Symfony/Extensions/PropertyNormalizerWrapper.php

@@ -40,8 +40,7 @@ protected function instantiateObject(
         \ReflectionClass $reflectionClass,
         $allowedAttributes,
         string $format = null
-    ): object
-    {
+    ): object {
         return $reflectionClass->newInstanceWithoutConstructor();
     }
 
@@ -52,11 +51,15 @@ protected function extractAttributes(object $object, string $format = null, arra
     {
         $class = \get_class($object);
 
-        if(false === isset($this->localStorage[$class]))
+        if (false === isset($this->localStorage[$class]))
         {
             $this->localStorage[$class] = [];
 
-            foreach(\get_object_vars($object) as $key => $value)
+            /**
+             * @var string $key
+             * @var mixed  $value
+             */
+            foreach (\get_object_vars($object) as $key => $value)
             {
                 $this->localStorage[$class][] = $key;
             }
@@ -70,7 +73,7 @@ protected function extractAttributes(object $object, string $format = null, arra
      */
     protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])
     {
-        if(isset($object->{$attribute}) === true)
+        if (true === isset($object->{$attribute}))
         {
             return $object->{$attribute};
         }
@@ -79,11 +82,13 @@ protected function getAttributeValue(object $object, string $attribute, string $
     }
 
     /**
+     * @psalm-param mixed $value
+     *
      * {@inheritdoc}
      */
-    protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = [])
+    protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = []): void
     {
-        if(isset($object->{$attribute}) === true)
+        if (true === isset($object->{$attribute}))
         {
             $object->{$attribute} = $value;
         }

src/Symfony/Extractor/FailOverExtractor.php

@@ -15,7 +15,6 @@
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
 use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
-use Symfony\Component\PropertyInfo\Type;
 
 /**
  */
@@ -24,26 +23,28 @@ final class FailOverExtractor implements PropertyTypeExtractorInterface
     /**
      * @var PropertyTypeExtractorInterface[]
      */
-    private array $extractors;
+    private array
+
+ $extractors;
 
     public function __construct()
     {
         $this->extractors = [
             new ReflectionExtractor(),
-            new PhpDocExtractor()
+            new PhpDocExtractor(),
         ];
     }
 
     /**
-     * @inheritDoc
+     * {@inheritdoc}
      */
     public function getTypes(string $class, string $property, array $context = []): ?array
     {
-        foreach($this->extractors as $extractor)
+        foreach ($this->extractors as $extractor)
         {
             $types = $extractor->getTypes($class, $property, $context);
 
-            if(null !== $types)
+            if (null !== $types)
             {
                 return $types;
             }

src/Symfony/SymfonyMessageSerializer.php

@@ -24,7 +24,6 @@
 use ServiceBus\MessageSerializer\SymfonyNormalizer\Extensions\EmptyDataNormalizer;
 use ServiceBus\MessageSerializer\SymfonyNormalizer\Extensions\PropertyNameConverter;
 use ServiceBus\MessageSerializer\SymfonyNormalizer\Extensions\PropertyNormalizerWrapper;
-use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
 use Symfony\Component\Serializer as SymfonySerializer;
 use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 
@@ -73,7 +72,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);
         }
@@ -96,7 +95,7 @@ public function decode(string $serializedMessage): object
 
             return $object;
         }
-        catch(\Throwable $throwable)
+        catch (\Throwable $throwable)
         {
             throw new DecodeMessageFailed($throwable->getMessage(), (int) $throwable->getCode(), $throwable);
         }
@@ -117,7 +116,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);
         }
@@ -132,7 +131,7 @@ public function normalize(object $message): array
         {
             $data = $this->normalizer->normalize($message);
 
-            if(true === \is_array($data))
+            if (true === \is_array($data))
             {
                 /** @psalm-var array<string, mixed> $data */
 
@@ -149,7 +148,7 @@ public function normalize(object $message): array
             );
             // @codeCoverageIgnoreEnd
         }
-        catch(\Throwable $throwable)
+        catch (\Throwable $throwable)
         {
             throw new NormalizationFailed($throwable->getMessage(), (int) $throwable->getCode(), $throwable);
         }
@@ -163,11 +162,10 @@ public function normalize(object $message): array
     private static function validateUnserializedData(array $data): void
     {
         /** Let's check if there are mandatory fields */
-        if(
+        if (
             false === isset($data['namespace']) ||
             false === isset($data['message'])
-        )
-        {
+        ) {
             throw new \UnexpectedValueException(
                 'The serialized data must contains a "namespace" field (indicates the message class) and "message" (indicates the message parameters)'
             );
@@ -178,7 +176,7 @@ private static function validateUnserializedData(array $data): void
          *
          * @psalm-suppress DocblockTypeContradiction
          */
-        if('' === $data['namespace'] || false === \class_exists((string) $data['namespace']))
+        if ('' === $data['namespace'] || false === \class_exists((string) $data['namespace']))
         {
             throw new \UnexpectedValueException(
                 \sprintf('Class "%s" not found', $data['namespace'])

tests/Stubs/AuthorCollection.php

@@ -19,5 +19,7 @@ final class AuthorCollection
     /**
      * @var Author[]
      */
-    public array $collection;
+    public array
+
+ $collection;
 }

tests/Stubs/MixedWithLegacy.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Messages serializer implementation.
+ *
+ * @author  Maksim Masiukevich <dev@async-php.com>
+ * @license MIT
+ * @license https://opensource.org/licenses/MIT
+ */
+
+declare(strict_types = 1);
+
+namespace ServiceBus\MessageSerializer\Tests\Stubs;
+
+/**
+ */
+final class MixedWithLegacy
+{
+    /**
+     * @var string
+     */
+    public $string;
+
+    /**
+     * @var \DateTimeInterface
+     */
+    public $dateTime;
+
+    /**
+     * @var int
+     */
+    public int $long;
+
+    /**
+     * MixedWithLegacy constructor.
+     *
+     * @param string             $string
+     * @param \DateTimeInterface $dateTime
+     * @param int                $long
+     */
+    public function __construct(string $string, \DateTimeInterface $dateTime, int $long)
+    {
+        $this->string   = $string;
+        $this->dateTime = $dateTime;
+        $this->long     = $long;
+    }
+}

tests/Symfony/SymfonyMessageSerializerTest.php

@@ -21,6 +21,7 @@
 use ServiceBus\MessageSerializer\Tests\Stubs\AuthorCollection;
 use ServiceBus\MessageSerializer\Tests\Stubs\ClassWithPrivateConstructor;
 use ServiceBus\MessageSerializer\Tests\Stubs\EmptyClassWithPrivateConstructor;
+use ServiceBus\MessageSerializer\Tests\Stubs\MixedWithLegacy;
 use ServiceBus\MessageSerializer\Tests\Stubs\TestMessage;
 use ServiceBus\MessageSerializer\Tests\Stubs\WithDateTimeField;
 use ServiceBus\MessageSerializer\Tests\Stubs\WithNullableObjectArgument;
@@ -212,7 +213,8 @@ public function successCollection(): void
     {
         $serializer = new SymfonyMessageSerializer();
 
-        $object               = new AuthorCollection();
+        $object = new AuthorCollection();
+
         $object->collection[] = Author::create('qwerty', 'root');
         $object->collection[] = Author::create('root', 'qwerty');
 
@@ -224,4 +226,27 @@ public function successCollection(): void
             array_map(fn(Author $author): string => $author->firstName, $unserialized->collection),
         );
     }
+
+    /**
+     * @test
+     *
+     * @throws \Throwable
+     */
+    public function legacyPropertiesSupport(): void
+    {
+        $serializer = new SymfonyMessageSerializer();
+
+        $object = new MixedWithLegacy(
+            'qwerty',
+            new \DateTimeImmutable('2019-01-01', new \DateTimeZone('UTC')),
+            100500
+        );
+
+        /** @var MixedWithLegacy $unserialized */
+        $unserialized = $serializer->decode($serializer->encode($object));
+
+        static::assertSame($object->string, $unserialized->string);
+        static::assertSame($object->dateTime->getTimestamp(), $unserialized->dateTime->getTimestamp());
+        static::assertSame($object->long, $unserialized->long);
+    }
 }