Skip to content

Commit 7a74847

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: [Process] Fix failing tests causing segfaults
2 parents 8d6be7c + 8bda0be commit 7a74847

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/ProcessTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1582,7 +1582,7 @@ public function testFailingProcessWithMultipleCallsToProcGetStatus()
15821582
*/
15831583
public function testLongRunningProcessWithMultipleCallsToProcGetStatus()
15841584
{
1585-
$process = $this->getProcess('php -r "sleep(1); echo \'done\';"');
1585+
$process = $this->getProcess('sleep 1 && echo "done" && php -r "exit(0);"');
15861586
$process->start(static function () use ($process) {
15871587
return $process->isRunning();
15881588
});
@@ -1597,7 +1597,7 @@ public function testLongRunningProcessWithMultipleCallsToProcGetStatus()
15971597
*/
15981598
public function testLongRunningProcessWithMultipleCallsToProcGetStatusError()
15991599
{
1600-
$process = $this->getProcess('php -r "sleep(1); echo \'failure\'; exit(123);"');
1600+
$process = $this->getProcess('sleep 1 && echo "failure" && php -r "exit(123);"');
16011601
$process->start(static function () use ($process) {
16021602
return $process->isRunning();
16031603
});

0 commit comments

Comments
 (0)