Skip to content

Commit a0c3359

Browse files
authored
Merge pull request #282 from php-school/05-05-fix_cs_for_dockerprocessfactory
Fix CS for DockerProcessFactory
2 parents ac6ac0e + e7493db commit a0c3359

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

src/Process/DockerProcessFactory.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,12 @@ public function create(ProcessInput $processInput): Process
4141
}, array_keys($processInput->getEnv()), $processInput->getEnv());
4242

4343
return new Process(
44-
[...$this->baseComposeCommand($mounts, $env), 'runtime', $processInput->getExecutable(), ...$processInput->getArgs()],
44+
[
45+
...$this->baseComposeCommand($mounts, $env),
46+
'runtime',
47+
$processInput->getExecutable(),
48+
...$processInput->getArgs()
49+
],
4550
$this->basePath,
4651
['SOLUTION' => $processInput->getWorkingDirectory()],
4752
$processInput->getInput(),

test/Process/DockerProcessFactoryTest.php

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ public function testCreate(): void
3838
$input = new ProcessInput('php', [], __DIR__, []);
3939

4040
$process = $factory->create($input);
41-
static::assertSame("'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml' 'run' '--rm' '-w' '/solution' 'runtime' 'php'", $process->getCommandLine());
41+
$cmd = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
42+
$cmd .= " 'run' '--rm' '-w' '/solution' 'runtime' 'php'";
43+
static::assertSame($cmd, $process->getCommandLine());
4244
static::assertSame('/docker-dir', $process->getWorkingDirectory());
4345
}
4446

@@ -54,7 +56,9 @@ public function testCreateMountsComposerCacheDirIfExecutableIsComposer(): void
5456
$input = new ProcessInput('composer', [], __DIR__, []);
5557

5658
$process = $factory->create($input);
57-
static::assertSame("'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml' 'run' '--rm' '-w' '/solution' '-v' '/composer/cache/dir:/root/.composer/cache' 'runtime' 'composer'", $process->getCommandLine());
59+
$cmd = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
60+
$cmd .= " 'run' '--rm' '-w' '/solution' '-v' '/composer/cache/dir:/root/.composer/cache' 'runtime' 'composer'";
61+
static::assertSame($cmd, $process->getCommandLine());
5862
static::assertSame('/docker-dir', $process->getWorkingDirectory());
5963
}
6064

@@ -70,7 +74,9 @@ public function testCreateWithArgs(): void
7074
$input = new ProcessInput('php', ['one', 'two'], __DIR__, []);
7175

7276
$process = $factory->create($input);
73-
static::assertSame("'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml' 'run' '--rm' '-w' '/solution' 'runtime' 'php' 'one' 'two'", $process->getCommandLine());
77+
$cmd = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
78+
$cmd .= "'run' '--rm' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
79+
static::assertSame($cmd, $process->getCommandLine());
7480
static::assertSame('/docker-dir', $process->getWorkingDirectory());
7581
}
7682

@@ -86,7 +92,9 @@ public function testCreateWithEnv(): void
8692
$input = new ProcessInput('php', ['one', 'two'], __DIR__, ['SOME_VAR' => 'value']);
8793

8894
$process = $factory->create($input);
89-
static::assertSame("'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml' 'run' '--rm' '-e SOME_VAR=value' '-w' '/solution' 'runtime' 'php' 'one' 'two'", $process->getCommandLine());
95+
$cmd = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
96+
$cmd .= " 'run' '--rm' '-e SOME_VAR=value' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
97+
static::assertSame($cmd, $process->getCommandLine());
9098
static::assertSame('/docker-dir', $process->getWorkingDirectory());
9199
}
92100

@@ -102,7 +110,9 @@ public function testWithInput(): void
102110
$input = new ProcessInput('php', [], __DIR__, [], 'someinput');
103111

104112
$process = $factory->create($input);
105-
static::assertSame("'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml' 'run' '--rm' '-w' '/solution' 'runtime' 'php'", $process->getCommandLine());
113+
$cmd = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
114+
$cmd .= " 'run' '--rm' '-w' '/solution' 'runtime' 'php'";
115+
static::assertSame($cmd, $process->getCommandLine());
106116
static::assertSame('someinput', $process->getInput());
107117
}
108118

@@ -118,7 +128,9 @@ public function testSolutionDirectoryIsPassedAsEnvVar(): void
118128
$input = new ProcessInput('php', ['one', 'two'], __DIR__, ['SOME_VAR' => 'value']);
119129

120130
$process = $factory->create($input);
121-
static::assertSame("'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml' 'run' '--rm' '-e SOME_VAR=value' '-w' '/solution' 'runtime' 'php' 'one' 'two'", $process->getCommandLine());
131+
$cmd = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
132+
$cmd .= " 'run' '--rm' '-e SOME_VAR=value' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
133+
static::assertSame($cmd, $process->getCommandLine());
122134
static::assertSame('/docker-dir', $process->getWorkingDirectory());
123135
static::assertSame(['SOLUTION' => __DIR__], $process->getEnv());
124136
}

0 commit comments

Comments
 (0)