Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit da9956376ceb · 2023-05-19T14:37:14.000+02:00
* 5.4:
  [Translation] Fix handling of null messages in `ArrayLoader`
  [Console] Remove exec and replace it by shell_exec
diff --git a/Helper/QuestionHelper.php b/Helper/QuestionHelper.php
@@ -496,13 +496,11 @@ private function isInteractiveInput($inputStream): bool
             return self::$stdinIsInteractive = @posix_isatty(fopen('php://stdin', 'r'));
         }
 
-        if (!\function_exists('exec')) {
+        if (!\function_exists('shell_exec')) {
             return self::$stdinIsInteractive = true;
         }
 
-        exec('stty 2> /dev/null', $output, $status);
-
-        return self::$stdinIsInteractive = 1 !== $status;
+        return self::$stdinIsInteractive = (bool) shell_exec('stty 2> '.('\\' === \DIRECTORY_SEPARATOR ? 'NUL' : '/dev/null'));
     }
 
     /**
diff --git a/Terminal.php b/Terminal.php
@@ -123,14 +123,12 @@ public static function hasSttyAvailable(): bool
             return self::$stty;
         }
 
-        // skip check if exec function is disabled
-        if (!\function_exists('exec')) {
+        // skip check if shell_exec function is disabled
+        if (!\function_exists('shell_exec')) {
             return false;
         }
 
-        exec('stty 2>&1', $output, $exitcode);
-
-        return self::$stty = 0 === $exitcode;
+        return self::$stty = (bool) shell_exec('stty 2> '.('\\' === \DIRECTORY_SEPARATOR ? 'NUL' : '/dev/null'));
     }
 
     private static function initDimensions()
diff --git a/Tests/Helper/QuestionHelperTest.php b/Tests/Helper/QuestionHelperTest.php
@@ -430,7 +430,7 @@ public function testAskHiddenResponse()
         $this->assertEquals('8AM', $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream("8AM\n")), $this->createOutputInterface(), $question));
     }
 
-    public function testAskHiddenResponseTrimmed()
+    public function testAskHiddenResponseNotTrimmed()
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('This test is not supported on Windows');
@@ -442,7 +442,7 @@ public function testAskHiddenResponseTrimmed()
         $question->setHidden(true);
         $question->setTrimmable(false);
 
-        $this->assertEquals(' 8AM', $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream(' 8AM')), $this->createOutputInterface(), $question));
+        $this->assertEquals(' 8AM'.\PHP_EOL, $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream(' 8AM'.\PHP_EOL)), $this->createOutputInterface(), $question));
     }
 
     public function testAskMultilineResponseWithEOF()
diff --git a/Tests/TerminalTest.php b/Tests/TerminalTest.php
@@ -77,8 +77,8 @@ public function testSttyOnWindows()
             $this->markTestSkipped('Must be on windows');
         }
 
-        $sttyString = exec('(stty -a | grep columns) 2>&1', $output, $exitcode);
-        if (0 !== $exitcode) {
+        $sttyString = shell_exec('(stty -a | grep columns) 2> NUL');
+        if (!$sttyString) {
             $this->markTestSkipped('Must have stty support');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -496,13 +496,11 @@ private function isInteractiveInput($inputStream): bool`
`496`	`496`	`return self::$stdinIsInteractive = @posix_isatty(fopen('php://stdin', 'r'));`
`497`	`497`	`}`
`498`	`498`
`499`		`- if (!\function_exists('exec')) {`
	`499`	`+ if (!\function_exists('shell_exec')) {`
`500`	`500`	`return self::$stdinIsInteractive = true;`
`501`	`501`	`}`
`502`	`502`
`503`		`- exec('stty 2> /dev/null', $output, $status);`
`504`		`-`
`505`		`- return self::$stdinIsInteractive = 1 !== $status;`
	`503`	`+ return self::$stdinIsInteractive = (bool) shell_exec('stty 2> '.('\\' === \DIRECTORY_SEPARATOR ? 'NUL' : '/dev/null'));`
`506`	`504`	`}`
`507`	`505`
`508`	`506`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -123,14 +123,12 @@ public static function hasSttyAvailable(): bool`
`123`	`123`	`return self::$stty;`
`124`	`124`	`}`
`125`	`125`
`126`		`- // skip check if exec function is disabled`
`127`		`- if (!\function_exists('exec')) {`
	`126`	`+ // skip check if shell_exec function is disabled`
	`127`	`+ if (!\function_exists('shell_exec')) {`
`128`	`128`	`return false;`
`129`	`129`	`}`
`130`	`130`
`131`		`- exec('stty 2>&1', $output, $exitcode);`
`132`		`-`
`133`		`- return self::$stty = 0 === $exitcode;`
	`131`	`+ return self::$stty = (bool) shell_exec('stty 2> '.('\\' === \DIRECTORY_SEPARATOR ? 'NUL' : '/dev/null'));`
`134`	`132`	`}`
`135`	`133`
`136`	`134`	`private static function initDimensions()`
Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ public function testAskHiddenResponse()`
`430`	`430`	`$this->assertEquals('8AM', $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream("8AM\n")), $this->createOutputInterface(), $question));`
`431`	`431`	`}`
`432`	`432`
`433`		`- public function testAskHiddenResponseTrimmed()`
	`433`	`+ public function testAskHiddenResponseNotTrimmed()`
`434`	`434`	`{`
`435`	`435`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`436`	`436`	`$this->markTestSkipped('This test is not supported on Windows');`
`@@ -442,7 +442,7 @@ public function testAskHiddenResponseTrimmed()`
`442`	`442`	`$question->setHidden(true);`
`443`	`443`	`$question->setTrimmable(false);`
`444`	`444`
`445`		`- $this->assertEquals(' 8AM', $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream(' 8AM')), $this->createOutputInterface(), $question));`
	`445`	`+ $this->assertEquals(' 8AM'.\PHP_EOL, $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream(' 8AM'.\PHP_EOL)), $this->createOutputInterface(), $question));`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`public function testAskMultilineResponseWithEOF()`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@ public function testSttyOnWindows()`
`77`	`77`	`$this->markTestSkipped('Must be on windows');`
`78`	`78`	`}`
`79`	`79`
`80`		`- $sttyString = exec('(stty -a \| grep columns) 2>&1', $output, $exitcode);`
`81`		`- if (0 !== $exitcode) {`
	`80`	`+ $sttyString = shell_exec('(stty -a \| grep columns) 2> NUL');`
	`81`	`+ if (!$sttyString) {`
`82`	`82`	`$this->markTestSkipped('Must have stty support');`
`83`	`83`	`}`
`84`	`84`