Remove detailed types

Author: SerafimArts

src/Mapping/Metadata/ClassMetadata.php

@@ -77,18 +77,14 @@ public function __construct(
      */
     public function getTypeStatement(Context $context, bool $read): TypeStatement
     {
-        if (!$context->isDetailedTypes()) {
-            return new NamedTypeNode($this->name);
-        }
-
         $fields = [];
 
         foreach ($this->properties as $property) {
             $fields[] = $property->getFieldNode($context, $read);
         }
 
         if ($fields === []) {
-            return new NamedTypeNode($this->name);
+            return new NamedTypeNode($this->name, fields: new FieldsListNode());
         }
 
         return new NamedTypeNode($this->name, fields: new FieldsListNode($fields));

src/Mapping/Metadata/ClassMetadata/PropertyMetadata.php

@@ -77,11 +77,11 @@ public function getTypeStatement(Context $context, bool $read): TypeStatement
 
         $statement = clone $info->statement;
 
-        if ($context->isDetailedTypes() || !$statement instanceof NamedTypeNode) {
-            return $statement;
+        if ($statement instanceof NamedTypeNode) {
+            return new NamedTypeNode($statement->name);
         }
 
-        return new NamedTypeNode($statement->name);
+        return $statement;
     }
 
     /**

src/Runtime/Configuration.php

@@ -14,11 +14,6 @@ final class Configuration implements ConfigurationInterface
      */
     public const OBJECTS_AS_ARRAYS_DEFAULT_VALUE = true;
 
-    /**
-     * Default value for {@see $isDetailedTypes} option.
-     */
-    public const DETAILED_TYPES_DEFAULT_VALUE = true;
-
     /**
      * Default value for {@see $isStrictTypes} option.
      */
@@ -30,32 +25,27 @@ public function __construct(
          * associative arrays, otherwise anonymous {@see object} will be
          * returned.
          */
-        private ?bool $isObjectsAsArrays = null,
-        /**
-         * If this option contains {@see true}, then all composite types will
-         * be displayed along with detailed fields/values.
-         */
-        private ?bool $isDetailedTypes = null,
+        private readonly ?bool $isObjectsAsArrays = null,
         /**
          * If this option contains {@see true}, then strict types will
          * be enabled.
          */
-        private ?bool $isStrictTypes = null,
+        private readonly ?bool $isStrictTypes = null,
         /**
          * If this option contains {@see LoggerInterface}, then logger
          * will be enabled.
          *
          * Logger will be disabled in case of argument contain {@see null}.
          */
-        private ?LoggerInterface $logger = null,
+        private readonly ?LoggerInterface $logger = null,
         /**
          * If this option contains {@see TracerInterface}, then an application
          * tracing will be enabled using given tracer.
          *
          * An application tracing will be disabled in case of argument
          * contain {@see null}.
          */
-        private ?TracerInterface $tracer = null,
+        private readonly ?TracerInterface $tracer = null,
     ) {}
 
     /**
@@ -67,10 +57,12 @@ public function __construct(
      */
     public function withObjectsAsArrays(?bool $enabled = null): self
     {
-        $self = clone $this;
-        $self->isObjectsAsArrays = $enabled;
-
-        return $self;
+        return new self(
+            isObjectsAsArrays: $enabled,
+            isStrictTypes: $this->isStrictTypes,
+            logger: $this->logger,
+            tracer: $this->tracer,
+        );
     }
 
     public function isObjectsAsArrays(): bool
@@ -88,36 +80,6 @@ public function isObjectsAsArraysOptionDefined(): bool
         return $this->isObjectsAsArrays !== null;
     }
 
-    /**
-     * Enables or disables detailed types in exceptions.
-     *
-     * In case of $enabled is {@see null} a default value will be defined.
-     *
-     * @api
-     */
-    public function withDetailedTypes(?bool $enabled = null): self
-    {
-        $self = clone $this;
-        $self->isDetailedTypes = $enabled;
-
-        return $self;
-    }
-
-    public function isDetailedTypes(): bool
-    {
-        return $this->isDetailedTypes ?? self::DETAILED_TYPES_DEFAULT_VALUE;
-    }
-
-    /**
-     * Returns {@see true} in case option is user-defined.
-     *
-     * @api
-     */
-    public function isDetailedTypesOptionDefined(): bool
-    {
-        return $this->isDetailedTypes !== null;
-    }
-
     /**
      * Enables or disables strict types in casting.
      *
@@ -127,10 +89,12 @@ public function isDetailedTypesOptionDefined(): bool
      */
     public function withStrictTypes(?bool $enabled = null): self
     {
-        $self = clone $this;
-        $self->isStrictTypes = $enabled;
-
-        return $self;
+        return new self(
+            isObjectsAsArrays: $this->isObjectsAsArrays,
+            isStrictTypes: $enabled,
+            logger: $this->logger,
+            tracer: $this->tracer,
+        );
     }
 
     public function isStrictTypesEnabled(): bool
@@ -156,10 +120,12 @@ public function isStrictTypesOptionDefined(): bool
      */
     public function withLogger(?LoggerInterface $logger = null): self
     {
-        $self = clone $this;
-        $self->logger = $logger;
-
-        return $self;
+        return new self(
+            isObjectsAsArrays: $this->isObjectsAsArrays,
+            isStrictTypes: $this->isStrictTypes,
+            logger: $logger,
+            tracer: $this->tracer,
+        );
     }
 
     public function getLogger(): ?LoggerInterface
@@ -176,10 +142,12 @@ public function getLogger(): ?LoggerInterface
      */
     public function withTracer(?TracerInterface $tracer = null): self
     {
-        $self = clone $this;
-        $self->tracer = $tracer;
-
-        return $self;
+        return new self(
+            isObjectsAsArrays: $this->isObjectsAsArrays,
+            isStrictTypes: $this->isStrictTypes,
+            logger: $this->logger,
+            tracer: $tracer,
+        );
     }
 
     public function getTracer(): ?TracerInterface

src/Runtime/ConfigurationInterface.php

@@ -17,14 +17,6 @@ interface ConfigurationInterface
      */
     public function isObjectsAsArrays(): bool;
 
-    /**
-     * In case of returns {@see true}, then all composite types will
-     * be displayed along with detailed fields/values.
-     *
-     * Otherwise, only a short description will be displayed.
-     */
-    public function isDetailedTypes(): bool;
-
     /**
      * In case of method returns {@see true}, all types will be checked
      * for compliance.

src/Runtime/Context.php

@@ -59,11 +59,6 @@ public function isObjectsAsArrays(): bool
         return $this->config->isObjectsAsArrays();
     }
 
-    public function isDetailedTypes(): bool
-    {
-        return $this->config->isDetailedTypes();
-    }
-
     public function isStrictTypesEnabled(): bool
     {
         return $this->config->isStrictTypesEnabled();

src/Runtime/Context/RootContext.php

@@ -29,7 +29,7 @@ public static function forNormalization(
         TypeRepositoryInterface $types,
     ): self {
         if ($config instanceof Configuration) {
-            // Disable strict-types for denormalization if option is not set
+            // Disable strict-types for normalization if option is not set
             if (!$config->isStrictTypesOptionDefined()) {
                 $config = $config->withStrictTypes(false);
             }
@@ -55,7 +55,7 @@ public static function forDenormalization(
         TypeRepositoryInterface $types,
     ): self {
         if ($config instanceof Configuration) {
-            // Enable strict-types for normalization if option is not set
+            // Enable strict-types for denormalization if option is not set
             if (!$config->isStrictTypesOptionDefined()) {
                 $config = $config->withStrictTypes(true);
             }