Monorepo v6 refactoring: EasyUtils (#1443)

eonx-com · Jun 27, 2024 · 3c66110 · 3c66110
1 parent 14635d3
commit 3c66110
Show file tree

Hide file tree

Showing 209 changed files with 770 additions and 726 deletions.
diff --git a/composer.json b/composer.json
@@ -149,6 +149,8 @@
             "EonX\\EasyTemplatingBlock\\Bundle\\": "packages/EasyTemplatingBlock/bundle",
             "EonX\\EasyTest\\": "packages/EasyTest/src",
             "EonX\\EasyUtils\\": "packages/EasyUtils/src",
+            "EonX\\EasyUtils\\Bundle\\": "packages/EasyUtils/bundle",
+            "EonX\\EasyUtils\\Laravel\\": "packages/EasyUtils/laravel",
             "EonX\\EasyWebhook\\": "packages/EasyWebhook/src",
             "EonX\\EasyWebhook\\Bundle\\": "packages/EasyWebhook/bundle",
             "EonX\\EasyWebhook\\Laravel\\": "packages/EasyWebhook/laravel"
@@ -234,6 +236,9 @@
             "EonX\\EasyTest\\Tests\\": "packages/EasyTest/tests",
             "EonX\\EasyTest\\Tests\\Unit\\": "packages/EasyTest/tests/Unit/src",
             "EonX\\EasyUtils\\Tests\\": "packages/EasyUtils/tests",
+            "EonX\\EasyUtils\\Tests\\Unit\\": "packages/EasyUtils/tests/Unit/src",
+            "EonX\\EasyUtils\\Tests\\Unit\\Bundle\\": "packages/EasyUtils/tests/Unit/bundle",
+            "EonX\\EasyUtils\\Tests\\Unit\\Laravel\\": "packages/EasyUtils/tests/Unit/laravel",
             "EonX\\EasyWebhook\\Tests\\": "packages/EasyWebhook/tests",
             "EonX\\EasyWebhook\\Tests\\Unit\\": "packages/EasyWebhook/tests/Unit/src",
             "EonX\\EasyWebhook\\Tests\\Unit\\Bundle\\": "packages/EasyWebhook/tests/Unit/bundle",

diff --git a/monorepo/Console/MonorepoApplication.php b/monorepo/Console/MonorepoApplication.php
@@ -3,7 +3,7 @@
 
 namespace EonX\EasyMonorepo\Console;
 
-use EonX\EasyUtils\Helpers\CollectorHelper;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
 

diff --git a/packages/EasyApiToken/src/Common/Decoder/ChainDecoder.php b/packages/EasyApiToken/src/Common/Decoder/ChainDecoder.php
@@ -4,7 +4,7 @@
 namespace EonX\EasyApiToken\Common\Decoder;
 
 use EonX\EasyApiToken\Common\ValueObject\ApiTokenInterface;
-use EonX\EasyUtils\Helpers\CollectorHelper;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
 use Symfony\Component\HttpFoundation\Request;
 
 final class ChainDecoder extends AbstractDecoder

diff --git a/packages/EasyApiToken/src/Common/Driver/HashedApiKeyDriver.php b/packages/EasyApiToken/src/Common/Driver/HashedApiKeyDriver.php
@@ -5,7 +5,7 @@
 
 use EonX\EasyApiToken\Common\ValueObject\HashedApiKey;
 use EonX\EasyApiToken\Common\ValueObject\HashedApiKeyInterface;
-use EonX\EasyUtils\Helpers\UrlHelper;
+use EonX\EasyUtils\Common\Helper\UrlHelper;
 
 final class HashedApiKeyDriver implements HashedApiKeyDriverInterface
 {

diff --git a/packages/EasyApiToken/src/Common/Factory/ApiTokenDecoderFactory.php b/packages/EasyApiToken/src/Common/Factory/ApiTokenDecoderFactory.php
@@ -9,7 +9,7 @@
 use EonX\EasyApiToken\Common\Exception\InvalidConfigurationException;
 use EonX\EasyApiToken\Common\Exception\InvalidDefaultDecoderException;
 use EonX\EasyApiToken\Common\Provider\DecoderProviderInterface;
-use EonX\EasyUtils\Helpers\CollectorHelper;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
 
 final class ApiTokenDecoderFactory implements ApiTokenDecoderFactoryInterface
 {

diff --git a/packages/EasyApiToken/src/Common/Provider/DecoderProviderInterface.php b/packages/EasyApiToken/src/Common/Provider/DecoderProviderInterface.php
@@ -3,7 +3,7 @@
 
 namespace EonX\EasyApiToken\Common\Provider;
 
-use EonX\EasyUtils\Interfaces\HasPriorityInterface;
+use EonX\EasyUtils\Common\Helper\HasPriorityInterface;
 
 interface DecoderProviderInterface extends HasPriorityInterface
 {

diff --git a/packages/EasyApiToken/tests/Stub/Common/Decoder/DecoderProviderStub.php b/packages/EasyApiToken/tests/Stub/Common/Decoder/DecoderProviderStub.php
@@ -5,7 +5,7 @@
 
 use EonX\EasyApiToken\Common\Decoder\BasicAuthDecoder;
 use EonX\EasyApiToken\Common\Provider\DecoderProviderInterface;
-use EonX\EasyUtils\Traits\HasPriorityTrait;
+use EonX\EasyUtils\Common\Helper\HasPriorityTrait;
 
 final class DecoderProviderStub implements DecoderProviderInterface
 {

diff --git a/packages/EasyBatch/src/Bridge/Symfony/Messenger/BatchItemExceptionHandler.php b/packages/EasyBatch/src/Bridge/Symfony/Messenger/BatchItemExceptionHandler.php
@@ -11,7 +11,7 @@
 use EonX\EasyBatch\Interfaces\EasyBatchExceptionInterface;
 use EonX\EasyBatch\Interfaces\EasyBatchPreventProcessExceptionInterface;
 use EonX\EasyBatch\Transformers\BatchItemTransformer;
-use EonX\EasyUtils\Helpers\ErrorDetailsHelper;
+use EonX\EasyUtils\Common\Helper\ErrorDetailsHelper;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Exception\ExceptionInterface as MessengerExceptionInterface;

diff --git a/packages/EasyBatch/src/Transformers/AbstractBatchObjectTransformer.php b/packages/EasyBatch/src/Transformers/AbstractBatchObjectTransformer.php
@@ -7,7 +7,7 @@
 use DateTimeInterface;
 use EonX\EasyBatch\Interfaces\BatchObjectInterface;
 use EonX\EasyBatch\Interfaces\BatchObjectTransformerInterface;
-use EonX\EasyUtils\Helpers\ErrorDetailsHelper;
+use EonX\EasyUtils\Common\Helper\ErrorDetailsHelper;
 use Throwable;
 
 abstract class AbstractBatchObjectTransformer implements BatchObjectTransformerInterface

diff --git a/packages/EasyBugsnag/src/Bridge/EasyUtils/SensitiveDataSanitizerConfigurator.php b/packages/EasyBugsnag/src/Bridge/EasyUtils/SensitiveDataSanitizerConfigurator.php
@@ -6,7 +6,7 @@
 use Bugsnag\Client;
 use Bugsnag\Report;
 use EonX\EasyBugsnag\Configurators\AbstractClientConfigurator;
-use EonX\EasyUtils\SensitiveData\SensitiveDataSanitizerInterface;
+use EonX\EasyUtils\SensitiveData\Sanitizer\SensitiveDataSanitizerInterface;
 
 final class SensitiveDataSanitizerConfigurator extends AbstractClientConfigurator
 {

diff --git a/packages/EasyBugsnag/src/Bridge/Laravel/EasyBugsnagServiceProvider.php b/packages/EasyBugsnag/src/Bridge/Laravel/EasyBugsnagServiceProvider.php
@@ -22,7 +22,7 @@
 use EonX\EasyBugsnag\Resolvers\DefaultAppNameResolver;
 use EonX\EasyBugsnag\Session\SessionTracker;
 use EonX\EasyBugsnag\Shutdown\ShutdownStrategy;
-use EonX\EasyUtils\SensitiveData\SensitiveDataSanitizerInterface;
+use EonX\EasyUtils\SensitiveData\Sanitizer\SensitiveDataSanitizerInterface;
 use Illuminate\Contracts\Cache\Repository;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Queue\Events\JobProcessing;

diff --git a/...ag/src/Bridge/Symfony/DependencyInjection/Compiler/SensitiveDataSanitizerCompilerPass.php b/...ag/src/Bridge/Symfony/DependencyInjection/Compiler/SensitiveDataSanitizerCompilerPass.php
@@ -6,7 +6,7 @@
 use EonX\EasyBugsnag\Bridge\BridgeConstantsInterface;
 use EonX\EasyBugsnag\Bridge\EasyUtils\Exceptions\EasyUtilsNotInstalledException;
 use EonX\EasyBugsnag\Bridge\EasyUtils\SensitiveDataSanitizerConfigurator;
-use EonX\EasyUtils\SensitiveData\SensitiveDataSanitizerInterface;
+use EonX\EasyUtils\SensitiveData\Sanitizer\SensitiveDataSanitizerInterface;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;

diff --git a/packages/EasyBugsnag/src/ClientFactory.php b/packages/EasyBugsnag/src/ClientFactory.php
@@ -9,7 +9,7 @@
 use Bugsnag\Shutdown\ShutdownStrategyInterface;
 use EonX\EasyBugsnag\Interfaces\ClientConfiguratorInterface;
 use EonX\EasyBugsnag\Interfaces\ClientFactoryInterface;
-use EonX\EasyUtils\Helpers\CollectorHelper;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
 use GuzzleHttp\ClientInterface;
 
 final class ClientFactory implements ClientFactoryInterface

diff --git a/packages/EasyBugsnag/src/Interfaces/ClientConfiguratorInterface.php b/packages/EasyBugsnag/src/Interfaces/ClientConfiguratorInterface.php
@@ -4,7 +4,7 @@
 namespace EonX\EasyBugsnag\Interfaces;
 
 use Bugsnag\Client;
-use EonX\EasyUtils\Interfaces\HasPriorityInterface;
+use EonX\EasyUtils\Common\Helper\HasPriorityInterface;
 
 interface ClientConfiguratorInterface extends HasPriorityInterface
 {

diff --git a/packages/EasyBugsnag/tests/Bridge/Laravel/AbstractLaravelTestCase.php b/packages/EasyBugsnag/tests/Bridge/Laravel/AbstractLaravelTestCase.php
@@ -5,7 +5,7 @@
 
 use EonX\EasyBugsnag\Bridge\Laravel\EasyBugsnagServiceProvider;
 use EonX\EasyBugsnag\Tests\AbstractTestCase;
-use EonX\EasyUtils\Bridge\Laravel\EasyUtilsServiceProvider;
+use EonX\EasyUtils\Laravel\EasyUtilsServiceProvider;
 use Laravel\Lumen\Application;
 
 abstract class AbstractLaravelTestCase extends AbstractTestCase

diff --git a/packages/EasyBugsnag/tests/Bridge/Symfony/Stubs/KernelStub.php b/packages/EasyBugsnag/tests/Bridge/Symfony/Stubs/KernelStub.php
@@ -4,7 +4,7 @@
 namespace EonX\EasyBugsnag\Tests\Bridge\Symfony\Stubs;
 
 use EonX\EasyBugsnag\Bridge\Symfony\EasyBugsnagSymfonyBundle;
-use EonX\EasyUtils\Bridge\Symfony\EasyUtilsSymfonyBundle;
+use EonX\EasyUtils\Bundle\EasyUtilsBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -70,7 +70,7 @@ public function process(ContainerBuilder $container): void
     public function registerBundles(): iterable
     {
         yield new EasyBugsnagSymfonyBundle();
-        yield new EasyUtilsSymfonyBundle();
+        yield new EasyUtilsBundle();
     }
 
     /**

diff --git a/packages/EasyDecision/src/Configurator/AddRulesDecisionConfigurator.php b/packages/EasyDecision/src/Configurator/AddRulesDecisionConfigurator.php
@@ -6,7 +6,7 @@
 use EonX\EasyDecision\Decision\DecisionInterface;
 use EonX\EasyDecision\Rule\RestrictedRuleInterface;
 use EonX\EasyDecision\Rule\RuleInterface;
-use EonX\EasyUtils\Helpers\CollectorHelper;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
 
 final class AddRulesDecisionConfigurator extends AbstractDecisionConfigurator
 {

diff --git a/packages/EasyDecision/src/Configurator/DecisionConfiguratorInterface.php b/packages/EasyDecision/src/Configurator/DecisionConfiguratorInterface.php
@@ -4,7 +4,7 @@
 namespace EonX\EasyDecision\Configurator;
 
 use EonX\EasyDecision\Decision\DecisionInterface;
-use EonX\EasyUtils\Interfaces\HasPriorityInterface;
+use EonX\EasyUtils\Common\Helper\HasPriorityInterface;
 
 interface DecisionConfiguratorInterface extends HasPriorityInterface
 {

diff --git a/packages/EasyDecision/src/Decision/AbstractDecision.php b/packages/EasyDecision/src/Decision/AbstractDecision.php
@@ -15,7 +15,7 @@
 use EonX\EasyDecision\ExpressionLanguage\ExpressionLanguageInterface;
 use EonX\EasyDecision\Rule\DecisionOutputForRuleAwareInterface;
 use EonX\EasyDecision\Rule\RuleInterface;
-use EonX\EasyUtils\Helpers\CollectorHelper;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
 use Throwable;
 
 abstract class AbstractDecision implements DecisionInterface

diff --git a/packages/EasyDecision/src/ExpressionLanguage/ExpressionLanguage.php b/packages/EasyDecision/src/ExpressionLanguage/ExpressionLanguage.php
@@ -6,7 +6,7 @@
 use EonX\EasyDecision\Exception\ExpressionLanguageLockedException;
 use EonX\EasyDecision\Exception\InvalidExpressionException;
 use EonX\EasyDecision\ExpressionFunction\ExpressionFunctionInterface;
-use EonX\EasyUtils\Helpers\CollectorHelper;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;
 use Symfony\Component\ExpressionLanguage\SyntaxError;

diff --git a/packages/EasyDecision/src/Factory/DecisionFactory.php b/packages/EasyDecision/src/Factory/DecisionFactory.php
@@ -11,7 +11,7 @@
 use EonX\EasyDecision\Decision\UnanimousDecision;
 use EonX\EasyDecision\Decision\ValueDecision;
 use EonX\EasyDecision\Provider\MappingProviderInterface;
-use EonX\EasyUtils\Helpers\CollectorHelper;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
 
 final class DecisionFactory implements DecisionFactoryInterface
 {

diff --git a/packages/EasyDecision/src/Rule/RuleInterface.php b/packages/EasyDecision/src/Rule/RuleInterface.php
@@ -3,7 +3,7 @@
 
 namespace EonX\EasyDecision\Rule;
 
-use EonX\EasyUtils\Interfaces\HasPriorityInterface;
+use EonX\EasyUtils\Common\Helper\HasPriorityInterface;
 
 interface RuleInterface extends HasPriorityInterface
 {

diff --git a/packages/EasyDecision/tests/Stub/Rule/OutputFromInputRuleStub.php b/packages/EasyDecision/tests/Stub/Rule/OutputFromInputRuleStub.php
@@ -4,7 +4,7 @@
 namespace EonX\EasyDecision\Tests\Stub\Rule;
 
 use EonX\EasyDecision\Rule\RuleInterface;
-use EonX\EasyUtils\Traits\HasPriorityTrait;
+use EonX\EasyUtils\Common\Helper\HasPriorityTrait;
 
 final class OutputFromInputRuleStub implements RuleInterface
 {

diff --git a/packages/EasyDoctrine/src/Common/Type/IntegerNumberType.php b/packages/EasyDoctrine/src/Common/Type/IntegerNumberType.php
@@ -6,7 +6,7 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\BigIntType as DoctrineBigIntType;
 use Doctrine\DBAL\Types\ConversionException;
-use EonX\EasyUtils\ValueObjects\Number;
+use EonX\EasyUtils\Math\ValueObject\Number;
 
 final class IntegerNumberType extends DoctrineBigIntType
 {

diff --git a/packages/EasyEncryption/src/Common/Provider/DefaultEncryptionKeyProvider.php b/packages/EasyEncryption/src/Common/Provider/DefaultEncryptionKeyProvider.php
@@ -7,7 +7,7 @@
 use EonX\EasyEncryption\Common\Exception\CouldNotProvideEncryptionKeyException;
 use EonX\EasyEncryption\Common\Factory\EncryptionKeyFactoryInterface;
 use EonX\EasyEncryption\Common\Resolver\EncryptionKeyResolverInterface;
-use EonX\EasyUtils\Helpers\CollectorHelper;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
 use ParagonIE\Halite\EncryptionKeyPair;
 use ParagonIE\Halite\Symmetric\EncryptionKey;
 use Throwable;

diff --git a/packages/EasyEncryption/src/Common/Resolver/AbstractEncryptionKeyResolver.php b/packages/EasyEncryption/src/Common/Resolver/AbstractEncryptionKeyResolver.php
@@ -4,7 +4,7 @@
 namespace EonX\EasyEncryption\Common\Resolver;
 
 use EonX\EasyEncryption\Common\Exception\CouldNotResolveEncryptionKeyException;
-use EonX\EasyUtils\Traits\HasPriorityTrait;
+use EonX\EasyUtils\Common\Helper\HasPriorityTrait;
 use ParagonIE\Halite\EncryptionKeyPair;
 use ParagonIE\Halite\Symmetric\EncryptionKey;
 

diff --git a/packages/EasyEncryption/src/Common/Resolver/EncryptionKeyResolverInterface.php b/packages/EasyEncryption/src/Common/Resolver/EncryptionKeyResolverInterface.php
@@ -3,7 +3,7 @@
 
 namespace EonX\EasyEncryption\Common\Resolver;
 
-use EonX\EasyUtils\Interfaces\HasPriorityInterface;
+use EonX\EasyUtils\Common\Helper\HasPriorityInterface;
 use ParagonIE\Halite\EncryptionKeyPair;
 use ParagonIE\Halite\Symmetric\EncryptionKey;
 

diff --git a/packages/EasyErrorHandler/src/Builders/AbstractErrorResponseBuilder.php b/packages/EasyErrorHandler/src/Builders/AbstractErrorResponseBuilder.php
@@ -4,7 +4,7 @@
 namespace EonX\EasyErrorHandler\Builders;
 
 use EonX\EasyErrorHandler\Interfaces\ErrorResponseBuilderInterface;
-use EonX\EasyUtils\Traits\HasPriorityTrait;
+use EonX\EasyUtils\Common\Helper\HasPriorityTrait;
 use Throwable;
 
 abstract class AbstractErrorResponseBuilder implements ErrorResponseBuilderInterface

diff --git a/packages/EasyErrorHandler/src/ErrorDetailsResolver.php b/packages/EasyErrorHandler/src/ErrorDetailsResolver.php
@@ -9,7 +9,7 @@
 use EonX\EasyErrorHandler\Interfaces\Exceptions\TranslatableExceptionInterface;
 use EonX\EasyErrorHandler\Interfaces\Exceptions\ValidationExceptionInterface;
 use EonX\EasyErrorHandler\Interfaces\TranslatorInterface;
-use EonX\EasyUtils\Helpers\ErrorDetailsHelper;
+use EonX\EasyUtils\Common\Helper\ErrorDetailsHelper;
 use Psr\Log\LoggerInterface;
 use Throwable;
 

diff --git a/packages/EasyErrorHandler/src/ErrorHandler.php b/packages/EasyErrorHandler/src/ErrorHandler.php
@@ -14,7 +14,7 @@
 use EonX\EasyErrorHandler\Interfaces\FormatAwareInterface;
 use EonX\EasyErrorHandler\Interfaces\VerboseStrategyInterface;
 use EonX\EasyErrorHandler\Response\Data\ErrorResponseData;
-use EonX\EasyUtils\Helpers\CollectorHelper;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
 use SplObjectStorage;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/packages/EasyErrorHandler/src/Interfaces/ErrorReporterInterface.php b/packages/EasyErrorHandler/src/Interfaces/ErrorReporterInterface.php
@@ -3,7 +3,7 @@
 
 namespace EonX\EasyErrorHandler\Interfaces;
 
-use EonX\EasyUtils\Interfaces\HasPriorityInterface;
+use EonX\EasyUtils\Common\Helper\HasPriorityInterface;
 use Throwable;
 
 interface ErrorReporterInterface extends HasPriorityInterface

diff --git a/packages/EasyErrorHandler/src/Interfaces/ErrorResponseBuilderInterface.php b/packages/EasyErrorHandler/src/Interfaces/ErrorResponseBuilderInterface.php
@@ -3,7 +3,7 @@
 
 namespace EonX\EasyErrorHandler\Interfaces;
 
-use EonX\EasyUtils\Interfaces\HasPriorityInterface;
+use EonX\EasyUtils\Common\Helper\HasPriorityInterface;
 use Throwable;
 
 interface ErrorResponseBuilderInterface extends HasPriorityInterface

diff --git a/packages/EasyErrorHandler/src/Interfaces/VerboseStrategyDriverInterface.php b/packages/EasyErrorHandler/src/Interfaces/VerboseStrategyDriverInterface.php
@@ -3,7 +3,7 @@
 
 namespace EonX\EasyErrorHandler\Interfaces;
 
-use EonX\EasyUtils\Interfaces\HasPriorityInterface;
+use EonX\EasyUtils\Common\Helper\HasPriorityInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Throwable;
 

diff --git a/packages/EasyErrorHandler/src/Reporters/AbstractErrorReporter.php b/packages/EasyErrorHandler/src/Reporters/AbstractErrorReporter.php
@@ -5,7 +5,7 @@
 
 use EonX\EasyErrorHandler\Interfaces\ErrorLogLevelResolverInterface;
 use EonX\EasyErrorHandler\Interfaces\ErrorReporterInterface;
-use EonX\EasyUtils\Traits\HasPriorityTrait;
+use EonX\EasyUtils\Common\Helper\HasPriorityTrait;
 
 abstract class AbstractErrorReporter implements ErrorReporterInterface
 {

diff --git a/packages/EasyErrorHandler/src/Verbose/AbstractVerboseStrategyDriver.php b/packages/EasyErrorHandler/src/Verbose/AbstractVerboseStrategyDriver.php
@@ -4,7 +4,7 @@
 namespace EonX\EasyErrorHandler\Verbose;
 
 use EonX\EasyErrorHandler\Interfaces\VerboseStrategyDriverInterface;
-use EonX\EasyUtils\Traits\HasPriorityTrait;
+use EonX\EasyUtils\Common\Helper\HasPriorityTrait;
 
 abstract class AbstractVerboseStrategyDriver implements VerboseStrategyDriverInterface
 {

diff --git a/packages/EasyErrorHandler/src/Verbose/ChainVerboseStrategy.php b/packages/EasyErrorHandler/src/Verbose/ChainVerboseStrategy.php
@@ -5,7 +5,7 @@
 
 use EonX\EasyErrorHandler\Interfaces\VerboseStrategyDriverInterface;
 use EonX\EasyErrorHandler\Interfaces\VerboseStrategyInterface;
-use EonX\EasyUtils\Helpers\CollectorHelper;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
 use Symfony\Component\HttpFoundation\Request;
 use Throwable;
 

diff --git a/packages/EasyHttpClient/src/Common/HttpClient/WithEventsHttpClient.php b/packages/EasyHttpClient/src/Common/HttpClient/WithEventsHttpClient.php
@@ -14,7 +14,7 @@
 use EonX\EasyHttpClient\Common\ValueObject\RequestDataInterface;
 use EonX\EasyHttpClient\Common\ValueObject\ResponseData;
 use EonX\EasyHttpClient\Common\ValueObject\ResponseDataInterface;
-use EonX\EasyUtils\Helpers\CollectorHelper;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
 use Symfony\Component\HttpClient\AsyncDecoratorTrait;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\HttpClient\Response\AsyncContext;

diff --git a/packages/EasyLogging/src/Bridge/EasyUtils/SensitiveDataSanitizerProcessor.php b/packages/EasyLogging/src/Bridge/EasyUtils/SensitiveDataSanitizerProcessor.php
@@ -5,7 +5,7 @@
 
 use EonX\EasyLogging\Config\AbstractSelfProcessorConfigProvider;
 use EonX\EasyLogging\Interfaces\Config\ProcessorConfigInterface;
-use EonX\EasyUtils\SensitiveData\SensitiveDataSanitizerInterface;
+use EonX\EasyUtils\SensitiveData\Sanitizer\SensitiveDataSanitizerInterface;
 
 final class SensitiveDataSanitizerProcessor extends AbstractSelfProcessorConfigProvider
 {

diff --git a/packages/EasyLogging/src/Bridge/Laravel/EasyLoggingServiceProvider.php b/packages/EasyLogging/src/Bridge/Laravel/EasyLoggingServiceProvider.php
@@ -9,8 +9,8 @@
 use EonX\EasyLogging\Config\StreamHandlerConfigProvider;
 use EonX\EasyLogging\Interfaces\LoggerFactoryInterface;
 use EonX\EasyLogging\LoggerFactory;
-use EonX\EasyUtils\Helpers\CollectorHelper;
-use EonX\EasyUtils\SensitiveData\SensitiveDataSanitizerInterface;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
+use EonX\EasyUtils\SensitiveData\Sanitizer\SensitiveDataSanitizerInterface;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Support\ServiceProvider;
 use Psr\Log\LoggerInterface;

diff --git a/...ng/src/Bridge/Symfony/DependencyInjection/Compiler/SensitiveDataSanitizerCompilerPass.php b/...ng/src/Bridge/Symfony/DependencyInjection/Compiler/SensitiveDataSanitizerCompilerPass.php
@@ -6,7 +6,7 @@
 use EonX\EasyLogging\Bridge\BridgeConstantsInterface;
 use EonX\EasyLogging\Bridge\EasyUtils\Exceptions\EasyUtilsNotInstalledException;
 use EonX\EasyLogging\Bridge\EasyUtils\SensitiveDataSanitizerProcessor;
-use EonX\EasyUtils\SensitiveData\SensitiveDataSanitizerInterface;
+use EonX\EasyUtils\SensitiveData\Sanitizer\SensitiveDataSanitizerInterface;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;

diff --git a/packages/EasyLogging/src/Interfaces/Config/LoggingConfigInterface.php b/packages/EasyLogging/src/Interfaces/Config/LoggingConfigInterface.php
@@ -3,7 +3,7 @@
 
 namespace EonX\EasyLogging\Interfaces\Config;
 
-use EonX\EasyUtils\Interfaces\HasPriorityInterface;
+use EonX\EasyUtils\Common\Helper\HasPriorityInterface;
 
 interface LoggingConfigInterface extends HasPriorityInterface
 {

diff --git a/packages/EasyLogging/src/LoggerFactory.php b/packages/EasyLogging/src/LoggerFactory.php
@@ -10,7 +10,7 @@
 use EonX\EasyLogging\Interfaces\Config\ProcessorConfigProviderInterface;
 use EonX\EasyLogging\Interfaces\LazyLoggerFactoryInterface;
 use EonX\EasyLogging\Interfaces\LoggerFactoryInterface;
-use EonX\EasyUtils\Helpers\CollectorHelper;
+use EonX\EasyUtils\Common\Helper\CollectorHelper;
 use Monolog\Handler\HandlerInterface;
 use Monolog\Handler\NullHandler;
 use Monolog\Logger;