Improve configuration params

Author: SerafimArts

src/Context/ChildContext.php

@@ -19,30 +19,40 @@ protected function __construct(
         private readonly EntryInterface $entry,
         mixed $value,
         Direction $direction,
+        ConfigurationInterface $config,
         TypeExtractorInterface $extractor,
         TypeParserInterface $parser,
         TypeRepositoryInterface $types,
-        ConfigurationInterface $config,
-        private readonly ?bool $isStrictTypes = null,
+        private readonly ?bool $overrideStrictTypes = null,
+        private readonly ?bool $overrideObjectAsArray = null,
     ) {
         parent::__construct(
             value: $value,
             direction: $direction,
+            config: $config,
             extractor: $extractor,
             parser: $parser,
             types: $types,
-            config: $config,
         );
     }
 
     #[\Override]
     public function isStrictTypesEnabled(): bool
     {
-        return $this->isStrictTypes
-            ?? $this->config->isStrictTypesEnabled();
+        return $this->overrideStrictTypes
+            ?? parent::isStrictTypesEnabled();
+    }
+
+    #[\Override]
+    public function isObjectAsArray(): bool
+    {
+        return $this->overrideObjectAsArray
+            ?? parent::isObjectAsArray();
     }
 
     /**
+     * Gets parent context
+     *
      * @api
      */
     public function getParent(): Context

src/Context/Context.php

@@ -25,27 +25,32 @@ abstract class Context implements
     protected function __construct(
         protected readonly mixed $value,
         protected readonly Direction $direction,
+        protected readonly ConfigurationInterface $config,
         protected readonly TypeExtractorInterface $extractor,
         protected readonly TypeParserInterface $parser,
         protected readonly TypeRepositoryInterface $types,
-        protected readonly ConfigurationInterface $config,
     ) {}
 
     /**
      * Creates new child context.
      */
-    public function enter(mixed $value, EntryInterface $entry, ?bool $isStrictTypes = null): self
-    {
+    public function enter(
+        mixed $value,
+        EntryInterface $entry,
+        ?bool $strictTypes = null,
+        ?bool $objectAsArray = null,
+    ): self {
         return new ChildContext(
             parent: $this,
             entry: $entry,
             value: $value,
             direction: $this->direction,
+            config: $this->config,
             extractor: $this->extractor,
             parser: $this->parser,
             types: $this->types,
-            config: $this->config,
-            isStrictTypes: $isStrictTypes,
+            overrideStrictTypes: $strictTypes,
+            overrideObjectAsArray: $objectAsArray,
         );
     }
 
@@ -54,24 +59,24 @@ public function getValue(): mixed
         return $this->value;
     }
 
-    public function isObjectsAsArrays(): bool
+    public function isObjectAsArray(): bool
     {
-        return $this->config->isObjectsAsArrays();
+        return $this->config->isObjectAsArray();
     }
 
     public function isStrictTypesEnabled(): bool
     {
         return $this->config->isStrictTypesEnabled();
     }
 
-    public function getLogger(): ?LoggerInterface
+    public function findLogger(): ?LoggerInterface
     {
-        return $this->config->getLogger();
+        return $this->config->findLogger();
     }
 
-    public function getTracer(): ?TracerInterface
+    public function findTracer(): ?TracerInterface
     {
-        return $this->config->getTracer();
+        return $this->config->findTracer();
     }
 
     /**

src/Context/RootContext.php

@@ -39,10 +39,10 @@ public static function forNormalization(
         return new self(
             value: $value,
             direction: Direction::Normalize,
+            config: $config,
             extractor: $extractor,
             parser: $parser,
             types: $types,
-            config: $config,
         );
     }
 
@@ -65,10 +65,10 @@ public static function forDenormalization(
         return new self(
             value: $value,
             direction: Direction::Denormalize,
+            config: $config,
             extractor: $extractor,
             parser: $parser,
             types: $types,
-            config: $config,
         );
     }
 

src/Runtime/Configuration.php

@@ -65,7 +65,7 @@ public function withObjectsAsArrays(?bool $enabled = null): self
         );
     }
 
-    public function isObjectsAsArrays(): bool
+    public function isObjectAsArray(): bool
     {
         return $this->isObjectsAsArrays ?? self::OBJECTS_AS_ARRAYS_DEFAULT_VALUE;
     }
@@ -128,7 +128,7 @@ public function withLogger(?LoggerInterface $logger = null): self
         );
     }
 
-    public function getLogger(): ?LoggerInterface
+    public function findLogger(): ?LoggerInterface
     {
         return $this->logger;
     }
@@ -150,7 +150,7 @@ public function withTracer(?TracerInterface $tracer = null): self
         );
     }
 
-    public function getTracer(): ?TracerInterface
+    public function findTracer(): ?TracerInterface
     {
         return $this->tracer;
     }

src/Runtime/ConfigurationInterface.php

@@ -15,7 +15,7 @@ interface ConfigurationInterface
      * In case of the method returns {@see true}, the object will be converted
      * to an associative array (hash map) unless otherwise specified.
      */
-    public function isObjectsAsArrays(): bool;
+    public function isObjectAsArray(): bool;
 
     /**
      * In case of method returns {@see true}, all types will be checked
@@ -30,11 +30,11 @@ public function isStrictTypesEnabled(): bool;
      * If this method returns {@see LoggerInterface}, then the given logger
      * will be enabled. Otherwise logger should be disabled.
      */
-    public function getLogger(): ?LoggerInterface;
+    public function findLogger(): ?LoggerInterface;
 
     /**
      * If this method returns {@see TracerInterface}, then the application
      * tracing will be enabled. Otherwise tracing should be disabled.
      */
-    public function getTracer(): ?TracerInterface;
+    public function findTracer(): ?TracerInterface;
 }

src/Runtime/Parser/Factory/DefaultTypeParserFactory.php

@@ -35,7 +35,7 @@ private function createDefaultParser(PlatformInterface $platform): TypeLangParse
 
     private function withTracing(Configuration $config, TypeParserInterface $parser): TypeParserInterface
     {
-        $tracer = $config->getTracer();
+        $tracer = $config->findTracer();
 
         if ($tracer === null) {
             return $parser;
@@ -46,7 +46,7 @@ private function withTracing(Configuration $config, TypeParserInterface $parser)
 
     private function withLogging(Configuration $config, TypeParserInterface $parser): TypeParserInterface
     {
-        $logger = $config->getLogger();
+        $logger = $config->findLogger();
 
         if ($logger === null) {
             return $parser;

src/Runtime/Repository/Factory/DefaultTypeRepositoryFactory.php

@@ -46,7 +46,7 @@ private function createDefaultRepository(
 
     private function withTracing(Configuration $config, TypeRepositoryInterface $types): TypeRepositoryInterface
     {
-        $tracer = $config->getTracer();
+        $tracer = $config->findTracer();
 
         if ($tracer === null) {
             return $types;
@@ -57,7 +57,7 @@ private function withTracing(Configuration $config, TypeRepositoryInterface $typ
 
     private function withLogging(Configuration $config, TypeRepositoryInterface $types): TypeRepositoryInterface
     {
-        $logger = $config->getLogger();
+        $logger = $config->findLogger();
 
         if ($logger === null) {
             return $types;

src/Type/ClassTypeFromArrayType.php

@@ -121,7 +121,7 @@ private function denormalizeObject(array $value, object $object, Context $contex
             $entrance = $context->enter(
                 value: $value,
                 entry: new ObjectPropertyEntry($meta->alias),
-                isStrictTypes: $meta->write->strict,
+                strictTypes: $meta->write->strict,
             );
 
             // Skip the property when not writable

src/Type/ClassTypeToArrayType.php

@@ -57,7 +57,7 @@ public function cast(mixed $value, Context $context): object|array
 
         $result = $this->normalizeObject($value, $entrance);
 
-        if ($this->metadata->isNormalizeAsArray ?? $context->isObjectsAsArrays()) {
+        if ($this->metadata->isNormalizeAsArray ?? $context->isObjectAsArray()) {
             return $result;
         }
 
@@ -77,7 +77,7 @@ protected function normalizeObject(object $object, Context $context): array
             $entrance = $context->enter(
                 value: $object,
                 entry: new ObjectPropertyEntry($meta->name),
-                isStrictTypes: $meta->read->strict,
+                strictTypes: $meta->read->strict,
             );
 
             // Skip the property when not readable

src/Type/ListFromIterableType.php

@@ -58,7 +58,7 @@ protected function process(iterable $value, Context $context): array
             $entrance = $context->enter(
                 value: $item,
                 entry: new ArrayIndexEntry($index),
-                isStrictTypes: $context->isStrictTypesEnabled(),
+                strictTypes: $context->isStrictTypesEnabled(),
             );
 
             try {