From 4756a26712a63c4497497a77f7ad0392009e2d6a Mon Sep 17 00:00:00 2001 From: Priyadi Iman Nurcahyo <1102197+priyadi@users.noreply.github.com> Date: Sat, 13 Jan 2024 11:35:05 +0700 Subject: [PATCH] refactor: Move `MainTransformer` to its own namespace. --- CHANGELOG.md | 1 + config/services.php | 2 +- .../MapperClassAttributeInterface.php | 18 ++++++++++++++++++ .../MainTransformerAwareInterface.php | 2 ++ src/Contracts/MainTransformerAwareTrait.php | 1 + src/{ => MainTransformer}/MainTransformer.php | 3 +-- .../MainTransformerInterface.php | 2 +- src/Mapper.php | 2 +- src/MapperFactory/MapperFactory.php | 2 +- src/MethodMapper/ClassMethodTransformer.php | 2 +- src/Transformer/ObjectToObjectTransformer.php | 2 +- .../TraversableToArrayAccessTransformer.php | 2 +- .../TraversableToTraversableTransformer.php | 2 +- tests/Common/AbstractIntegrationTest.php | 2 +- tests/Common/MapperTestFactory.php | 2 +- 15 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 src/Attribute/MapperClassAttributeInterface.php rename src/{ => MainTransformer}/MainTransformer.php (98%) rename src/{Contracts => MainTransformer}/MainTransformerInterface.php (93%) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd44931..ae90552 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * refactor: Consolidate boilerplate code for getting the `ObjectCache`. * refactor: Move transformer query logic to `TransformerRegistry`. * refactor: Mover more logic to `TransformerRegistry`. +* refactor: Move `MainTransformer` to its own namespace. ## 0.5.4 diff --git a/config/services.php b/config/services.php index 892ec84..8f7de00 100644 --- a/config/services.php +++ b/config/services.php @@ -13,7 +13,7 @@ use Rekalogika\Mapper\Command\MappingCommand; use Rekalogika\Mapper\Command\TryCommand; -use Rekalogika\Mapper\MainTransformer; +use Rekalogika\Mapper\MainTransformer\MainTransformer; use Rekalogika\Mapper\Mapper; use Rekalogika\Mapper\MapperInterface; use Rekalogika\Mapper\Mapping\CachingMappingFactory; diff --git a/src/Attribute/MapperClassAttributeInterface.php b/src/Attribute/MapperClassAttributeInterface.php new file mode 100644 index 0000000..873bf85 --- /dev/null +++ b/src/Attribute/MapperClassAttributeInterface.php @@ -0,0 +1,18 @@ + + * + * For the full copyright and license information, please view the LICENSE file + * that was distributed with this source code. + */ + +namespace Rekalogika\Mapper\Attribute; + +interface MapperClassAttributeInterface +{ +} diff --git a/src/Contracts/MainTransformerAwareInterface.php b/src/Contracts/MainTransformerAwareInterface.php index fe1f5e2..950aac3 100644 --- a/src/Contracts/MainTransformerAwareInterface.php +++ b/src/Contracts/MainTransformerAwareInterface.php @@ -13,6 +13,8 @@ namespace Rekalogika\Mapper\Contracts; +use Rekalogika\Mapper\MainTransformer\MainTransformerInterface; + interface MainTransformerAwareInterface { public function withMainTransformer(MainTransformerInterface $mainTransformer): static; diff --git a/src/Contracts/MainTransformerAwareTrait.php b/src/Contracts/MainTransformerAwareTrait.php index 0aeb969..76e3e8a 100644 --- a/src/Contracts/MainTransformerAwareTrait.php +++ b/src/Contracts/MainTransformerAwareTrait.php @@ -14,6 +14,7 @@ namespace Rekalogika\Mapper\Contracts; use Rekalogika\Mapper\Exception\LogicException; +use Rekalogika\Mapper\MainTransformer\MainTransformerInterface; trait MainTransformerAwareTrait { diff --git a/src/MainTransformer.php b/src/MainTransformer/MainTransformer.php similarity index 98% rename from src/MainTransformer.php rename to src/MainTransformer/MainTransformer.php index d316216..31901cc 100644 --- a/src/MainTransformer.php +++ b/src/MainTransformer/MainTransformer.php @@ -11,10 +11,9 @@ * that was distributed with this source code. */ -namespace Rekalogika\Mapper; +namespace Rekalogika\Mapper\MainTransformer; 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; diff --git a/src/Contracts/MainTransformerInterface.php b/src/MainTransformer/MainTransformerInterface.php similarity index 93% rename from src/Contracts/MainTransformerInterface.php rename to src/MainTransformer/MainTransformerInterface.php index cb1bdd0..062bcd5 100644 --- a/src/Contracts/MainTransformerInterface.php +++ b/src/MainTransformer/MainTransformerInterface.php @@ -11,7 +11,7 @@ * that was distributed with this source code. */ -namespace Rekalogika\Mapper\Contracts; +namespace Rekalogika\Mapper\MainTransformer; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Mapper.php b/src/Mapper.php index 821246c..0b0736f 100644 --- a/src/Mapper.php +++ b/src/Mapper.php @@ -13,8 +13,8 @@ namespace Rekalogika\Mapper; -use Rekalogika\Mapper\Contracts\MainTransformerInterface; use Rekalogika\Mapper\Exception\UnexpectedValueException; +use Rekalogika\Mapper\MainTransformer\MainTransformerInterface; use Rekalogika\Mapper\Util\TypeFactory; final class Mapper implements MapperInterface diff --git a/src/MapperFactory/MapperFactory.php b/src/MapperFactory/MapperFactory.php index 926d799..14b37b6 100644 --- a/src/MapperFactory/MapperFactory.php +++ b/src/MapperFactory/MapperFactory.php @@ -18,7 +18,7 @@ use Rekalogika\Mapper\Command\MappingCommand; use Rekalogika\Mapper\Command\TryCommand; use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\MainTransformer; +use Rekalogika\Mapper\MainTransformer\MainTransformer; use Rekalogika\Mapper\Mapper; use Rekalogika\Mapper\MapperInterface; use Rekalogika\Mapper\Mapping\MappingFactory; diff --git a/src/MethodMapper/ClassMethodTransformer.php b/src/MethodMapper/ClassMethodTransformer.php index 9f362cd..2821f7f 100644 --- a/src/MethodMapper/ClassMethodTransformer.php +++ b/src/MethodMapper/ClassMethodTransformer.php @@ -18,7 +18,7 @@ use Rekalogika\Mapper\Contracts\TransformerInterface; use Rekalogika\Mapper\Contracts\TypeMapping; use Rekalogika\Mapper\Exception\InvalidArgumentException; -use Rekalogika\Mapper\MainTransformer; +use Rekalogika\Mapper\MainTransformer\MainTransformer; use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface; use Rekalogika\Mapper\Util\TypeFactory; use Symfony\Component\PropertyInfo\Type; diff --git a/src/Transformer/ObjectToObjectTransformer.php b/src/Transformer/ObjectToObjectTransformer.php index 889836a..b0ebda5 100644 --- a/src/Transformer/ObjectToObjectTransformer.php +++ b/src/Transformer/ObjectToObjectTransformer.php @@ -23,7 +23,7 @@ use Rekalogika\Mapper\Exception\InstantiationFailureException; use Rekalogika\Mapper\Exception\InvalidArgumentException; use Rekalogika\Mapper\Exception\InvalidClassException; -use Rekalogika\Mapper\MainTransformer; +use Rekalogika\Mapper\MainTransformer\MainTransformer; use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface; use Rekalogika\Mapper\TypeResolver\TypeResolverInterface; use Rekalogika\Mapper\Util\TypeCheck; diff --git a/src/Transformer/TraversableToArrayAccessTransformer.php b/src/Transformer/TraversableToArrayAccessTransformer.php index f60e69f..89feda8 100644 --- a/src/Transformer/TraversableToArrayAccessTransformer.php +++ b/src/Transformer/TraversableToArrayAccessTransformer.php @@ -23,7 +23,7 @@ use Rekalogika\Mapper\Exception\InvalidArgumentException; use Rekalogika\Mapper\Exception\InvalidTypeInArgumentException; use Rekalogika\Mapper\Exception\MissingMemberKeyTypeException; -use Rekalogika\Mapper\MainTransformer; +use Rekalogika\Mapper\MainTransformer\MainTransformer; use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface; use Rekalogika\Mapper\Util\TypeCheck; use Rekalogika\Mapper\Util\TypeFactory; diff --git a/src/Transformer/TraversableToTraversableTransformer.php b/src/Transformer/TraversableToTraversableTransformer.php index 1d60a04..4ef2325 100644 --- a/src/Transformer/TraversableToTraversableTransformer.php +++ b/src/Transformer/TraversableToTraversableTransformer.php @@ -21,7 +21,7 @@ use Rekalogika\Mapper\Exception\InvalidArgumentException; use Rekalogika\Mapper\Exception\MissingMemberKeyTypeException; use Rekalogika\Mapper\Exception\MissingMemberValueTypeException; -use Rekalogika\Mapper\MainTransformer; +use Rekalogika\Mapper\MainTransformer\MainTransformer; use Rekalogika\Mapper\Model\TraversableCountableWrapper; use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface; use Rekalogika\Mapper\Util\TypeCheck; diff --git a/tests/Common/AbstractIntegrationTest.php b/tests/Common/AbstractIntegrationTest.php index a81595a..779d777 100644 --- a/tests/Common/AbstractIntegrationTest.php +++ b/tests/Common/AbstractIntegrationTest.php @@ -15,7 +15,7 @@ use PHPUnit\Framework\TestCase; use Rekalogika\Mapper\Contracts\TransformerInterface; -use Rekalogika\Mapper\MainTransformer; +use Rekalogika\Mapper\MainTransformer\MainTransformer; use Rekalogika\Mapper\MapperInterface; abstract class AbstractIntegrationTest extends TestCase diff --git a/tests/Common/MapperTestFactory.php b/tests/Common/MapperTestFactory.php index 914a474..d409e44 100644 --- a/tests/Common/MapperTestFactory.php +++ b/tests/Common/MapperTestFactory.php @@ -13,7 +13,7 @@ namespace Rekalogika\Mapper\Tests\Common; -use Rekalogika\Mapper\MainTransformer; +use Rekalogika\Mapper\MainTransformer\MainTransformer; use Rekalogika\Mapper\MapperFactory\MapperFactory; use Rekalogika\Mapper\Mapping\MappingFactoryInterface; use Rekalogika\Mapper\TypeResolver\TypeResolverInterface;