8000 Merge branch '5.4' into 6.0 · symfony/process@44270a0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 44270a0

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.0
* 5.4: CS fixes Bump Symfony version to 5.4.11 Update VERSION for 5.4.10 Update CHANGELOG for 5.4.10 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
2 parents d074154 + 6e75fe6 commit 44270a0

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

‎ExecutableFinder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public function addSuffix(string $suffix)
4646
*/
4747
public function find(string $name, string $default = null, array $extraDirs = []): ?string
4848
{
49-
if (ini_get('open_basedir')) {
50-
$searchPath = array_merge(explode(\PATH_SEPARATOR, ini_get('open_basedir')), $extraDirs);
49+
if (\ini_get('open_basedir')) {
50+
$searchPath = array_merge(explode(\PATH_SEPARATOR, \ini_get('open_basedir')), $extraDirs);
5151
$dirs = [];
5252
foreach ($searchPath as $path) {
5353
// Silencing against https://bugs.php.net/69240

‎Pipes/AbstractPipes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ protected function write(): ?array
104104
stream_set_blocking($input, 0);
105105
} elseif (!isset($this->inputBuffer[0])) {
106106
if (!\is_string($input)) {
107-
if (!is_scalar($input)) {
107+
if (!\is_scalar($input)) {
108108
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)));
109109
}
110110
$input = (string) $input;

‎ProcessUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static function validateInput(string $caller, mixed $input): mixed
4646
if (\is_string($input)) {
4747
return $input;
4848
}
49-
if (is_scalar($input)) {
49+
if (\is_scalar($input)) {
5050
return (string) $input;
5151
}
5252
if ($input instanceof Process) {

‎Tests/ExecutableFinderTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private function setPath($path)
3737

3838
public function testFind()
3939
{
40-
if (ini_get('open_basedir')) {
40+
if (\ini_get('open_basedir')) {
4141
$this->markTestSkipped('Cannot test when open_basedir is set');
4242
}
4343

@@ -51,7 +51,7 @@ public function testFind()
5151

5252
public function testFindWithDefault()
5353
{
54-
if (ini_get('open_basedir')) {
54+
if (\ini_get('open_basedir')) {
5555
$this->markTestSkipped('Cannot test when open_basedir is set');
5656
}
5757

@@ -67,7 +67,7 @@ public function testFindWithDefault()
6767

6868
public function testFindWithNullAsDefault()
6969
{
70-
if (ini_get('open_basedir')) {
70+
if (\ini_get('open_basedir')) {
7171
$this->markTestSkipped('Cannot test when open_basedir is set');
7272
}
7373

@@ -82,7 +82,7 @@ public function testFindWithNullAsDefault()
8282

8383
public function testFindWithExtraDirs()
8484
{
85-
if (ini_get('open_basedir')) {
85+
if (\ini_get('open_basedir')) {
8686
$this->markTestSkipped('Cannot test when open_basedir is set');
8787
}
8888

@@ -105,7 +105,7 @@ public function testFindWithOpenBaseDir()
105105
$this->markTestSkipped('Cannot run test on windows');
106106
}
107107

108-
if (ini_get('open_basedir')) {
108+
if (\ini_get('open_basedir')) {
109109
$this->markTestSkipped('Cannot test when open_basedir is set');
110110
}
111111

@@ -122,7 +122,7 @@ public function testFindWithOpenBaseDir()
122122
*/
123123
public function testFindProcessInOpenBasedir()
124124
{
125-
if (ini_get('open_basedir')) {
125+
if (\ini_get('open_basedir')) {
126126
$this->markTestSkipped('Cannot test when open_basedir is set');
127127
}
128128
if ('\\' === \DIRECTORY_SEPARATOR) {
@@ -140,7 +140,7 @@ public function testFindProcessInOpenBasedir()
140140

141141
public function testFindBatchExecutableOnWindows()
142142
{
143-
if (ini_get('open_basedir')) {
143+
if (\ini_get('open_basedir')) {
144144
$this->markTestSkipped('Cannot test when open_basedir is set');
145145
}
146146
if ('\\' !== \DIRECTORY_SEPARATOR) {

‎Tests/ProcessTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,7 @@ public function testTermSignalTerminatesProcessCleanly()
11331133
public function responsesCodeProvider()
11341134
{
11351135
return [
1136-
//expected output / getter / code to execute
1136+
// expected output / getter / code to execute
11371137
// [1,'getExitCode','exit(1);'],
11381138
// [true,'isSuccessful','exit();'],
11391139
['output', 'getOutput', 'echo \'output\';'],

0 commit comments

Comments
 (0)
0