Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit 6e75fe6874cb · 2022-06-27T18:58:25.000+02:00
* 4.4:
  CS fixes
  Bump Symfony version to 4.4.44
  Update VERSION for 4.4.43
  Update CONTRIBUTORS for 4.4.43
  Update CHANGELOG for 4.4.43
diff --git a/ExecutableFinder.php b/ExecutableFinder.php
@@ -48,8 +48,8 @@ public function addSuffix(string $suffix)
      */
     public function find(string $name, string $default = null, array $extraDirs = [])
     {
-        if (ini_get('open_basedir')) {
-            $searchPath = array_merge(explode(\PATH_SEPARATOR, ini_get('open_basedir')), $extraDirs);
+        if (\ini_get('open_basedir')) {
+            $searchPath = array_merge(explode(\PATH_SEPARATOR, \ini_get('open_basedir')), $extraDirs);
             $dirs = [];
             foreach ($searchPath as $path) {
                 // Silencing against https://bugs.php.net/69240
diff --git a/Pipes/AbstractPipes.php b/Pipes/AbstractPipes.php
@@ -104,7 +104,7 @@ protected function write(): ?array
                 stream_set_blocking($input, 0);
             } elseif (!isset($this->inputBuffer[0])) {
                 if (!\is_string($input)) {
-                    if (!is_scalar($input)) {
+                    if (!\is_scalar($input)) {
                         throw new InvalidArgumentException(sprintf('"%s" yielded a value of type "%s", but only scalars and stream resources are supported.', get_debug_type($this->input), get_debug_type($input)));
                     }
                     $input = (string) $input;
diff --git a/ProcessUtils.php b/ProcessUtils.php
@@ -48,7 +48,7 @@ public static function validateInput(string $caller, $input)
             if (\is_string($input)) {
                 return $input;
             }
-            if (is_scalar($input)) {
+            if (\is_scalar($input)) {
                 return (string) $input;
             }
             if ($input instanceof Process) {
diff --git a/Tests/ExecutableFinderTest.php b/Tests/ExecutableFinderTest.php
@@ -37,7 +37,7 @@ private function setPath($path)
 
     public function testFind()
     {
-        if (ini_get('open_basedir')) {
+        if (\ini_get('open_basedir')) {
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
@@ -51,7 +51,7 @@ public function testFind()
 
     public function testFindWithDefault()
     {
-        if (ini_get('open_basedir')) {
+        if (\ini_get('open_basedir')) {
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
@@ -67,7 +67,7 @@ public function testFindWithDefault()
 
     public function testFindWithNullAsDefault()
     {
-        if (ini_get('open_basedir')) {
+        if (\ini_get('open_basedir')) {
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
@@ -82,7 +82,7 @@ public function testFindWithNullAsDefault()
 
     public function testFindWithExtraDirs()
     {
-        if (ini_get('open_basedir')) {
+        if (\ini_get('open_basedir')) {
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
@@ -105,7 +105,7 @@ public function testFindWithOpenBaseDir()
             $this->markTestSkipped('Cannot run test on windows');
         }
 
-        if (ini_get('open_basedir')) {
+        if (\ini_get('open_basedir')) {
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
@@ -122,7 +122,7 @@ public function testFindWithOpenBaseDir()
      */
     public function testFindProcessInOpenBasedir()
     {
-        if (ini_get('open_basedir')) {
+        if (\ini_get('open_basedir')) {
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
         if ('\\' === \DIRECTORY_SEPARATOR) {
@@ -140,7 +140,7 @@ public function testFindProcessInOpenBasedir()
 
     public function testFindBatchExecutableOnWindows()
     {
-        if (ini_get('open_basedir')) {
+        if (\ini_get('open_basedir')) {
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
         if ('\\' !== \DIRECTORY_SEPARATOR) {
diff --git a/Tests/ProcessTest.php b/Tests/ProcessTest.php
@@ -1133,7 +1133,7 @@ public function testTermSignalTerminatesProcessCleanly()
     public function responsesCodeProvider()
     {
         return [
-            //expected output / getter / code to execute
+            // expected output / getter / code to execute
             // [1,'getExitCode','exit(1);'],
             // [true,'isSuccessful','exit();'],
             ['output', 'getOutput', 'echo \'output\';'],

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ protected function write(): ?array`
`104`	`104`	`stream_set_blocking($input, 0);`
`105`	`105`	`} elseif (!isset($this->inputBuffer[0])) {`
`106`	`106`	`if (!\is_string($input)) {`
`107`		`- if (!is_scalar($input)) {`
	`107`	`+ if (!\is_scalar($input)) {`
`108`	`108`	`throw new InvalidArgumentException(sprintf('"%s" yielded a value of type "%s", but only scalars and stream resources are supported.', get_debug_type($this->input), get_debug_type($input)));`
`109`	`109`	`}`
`110`	`110`	`$input = (string) $input;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static function validateInput(string $caller, $input)`
`48`	`48`	`if (\is_string($input)) {`
`49`	`49`	`return $input;`
`50`	`50`	`}`
`51`		`- if (is_scalar($input)) {`
	`51`	`+ if (\is_scalar($input)) {`
`52`	`52`	`return (string) $input;`
`53`	`53`	`}`
`54`	`54`	`if ($input instanceof Process) {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ private function setPath($path)`
`37`	`37`
`38`	`38`	`public function testFind()`
`39`	`39`	`{`
`40`		`- if (ini_get('open_basedir')) {`
	`40`	`+ if (\ini_get('open_basedir')) {`
`41`	`41`	`$this->markTestSkipped('Cannot test when open_basedir is set');`
`42`	`42`	`}`
`43`	`43`
`@@ -51,7 +51,7 @@ public function testFind()`
`51`	`51`
`52`	`52`	`public function testFindWithDefault()`
`53`	`53`	`{`
`54`		`- if (ini_get('open_basedir')) {`
	`54`	`+ if (\ini_get('open_basedir')) {`
`55`	`55`	`$this->markTestSkipped('Cannot test when open_basedir is set');`
`56`	`56`	`}`
`57`	`57`
`@@ -67,7 +67,7 @@ public function testFindWithDefault()`
`67`	`67`
`68`	`68`	`public function testFindWithNullAsDefault()`
`69`	`69`	`{`
`70`		`- if (ini_get('open_basedir')) {`
	`70`	`+ if (\ini_get('open_basedir')) {`
`71`	`71`	`$this->markTestSkipped('Cannot test when open_basedir is set');`
`72`	`72`	`}`
`73`	`73`
`@@ -82,7 +82,7 @@ public function testFindWithNullAsDefault()`
`82`	`82`
`83`	`83`	`public function testFindWithExtraDirs()`
`84`	`84`	`{`
`85`		`- if (ini_get('open_basedir')) {`
	`85`	`+ if (\ini_get('open_basedir')) {`
`86`	`86`	`$this->markTestSkipped('Cannot test when open_basedir is set');`
`87`	`87`	`}`
`88`	`88`
`@@ -105,7 +105,7 @@ public function testFindWithOpenBaseDir()`
`105`	`105`	`$this->markTestSkipped('Cannot run test on windows');`
`106`	`106`	`}`
`107`	`107`
`108`		`- if (ini_get('open_basedir')) {`
	`108`	`+ if (\ini_get('open_basedir')) {`
`109`	`109`	`$this->markTestSkipped('Cannot test when open_basedir is set');`
`110`	`110`	`}`
`111`	`111`
`@@ -122,7 +122,7 @@ public function testFindWithOpenBaseDir()`
`122`	`122`	`*/`
`123`	`123`	`public function testFindProcessInOpenBasedir()`
`124`	`124`	`{`
`125`		`- if (ini_get('open_basedir')) {`
	`125`	`+ if (\ini_get('open_basedir')) {`
`126`	`126`	`$this->markTestSkipped('Cannot test when open_basedir is set');`
`127`	`127`	`}`
`128`	`128`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`@@ -140,7 +140,7 @@ public function testFindProcessInOpenBasedir()`
`140`	`140`
`141`	`141`	`public function testFindBatchExecutableOnWindows()`
`142`	`142`	`{`
`143`		`- if (ini_get('open_basedir')) {`
	`143`	`+ if (\ini_get('open_basedir')) {`
`144`	`144`	`$this->markTestSkipped('Cannot test when open_basedir is set');`
`145`	`145`	`}`
`146`	`146`	`if ('\\' !== \DIRECTORY_SEPARATOR) {`
Original file line number	Diff line number	Diff line change
`@@ -1133,7 +1133,7 @@ public function testTermSignalTerminatesProcessCleanly()`
`1133`	`1133`	`public function responsesCodeProvider()`
`1134`	`1134`	`{`
`1135`	`1135`	`return [`
`1136`		`- //expected output / getter / code to execute`
	`1136`	`+ // expected output / getter / code to execute`
`1137`	`1137`	`// [1,'getExitCode','exit(1);'],`
`1138`	`1138`	`// [true,'isSuccessful','exit();'],`
`1139`	`1139`	`['output', 'getOutput', 'echo \'output\';'],`