refactor: Move Context to its own namespace.

rekalogika · Jan 13, 2024 · 3c500df · 3c500df
1 parent 7a89314
commit 3c500df
Show file tree

Hide file tree

Showing 27 changed files with 29 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * refactor: Remove `$context` from `MapperInterface`
 * chore: Fix static analysis issues.
 * refactor: Change context array to `Context` object.
+* refactor: Move `Context` to its own namespace.
 
 ## 0.5.4
 

diff --git a/src/MainTransformer/Context.php → src/Context/Context.php b/src/MainTransformer/Context.php → src/Context/Context.php
@@ -11,10 +11,10 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\MainTransformer;
+namespace Rekalogika\Mapper\Context;
 
 use Rekalogika\Mapper\Exception\LogicException;
-use Rekalogika\Mapper\MainTransformer\Exception\ContextMemberNotFoundException;
+use Rekalogika\Mapper\Context\ContextMemberNotFoundException;
 
 /**
  * @immutable

diff --git a/...eption/ContextMemberNotFoundException.php → ...ontext/ContextMemberNotFoundException.php b/...eption/ContextMemberNotFoundException.php → ...ontext/ContextMemberNotFoundException.php
@@ -11,7 +11,7 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\MainTransformer\Exception;
+namespace Rekalogika\Mapper\Context;
 
 use Rekalogika\Mapper\Exception\RuntimeException;
 

diff --git a/src/MainTransformer/MainTransformer.php b/src/MainTransformer/MainTransformer.php
@@ -13,8 +13,9 @@
 
 namespace Rekalogika\Mapper\MainTransformer;
 
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\MainTransformer\Exception\CannotFindTransformerException;
-use Rekalogika\Mapper\MainTransformer\Exception\ContextMemberNotFoundException;
+use Rekalogika\Mapper\Context\ContextMemberNotFoundException;
 use Rekalogika\Mapper\MainTransformer\Exception\TransformerReturnsUnexpectedValueException;
 use Rekalogika\Mapper\ObjectCache\Exception\CachedTargetObjectNotFoundException;
 use Rekalogika\Mapper\ObjectCache\ObjectCache;

diff --git a/src/MainTransformer/MainTransformerInterface.php b/src/MainTransformer/MainTransformerInterface.php
@@ -13,6 +13,7 @@
 
 namespace Rekalogika\Mapper\MainTransformer;
 
+use Rekalogika\Mapper\Context\Context;
 use Symfony\Component\PropertyInfo\Type;
 
 interface MainTransformerInterface

diff --git a/src/Mapper.php b/src/Mapper.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper;
 
 use Rekalogika\Mapper\Exception\UnexpectedValueException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\MainTransformer\MainTransformerInterface;
 use Rekalogika\Mapper\Util\TypeFactory;
 

diff --git a/src/MethodMapper/ClassMethodTransformer.php b/src/MethodMapper/ClassMethodTransformer.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\MethodMapper;
 
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\ObjectCache\ObjectCache;
 use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareInterface;
 use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareTrait;

diff --git a/src/MethodMapper/MapFromObjectInterface.php b/src/MethodMapper/MapFromObjectInterface.php
@@ -13,7 +13,7 @@
 
 namespace Rekalogika\Mapper\MethodMapper;
 
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 
 interface MapFromObjectInterface
 {

diff --git a/src/MethodMapper/MapToObjectInterface.php b/src/MethodMapper/MapToObjectInterface.php
@@ -13,7 +13,7 @@
 
 namespace Rekalogika\Mapper\MethodMapper;
 
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 
 interface MapToObjectInterface
 {

diff --git a/src/MethodMapper/SubMapper.php b/src/MethodMapper/SubMapper.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\MethodMapper;
 
 use Rekalogika\Mapper\Exception\UnexpectedValueException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareInterface;
 use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareTrait;
 use Rekalogika\Mapper\Util\TypeFactory;

diff --git a/src/MethodMapper/SubMapperInterface.php b/src/MethodMapper/SubMapperInterface.php
@@ -13,7 +13,7 @@
 
 namespace Rekalogika\Mapper\MethodMapper;
 
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 
 interface SubMapperInterface
 {

diff --git a/src/Transformer/ArrayToObjectTransformer.php b/src/Transformer/ArrayToObjectTransformer.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Transformer;
 
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
 use Rekalogika\Mapper\Transformer\Contracts\TypeMapping;
 use Rekalogika\Mapper\Transformer\Exception\InvalidTypeInArgumentException;

diff --git a/src/Transformer/Contracts/TransformerInterface.php b/src/Transformer/Contracts/TransformerInterface.php
@@ -13,7 +13,7 @@
 
 namespace Rekalogika\Mapper\Transformer\Contracts;
 
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Symfony\Component\PropertyInfo\Type;
 
 interface TransformerInterface

diff --git a/src/Transformer/CopyTransformer.php b/src/Transformer/CopyTransformer.php
@@ -13,7 +13,7 @@
 
 namespace Rekalogika\Mapper\Transformer;
 
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Transformer\Contracts\MixedType;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
 use Rekalogika\Mapper\Transformer\Contracts\TypeMapping;

diff --git a/src/Transformer/DateTimeTransformer.php b/src/Transformer/DateTimeTransformer.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Transformer;
 
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
 use Rekalogika\Mapper\Transformer\Contracts\TypeMapping;
 use Rekalogika\Mapper\Util\TypeCheck;

diff --git a/src/Transformer/NullTransformer.php b/src/Transformer/NullTransformer.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Transformer;
 
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
 use Rekalogika\Mapper\Transformer\Contracts\TypeMapping;
 use Rekalogika\Mapper\Util\TypeCheck;

diff --git a/src/Transformer/ObjectToArrayTransformer.php b/src/Transformer/ObjectToArrayTransformer.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Transformer;
 
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
 use Rekalogika\Mapper\Transformer\Contracts\TypeMapping;
 use Rekalogika\Mapper\Util\TypeFactory;

diff --git a/src/Transformer/ObjectToObjectTransformer.php b/src/Transformer/ObjectToObjectTransformer.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Transformer;
 
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\ObjectCache\ObjectCache;
 use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareInterface;
 use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareTrait;

diff --git a/src/Transformer/ObjectToStringTransformer.php b/src/Transformer/ObjectToStringTransformer.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Transformer;
 
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
 use Rekalogika\Mapper\Transformer\Contracts\TypeMapping;
 use Rekalogika\Mapper\Util\TypeFactory;

diff --git a/src/Transformer/ScalarToScalarTransformer.php b/src/Transformer/ScalarToScalarTransformer.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Transformer;
 
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
 use Rekalogika\Mapper\Transformer\Contracts\TypeMapping;
 use Rekalogika\Mapper\Util\TypeCheck;

diff --git a/src/Transformer/StringToBackedEnumTransformer.php b/src/Transformer/StringToBackedEnumTransformer.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Transformer;
 
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
 use Rekalogika\Mapper\Transformer\Contracts\TypeMapping;
 use Rekalogika\Mapper\Transformer\Exception\InvalidTypeInArgumentException;

diff --git a/src/Transformer/TraversableToArrayAccessTransformer.php b/src/Transformer/TraversableToArrayAccessTransformer.php
@@ -16,7 +16,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\ObjectCache\ObjectCache;
 use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareInterface;
 use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareTrait;

diff --git a/src/Transformer/TraversableToTraversableTransformer.php b/src/Transformer/TraversableToTraversableTransformer.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Transformer;
 
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\ObjectCache\ObjectCache;
 use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareInterface;
 use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareTrait;

diff --git a/tests/Fixtures/MethodMapper/MoneyDto.php b/tests/Fixtures/MethodMapper/MoneyDto.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Tests\Fixtures\MethodMapper;
 
 use Brick\Money\Money;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\MethodMapper\MapFromObjectInterface;
 use Rekalogika\Mapper\MethodMapper\MapToObjectInterface;
 use Rekalogika\Mapper\MethodMapper\SubMapperInterface;

diff --git a/tests/Fixtures/MethodMapper/ObjectWithArrayPropertyDto.php b/tests/Fixtures/MethodMapper/ObjectWithArrayPropertyDto.php
@@ -13,7 +13,7 @@
 
 namespace Rekalogika\Mapper\Tests\Fixtures\MethodMapper;
 
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\MethodMapper\MapFromObjectInterface;
 use Rekalogika\Mapper\MethodMapper\SubMapperInterface;
 use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto;

diff --git a/tests/Fixtures/MethodMapper/ObjectWithObjectWithScalarPropertiesDto.php b/tests/Fixtures/MethodMapper/ObjectWithObjectWithScalarPropertiesDto.php
@@ -13,7 +13,7 @@
 
 namespace Rekalogika\Mapper\Tests\Fixtures\MethodMapper;
 
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\MethodMapper\MapFromObjectInterface;
 use Rekalogika\Mapper\MethodMapper\MapToObjectInterface;
 use Rekalogika\Mapper\MethodMapper\SubMapperInterface;

diff --git a/tests/Fixtures/Transformer/MoneyToMoneyDtoTransformer.php b/tests/Fixtures/Transformer/MoneyToMoneyDtoTransformer.php
@@ -15,7 +15,7 @@
 
 use Brick\Money\Money;
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\MainTransformer\Context;
+use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Tests\Fixtures\Money\MoneyDto;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
 use Rekalogika\Mapper\Transformer\Contracts\TypeMapping;