Merge pull request #11 from veewee/cached-encoder-detection

Cache encoder detection

Author: veewee

src/Encoder/EncoderDetector.php

@@ -5,29 +5,55 @@
 
 use Soap\Engine\Metadata\Model\XsdType;
 use stdClass;
+use WeakMap;
 
 final class EncoderDetector
 {
+    /**
+     * @var WeakMap<XsdType, XmlEncoder<mixed, string>>
+     */
+    private WeakMap $cache;
+
+    public static function default(): self
+    {
+        /** @var self $self */
+        static $self = new self();
+
+        return $self;
+    }
+
+    private function __construct()
+    {
+        /** @var WeakMap<XsdType, XmlEncoder<mixed, string>> cache */
+        $this->cache = new WeakMap();
+    }
+
     /**
      * @return XmlEncoder<mixed, string>
      *
-     * @psalm-suppress InvalidReturnType, PossiblyInvalidArgument, InvalidReturnStatement - The simple type detector could return string|null, but should not be an issue here.
+     * @psalm-suppress InvalidArgument, InvalidReturnType, PossiblyInvalidArgument, InvalidReturnStatement - The simple type detector could return string|null, but should not be an issue here.
      */
     public function __invoke(Context $context): XmlEncoder
     {
         $type = $context->type;
+        if ($cached = $this->cache[$type] ?? null) {
+            return $cached;
+        }
+
         $meta = $type->getMeta();
 
         $encoder = match(true) {
-            $meta->isSimple()->unwrapOr(false) => (new SimpleType\EncoderDetector())($context),
+            $meta->isSimple()->unwrapOr(false) => SimpleType\EncoderDetector::default()($context),
             default => $this->detectComplexTypeEncoder($type, $context),
         };
 
         if (!$encoder instanceof Feature\ListAware && $meta->isRepeatingElement()->unwrapOr(false)) {
             $encoder = new RepeatingElementEncoder($encoder);
         }
 
-        return new ErrorHandlingEncoder($encoder);
+        $encoder = new ErrorHandlingEncoder($encoder);
+
+        return $this->cache[$type] = $encoder;
     }
 
     /**

src/Encoder/ObjectEncoder.php

@@ -222,7 +222,7 @@ private function decorateLensForType(Lens $lens, TypeMeta $meta): Lens
      */
     private function detectProperties(Context $context): array
     {
-        $type = (new ComplexTypeBuilder())($context);
+        $type = ComplexTypeBuilder::default()($context);
 
         return reindex(
             sort_by(

src/Encoder/SimpleType/EncoderDetector.php

@@ -13,6 +13,14 @@
 
 final class EncoderDetector
 {
+    public static function default(): self
+    {
+        /** @var self $self */
+        static $self = new self();
+
+        return $self;
+    }
+
     /**
      * @return XmlEncoder<mixed, string|null>
      */

src/EncoderRegistry.php

@@ -317,6 +317,6 @@ public function hasRegisteredComplexTypeForXsdType(XsdType $type): bool
      */
     public function detectEncoderForContext(Context $context): XmlEncoder
     {
-        return (new EncoderDetector())($context);
+        return EncoderDetector::default()($context);
     }
 }

src/TypeInference/ComplexTypeBuilder.php

@@ -10,6 +10,14 @@
 
 final class ComplexTypeBuilder
 {
+    public static function default(): self
+    {
+        /** @var self $self */
+        static $self = new self();
+
+        return $self;
+    }
+
     public function __invoke(Context $context): Type
     {
         $type = $context->metadata->getTypes()->fetchByNameAndXmlNamespace(