OXDEV-7248 Remove env var oxid source directory

source/Core/UtilsFile.php

@@ -671,9 +671,10 @@ private function addErrorMessageToDisplay($message): void
      */
     private function makePathRelativeToShopSource(string $path): string
     {
+
         return Path::makeRelative(
             $path,
-            (new BootstrapConfigurationFactory())->create()->getShopSourceDirectory()
+            ContainerFacade::getParameter('oxid_shop_source_directory')
         );
     }
 }

source/Core/UtilsPic.php

@@ -288,7 +288,7 @@ private function makePathRelativeToShopSource(string $path): string
     {
         return Path::makeRelative(
             $path,
-            (new BootstrapConfigurationFactory())->create()->getShopSourceDirectory()
+            ContainerFacade::getParameter('oxid_shop_source_directory')
         );
     }
 }

source/Internal/Container/services.yaml

@@ -2,7 +2,6 @@ imports:
     - { resource: bootstrap-services.yaml }
 
 parameters:
-    oxid_shop_source_directory: '%env(OXID_SHOP_SOURCE_DIRECTORY)%'
     oxid_cache_directory: '%env(OXID_CACHE_DIRECTORY)%'
     oxid_log_level: '%env(OXID_LOG_LEVEL)%'
 

source/Internal/Framework/Configuration/BootstrapConfigurationFactory.php

@@ -29,9 +29,5 @@ private function initEnvironment(): void
         $projectRootDirectory = (new BootstrapLocator())->getProjectRoot();
         $dotenvLoader = new DotenvLoader($projectRootDirectory);
         $dotenvLoader->loadEnvironmentVariables();
-        $dotenvLoader->putEnvironmentVariable(
-            'OXID_SHOP_SOURCE_DIRECTORY',
-            Path::join($projectRootDirectory, 'source')
-        );
     }
 }

source/Internal/Framework/Configuration/Dao/SystemConfigurationDao.php

@@ -19,7 +19,6 @@ public function get(): SystemConfiguration
     {
         $systemConfiguration = new SystemConfiguration();
         $systemConfiguration->setDatabaseUrl(getenv('OXID_DB_URL'));
-        $systemConfiguration->setShopSourceDirectory(getenv('OXID_SHOP_SOURCE_DIRECTORY'));
         $systemConfiguration->setCacheDirectory(getenv('OXID_CACHE_DIRECTORY'));
         $systemConfiguration->setLogLevel(getenv('OXID_LOG_LEVEL'));
 

source/Internal/Framework/Configuration/DataObject/SystemConfiguration.php

@@ -27,16 +27,6 @@ public function setDatabaseUrl(string $databaseUrl): void
         $this->databaseUrl = $databaseUrl;
     }
 
-    public function getShopSourceDirectory(): string
-    {
-        return $this->shopSourceDirectory;
-    }
-
-    public function setShopSourceDirectory(string $shopSourceDirectory): void
-    {
-        $this->shopSourceDirectory = $shopSourceDirectory;
-    }
-
     public function getCacheDirectory(): string
     {
         return $this->cacheDirectory;

source/Internal/Framework/DIContainer/ContainerBuilder.php

@@ -41,6 +41,7 @@ public function getContainer(): SymfonyContainerBuilder
         $symfonyContainer = new SymfonyContainerBuilder();
         $symfonyContainer->addCompilerPass(new RegisterListenersPass());
         $symfonyContainer->addCompilerPass(new AddConsoleCommandPass());
+        $symfonyContainer->setParameter('oxid_shop_source_directory', $this->context->getSourcePath());
         $this->loadEditionServices($symfonyContainer);
         $this->loadModuleServices($symfonyContainer);
         $this->loadProjectServices($symfonyContainer);

source/Internal/Framework/Env/DotenvLoader.php

@@ -23,20 +23,12 @@ public function __construct(private readonly string $pathToEnvFiles)
     }
 
     public function loadEnvironmentVariables(): void
-    {
-        $this->loadDotEnv()->loadEnv(Path::join($this->pathToEnvFiles, $this->envFile));
-    }
-
-    public function putEnvironmentVariable(string $name, string $value): void
-    {
-        $this->loadDotEnv()->populate([$name => $value]);
-    }
-
-    private function loadDotEnv(): Dotenv
     {
         $dotEnv = new Dotenv($this->envKey, $this->debugKey);
-        $dotEnv->usePutenv();
-
-        return $dotEnv;
+        $dotEnv
+            ->usePutenv()
+            ->loadEnv(
+                Path::join($this->pathToEnvFiles, $this->envFile)
+            );
     }
 }

source/Internal/Framework/Env/DotenvLoaderInterface.php

@@ -12,5 +12,4 @@
 interface DotenvLoaderInterface
 {
     public function loadEnvironmentVariables(): void;
-    public function putEnvironmentVariable(string $name, string $value): void;
 }

source/Internal/Transition/Utility/BasicContext.php

@@ -83,7 +83,7 @@ public function getActiveModuleServicesFilePath(int $shopId): string
      */
     public function getSourcePath(): string
     {
-        return $this->systemConfiguration->getShopSourceDirectory();
+        return Path::join($this->getShopRootPath(), 'source');
     }
 
     /**

source/Setup/Utilities.php

@@ -11,6 +11,7 @@
 use OxidEsales\DatabaseViewsGenerator\ViewsGenerator;
 use OxidEsales\DoctrineMigrationWrapper\Migrations;
 use OxidEsales\DoctrineMigrationWrapper\MigrationsBuilder;
+use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
 use OxidEsales\EshopCommunity\Internal\Framework\Configuration\BootstrapConfigurationFactory;
 use OxidEsales\Facts\Facts;
 use Symfony\Component\Console\Output\ConsoleOutput;
@@ -483,7 +484,7 @@ public function getRootDirectory(): string
     public function getSqlDirectory(): string
     {
         return Path::join(
-            (new BootstrapConfigurationFactory())->create()->getShopSourceDirectory(),
+            ContainerFacade::getParameter('oxid_shop_source_directory'),
             self::SETUP_DIRECTORY,
             self::DATABASE_SQL_DIRECTORY
         );

tests/Codeception/Config/CodeceptionParametersProvider.php

@@ -10,6 +10,7 @@
 namespace OxidEsales\EshopCommunity\Tests\Codeception\Config;
 
 use OxidEsales\Codeception\Module\Database;
+use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
 use OxidEsales\EshopCommunity\Internal\Framework\Configuration\BootstrapConfigurationFactory;
 use OxidEsales\EshopCommunity\Internal\Framework\Configuration\DataObject\DatabaseConfiguration;
 use OxidEsales\EshopCommunity\Internal\Framework\FileSystem\BootstrapLocator;
@@ -29,7 +30,8 @@ public function getParameters(): array
         $this->dbConfig = (new DatabaseConfiguration($databaseUrl));
         return [
             'SHOP_URL' => getenv('SHOP_URL') ?: $facts->getShopUrl(),
-            'SHOP_SOURCE_PATH' => getenv('SHOP_SOURCE_PATH') ?: $systemConfiguration->getShopSourceDirectory(),
+            'SHOP_SOURCE_PATH' => getenv('SHOP_SOURCE_PATH') ?:
+                ContainerFacade::getParameter('oxid_shop_source_directory'),
             'VENDOR_PATH' => $facts->getVendorPath(),
             'DB_NAME' => $this->getDbName(),
             'DB_USERNAME' => $this->getDbUser(),

tests/Integration/Internal/Framework/Configuration/Dao/SystemConfigurationDaoTest.php

@@ -51,7 +51,6 @@ public function testGetDatabaseConfigurationWillContainSomeDefaults(): void
 
     public function testGetBootstrapParametersWillContainsDefaults(): void
     {
-        $this->assertNotEmpty($this->systemConfiguration->get()->getShopSourceDirectory());
         $this->assertNotEmpty($this->systemConfiguration->get()->getCacheDirectory());
     }
 }

tests/Integration/Internal/Framework/Env/EnvLoaderTest.php

@@ -10,7 +10,6 @@
 namespace OxidEsales\EshopCommunity\Tests\Integration\Internal\Framework\Env;
 
 use OxidEsales\EshopCommunity\Internal\Framework\Configuration\BootstrapConfigurationFactory;
-use OxidEsales\EshopCommunity\Internal\Framework\Env\DotenvLoader;
 use OxidEsales\EshopCommunity\Tests\ContainerTrait;
 use OxidEsales\EshopCommunity\Tests\EnvTrait;
 use OxidEsales\EshopCommunity\Tests\RequestTrait;
@@ -83,15 +82,4 @@ public function testJsonDSNsWithSpecialCharactersWillBeParsedAsArray(): void
 
         $this->assertEquals($dsnString, $containerParameter[2]);
     }
-
-    public function testCanPutEnvironmentVariable(): void
-    {
-        $someKey = uniqid('some-key', true);
-        $someValue = uniqid('some-value', true);
-
-        $dotEnvLoader = new DotenvLoader($this->fixtures);
-        $dotEnvLoader->putEnvironmentVariable($someKey, $someValue);
-
-        $this->assertEquals($someValue, getenv($someKey));
-    }
 }

tests/Unit/Internal/BasicContextStub.php

@@ -205,11 +205,6 @@ public function getShopRootPath(): string
         return $this->shopRootPath;
     }
 
-    public function setShopRootPath(string $shopRootPath): void
-    {
-        $this->shopRootPath = $shopRootPath;
-    }
-
     public function getOutPath(): string
     {
         return $this->outPath;