refactor work with reflection api

Author: mmasiukevich

composer.lock

@@ -14,6 +14,8 @@
 
 use ServiceBus\MessageSerializer\Exceptions\SerializationFailed;
 use ServiceBus\MessageSerializer\Exceptions\UnserializeFailed;
+use function ServiceBus\Common\jsonDecode;
+use function ServiceBus\Common\jsonEncode;
 
 /**
  *
@@ -27,10 +29,7 @@ public function serialize(array $payload): string
     {
         try
         {
-            /** @var string $encoded */
-            $encoded = \json_encode($payload, \JSON_UNESCAPED_UNICODE | \JSON_THROW_ON_ERROR);
-
-            return $encoded;
+            return jsonEncode($payload);
         }
         catch (\Throwable $throwable)
         {
@@ -49,12 +48,7 @@ public function unserialize(string $content): array
     {
         try
         {
-            /** @noinspection PhpUnnecessaryLocalVariableInspection */
-            /** @noinspection OneTimeUseVariablesInspection */
-            /** @psalm-var array<string, string|int|float|null> $decoded */
-            $decoded = \json_decode($content, true, 512, \JSON_THROW_ON_ERROR);
-
-            return $decoded;
+            return jsonDecode($content);
         }
         catch (\Throwable $throwable)
         {

src/JsonSerializer.php

@@ -51,23 +51,16 @@ protected function extractAttributes(object $object, string $format = null, arra
 
         if (false === isset($this->localStorage[$class]))
         {
-            $this->localStorage[$class] = [];
-
-            /**
-             * @var string $key
-             * @var mixed  $value
-             */
-            foreach (\get_object_vars($object) as $key => $value)
-            {
-                $this->localStorage[$class][] = $key;
-            }
+            $this->localStorage[$class] = parent::extractAttributes($object, $format, $context);
         }
 
         return $this->localStorage[$class];
     }
 
     /**
      * {@inheritdoc}
+     *
+     * @throws \Throwable
      */
     protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])
     {
@@ -76,7 +69,19 @@ protected function getAttributeValue(object $object, string $attribute, string $
             return $object->{$attribute};
         }
 
-        return parent::getAttributeValue($object, $attribute, $format, $context);
+        try
+        {
+            return parent::getAttributeValue($object, $attribute, $format, $context);
+        }
+        catch (\Throwable $throwable)
+        {
+            if (\strpos($throwable->getMessage(), 'before initialization') !== false)
+            {
+                return null;
+            }
+
+            throw $throwable;
+        }
     }
 
     /**

src/Symfony/Extensions/PropertyNormalizerWrapper.php

@@ -20,34 +20,45 @@
  */
 final class FailOverExtractor implements PropertyTypeExtractorInterface
 {
+    /**
+     * @psalm-var array<string, \Symfony\Component\PropertyInfo\Type[]|null>
+     */
+    private array $localStorage;
+
     /**
      * @var PropertyTypeExtractorInterface[]
      */
     private array $extractors;
 
     public function __construct()
     {
-        $this->extractors = [
-            new ReflectionExtractor(),
-            new PhpDocExtractor(),
-        ];
+        $this->extractors = [new PhpDocExtractor(), new ReflectionExtractor()];
     }
 
     /**
      * {@inheritdoc}
      */
     public function getTypes(string $class, string $property, array $context = []): ?array
     {
-        foreach ($this->extractors as $extractor)
+        $cacheKey = \sha1($class . $property);
+
+        if (isset($this->localStorage[$cacheKey]) === false)
         {
-            $types = $extractor->getTypes($class, $property, $context);
+            $this->localStorage[$cacheKey] = null;
 
-            if (null !== $types)
+            foreach ($this->extractors as $extractor)
             {
-                return $types;
+                $types = $extractor->getTypes($class, $property, $context);
+
+                if (null !== $types)
+                {
+                    $this->localStorage[$cacheKey] = $types;
+
+                    break;
+                }
             }
         }
 
-        return null;
+        return $this->localStorage[$cacheKey];
     }
 }

src/Symfony/Extractor/FailOverExtractor.php

@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Messages serializer implementation.
+ *
+ * @author  Maksim Masiukevich <[email protected]>
+ * @license MIT
+ * @license https://opensource.org/licenses/MIT
+ */
+
+declare(strict_types = 1);
+
+namespace ServiceBus\MessageSerializer\Tests\Stubs;
+
+/**
+ */
+final class WithPrivateProperties
+{
+    /**
+     * @var string
+     */
+    private $qwerty;
+
+    private int $root;
+    private ?\DateTimeImmutable $dateTime;
+
+    /**
+     * @var \DateTimeImmutable
+     */
+    private $createdAt;
+
+    public function __construct(string $qwerty, int $root, \DateTimeImmutable $createdAt)
+    {
+        $this->qwerty    = $qwerty;
+        $this->root      = $root;
+        $this->createdAt = $createdAt;
+    }
+}

tests/Stubs/WithPrivateProperties.php

@@ -25,6 +25,8 @@
 use ServiceBus\MessageSerializer\Tests\Stubs\TestMessage;
 use ServiceBus\MessageSerializer\Tests\Stubs\WithDateTimeField;
 use ServiceBus\MessageSerializer\Tests\Stubs\WithNullableObjectArgument;
+use ServiceBus\MessageSerializer\Tests\Stubs\WithPrivateProperties;
+use function ServiceBus\Common\now;
 
 /**
  *
@@ -249,4 +251,23 @@ public function legacyPropertiesSupport(): void
         static::assertSame($object->dateTime->getTimestamp(), $unserialized->dateTime->getTimestamp());
         static::assertSame($object->long, $unserialized->long);
     }
+
+    /**
+     * @test
+     *
+     * @throws \Throwable
+     */
+    public function privateMixedPropertiesSupport(): void
+    {
+        $serializer = new SymfonyMessageSerializer();
+
+        $object = new WithPrivateProperties(
+            'Some string',
+            100500,
+            now()
+        );
+
+        /** @var WithPrivateProperties $unserialized */
+        $unserialized = $serializer->decode($serializer->encode($object));
+    }
 }