diff --git a/src/Exception/MissingMemberKeyTypeException.php b/src/Exception/MissingMemberKeyTypeException.php index a408786..3fe22e1 100644 --- a/src/Exception/MissingMemberKeyTypeException.php +++ b/src/Exception/MissingMemberKeyTypeException.php @@ -13,7 +13,7 @@ namespace Rekalogika\Mapper\Exception; -use Rekalogika\Mapper\Contracts\MixedType; +use Rekalogika\Mapper\Transformer\Contracts\MixedType; use Rekalogika\Mapper\Util\TypeUtil; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Exception/MissingMemberValueTypeException.php b/src/Exception/MissingMemberValueTypeException.php index 4b48549..75b633d 100644 --- a/src/Exception/MissingMemberValueTypeException.php +++ b/src/Exception/MissingMemberValueTypeException.php @@ -13,7 +13,7 @@ namespace Rekalogika\Mapper\Exception; -use Rekalogika\Mapper\Contracts\MixedType; +use Rekalogika\Mapper\Transformer\Contracts\MixedType; use Rekalogika\Mapper\Util\TypeUtil; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Exception/UnableToFindSuitableTransformerException.php b/src/Exception/UnableToFindSuitableTransformerException.php index 80e1d9f..446429d 100644 --- a/src/Exception/UnableToFindSuitableTransformerException.php +++ b/src/Exception/UnableToFindSuitableTransformerException.php @@ -13,7 +13,7 @@ namespace Rekalogika\Mapper\Exception; -use Rekalogika\Mapper\Contracts\MixedType; +use Rekalogika\Mapper\Transformer\Contracts\MixedType; use Rekalogika\Mapper\Util\TypeUtil; use Symfony\Component\PropertyInfo\Type; diff --git a/src/MainTransformer/MainTransformer.php b/src/MainTransformer/MainTransformer.php index fc6797b..536cffa 100644 --- a/src/MainTransformer/MainTransformer.php +++ b/src/MainTransformer/MainTransformer.php @@ -13,13 +13,13 @@ namespace Rekalogika\Mapper\MainTransformer; -use Rekalogika\Mapper\Contracts\MainTransformerAwareInterface; -use Rekalogika\Mapper\Contracts\MixedType; -use Rekalogika\Mapper\Contracts\TransformerInterface; use Rekalogika\Mapper\Exception\LogicException; use Rekalogika\Mapper\Exception\UnableToFindSuitableTransformerException; use Rekalogika\Mapper\ObjectCache\ObjectCache; use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface; +use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareInterface; +use Rekalogika\Mapper\Transformer\Contracts\MixedType; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; use Rekalogika\Mapper\TransformerRegistry\TransformerRegistryInterface; use Rekalogika\Mapper\TypeResolver\TypeResolverInterface; use Symfony\Component\PropertyInfo\Type; diff --git a/src/MapperFactory/MapperFactory.php b/src/MapperFactory/MapperFactory.php index 14b37b6..6176368 100644 --- a/src/MapperFactory/MapperFactory.php +++ b/src/MapperFactory/MapperFactory.php @@ -17,7 +17,6 @@ use Psr\Container\ContainerInterface; use Rekalogika\Mapper\Command\MappingCommand; use Rekalogika\Mapper\Command\TryCommand; -use Rekalogika\Mapper\Contracts\TransformerInterface; use Rekalogika\Mapper\MainTransformer\MainTransformer; use Rekalogika\Mapper\Mapper; use Rekalogika\Mapper\MapperInterface; @@ -28,6 +27,7 @@ use Rekalogika\Mapper\ObjectCache\ObjectCacheFactory; use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface; use Rekalogika\Mapper\Transformer\ArrayToObjectTransformer; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; use Rekalogika\Mapper\Transformer\CopyTransformer; use Rekalogika\Mapper\Transformer\DateTimeTransformer; use Rekalogika\Mapper\Transformer\NullTransformer; diff --git a/src/Mapping/MappingFactory.php b/src/Mapping/MappingFactory.php index 58e27e2..fa7243f 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\Transformer\Contracts\MixedType; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; use Rekalogika\Mapper\TypeResolver\TypeResolverInterface; use Symfony\Component\PropertyInfo\Type; diff --git a/src/MethodMapper/ClassMethodTransformer.php b/src/MethodMapper/ClassMethodTransformer.php index 2821f7f..8388cf6 100644 --- a/src/MethodMapper/ClassMethodTransformer.php +++ b/src/MethodMapper/ClassMethodTransformer.php @@ -13,13 +13,13 @@ namespace Rekalogika\Mapper\MethodMapper; -use Rekalogika\Mapper\Contracts\MainTransformerAwareInterface; -use Rekalogika\Mapper\Contracts\MainTransformerAwareTrait; -use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Contracts\TypeMapping; use Rekalogika\Mapper\Exception\InvalidArgumentException; use Rekalogika\Mapper\MainTransformer\MainTransformer; use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface; +use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareInterface; +use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareTrait; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\TypeMapping; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\PropertyInfo\Type; diff --git a/src/MethodMapper/SubMapper.php b/src/MethodMapper/SubMapper.php index 9463ec4..b8edb76 100644 --- a/src/MethodMapper/SubMapper.php +++ b/src/MethodMapper/SubMapper.php @@ -13,9 +13,9 @@ namespace Rekalogika\Mapper\MethodMapper; -use Rekalogika\Mapper\Contracts\MainTransformerAwareInterface; -use Rekalogika\Mapper\Contracts\MainTransformerAwareTrait; use Rekalogika\Mapper\Exception\UnexpectedValueException; +use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareInterface; +use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareTrait; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface; use Symfony\Component\PropertyInfo\Type; diff --git a/src/RekalogikaMapperBundle.php b/src/RekalogikaMapperBundle.php index e66344e..e624477 100644 --- a/src/RekalogikaMapperBundle.php +++ b/src/RekalogikaMapperBundle.php @@ -13,8 +13,8 @@ namespace Rekalogika\Mapper; -use Rekalogika\Mapper\Contracts\TransformerInterface; use Rekalogika\Mapper\Tests\Common\TestKernel; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Symfony\Component\HttpKernel\Bundle\AbstractBundle; diff --git a/src/Transformer/ArrayToObjectTransformer.php b/src/Transformer/ArrayToObjectTransformer.php index a3c6f78..a383da0 100644 --- a/src/Transformer/ArrayToObjectTransformer.php +++ b/src/Transformer/ArrayToObjectTransformer.php @@ -13,10 +13,10 @@ namespace Rekalogika\Mapper\Transformer; -use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Contracts\TypeMapping; use Rekalogika\Mapper\Exception\InvalidArgumentException; use Rekalogika\Mapper\Exception\InvalidTypeInArgumentException; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\TypeMapping; use Rekalogika\Mapper\Util\TypeCheck; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Contracts/MainTransformerAwareInterface.php b/src/Transformer/Contracts/MainTransformerAwareInterface.php similarity index 90% rename from src/Contracts/MainTransformerAwareInterface.php rename to src/Transformer/Contracts/MainTransformerAwareInterface.php index 950aac3..91dc073 100644 --- a/src/Contracts/MainTransformerAwareInterface.php +++ b/src/Transformer/Contracts/MainTransformerAwareInterface.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Mapper\Contracts; +namespace Rekalogika\Mapper\Transformer\Contracts; use Rekalogika\Mapper\MainTransformer\MainTransformerInterface; diff --git a/src/Contracts/MainTransformerAwareTrait.php b/src/Transformer/Contracts/MainTransformerAwareTrait.php similarity index 95% rename from src/Contracts/MainTransformerAwareTrait.php rename to src/Transformer/Contracts/MainTransformerAwareTrait.php index 76e3e8a..c7a7879 100644 --- a/src/Contracts/MainTransformerAwareTrait.php +++ b/src/Transformer/Contracts/MainTransformerAwareTrait.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Mapper\Contracts; +namespace Rekalogika\Mapper\Transformer\Contracts; use Rekalogika\Mapper\Exception\LogicException; use Rekalogika\Mapper\MainTransformer\MainTransformerInterface; diff --git a/src/Contracts/MixedType.php b/src/Transformer/Contracts/MixedType.php similarity index 92% rename from src/Contracts/MixedType.php rename to src/Transformer/Contracts/MixedType.php index 13b5105..fe0a406 100644 --- a/src/Contracts/MixedType.php +++ b/src/Transformer/Contracts/MixedType.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Mapper\Contracts; +namespace Rekalogika\Mapper\Transformer\Contracts; /** * Sentinel class to indicate mixed type diff --git a/src/Contracts/TransformerInterface.php b/src/Transformer/Contracts/TransformerInterface.php similarity index 95% rename from src/Contracts/TransformerInterface.php rename to src/Transformer/Contracts/TransformerInterface.php index 2a7099b..79af606 100644 --- a/src/Contracts/TransformerInterface.php +++ b/src/Transformer/Contracts/TransformerInterface.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Mapper\Contracts; +namespace Rekalogika\Mapper\Transformer\Contracts; use Rekalogika\Mapper\Exception\CircularReferenceException; use Rekalogika\Mapper\Exception\ExceptionInterface; diff --git a/src/Contracts/TypeMapping.php b/src/Transformer/Contracts/TypeMapping.php similarity index 94% rename from src/Contracts/TypeMapping.php rename to src/Transformer/Contracts/TypeMapping.php index c60d421..0be28b4 100644 --- a/src/Contracts/TypeMapping.php +++ b/src/Transformer/Contracts/TypeMapping.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Mapper\Contracts; +namespace Rekalogika\Mapper\Transformer\Contracts; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Transformer/CopyTransformer.php b/src/Transformer/CopyTransformer.php index 7a157b8..fa4ab09 100644 --- a/src/Transformer/CopyTransformer.php +++ b/src/Transformer/CopyTransformer.php @@ -13,9 +13,9 @@ namespace Rekalogika\Mapper\Transformer; -use Rekalogika\Mapper\Contracts\MixedType; -use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Contracts\TypeMapping; +use Rekalogika\Mapper\Transformer\Contracts\MixedType; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\TypeMapping; use Symfony\Component\PropertyInfo\Type; final class CopyTransformer implements TransformerInterface diff --git a/src/Transformer/DateTimeTransformer.php b/src/Transformer/DateTimeTransformer.php index 09008dd..41a515b 100644 --- a/src/Transformer/DateTimeTransformer.php +++ b/src/Transformer/DateTimeTransformer.php @@ -13,9 +13,9 @@ namespace Rekalogika\Mapper\Transformer; -use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Contracts\TypeMapping; use Rekalogika\Mapper\Exception\InvalidArgumentException; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\TypeMapping; use Rekalogika\Mapper\Util\TypeCheck; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\Clock\DatePoint; diff --git a/src/Model/TraversableCountableWrapper.php b/src/Transformer/Model/TraversableCountableWrapper.php similarity index 95% rename from src/Model/TraversableCountableWrapper.php rename to src/Transformer/Model/TraversableCountableWrapper.php index 441ab68..0f0dd7f 100644 --- a/src/Model/TraversableCountableWrapper.php +++ b/src/Transformer/Model/TraversableCountableWrapper.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Mapper\Model; +namespace Rekalogika\Mapper\Transformer\Model; /** * @template TKey diff --git a/src/Transformer/NullTransformer.php b/src/Transformer/NullTransformer.php index daa0099..2f5e10c 100644 --- a/src/Transformer/NullTransformer.php +++ b/src/Transformer/NullTransformer.php @@ -13,9 +13,9 @@ namespace Rekalogika\Mapper\Transformer; -use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Contracts\TypeMapping; use Rekalogika\Mapper\Exception\InvalidArgumentException; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\TypeMapping; use Rekalogika\Mapper\Util\TypeCheck; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Transformer/ObjectToArrayTransformer.php b/src/Transformer/ObjectToArrayTransformer.php index 5395d89..38dc945 100644 --- a/src/Transformer/ObjectToArrayTransformer.php +++ b/src/Transformer/ObjectToArrayTransformer.php @@ -13,9 +13,9 @@ namespace Rekalogika\Mapper\Transformer; -use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Contracts\TypeMapping; use Rekalogika\Mapper\Exception\InvalidArgumentException; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\TypeMapping; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\PropertyInfo\Type; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; diff --git a/src/Transformer/ObjectToObjectTransformer.php b/src/Transformer/ObjectToObjectTransformer.php index b0ebda5..01436bc 100644 --- a/src/Transformer/ObjectToObjectTransformer.php +++ b/src/Transformer/ObjectToObjectTransformer.php @@ -13,10 +13,6 @@ namespace Rekalogika\Mapper\Transformer; -use Rekalogika\Mapper\Contracts\MainTransformerAwareInterface; -use Rekalogika\Mapper\Contracts\MainTransformerAwareTrait; -use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Contracts\TypeMapping; use Rekalogika\Mapper\Exception\CachedTargetObjectNotFoundException; use Rekalogika\Mapper\Exception\ClassNotInstantiableException; use Rekalogika\Mapper\Exception\IncompleteConstructorArgument; @@ -25,6 +21,10 @@ use Rekalogika\Mapper\Exception\InvalidClassException; use Rekalogika\Mapper\MainTransformer\MainTransformer; use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface; +use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareInterface; +use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareTrait; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\TypeMapping; use Rekalogika\Mapper\TypeResolver\TypeResolverInterface; use Rekalogika\Mapper\Util\TypeCheck; use Rekalogika\Mapper\Util\TypeFactory; diff --git a/src/Transformer/ObjectToStringTransformer.php b/src/Transformer/ObjectToStringTransformer.php index 9801c32..774f083 100644 --- a/src/Transformer/ObjectToStringTransformer.php +++ b/src/Transformer/ObjectToStringTransformer.php @@ -13,9 +13,9 @@ namespace Rekalogika\Mapper\Transformer; -use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Contracts\TypeMapping; use Rekalogika\Mapper\Exception\InvalidArgumentException; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\TypeMapping; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Transformer/ScalarToScalarTransformer.php b/src/Transformer/ScalarToScalarTransformer.php index 54b79b4..7d97fec 100644 --- a/src/Transformer/ScalarToScalarTransformer.php +++ b/src/Transformer/ScalarToScalarTransformer.php @@ -13,9 +13,9 @@ namespace Rekalogika\Mapper\Transformer; -use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Contracts\TypeMapping; use Rekalogika\Mapper\Exception\InvalidArgumentException; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\TypeMapping; use Rekalogika\Mapper\Util\TypeCheck; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Transformer/StringToBackedEnumTransformer.php b/src/Transformer/StringToBackedEnumTransformer.php index b97eae0..f8f37ea 100644 --- a/src/Transformer/StringToBackedEnumTransformer.php +++ b/src/Transformer/StringToBackedEnumTransformer.php @@ -13,9 +13,9 @@ namespace Rekalogika\Mapper\Transformer; -use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Contracts\TypeMapping; use Rekalogika\Mapper\Exception\InvalidArgumentException; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\TypeMapping; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Transformer/TraversableToArrayAccessTransformer.php b/src/Transformer/TraversableToArrayAccessTransformer.php index 89feda8..1072f35 100644 --- a/src/Transformer/TraversableToArrayAccessTransformer.php +++ b/src/Transformer/TraversableToArrayAccessTransformer.php @@ -15,16 +15,16 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Rekalogika\Mapper\Contracts\MainTransformerAwareInterface; -use Rekalogika\Mapper\Contracts\MainTransformerAwareTrait; -use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Contracts\TypeMapping; use Rekalogika\Mapper\Exception\CachedTargetObjectNotFoundException; use Rekalogika\Mapper\Exception\InvalidArgumentException; use Rekalogika\Mapper\Exception\InvalidTypeInArgumentException; use Rekalogika\Mapper\Exception\MissingMemberKeyTypeException; use Rekalogika\Mapper\MainTransformer\MainTransformer; use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface; +use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareInterface; +use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareTrait; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\TypeMapping; use Rekalogika\Mapper\Util\TypeCheck; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Transformer/TraversableToTraversableTransformer.php b/src/Transformer/TraversableToTraversableTransformer.php index 4ef2325..0010c0b 100644 --- a/src/Transformer/TraversableToTraversableTransformer.php +++ b/src/Transformer/TraversableToTraversableTransformer.php @@ -13,17 +13,17 @@ namespace Rekalogika\Mapper\Transformer; -use Rekalogika\Mapper\Contracts\MainTransformerAwareInterface; -use Rekalogika\Mapper\Contracts\MainTransformerAwareTrait; -use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Contracts\TypeMapping; use Rekalogika\Mapper\Exception\CachedTargetObjectNotFoundException; use Rekalogika\Mapper\Exception\InvalidArgumentException; use Rekalogika\Mapper\Exception\MissingMemberKeyTypeException; use Rekalogika\Mapper\Exception\MissingMemberValueTypeException; use Rekalogika\Mapper\MainTransformer\MainTransformer; -use Rekalogika\Mapper\Model\TraversableCountableWrapper; use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface; +use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareInterface; +use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareTrait; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\TypeMapping; +use Rekalogika\Mapper\Transformer\Model\TraversableCountableWrapper; use Rekalogika\Mapper\Util\TypeCheck; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\PropertyInfo\Type; diff --git a/src/TransformerRegistry/SearchResultEntry.php b/src/TransformerRegistry/SearchResultEntry.php index e68c2f5..9458c1a 100644 --- a/src/TransformerRegistry/SearchResultEntry.php +++ b/src/TransformerRegistry/SearchResultEntry.php @@ -13,8 +13,8 @@ namespace Rekalogika\Mapper\TransformerRegistry; -use Rekalogika\Mapper\Contracts\MixedType; -use Rekalogika\Mapper\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\MixedType; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; use Symfony\Component\PropertyInfo\Type; class SearchResultEntry diff --git a/src/TransformerRegistry/TransformerRegistry.php b/src/TransformerRegistry/TransformerRegistry.php index 57698e4..62a7b93 100644 --- a/src/TransformerRegistry/TransformerRegistry.php +++ b/src/TransformerRegistry/TransformerRegistry.php @@ -14,10 +14,10 @@ namespace Rekalogika\Mapper\TransformerRegistry; use Psr\Container\ContainerInterface; -use Rekalogika\Mapper\Contracts\MixedType; -use Rekalogika\Mapper\Contracts\TransformerInterface; use Rekalogika\Mapper\Exception\LogicException; use Rekalogika\Mapper\Mapping\MappingFactoryInterface; +use Rekalogika\Mapper\Transformer\Contracts\MixedType; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; use Rekalogika\Mapper\TypeResolver\TypeResolverInterface; use Symfony\Component\PropertyInfo\Type; diff --git a/src/TransformerRegistry/TransformerRegistryInterface.php b/src/TransformerRegistry/TransformerRegistryInterface.php index 81e3746..8afd790 100644 --- a/src/TransformerRegistry/TransformerRegistryInterface.php +++ b/src/TransformerRegistry/TransformerRegistryInterface.php @@ -13,9 +13,9 @@ namespace Rekalogika\Mapper\TransformerRegistry; -use Rekalogika\Mapper\Contracts\MixedType; -use Rekalogika\Mapper\Contracts\TransformerInterface; use Rekalogika\Mapper\Mapping\MappingEntry; +use Rekalogika\Mapper\Transformer\Contracts\MixedType; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; use Symfony\Component\PropertyInfo\Type; interface TransformerRegistryInterface diff --git a/src/TypeResolver/CachingTypeResolver.php b/src/TypeResolver/CachingTypeResolver.php index 24b7c91..0a9805b 100644 --- a/src/TypeResolver/CachingTypeResolver.php +++ b/src/TypeResolver/CachingTypeResolver.php @@ -13,7 +13,7 @@ namespace Rekalogika\Mapper\TypeResolver; -use Rekalogika\Mapper\Contracts\MixedType; +use Rekalogika\Mapper\Transformer\Contracts\MixedType; use Symfony\Component\PropertyInfo\Type; class CachingTypeResolver implements TypeResolverInterface diff --git a/src/TypeResolver/TypeResolver.php b/src/TypeResolver/TypeResolver.php index 0739fa3..61c856c 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\Transformer\Contracts\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 396aeaa..1df0e03 100644 --- a/src/TypeResolver/TypeResolverInterface.php +++ b/src/TypeResolver/TypeResolverInterface.php @@ -13,7 +13,7 @@ namespace Rekalogika\Mapper\TypeResolver; -use Rekalogika\Mapper\Contracts\MixedType; +use Rekalogika\Mapper\Transformer\Contracts\MixedType; use Symfony\Component\PropertyInfo\Type; interface TypeResolverInterface diff --git a/src/Util/TypeCheck.php b/src/Util/TypeCheck.php index 92e32fe..11efb61 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\Transformer\Contracts\MixedType; use Symfony\Component\PropertyInfo\Type; class TypeCheck diff --git a/src/Util/TypeFactory.php b/src/Util/TypeFactory.php index 0d70f53..03e4a6f 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\Transformer\Contracts\MixedType; use Symfony\Component\PropertyInfo\Type; /** diff --git a/src/Util/TypeUtil.php b/src/Util/TypeUtil.php index a40a53d..bff2751 100644 --- a/src/Util/TypeUtil.php +++ b/src/Util/TypeUtil.php @@ -15,11 +15,11 @@ 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\Tests\UnitTest\Util\TypeUtil2Test; use Rekalogika\Mapper\Tests\UnitTest\Util\TypeUtilTest; +use Rekalogika\Mapper\Transformer\Contracts\MixedType; use Rekalogika\Mapper\TypeResolver\TypeResolver; use Symfony\Component\PropertyInfo\Type; diff --git a/tests/Common/AbstractIntegrationTest.php b/tests/Common/AbstractIntegrationTest.php index 779d777..8a8a9ba 100644 --- a/tests/Common/AbstractIntegrationTest.php +++ b/tests/Common/AbstractIntegrationTest.php @@ -14,9 +14,9 @@ namespace Rekalogika\Mapper\Tests\Common; use PHPUnit\Framework\TestCase; -use Rekalogika\Mapper\Contracts\TransformerInterface; use Rekalogika\Mapper\MainTransformer\MainTransformer; use Rekalogika\Mapper\MapperInterface; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; abstract class AbstractIntegrationTest extends TestCase { diff --git a/tests/Fixtures/Transformer/MoneyToMoneyDtoTransformer.php b/tests/Fixtures/Transformer/MoneyToMoneyDtoTransformer.php index c159a73..2868ba6 100644 --- a/tests/Fixtures/Transformer/MoneyToMoneyDtoTransformer.php +++ b/tests/Fixtures/Transformer/MoneyToMoneyDtoTransformer.php @@ -14,10 +14,10 @@ namespace Rekalogika\Mapper\Tests\Fixtures\Transformer; use Brick\Money\Money; -use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\Contracts\TypeMapping; use Rekalogika\Mapper\Exception\InvalidArgumentException; use Rekalogika\Mapper\Tests\Fixtures\Money\MoneyDto; +use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface; +use Rekalogika\Mapper\Transformer\Contracts\TypeMapping; use Rekalogika\Mapper\Util\TypeCheck; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\PropertyInfo\Type; diff --git a/tests/IntegrationTest/TraversableToTraversableMappingTest.php b/tests/IntegrationTest/TraversableToTraversableMappingTest.php index dac8476..ce32c41 100644 --- a/tests/IntegrationTest/TraversableToTraversableMappingTest.php +++ b/tests/IntegrationTest/TraversableToTraversableMappingTest.php @@ -13,7 +13,6 @@ namespace Rekalogika\Mapper\Tests\IntegrationTest; -use Rekalogika\Mapper\Model\TraversableCountableWrapper; use Rekalogika\Mapper\Tests\Common\AbstractIntegrationTest; use Rekalogika\Mapper\Tests\Fixtures\ArrayLike\ObjectWithArrayProperty; use Rekalogika\Mapper\Tests\Fixtures\ArrayLike\ObjectWithLazyDoctrineCollectionProperty; @@ -21,6 +20,7 @@ use Rekalogika\Mapper\Tests\Fixtures\ArrayLike\ObjectWithTraversableProperties; use Rekalogika\Mapper\Tests\Fixtures\ArrayLikeDto\ObjectWithTraversablePropertyDto; use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto; +use Rekalogika\Mapper\Transformer\Model\TraversableCountableWrapper; class TraversableToTraversableMappingTest extends AbstractIntegrationTest {