optimize extractors

Author: mmasiukevich

src/Symfony/Extractor/FailOverExtractor.php renamed to src/Symfony/Extractor/CombinedExtractor.php

@@ -17,22 +17,23 @@
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
 
 /**
+ *
  */
-final class FailOverExtractor implements PropertyTypeExtractorInterface
+final class CombinedExtractor implements PropertyTypeExtractorInterface
 {
-    /**
-     * @psalm-var array<string, \Symfony\Component\PropertyInfo\Type[]|null>
-     */
+    /** @psalm-var array<string, \Symfony\Component\PropertyInfo\Type[]|null> */
     private $localStorage = [];
 
-    /**
-     * @var PropertyTypeExtractorInterface[]
-     */
-    private $extractors;
+    /** @var PhpDocExtractor */
+    private $phpDocExtractor;
+
+    /** @var ReflectionExtractor */
+    private $reflectionPropertyExtractor;
 
     public function __construct()
     {
-        $this->extractors = [new PhpDocExtractor(), new ReflectionExtractor()];
+        $this->phpDocExtractor             = new PhpDocExtractor();
+        $this->reflectionPropertyExtractor = new ReflectionExtractor();
     }
 
     /**
@@ -44,19 +45,14 @@ public function getTypes(string $class, string $property, array $context = []):
 
         if (\array_key_exists($cacheKey, $this->localStorage) === false)
         {
-            $this->localStorage[$cacheKey] = null;
+            $types = $this->phpDocExtractor->getTypes($class, $property, $context);
 
-            foreach ($this->extractors as $extractor)
+            if ($types === null)
             {
-                $types = $extractor->getTypes($class, $property, $context);
-
-                if (null !== $types)
-                {
-                    $this->localStorage[$cacheKey] = $types;
-
-                    break;
-                }
+                $types = $this->reflectionPropertyExtractor->getTypes($class, $property, $context);
             }
+
+            $this->localStorage[$cacheKey] = $types;
         }
 
         return $this->localStorage[$cacheKey];

src/Symfony/SymfonyMessageSerializer.php

@@ -20,10 +20,11 @@
 use ServiceBus\MessageSerializer\MessageDecoder;
 use ServiceBus\MessageSerializer\MessageEncoder;
 use ServiceBus\MessageSerializer\Serializer;
-use ServiceBus\MessageSerializer\Symfony\Extractor\FailOverExtractor;
+use ServiceBus\MessageSerializer\Symfony\Extractor\CombinedExtractor;
 use ServiceBus\MessageSerializer\SymfonyNormalizer\Extensions\EmptyDataNormalizer;
 use ServiceBus\MessageSerializer\SymfonyNormalizer\Extensions\PropertyNameConverter;
 use ServiceBus\MessageSerializer\SymfonyNormalizer\Extensions\PropertyNormalizerWrapper;
+use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
 use Symfony\Component\Serializer as SymfonySerializer;
 use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 
@@ -51,10 +52,12 @@ final class SymfonyMessageSerializer implements MessageEncoder, MessageDecoder
      */
     public function __construct(Serializer $serializer = null, array $normalizers = [])
     {
+        $extractor = \PHP_VERSION_ID >= 70400 ? new CombinedExtractor() : new PhpDocExtractor();
+
         $defaultNormalizers = [
             new DateTimeNormalizer(['datetime_format' => 'c']),
             new SymfonySerializer\Normalizer\ArrayDenormalizer(),
-            new PropertyNormalizerWrapper(null, new PropertyNameConverter(), new FailOverExtractor()),
+            new PropertyNormalizerWrapper(null, new PropertyNameConverter(), $extractor),
             new EmptyDataNormalizer(),
         ];