diff --git a/setup/sequencers/StepSequencer.php b/setup/sequencers/StepSequencer.php index 5f3d5664e..efe1bbdd4 100644 --- a/setup/sequencers/StepSequencer.php +++ b/setup/sequencers/StepSequencer.php @@ -38,9 +38,10 @@ abstract class StepSequencer { if (is_null($oRunTimeEnvironment)) { $sEnvironment = $oParams->Get('target_env', 'production'); - $oRunTimeEnvironment = new RunTimeEnvironment($sEnvironment, false); + $this->oRunTimeEnvironment = new RunTimeEnvironment($sEnvironment, false); + } else { + $this->oRunTimeEnvironment = $oRunTimeEnvironment; } - $this->oRunTimeEnvironment = $oRunTimeEnvironment; $this->oParams = $oParams; diff --git a/tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php b/tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php index 2c12e56a0..4cd3b9d90 100644 --- a/tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php +++ b/tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php @@ -55,14 +55,14 @@ class UnitTestRunTimeEnvironment extends RunTimeEnvironment SetupUtils::rrmdir($sDestModulesDir); } - SetupUtils::copydir(APPROOT.'/data/'.$sSourceEnv.'-modules', $sDestModulesDir, $bUseSymLinks); + SetupUtils::copydir(APPROOT.'/data/'.$sSourceEnv.'-modules', $sDestModulesDir, (true === $bUseSymLinks)); if ($this->bUseAdditionalFeatures) { foreach ($this->GetExtensionFoldersToAdd() as $sExtensionCode => $sFolderPath) { \SetupLog::Info("ExtensionFoldersToAdd: $sExtensionCode => $sFolderPath"); $sFolderName = basename($sFolderPath); @mkdir($sDestModulesDir.DIRECTORY_SEPARATOR.$sFolderName); - SetupUtils::copydir($sFolderPath, $sDestModulesDir.DIRECTORY_SEPARATOR.$sFolderName, $bUseSymLinks); + SetupUtils::copydir($sFolderPath, $sDestModulesDir.DIRECTORY_SEPARATOR.$sFolderName, (true === $bUseSymLinks)); } } diff --git a/tests/php-unit-tests/unitary-tests/setup/ApplicationInstallSequencerFake.php b/tests/php-unit-tests/unitary-tests/setup/ApplicationInstallSequencerFake.php index b6e578942..f0d5bf80e 100644 --- a/tests/php-unit-tests/unitary-tests/setup/ApplicationInstallSequencerFake.php +++ b/tests/php-unit-tests/unitary-tests/setup/ApplicationInstallSequencerFake.php @@ -4,7 +4,7 @@ class ApplicationInstallSequencerFake extends ApplicationInstallSequencer { public function __construct(Parameters $oParams) { - $this->oParams = $oParams; + parent::__construct($oParams); } protected function DoLogParameters($sPrefix = 'install-', $sOperation = '') @@ -23,10 +23,7 @@ class ApplicationInstallSequencerFake extends ApplicationInstallSequencer { } - protected function DoUpdateDBSchema($aSelectedModules) - { - } protected function AfterDBCreate( $aAdminParams, $aSelectedModules diff --git a/tests/php-unit-tests/unitary-tests/setup/DataAuditSequencerFake.php b/tests/php-unit-tests/unitary-tests/setup/DataAuditSequencerFake.php index d024cd6c8..8bc28625c 100644 --- a/tests/php-unit-tests/unitary-tests/setup/DataAuditSequencerFake.php +++ b/tests/php-unit-tests/unitary-tests/setup/DataAuditSequencerFake.php @@ -4,7 +4,7 @@ class DataAuditSequencerFake extends DataAuditSequencer { public function __construct(Parameters $oParams) { - $this->oParams = $oParams; + paret::__construct($oParams); } protected function DoCopy($aCopies) diff --git a/tests/php-unit-tests/unitary-tests/setup/StepSequencerTest.php b/tests/php-unit-tests/unitary-tests/setup/StepSequencerTest.php index cb4d5257f..1733e161a 100644 --- a/tests/php-unit-tests/unitary-tests/setup/StepSequencerTest.php +++ b/tests/php-unit-tests/unitary-tests/setup/StepSequencerTest.php @@ -20,6 +20,7 @@ class StepSequencerTest extends ItopTestCase $this->RequireOnceItopFile('/setup/sequencers/DataAuditSequencer.php'); $this->RequireOnceItopFile('/setup/parameters.class.inc.php'); $this->RequireOnceItopFile('/setup/setuputils.class.inc.php'); + $this->RequireOnceItopFile('/setup/runtimeenv.class.inc.php'); require_once __DIR__.'/ApplicationInstallSequencerFake.php'; require_once __DIR__.'/DataAuditSequencerFake.php'; } @@ -27,7 +28,23 @@ class StepSequencerTest extends ItopTestCase public function testApplicationInstallSequencer() { $oParams = new PHPParameters(); - $oParams->LoadFromHash([]); + $aParams = [ + 'mode' => 'install', + 'database' => [ + 'server' => 'server', + 'user' => 'user', + 'pwd' => 'pwd', + 'name' => 'name', + 'prefix' => 'prefix', + 'db_tls_enabled' => 'db_tls_enabled', + 'db_tls_ca' => 'db_tls_ca', + ], + 'application_path' => '', + 'language' => '', + 'graphviz_path' => '', + 'source_dir' => '', + ]; + $oParams->LoadFromHash($aParams); $oInstallSequencer = new ApplicationInstallSequencerFake($oParams); $oInstallSequencer->ExecuteAllSteps();