Skip to content

Commit aa41106

Browse files
committed
refactor(ProxyGeneratorInterface): Move proxy namespace to top-level namespace.
1 parent 03e7f31 commit aa41106

14 files changed

+28
-26
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
* refactor(`ObjectToObjectMetadataFactory`): Remove `Context`.
1414
* refactor(`MapperOptions`): Simplify option names.
1515
* fix: Fix deprecations.
16+
* refactor(`ProxyGeneratorInterface`): Use class as input. Remove dependency on `ObjectToObjectMetadata`.
17+
* refactor(`ProxyGeneratorInterface`): Move proxy namespace to top-level namespace.
1618

1719
## 0.7.3
1820

config/services.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
use Rekalogika\Mapper\Mapping\Implementation\WarmableMappingFactory;
2828
use Rekalogika\Mapper\Mapping\MappingFactoryInterface;
2929
use Rekalogika\Mapper\ObjectCache\Implementation\ObjectCacheFactory;
30+
use Rekalogika\Mapper\Proxy\Implementation\ProxyGenerator;
31+
use Rekalogika\Mapper\Proxy\Implementation\ProxyRegistry;
3032
use Rekalogika\Mapper\SubMapper\Implementation\SubMapperFactory;
3133
use Rekalogika\Mapper\Transformer\ArrayLikeMetadata\Implementation\ArrayLikeMetadataFactory;
3234
use Rekalogika\Mapper\Transformer\ArrayLikeMetadata\Implementation\CachingArrayLikeMetadataFactory;
@@ -45,8 +47,6 @@
4547
use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\Implementation\ProxyResolvingObjectToObjectMetadataFactory;
4648
use Rekalogika\Mapper\Transformer\ObjectToObjectTransformer;
4749
use Rekalogika\Mapper\Transformer\ObjectToStringTransformer;
48-
use Rekalogika\Mapper\Transformer\Proxy\Implementation\ProxyGenerator;
49-
use Rekalogika\Mapper\Transformer\Proxy\Implementation\ProxyRegistry;
5050
use Rekalogika\Mapper\Transformer\ScalarToScalarTransformer;
5151
use Rekalogika\Mapper\Transformer\StringToBackedEnumTransformer;
5252
use Rekalogika\Mapper\Transformer\SymfonyUidTransformer;

src/MapperFactory/MapperFactory.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
use Rekalogika\Mapper\Mapping\MappingFactoryInterface;
3232
use Rekalogika\Mapper\ObjectCache\Implementation\ObjectCacheFactory;
3333
use Rekalogika\Mapper\ObjectCache\ObjectCacheFactoryInterface;
34+
use Rekalogika\Mapper\Proxy\Implementation\ProxyGenerator;
35+
use Rekalogika\Mapper\Proxy\Implementation\ProxyRegistry;
36+
use Rekalogika\Mapper\Proxy\ProxyAutoloaderInterface;
37+
use Rekalogika\Mapper\Proxy\ProxyGeneratorInterface;
38+
use Rekalogika\Mapper\Proxy\ProxyRegistryInterface;
3439
use Rekalogika\Mapper\ServiceMethod\ServiceMethodSpecification;
3540
use Rekalogika\Mapper\SubMapper\Implementation\SubMapperFactory;
3641
use Rekalogika\Mapper\SubMapper\SubMapperFactoryInterface;
@@ -51,11 +56,6 @@
5156
use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\ObjectToObjectMetadataFactoryInterface;
5257
use Rekalogika\Mapper\Transformer\ObjectToObjectTransformer;
5358
use Rekalogika\Mapper\Transformer\ObjectToStringTransformer;
54-
use Rekalogika\Mapper\Transformer\Proxy\Implementation\ProxyGenerator;
55-
use Rekalogika\Mapper\Transformer\Proxy\Implementation\ProxyRegistry;
56-
use Rekalogika\Mapper\Transformer\Proxy\ProxyAutoloaderInterface;
57-
use Rekalogika\Mapper\Transformer\Proxy\ProxyGeneratorInterface;
58-
use Rekalogika\Mapper\Transformer\Proxy\ProxyRegistryInterface;
5959
use Rekalogika\Mapper\Transformer\ScalarToScalarTransformer;
6060
use Rekalogika\Mapper\Transformer\StringToBackedEnumTransformer;
6161
use Rekalogika\Mapper\Transformer\SymfonyUidTransformer;

src/Transformer/Proxy/Exception/ProxyNotSupportedException.php src/Proxy/Exception/ProxyNotSupportedException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* that was distributed with this source code.
1212
*/
1313

14-
namespace Rekalogika\Mapper\Transformer\Proxy\Exception;
14+
namespace Rekalogika\Mapper\Proxy\Exception;
1515

1616
use Rekalogika\Mapper\Exception\RuntimeException;
1717

src/Transformer/Proxy/Implementation/ProxyGenerator.php src/Proxy/Implementation/ProxyGenerator.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
* that was distributed with this source code.
1212
*/
1313

14-
namespace Rekalogika\Mapper\Transformer\Proxy\Implementation;
14+
namespace Rekalogika\Mapper\Proxy\Implementation;
1515

16-
use Rekalogika\Mapper\Transformer\Proxy\Exception\ProxyNotSupportedException;
17-
use Rekalogika\Mapper\Transformer\Proxy\ProxyGeneratorInterface;
18-
use Rekalogika\Mapper\Transformer\Proxy\ProxySpecification;
16+
use Rekalogika\Mapper\Proxy\Exception\ProxyNotSupportedException;
17+
use Rekalogika\Mapper\Proxy\ProxyGeneratorInterface;
18+
use Rekalogika\Mapper\Proxy\ProxySpecification;
1919
use Symfony\Component\VarExporter\Exception\LogicException;
2020
use Symfony\Component\VarExporter\ProxyHelper;
2121

src/Transformer/Proxy/Implementation/ProxyRegistry.php src/Proxy/Implementation/ProxyRegistry.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
* that was distributed with this source code.
1212
*/
1313

14-
namespace Rekalogika\Mapper\Transformer\Proxy\Implementation;
14+
namespace Rekalogika\Mapper\Proxy\Implementation;
1515

16-
use Rekalogika\Mapper\Transformer\Proxy\ProxyAutoloaderInterface;
17-
use Rekalogika\Mapper\Transformer\Proxy\ProxyRegistryInterface;
18-
use Rekalogika\Mapper\Transformer\Proxy\ProxySpecification;
16+
use Rekalogika\Mapper\Proxy\ProxyAutoloaderInterface;
17+
use Rekalogika\Mapper\Proxy\ProxyRegistryInterface;
18+
use Rekalogika\Mapper\Proxy\ProxySpecification;
1919

2020
final class ProxyRegistry implements ProxyRegistryInterface, ProxyAutoloaderInterface
2121
{

src/Transformer/Proxy/ProxyAutoloaderInterface.php src/Proxy/ProxyAutoloaderInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* that was distributed with this source code.
1212
*/
1313

14-
namespace Rekalogika\Mapper\Transformer\Proxy;
14+
namespace Rekalogika\Mapper\Proxy;
1515

1616
interface ProxyAutoloaderInterface
1717
{

src/Transformer/Proxy/ProxyGeneratorInterface.php src/Proxy/ProxyGeneratorInterface.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
* that was distributed with this source code.
1212
*/
1313

14-
namespace Rekalogika\Mapper\Transformer\Proxy;
14+
namespace Rekalogika\Mapper\Proxy;
1515

16-
use Rekalogika\Mapper\Transformer\Proxy\Exception\ProxyNotSupportedException;
16+
use Rekalogika\Mapper\Proxy\Exception\ProxyNotSupportedException;
1717

1818
interface ProxyGeneratorInterface
1919
{

src/Transformer/Proxy/ProxyRegistryInterface.php src/Proxy/ProxyRegistryInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* that was distributed with this source code.
1212
*/
1313

14-
namespace Rekalogika\Mapper\Transformer\Proxy;
14+
namespace Rekalogika\Mapper\Proxy;
1515

1616
interface ProxyRegistryInterface
1717
{

src/Transformer/Proxy/ProxySpecification.php src/Proxy/ProxySpecification.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* that was distributed with this source code.
1212
*/
1313

14-
namespace Rekalogika\Mapper\Transformer\Proxy;
14+
namespace Rekalogika\Mapper\Proxy;
1515

1616
final readonly class ProxySpecification
1717
{

src/RekalogikaMapperBundle.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use Rekalogika\Mapper\DependencyInjection\CompilerPass\ObjectMapperPass;
1818
use Rekalogika\Mapper\DependencyInjection\CompilerPass\PropertyMapperPass;
1919
use Rekalogika\Mapper\DependencyInjection\CompilerPass\RemoveOptionalDefinitionPass;
20-
use Rekalogika\Mapper\Transformer\Proxy\ProxyAutoloaderInterface;
20+
use Rekalogika\Mapper\Proxy\ProxyAutoloaderInterface;
2121
use Symfony\Component\DependencyInjection\ContainerBuilder;
2222
use Symfony\Component\HttpKernel\Bundle\Bundle;
2323

src/Transformer/ObjectToObjectMetadata/Implementation/ObjectToObjectMetadataFactory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
use Rekalogika\Mapper\Attribute\InheritanceMap;
1717
use Rekalogika\Mapper\CustomMapper\PropertyMapperResolverInterface;
18+
use Rekalogika\Mapper\Proxy\Exception\ProxyNotSupportedException;
19+
use Rekalogika\Mapper\Proxy\ProxyGeneratorInterface;
1820
use Rekalogika\Mapper\Transformer\Contracts\MixedType;
1921
use Rekalogika\Mapper\Transformer\EagerPropertiesResolver\EagerPropertiesResolverInterface;
2022
use Rekalogika\Mapper\Transformer\Exception\InternalClassUnsupportedException;
@@ -25,8 +27,6 @@
2527
use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\ReadMode;
2628
use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\Visibility;
2729
use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\WriteMode;
28-
use Rekalogika\Mapper\Transformer\Proxy\Exception\ProxyNotSupportedException;
29-
use Rekalogika\Mapper\Transformer\Proxy\ProxyGeneratorInterface;
3030
use Rekalogika\Mapper\TypeResolver\TypeResolverInterface;
3131
use Rekalogika\Mapper\Util\ClassUtil;
3232
use Symfony\Component\PropertyInfo\PropertyInitializableExtractorInterface;

src/Transformer/ObjectToObjectMetadata/ObjectToObjectMetadata.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace Rekalogika\Mapper\Transformer\ObjectToObjectMetadata;
1515

16-
use Rekalogika\Mapper\Transformer\Proxy\ProxySpecification;
16+
use Rekalogika\Mapper\Proxy\ProxySpecification;
1717

1818
/**
1919
* @immutable

src/Transformer/ObjectToObjectTransformer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Rekalogika\Mapper\Exception\InvalidArgumentException;
2020
use Rekalogika\Mapper\Exception\LogicException;
2121
use Rekalogika\Mapper\ObjectCache\ObjectCache;
22+
use Rekalogika\Mapper\Proxy\ProxyRegistryInterface;
2223
use Rekalogika\Mapper\ServiceMethod\ServiceMethodRunner;
2324
use Rekalogika\Mapper\SubMapper\SubMapperFactoryInterface;
2425
use Rekalogika\Mapper\Transformer\Contracts\MainTransformerAwareInterface;
@@ -37,7 +38,6 @@
3738
use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\PropertyMapping;
3839
use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\Visibility;
3940
use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\WriteMode;
40-
use Rekalogika\Mapper\Transformer\Proxy\ProxyRegistryInterface;
4141
use Rekalogika\Mapper\Transformer\Util\ReaderWriter;
4242
use Rekalogika\Mapper\Util\TypeCheck;
4343
use Rekalogika\Mapper\Util\TypeFactory;

0 commit comments

Comments
 (0)