Simplify type namespaces

SerafimArts · SerafimArts · commit f6e22e7b4e4e · 2025-10-26T16:02:39.000+03:00
diff --git a/src/Type/BackedEnumFromScalarType.php b/src/Type/BackedEnumFromScalarType.php
@@ -2,11 +2,10 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Type\BackedEnumType;
+namespace TypeLang\Mapper\Type;
 
 use TypeLang\Mapper\Context\Context;
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
-use TypeLang\Mapper\Type\TypeInterface;
 
 /**
  * @template TEnum of \BackedEnum = \BackedEnum
diff --git a/src/Type/BackedEnumToScalarType.php b/src/Type/BackedEnumToScalarType.php
@@ -2,11 +2,10 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Type\BackedEnumType;
+namespace TypeLang\Mapper\Type;
 
 use TypeLang\Mapper\Context\Context;
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
-use TypeLang\Mapper\Type\TypeInterface;
 
 /**
  * @template TEnum of \BackedEnum = \BackedEnum
diff --git a/src/Type/Builder/BackedEnumFromScalarTypeBuilder.php b/src/Type/Builder/BackedEnumFromScalarTypeBuilder.php
@@ -4,7 +4,7 @@
 
 namespace TypeLang\Mapper\Type\Builder;
 
-use TypeLang\Mapper\Type\BackedEnumType\BackedEnumFromScalarType;
+use TypeLang\Mapper\Type\BackedEnumFromScalarType;
 use TypeLang\Mapper\Type\TypeInterface;
 
 /**
diff --git a/src/Type/Builder/BackedEnumToScalarTypeBuilder.php b/src/Type/Builder/BackedEnumToScalarTypeBuilder.php
@@ -4,7 +4,7 @@
 
 namespace TypeLang\Mapper\Type\Builder;
 
-use TypeLang\Mapper\Type\BackedEnumType\BackedEnumToScalarType;
+use TypeLang\Mapper\Type\BackedEnumToScalarType;
 use TypeLang\Mapper\Type\TypeInterface;
 
 /**
diff --git a/src/Type/Builder/ClassFromArrayTypeBuilder.php b/src/Type/Builder/ClassFromArrayTypeBuilder.php
@@ -5,7 +5,7 @@
 namespace TypeLang\Mapper\Type\Builder;
 
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
-use TypeLang\Mapper\Type\ClassType\ClassTypeFromArrayType;
+use TypeLang\Mapper\Type\ClassTypeFromArrayType;
 use TypeLang\Mapper\Type\TypeInterface;
 
 /**
diff --git a/src/Type/Builder/ClassToArrayTypeBuilder.php b/src/Type/Builder/ClassToArrayTypeBuilder.php
@@ -5,7 +5,7 @@
 namespace TypeLang\Mapper\Type\Builder;
 
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
-use TypeLang\Mapper\Type\ClassType\ClassTypeToArrayType;
+use TypeLang\Mapper\Type\ClassTypeToArrayType;
 use TypeLang\Mapper\Type\TypeInterface;
 
 /**
diff --git a/src/Type/Builder/DateTimeFromStringTypeBuilder.php b/src/Type/Builder/DateTimeFromStringTypeBuilder.php
@@ -4,7 +4,7 @@
 
 namespace TypeLang\Mapper\Type\Builder;
 
-use TypeLang\Mapper\Type\DateTimeType\DateTimeFromStringType;
+use TypeLang\Mapper\Type\DateTimeFromStringType;
 
 /**
  * @template TDateTime of \DateTime|\DateTimeImmutable = \DateTimeImmutable
diff --git a/src/Type/Builder/DateTimeToStringTypeBuilder.php b/src/Type/Builder/DateTimeToStringTypeBuilder.php
@@ -4,7 +4,7 @@
 
 namespace TypeLang\Mapper\Type\Builder;
 
-use TypeLang\Mapper\Type\DateTimeType\DateTimeToStringType;
+use TypeLang\Mapper\Type\DateTimeToStringType;
 
 /**
  * @template TDateTime of \DateTime|\DateTimeImmutable = \DateTimeImmutable
diff --git a/src/Type/Builder/ListFromArrayTypeBuilder.php b/src/Type/Builder/ListFromArrayTypeBuilder.php
@@ -4,7 +4,7 @@
 
 namespace TypeLang\Mapper\Type\Builder;
 
-use TypeLang\Mapper\Type\ListType\ListFromArrayType;
+use TypeLang\Mapper\Type\ListFromArrayType;
 use TypeLang\Mapper\Type\TypeInterface;
 
 class ListFromArrayTypeBuilder extends ListTypeBuilder
diff --git a/src/Type/Builder/ListFromIterableTypeBuilder.php b/src/Type/Builder/ListFromIterableTypeBuilder.php
@@ -4,7 +4,7 @@
 
 namespace TypeLang\Mapper\Type\Builder;
 
-use TypeLang\Mapper\Type\ListType\ListFromIterableType;
+use TypeLang\Mapper\Type\ListFromIterableType;
 use TypeLang\Mapper\Type\TypeInterface;
 
 class ListFromIterableTypeBuilder extends ListTypeBuilder
diff --git a/src/Type/Builder/ObjectFromArrayTypeBuilder.php b/src/Type/Builder/ObjectFromArrayTypeBuilder.php
@@ -4,7 +4,7 @@
 
 namespace TypeLang\Mapper\Type\Builder;
 
-use TypeLang\Mapper\Type\ObjectType\ObjectTypeFromArrayType;
+use TypeLang\Mapper\Type\ObjectTypeFromArrayType;
 use TypeLang\Mapper\Type\TypeInterface;
 
 class ObjectFromArrayTypeBuilder extends ObjectTypeBuilder
diff --git a/src/Type/Builder/ObjectToArrayTypeBuilder.php b/src/Type/Builder/ObjectToArrayTypeBuilder.php
@@ -4,7 +4,7 @@
 
 namespace TypeLang\Mapper\Type\Builder;
 
-use TypeLang\Mapper\Type\ObjectType\ObjectTypeToArrayType;
+use TypeLang\Mapper\Type\ObjectTypeToArrayType;
 use TypeLang\Mapper\Type\TypeInterface;
 
 class ObjectToArrayTypeBuilder extends ObjectTypeBuilder
diff --git a/src/Type/Builder/UnitEnumFromScalarTypeBuilder.php b/src/Type/Builder/UnitEnumFromScalarTypeBuilder.php
@@ -5,7 +5,7 @@
 namespace TypeLang\Mapper\Type\Builder;
 
 use TypeLang\Mapper\Type\TypeInterface;
-use TypeLang\Mapper\Type\UnitEnumType\UnitEnumFromStringType;
+use TypeLang\Mapper\Type\UnitEnumFromStringType;
 
 /**
  * @template TEnum of \UnitEnum = \UnitEnum
diff --git a/src/Type/Builder/UnitEnumToScalarTypeBuilder.php b/src/Type/Builder/UnitEnumToScalarTypeBuilder.php
@@ -5,7 +5,7 @@
 namespace TypeLang\Mapper\Type\Builder;
 
 use TypeLang\Mapper\Type\TypeInterface;
-use TypeLang\Mapper\Type\UnitEnumType\UnitEnumToStringType;
+use TypeLang\Mapper\Type\UnitEnumToStringType;
 
 /**
  * @template TEnum of \UnitEnum = \UnitEnum
diff --git a/src/Type/ClassTypeFromArrayType.php b/src/Type/ClassTypeFromArrayType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Type\ClassType;
+namespace TypeLang\Mapper\Type;
 
 use TypeLang\Mapper\Context\Context;
 use TypeLang\Mapper\Context\Path\Entry\ObjectEntry;
@@ -15,7 +15,7 @@
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
 use TypeLang\Mapper\Runtime\ClassInstantiator\ClassInstantiatorInterface;
 use TypeLang\Mapper\Runtime\PropertyAccessor\PropertyAccessorInterface;
-use TypeLang\Mapper\Type\TypeInterface;
+use TypeLang\Mapper\Type\ClassType\DiscriminatorTypeSelector;
 
 /**
  * @template TObject of object = object
diff --git a/src/Type/ClassTypeToArrayType.php b/src/Type/ClassTypeToArrayType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Type\ClassType;
+namespace TypeLang\Mapper\Type;
 
 use TypeLang\Mapper\Context\Context;
 use TypeLang\Mapper\Context\Path\Entry\ObjectEntry;
@@ -12,7 +12,6 @@
 use TypeLang\Mapper\Exception\Mapping\InvalidValueOfTypeException;
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
 use TypeLang\Mapper\Runtime\PropertyAccessor\PropertyAccessorInterface;
-use TypeLang\Mapper\Type\TypeInterface;
 
 /**
  * @template TObject of object = object
diff --git a/src/Type/DateTimeFromStringType.php b/src/Type/DateTimeFromStringType.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Type\DateTimeType;
+namespace TypeLang\Mapper\Type;
 
+use DateTime as TDateTime;
 use TypeLang\Mapper\Context\Context;
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
-use TypeLang\Mapper\Type\TypeInterface;
 
 /**
  * @template TDateTime of \DateTime|\DateTimeImmutable = \DateTimeImmutable
diff --git a/src/Type/DateTimeToStringType.php b/src/Type/DateTimeToStringType.php
@@ -2,11 +2,10 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Type\DateTimeType;
+namespace TypeLang\Mapper\Type;
 
 use TypeLang\Mapper\Context\Context;
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
-use TypeLang\Mapper\Type\TypeInterface;
 
 /**
  * @template-implements TypeInterface<string>
diff --git a/src/Type/ListFromArrayType.php b/src/Type/ListFromArrayType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Type\ListType;
+namespace TypeLang\Mapper\Type;
 
 use TypeLang\Mapper\Context\Context;
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
diff --git a/src/Type/ListFromIterableType.php b/src/Type/ListFromIterableType.php
@@ -2,14 +2,12 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Type\ListType;
+namespace TypeLang\Mapper\Type;
 
 use TypeLang\Mapper\Context\Context;
 use TypeLang\Mapper\Context\Path\Entry\ArrayIndexEntry;
 use TypeLang\Mapper\Exception\Mapping\InvalidIterableValueException;
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
-use TypeLang\Mapper\Type\MixedType;
-use TypeLang\Mapper\Type\TypeInterface;
 
 /**
  * @template-covariant TItem of mixed = mixed
diff --git a/src/Type/ObjectTypeFromArrayType.php b/src/Type/ObjectTypeFromArrayType.php
@@ -2,11 +2,10 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Type\ObjectType;
+namespace TypeLang\Mapper\Type;
 
 use TypeLang\Mapper\Context\Context;
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
-use TypeLang\Mapper\Type\TypeInterface;
 
 /**
  * @template-implements TypeInterface<object>
diff --git a/src/Type/ObjectTypeToArrayType.php b/src/Type/ObjectTypeToArrayType.php
@@ -2,11 +2,10 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Type\ObjectType;
+namespace TypeLang\Mapper\Type;
 
 use TypeLang\Mapper\Context\Context;
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
-use TypeLang\Mapper\Type\TypeInterface;
 
 /**
  * @template-implements TypeInterface<object|array<array-key, mixed>>
diff --git a/src/Type/UnitEnumFromStringType.php b/src/Type/UnitEnumFromStringType.php
@@ -2,12 +2,10 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Type\UnitEnumType;
+namespace TypeLang\Mapper\Type;
 
 use TypeLang\Mapper\Context\Context;
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
-use TypeLang\Mapper\Type\StringType;
-use TypeLang\Mapper\Type\TypeInterface;
 
 /**
  * @template TEnum of \UnitEnum = \UnitEnum
diff --git a/src/Type/UnitEnumToStringType.php b/src/Type/UnitEnumToStringType.php
@@ -2,11 +2,10 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Type\UnitEnumType;
+namespace TypeLang\Mapper\Type;
 
 use TypeLang\Mapper\Context\Context;
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
-use TypeLang\Mapper\Type\TypeInterface;
 
 /**
  * @template TEnum of \UnitEnum = \UnitEnum
