Task: #53687 Simplify cfg argument handling and keep --siteDir with JSON write input (-i)

This commit is contained in:
Alejandro Sosa 2026-03-26 12:27:12 +01:00
commit 2a391f4e0a
2 changed files with 24 additions and 57 deletions

View file

@ -151,14 +151,13 @@ class CfgTest extends TestCase
public function testWriteWithSiteDirCreatesAndWritesSiteConfig(): void
{
$result = $this->runCfg([
'-a',
$this->tmpDir,
'write',
'Extension',
'module:code="X100"',
'--siteDir',
'owner_xyz',
]);
'-a',
$this->tmpDir,
'write',
'Extension',
'module:code="X100"',
'--siteDir=owner_xyz',
]);
$this->assertSame(0, $result['code'], $result['output']);
@ -173,25 +172,23 @@ class CfgTest extends TestCase
public function testWriteWithSiteDirMergesIntoExistingSiteConfig(): void
{
$firstWrite = $this->runCfg([
'-a',
$this->tmpDir,
'write',
'Extension',
'module:code="X100"',
'--siteDir',
'owner_xyz',
]);
'-a',
$this->tmpDir,
'write',
'Extension',
'module:code="X100"',
'--siteDir=owner_xyz',
]);
$this->assertSame(0, $firstWrite['code'], $firstWrite['output']);
$secondWrite = $this->runCfg([
'-a',
$this->tmpDir,
'write',
'Extension',
'module:label="demo-module"',
'--siteDir',
'owner_xyz',
]);
'-a',
$this->tmpDir,
'write',
'Extension',
'module:label="demo-module"',
'--siteDir=owner_xyz',
]);
$this->assertSame(0, $secondWrite['code'], $secondWrite['output']);
$siteFile = $this->tmpDir.'/config/owner_xyz/Extension.conf.php';
@ -327,10 +324,10 @@ class CfgTest extends TestCase
'Extension',
'module:code="X100"',
'--siteDir=',
]);
]);
$this->assertSame(1, $result['code']);
$this->assertStringContainsString('Option --siteDir is empty.', $result['output']);
$this->assertStringContainsString('a value is required for --siteDir', $result['output']);
}
private function runCfg(array $args): array