refactor: Move implementation under their own namespaces.

rekalogika · Feb 3, 2024 · 0e99fd9 · 0e99fd9
1 parent 90d8a79
commit 0e99fd9
Show file tree

Hide file tree

Showing 21 changed files with 51 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 * refactor(`ObjectCache`): Remove references to `Context`.
 * refactor(`SubMapper`): Add `cache()` method.
 * refactor: Rename `MapperPass` to `RemoveOptionalDefinitionPass`
+* refactor: Move implementation under their own namespaces.
 
 ## 0.5.26
 

diff --git a/config/services.php b/config/services.php
@@ -17,11 +17,11 @@
 use Rekalogika\Mapper\MainTransformer\MainTransformer;
 use Rekalogika\Mapper\Mapper;
 use Rekalogika\Mapper\MapperInterface;
-use Rekalogika\Mapper\Mapping\CachingMappingFactory;
-use Rekalogika\Mapper\Mapping\MappingFactory;
+use Rekalogika\Mapper\Mapping\Implementation\CachingMappingFactory;
+use Rekalogika\Mapper\Mapping\Implementation\MappingFactory;
 use Rekalogika\Mapper\Mapping\MappingFactoryInterface;
-use Rekalogika\Mapper\ObjectCache\ObjectCacheFactory;
-use Rekalogika\Mapper\PropertyMapper\PropertyMapperResolver;
+use Rekalogika\Mapper\ObjectCache\Implementation\ObjectCacheFactory;
+use Rekalogika\Mapper\PropertyMapper\Implementation\PropertyMapperResolver;
 use Rekalogika\Mapper\SubMapper\Implementation\SubMapperFactory;
 use Rekalogika\Mapper\Transformer\ArrayLikeMetadata\ArrayLikeMetadataFactory;
 use Rekalogika\Mapper\Transformer\ArrayLikeMetadata\CachingArrayLikeMetadataFactory;
@@ -41,10 +41,10 @@
 use Rekalogika\Mapper\Transformer\SymfonyUidTransformer;
 use Rekalogika\Mapper\Transformer\TraversableToArrayAccessTransformer;
 use Rekalogika\Mapper\Transformer\TraversableToTraversableTransformer;
-use Rekalogika\Mapper\TransformerRegistry\CachingTransformerRegistry;
-use Rekalogika\Mapper\TransformerRegistry\TransformerRegistry;
-use Rekalogika\Mapper\TypeResolver\CachingTypeResolver;
-use Rekalogika\Mapper\TypeResolver\TypeResolver;
+use Rekalogika\Mapper\TransformerRegistry\Implementation\CachingTransformerRegistry;
+use Rekalogika\Mapper\TransformerRegistry\Implementation\TransformerRegistry;
+use Rekalogika\Mapper\TypeResolver\Implementation\CachingTypeResolver;
+use Rekalogika\Mapper\TypeResolver\Implementation\TypeResolver;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\PropertyInfo\PropertyInfoCacheExtractor;

diff --git a/src/DependencyInjection/PropertyMapperPass.php b/src/DependencyInjection/PropertyMapperPass.php
@@ -16,7 +16,7 @@
 use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
 use Rekalogika\Mapper\MainTransformer\MainTransformerInterface;
-use Rekalogika\Mapper\PropertyMapper\Contracts\PropertyMapperServicePointer;
+use Rekalogika\Mapper\PropertyMapper\PropertyMapperServicePointer;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 

diff --git a/src/MapperFactory/MapperFactory.php b/src/MapperFactory/MapperFactory.php
@@ -21,13 +21,13 @@
 use Rekalogika\Mapper\MainTransformer\MainTransformer;
 use Rekalogika\Mapper\Mapper;
 use Rekalogika\Mapper\MapperInterface;
-use Rekalogika\Mapper\Mapping\MappingFactory;
+use Rekalogika\Mapper\Mapping\Implementation\MappingFactory;
 use Rekalogika\Mapper\Mapping\MappingFactoryInterface;
-use Rekalogika\Mapper\ObjectCache\ObjectCacheFactory;
+use Rekalogika\Mapper\ObjectCache\Implementation\ObjectCacheFactory;
 use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface;
-use Rekalogika\Mapper\PropertyMapper\Contracts\PropertyMapperResolverInterface;
-use Rekalogika\Mapper\PropertyMapper\Contracts\PropertyMapperServicePointer;
-use Rekalogika\Mapper\PropertyMapper\PropertyMapperResolver;
+use Rekalogika\Mapper\PropertyMapper\Implementation\PropertyMapperResolver;
+use Rekalogika\Mapper\PropertyMapper\PropertyMapperResolverInterface;
+use Rekalogika\Mapper\PropertyMapper\PropertyMapperServicePointer;
 use Rekalogika\Mapper\SubMapper\Implementation\SubMapperFactory;
 use Rekalogika\Mapper\SubMapper\SubMapperFactoryInterface;
 use Rekalogika\Mapper\Transformer\ArrayLikeMetadata\ArrayLikeMetadataFactory;
@@ -49,10 +49,10 @@
 use Rekalogika\Mapper\Transformer\SymfonyUidTransformer;
 use Rekalogika\Mapper\Transformer\TraversableToArrayAccessTransformer;
 use Rekalogika\Mapper\Transformer\TraversableToTraversableTransformer;
-use Rekalogika\Mapper\TransformerRegistry\TransformerRegistry;
+use Rekalogika\Mapper\TransformerRegistry\Implementation\TransformerRegistry;
 use Rekalogika\Mapper\TransformerRegistry\TransformerRegistryInterface;
-use Rekalogika\Mapper\TypeResolver\CachingTypeResolver;
-use Rekalogika\Mapper\TypeResolver\TypeResolver;
+use Rekalogika\Mapper\TypeResolver\Implementation\CachingTypeResolver;
+use Rekalogika\Mapper\TypeResolver\Implementation\TypeResolver;
 use Rekalogika\Mapper\TypeResolver\TypeResolverInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Console\Application;

diff --git a/src/Mapping/CachingMappingFactory.php → .../Implementation/CachingMappingFactory.php b/src/Mapping/CachingMappingFactory.php → .../Implementation/CachingMappingFactory.php
@@ -11,8 +11,10 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\Mapping;
+namespace Rekalogika\Mapper\Mapping\Implementation;
 
+use Rekalogika\Mapper\Mapping\Mapping;
+use Rekalogika\Mapper\Mapping\MappingFactoryInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\VarExporter\VarExporter;

diff --git a/src/Mapping/MappingFactory.php → ...Mapping/Implementation/MappingFactory.php b/src/Mapping/MappingFactory.php → ...Mapping/Implementation/MappingFactory.php
@@ -11,8 +11,10 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\Mapping;
+namespace Rekalogika\Mapper\Mapping\Implementation;
 
+use Rekalogika\Mapper\Mapping\Mapping;
+use Rekalogika\Mapper\Mapping\MappingFactoryInterface;
 use Rekalogika\Mapper\Transformer\Contracts\MixedType;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
 use Rekalogika\Mapper\TypeResolver\TypeResolverInterface;

diff --git a/src/ObjectCache/ObjectCacheFactory.php → ...che/Implementation/ObjectCacheFactory.php b/src/ObjectCache/ObjectCacheFactory.php → ...che/Implementation/ObjectCacheFactory.php
@@ -11,8 +11,10 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\ObjectCache;
+namespace Rekalogika\Mapper\ObjectCache\Implementation;
 
+use Rekalogika\Mapper\ObjectCache\ObjectCache;
+use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface;
 use Rekalogika\Mapper\TypeResolver\TypeResolverInterface;
 
 final class ObjectCacheFactory implements ObjectCacheFactoryInterface

diff --git a/...PropertyMapper/PropertyMapperResolver.php → ...Implementation/PropertyMapperResolver.php b/...PropertyMapper/PropertyMapperResolver.php → ...Implementation/PropertyMapperResolver.php
@@ -11,10 +11,10 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\PropertyMapper;
+namespace Rekalogika\Mapper\PropertyMapper\Implementation;
 
-use Rekalogika\Mapper\PropertyMapper\Contracts\PropertyMapperResolverInterface;
-use Rekalogika\Mapper\PropertyMapper\Contracts\PropertyMapperServicePointer;
+use Rekalogika\Mapper\PropertyMapper\PropertyMapperResolverInterface;
+use Rekalogika\Mapper\PropertyMapper\PropertyMapperServicePointer;
 
 class PropertyMapperResolver implements PropertyMapperResolverInterface
 {

diff --git a/...racts/PropertyMapperResolverInterface.php → ...apper/PropertyMapperResolverInterface.php b/...racts/PropertyMapperResolverInterface.php → ...apper/PropertyMapperResolverInterface.php
@@ -11,7 +11,7 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\PropertyMapper\Contracts;
+namespace Rekalogika\Mapper\PropertyMapper;
 
 interface PropertyMapperResolverInterface
 {

diff --git a/...ontracts/PropertyMapperServicePointer.php → ...tyMapper/PropertyMapperServicePointer.php b/...ontracts/PropertyMapperServicePointer.php → ...tyMapper/PropertyMapperServicePointer.php
@@ -11,7 +11,7 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\PropertyMapper\Contracts;
+namespace Rekalogika\Mapper\PropertyMapper;
 
 final readonly class PropertyMapperServicePointer
 {

diff --git a/src/Transformer/ObjectToObjectMetadata/Contracts/PropertyMapping.php b/src/Transformer/ObjectToObjectMetadata/Contracts/PropertyMapping.php
@@ -13,7 +13,7 @@
 
 namespace Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\Contracts;
 
-use Rekalogika\Mapper\PropertyMapper\Contracts\PropertyMapperServicePointer;
+use Rekalogika\Mapper\PropertyMapper\PropertyMapperServicePointer;
 use Rekalogika\Mapper\Util\TypeCheck;
 use Symfony\Component\PropertyInfo\Type;
 

diff --git a/src/Transformer/ObjectToObjectMetadata/ObjectToObjectMetadataFactory.php b/src/Transformer/ObjectToObjectMetadata/ObjectToObjectMetadataFactory.php
@@ -15,7 +15,7 @@
 
 use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\PropertyMapper\Contracts\PropertyMapperResolverInterface;
+use Rekalogika\Mapper\PropertyMapper\PropertyMapperResolverInterface;
 use Rekalogika\Mapper\Transformer\Exception\InternalClassUnsupportedException;
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\Contracts\ObjectToObjectMetadata;
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\Contracts\ObjectToObjectMetadataFactoryInterface;

diff --git a/src/Transformer/ObjectToObjectTransformer.php b/src/Transformer/ObjectToObjectTransformer.php
@@ -17,7 +17,7 @@
 use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
 use Rekalogika\Mapper\ObjectCache\ObjectCache;
-use Rekalogika\Mapper\PropertyMapper\Contracts\PropertyMapperServicePointer;
+use Rekalogika\Mapper\PropertyMapper\PropertyMapperServicePointer;
 use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareInterface;
 use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareTrait;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;

diff --git a/...erRegistry/CachingTransformerRegistry.php → ...ementation/CachingTransformerRegistry.php b/...erRegistry/CachingTransformerRegistry.php → ...ementation/CachingTransformerRegistry.php
@@ -11,10 +11,12 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\TransformerRegistry;
+namespace Rekalogika\Mapper\TransformerRegistry\Implementation;
 
 use Psr\Cache\CacheItemPoolInterface;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
+use Rekalogika\Mapper\TransformerRegistry\SearchResult;
+use Rekalogika\Mapper\TransformerRegistry\TransformerRegistryInterface;
 
 class CachingTransformerRegistry implements TransformerRegistryInterface
 {

diff --git a/...ansformerRegistry/TransformerRegistry.php → ...ry/Implementation/TransformerRegistry.php b/...ansformerRegistry/TransformerRegistry.php → ...ry/Implementation/TransformerRegistry.php
@@ -11,14 +11,17 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\TransformerRegistry;
+namespace Rekalogika\Mapper\TransformerRegistry\Implementation;
 
 use Psr\Container\ContainerInterface;
 use Rekalogika\Mapper\Exception\LogicException;
 use Rekalogika\Mapper\Mapping\MappingEntry;
 use Rekalogika\Mapper\Mapping\MappingFactoryInterface;
 use Rekalogika\Mapper\Transformer\Contracts\MixedType;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
+use Rekalogika\Mapper\TransformerRegistry\SearchResult;
+use Rekalogika\Mapper\TransformerRegistry\SearchResultEntry;
+use Rekalogika\Mapper\TransformerRegistry\TransformerRegistryInterface;
 use Rekalogika\Mapper\TypeResolver\TypeResolverInterface;
 use Rekalogika\Mapper\Util\TypeCheck;
 use Symfony\Component\PropertyInfo\Type;

diff --git a/src/TypeResolver/CachingTypeResolver.php → ...er/Implementation/CachingTypeResolver.php b/src/TypeResolver/CachingTypeResolver.php → ...er/Implementation/CachingTypeResolver.php
@@ -11,9 +11,10 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\TypeResolver;
+namespace Rekalogika\Mapper\TypeResolver\Implementation;
 
 use Rekalogika\Mapper\Transformer\Contracts\MixedType;
+use Rekalogika\Mapper\TypeResolver\TypeResolverInterface;
 use Symfony\Component\PropertyInfo\Type;
 
 class CachingTypeResolver implements TypeResolverInterface

diff --git a/src/TypeResolver/TypeResolver.php → ...eResolver/Implementation/TypeResolver.php b/src/TypeResolver/TypeResolver.php → ...eResolver/Implementation/TypeResolver.php
@@ -11,9 +11,10 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\TypeResolver;
+namespace Rekalogika\Mapper\TypeResolver\Implementation;
 
 use Rekalogika\Mapper\Transformer\Contracts\MixedType;
+use Rekalogika\Mapper\TypeResolver\TypeResolverInterface;
 use Rekalogika\Mapper\Util\TypeUtil;
 use Symfony\Component\PropertyInfo\Type;
 

diff --git a/src/Util/TypeUtil.php b/src/Util/TypeUtil.php
@@ -20,7 +20,7 @@
 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 Rekalogika\Mapper\TypeResolver\Implementation\TypeResolver;
 use Symfony\Component\PropertyInfo\Type;
 
 class TypeUtil

diff --git a/tests/IntegrationTest/PropertyMappingTest.php b/tests/IntegrationTest/PropertyMappingTest.php
@@ -15,8 +15,8 @@
 
 use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\MainTransformer\MainTransformer;
-use Rekalogika\Mapper\PropertyMapper\Contracts\PropertyMapperResolverInterface;
-use Rekalogika\Mapper\PropertyMapper\Contracts\PropertyMapperServicePointer;
+use Rekalogika\Mapper\PropertyMapper\PropertyMapperResolverInterface;
+use Rekalogika\Mapper\PropertyMapper\PropertyMapperServicePointer;
 use Rekalogika\Mapper\Tests\Common\AbstractFrameworkTest;
 use Rekalogika\Mapper\Tests\Fixtures\PropertyMapper\PropertyMapperWithClassAttribute;
 use Rekalogika\Mapper\Tests\Fixtures\PropertyMapper\PropertyMapperWithClassAttributeWithoutExplicitProperty;

diff --git a/tests/UnitTest/Model/ObjectCacheTest.php b/tests/UnitTest/Model/ObjectCacheTest.php
@@ -17,7 +17,7 @@
 use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\ObjectCache\Exception\CachedTargetObjectNotFoundException;
 use Rekalogika\Mapper\ObjectCache\ObjectCache;
-use Rekalogika\Mapper\TypeResolver\TypeResolver;
+use Rekalogika\Mapper\TypeResolver\Implementation\TypeResolver;
 use Rekalogika\Mapper\Util\TypeFactory;
 
 class ObjectCacheTest extends TestCase

diff --git a/tests/UnitTest/Util/TypeUtilTest.php b/tests/UnitTest/Util/TypeUtilTest.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Tests\UnitTest\Util;
 
 use PHPUnit\Framework\TestCase;
-use Rekalogika\Mapper\TypeResolver\TypeResolver;
+use Rekalogika\Mapper\TypeResolver\Implementation\TypeResolver;
 use Rekalogika\Mapper\Util\TypeFactory;
 use Rekalogika\Mapper\Util\TypeGuesser;
 use Rekalogika\Mapper\Util\TypeUtil;