diff --git a/CHANGELOG.md b/CHANGELOG.md index b8f2f8e..5140886 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ target type * feat: Constructor arguments * test: Custom transformer +* refactor: Move `MixedType` to contracts ## 0.5.3 diff --git a/src/Model/MixedType.php b/src/Contracts/MixedType.php similarity index 94% rename from src/Model/MixedType.php rename to src/Contracts/MixedType.php index 5f4b49d..13b5105 100644 --- a/src/Model/MixedType.php +++ b/src/Contracts/MixedType.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Mapper\Model; +namespace Rekalogika\Mapper\Contracts; /** * Sentinel class to indicate mixed type diff --git a/src/Contracts/TypeMapping.php b/src/Contracts/TypeMapping.php index b3d67eb..c60d421 100644 --- a/src/Contracts/TypeMapping.php +++ b/src/Contracts/TypeMapping.php @@ -13,7 +13,6 @@ namespace Rekalogika\Mapper\Contracts; -use Rekalogika\Mapper\Model\MixedType; use Symfony\Component\PropertyInfo\Type; class TypeMapping diff --git a/src/MainTransformer.php b/src/MainTransformer.php index aacb67b..75e32eb 100644 --- a/src/MainTransformer.php +++ b/src/MainTransformer.php @@ -16,12 +16,12 @@ use Psr\Container\ContainerInterface; use Rekalogika\Mapper\Contracts\MainTransformerAwareInterface; use Rekalogika\Mapper\Contracts\MainTransformerInterface; +use Rekalogika\Mapper\Contracts\MixedType; use Rekalogika\Mapper\Contracts\TransformerInterface; use Rekalogika\Mapper\Exception\LogicException; use Rekalogika\Mapper\Exception\UnableToFindSuitableTransformerException; use Rekalogika\Mapper\Mapping\MappingEntry; use Rekalogika\Mapper\Mapping\MappingFactoryInterface; -use Rekalogika\Mapper\Model\MixedType; use Rekalogika\Mapper\ObjectCache\ObjectCache; use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface; use Rekalogika\Mapper\TypeResolver\TypeResolverInterface; diff --git a/src/Mapper.php b/src/Mapper.php index 8a05f7f..5a77017 100644 --- a/src/Mapper.php +++ b/src/Mapper.php @@ -14,9 +14,9 @@ namespace Rekalogika\Mapper; use Rekalogika\Mapper\Contracts\MainTransformerInterface; +use Rekalogika\Mapper\Contracts\MixedType; use Rekalogika\Mapper\Exception\MapperReturnsUnexpectedValueException; use Rekalogika\Mapper\Exception\UnexpectedValueException; -use Rekalogika\Mapper\Model\MixedType; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Mapping/MappingFactory.php b/src/Mapping/MappingFactory.php index 9318059..58e27e2 100644 --- a/src/Mapping/MappingFactory.php +++ b/src/Mapping/MappingFactory.php @@ -13,8 +13,8 @@ namespace Rekalogika\Mapper\Mapping; +use Rekalogika\Mapper\Contracts\MixedType; use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Model\MixedType; use Rekalogika\Mapper\TypeResolver\TypeResolverInterface; use Symfony\Component\PropertyInfo\Type; diff --git a/src/TypeResolver/CachingTypeResolver.php b/src/TypeResolver/CachingTypeResolver.php index 67e1db6..b462d6d 100644 --- a/src/TypeResolver/CachingTypeResolver.php +++ b/src/TypeResolver/CachingTypeResolver.php @@ -13,7 +13,7 @@ namespace Rekalogika\Mapper\TypeResolver; -use Rekalogika\Mapper\Model\MixedType; +use Rekalogika\Mapper\Contracts\MixedType; use Symfony\Component\PropertyInfo\Type; class CachingTypeResolver implements TypeResolverInterface diff --git a/src/TypeResolver/TypeResolver.php b/src/TypeResolver/TypeResolver.php index 03cece4..52eabd4 100644 --- a/src/TypeResolver/TypeResolver.php +++ b/src/TypeResolver/TypeResolver.php @@ -13,8 +13,8 @@ namespace Rekalogika\Mapper\TypeResolver; +use Rekalogika\Mapper\Contracts\MixedType; use Rekalogika\Mapper\Exception\InvalidArgumentException; -use Rekalogika\Mapper\Model\MixedType; use Rekalogika\Mapper\Util\TypeFactory; use Rekalogika\Mapper\Util\TypeUtil; use Symfony\Component\PropertyInfo\Type; diff --git a/src/TypeResolver/TypeResolverInterface.php b/src/TypeResolver/TypeResolverInterface.php index 2695c51..89697eb 100644 --- a/src/TypeResolver/TypeResolverInterface.php +++ b/src/TypeResolver/TypeResolverInterface.php @@ -13,7 +13,7 @@ namespace Rekalogika\Mapper\TypeResolver; -use Rekalogika\Mapper\Model\MixedType; +use Rekalogika\Mapper\Contracts\MixedType; use Symfony\Component\PropertyInfo\Type; interface TypeResolverInterface diff --git a/src/Util/TypeCheck.php b/src/Util/TypeCheck.php index a8bbaec..2210745 100644 --- a/src/Util/TypeCheck.php +++ b/src/Util/TypeCheck.php @@ -13,8 +13,8 @@ namespace Rekalogika\Mapper\Util; +use Rekalogika\Mapper\Contracts\MixedType; use Rekalogika\Mapper\Exception\LogicException; -use Rekalogika\Mapper\Model\MixedType; use Symfony\Component\PropertyInfo\Type; class TypeCheck diff --git a/src/Util/TypeFactory.php b/src/Util/TypeFactory.php index ab06004..0d70f53 100644 --- a/src/Util/TypeFactory.php +++ b/src/Util/TypeFactory.php @@ -13,8 +13,8 @@ namespace Rekalogika\Mapper\Util; +use Rekalogika\Mapper\Contracts\MixedType; use Rekalogika\Mapper\Exception\InvalidArgumentException; -use Rekalogika\Mapper\Model\MixedType; use Symfony\Component\PropertyInfo\Type; /** diff --git a/src/Util/TypeUtil.php b/src/Util/TypeUtil.php index 2d3da41..f7a3cd6 100644 --- a/src/Util/TypeUtil.php +++ b/src/Util/TypeUtil.php @@ -15,9 +15,9 @@ use DaveLiddament\PhpLanguageExtensions\Friend; use DaveLiddament\PhpLanguageExtensions\NamespaceVisibility; +use Rekalogika\Mapper\Contracts\MixedType; use Rekalogika\Mapper\Exception\InvalidArgumentException; use Rekalogika\Mapper\Exception\MapperReturnsUnexpectedValueException; -use Rekalogika\Mapper\Model\MixedType; use Rekalogika\Mapper\Tests\UnitTest\Util\TypeUtil2Test; use Rekalogika\Mapper\Tests\UnitTest\Util\TypeUtilTest; use Rekalogika\Mapper\TypeResolver\TypeResolver;