Skip to content

Commit 52075fa

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: Fix quotes in exception messages
2 parents 16f6867 + 7ca8560 commit 52075fa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Process.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1606,7 +1606,7 @@ function ($m) use (&$env, &$varCache, &$varCount, $uid) {
16061606
private function requireProcessIsStarted(string $functionName)
16071607
{
16081608
if (!$this->isStarted()) {
1609-
throw new LogicException(sprintf('Process must be started before calling %s.', $functionName));
1609+
throw new LogicException(sprintf('Process must be started before calling "%s()".', $functionName));
16101610
}
16111611
}
16121612

@@ -1618,7 +1618,7 @@ private function requireProcessIsStarted(string $functionName)
16181618
private function requireProcessIsTerminated(string $functionName)
16191619
{
16201620
if (!$this->isTerminated()) {
1621-
throw new LogicException(sprintf('Process must be terminated before calling %s.', $functionName));
1621+
throw new LogicException(sprintf('Process must be terminated before calling "%s()".', $functionName));
16221622
}
16231623
}
16241624

Tests/ProcessTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ public function testMethodsThatNeedARunningProcess($method)
940940
$process = $this->getProcess('foo');
941941

942942
$this->expectException('Symfony\Component\Process\Exception\LogicException');
943-
$this->expectExceptionMessage(sprintf('Process must be started before calling %s.', $method));
943+
$this->expectExceptionMessage(sprintf('Process must be started before calling "%s()".', $method));
944944

945945
$process->{$method}();
946946
}

0 commit comments

Comments
 (0)