OXDEV-7248 Update namespaces

OXID-eSales · Nov 13, 2024 · 06f43ec · 06f43ec
1 parent 17c9c7f
commit 06f43ec
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 25 deletions.
diff --git a/source/Application/Controller/Admin/ShopConfiguration.php b/source/Application/Controller/Admin/ShopConfiguration.php
@@ -12,7 +12,6 @@
 use OxidEsales\Eshop\Core\Str;
 use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
 use OxidEsales\EshopCommunity\Internal\Domain\Contact\Form\ContactFormBridgeInterface;
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
 use OxidEsales\EshopCommunity\Internal\Framework\FormConfiguration\FieldConfigurationInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleConfigurationDaoBridgeInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Setting\Event\SettingChangedEvent;

diff --git a/source/Core/Config.php b/source/Core/Config.php
@@ -13,7 +13,7 @@
 use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
 use OxidEsales\EshopCommunity\Internal\Framework\Config\Event\ShopConfigurationChangedEvent;
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\Edition;
 use OxidEsales\EshopCommunity\Internal\Framework\Theme\Bridge\AdminThemeBridgeInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Theme\Event\ThemeSettingChangedEvent;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;

diff --git a/source/Internal/Framework/DIContainer/ContainerBuilder.php b/source/Internal/Framework/DIContainer/ContainerBuilder.php
@@ -12,7 +12,7 @@
 use OxidEsales\Eshop\Core\FileCache;
 use OxidEsales\Eshop\Core\ShopIdCalculator;
 use OxidEsales\Eshop\Core\UtilsServer;
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\Edition;
 use OxidEsales\EshopCommunity\Internal\Framework\Env\EnvUrlFormatter;
 use OxidEsales\EshopCommunity\Internal\Framework\Logger\LoggerServiceFactory;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;

diff --git a/source/Internal/Framework/Edition.php → ...ce/Internal/Framework/Edition/Edition.php b/source/Internal/Framework/Edition.php → ...ce/Internal/Framework/Edition/Edition.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Internal\Framework;
+namespace OxidEsales\EshopCommunity\Internal\Framework\Edition;
 
 enum Edition: string
 {

diff --git a/.../FileSystem/EditionDirectoriesLocator.php → ...ork/Edition/EditionDirectoriesLocator.php b/.../FileSystem/EditionDirectoriesLocator.php → ...ork/Edition/EditionDirectoriesLocator.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Internal\Framework\FileSystem;
+namespace OxidEsales\EshopCommunity\Internal\Framework\Edition;
 
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\DirectoryNotExistentException;
+use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\ProjectDirectoriesLocator;
 use Symfony\Component\Filesystem\Path;
 
 readonly class EditionDirectoriesLocator

diff --git a/...nal/Framework/FileSystem/EditionPaths.php → ...ternal/Framework/Edition/EditionPaths.php b/...nal/Framework/FileSystem/EditionPaths.php → ...ternal/Framework/Edition/EditionPaths.php
@@ -7,9 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Internal\Framework\FileSystem;
-
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
+namespace OxidEsales\EshopCommunity\Internal\Framework\Edition;
 
 enum EditionPaths: string
 {

diff --git a/.../Framework/FileSystem/EditionResolver.php → ...nal/Framework/Edition/EditionResolver.php b/.../Framework/FileSystem/EditionResolver.php → ...nal/Framework/Edition/EditionResolver.php
@@ -7,9 +7,9 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\EshopCommunity\Internal\Framework\FileSystem;
+namespace OxidEsales\EshopCommunity\Internal\Framework\Edition;
 
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\DirectoryNotExistentException;
 
 readonly class EditionResolver
 {

diff --git a/source/Internal/Transition/Utility/BasicContext.php b/source/Internal/Transition/Utility/BasicContext.php
@@ -11,14 +11,13 @@
 
 use OxidEsales\EshopCommunity\Core\Autoload\BackwardsCompatibilityClassMapProvider;
 use OxidEsales\EshopCommunity\Core\ShopIdCalculator;
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
-use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\EditionDirectoriesLocator;
-use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\EditionPaths;
-use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\EditionResolver;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\EditionDirectoriesLocator;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\EditionPaths;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\EditionResolver;
 use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\ProjectDirectoriesLocator;
 use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\ProjectRootLocator;
 use Symfony\Component\Filesystem\Path;
-
 use function sprintf;
 
 class BasicContext implements BasicContextInterface

diff --git a/source/Internal/Transition/Utility/BasicContextInterface.php b/source/Internal/Transition/Utility/BasicContextInterface.php
@@ -7,7 +7,7 @@
 
 namespace OxidEsales\EshopCommunity\Internal\Transition\Utility;
 
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\Edition;
 
 interface BasicContextInterface
 {

diff --git a/tests/Codeception/Config/CodeceptionParametersProvider.php b/tests/Codeception/Config/CodeceptionParametersProvider.php
@@ -11,10 +11,10 @@
 
 use OxidEsales\Codeception\Module\Database;
 use OxidEsales\EshopCommunity\Internal\Framework\Configuration\DataObject\DatabaseConfiguration;
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\EditionDirectoriesLocator;
 use OxidEsales\EshopCommunity\Internal\Framework\Env\DotenvLoader;
 use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\DirectoryNotExistentException;
-use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\EditionDirectoriesLocator;
 use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\ProjectDirectoriesLocator;
 use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\ProjectRootLocator;
 use Symfony\Component\Filesystem\Path;

diff --git a/tests/DatabaseTrait.php b/tests/DatabaseTrait.php
@@ -11,8 +11,8 @@
 
 use Doctrine\DBAL\Connection;
 use OxidEsales\Eshop\Core\DatabaseProvider;
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
-use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\EditionDirectoriesLocator;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\EditionDirectoriesLocator;
 use ReflectionClass;
 
 trait DatabaseTrait

diff --git a/tests/Integration/Internal/Framework/DIContainer/ContainerBuilderTest.php b/tests/Integration/Internal/Framework/DIContainer/ContainerBuilderTest.php
@@ -11,7 +11,7 @@
 
 use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
 use OxidEsales\EshopCommunity\Internal\Framework\DIContainer\ContainerBuilder;
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\Edition;
 use OxidEsales\EshopCommunity\Tests\EnvTrait;
 use OxidEsales\EshopCommunity\Tests\Integration\Internal\Framework\DIContainer\Fixtures\Ce\Internal\ServiceInterface;
 use OxidEsales\EshopCommunity\Tests\Unit\Internal\ContextStub;

diff --git a/tests/Unit/Internal/BasicContextStub.php b/tests/Unit/Internal/BasicContextStub.php
@@ -10,7 +10,7 @@
 namespace OxidEsales\EshopCommunity\Tests\Unit\Internal;
 
 use OxidEsales\EshopCommunity\Internal\Container\BootstrapContainerFactory;
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\Edition;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;
 use Symfony\Component\Filesystem\Path;
 

diff --git a/tests/Unit/Internal/Framework/Templating/Locator/EditionMenuFileLocatorTest.php b/tests/Unit/Internal/Framework/Templating/Locator/EditionMenuFileLocatorTest.php
@@ -11,7 +11,7 @@
 
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\Edition;
 use OxidEsales\EshopCommunity\Internal\Framework\Templating\Locator\EditionMenuFileLocator;
 use OxidEsales\EshopCommunity\Internal\Framework\Theme\Bridge\AdminThemeBridgeInterface;
 use OxidEsales\EshopCommunity\Tests\Unit\Internal\BasicContextStub;

diff --git a/tests/Unit/Internal/Framework/Templating/Locator/EditionUserFileLocatorTest.php b/tests/Unit/Internal/Framework/Templating/Locator/EditionUserFileLocatorTest.php
@@ -11,7 +11,7 @@
 
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
-use OxidEsales\EshopCommunity\Internal\Framework\Edition;
+use OxidEsales\EshopCommunity\Internal\Framework\Edition\Edition;
 use OxidEsales\EshopCommunity\Internal\Framework\Templating\Locator\EditionUserFileLocator;
 use OxidEsales\EshopCommunity\Internal\Framework\Theme\Bridge\AdminThemeBridgeInterface;
 use OxidEsales\EshopCommunity\Tests\Unit\Internal\BasicContextStub;