projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull merge.
[yaffs-website]
/
vendor
/
symfony
/
process
/
Tests
/
ProcessTest.php
diff --git
a/vendor/symfony/process/Tests/ProcessTest.php
b/vendor/symfony/process/Tests/ProcessTest.php
index bca7ddd9af10db79d142421d7bb69a8b5cbe7b04..da74a3db225af2c7a30e457c38d80a7784816a27 100644
(file)
--- a/
vendor/symfony/process/Tests/ProcessTest.php
+++ b/
vendor/symfony/process/Tests/ProcessTest.php
@@
-33,7
+33,7
@@
class ProcessTest extends TestCase
public static function setUpBeforeClass()
{
$phpBin = new PhpExecutableFinder();
public static function setUpBeforeClass()
{
$phpBin = new PhpExecutableFinder();
- self::$phpBin = getenv('SYMFONY_PROCESS_PHP_TEST_BINARY') ?: ('phpdbg' === PHP_SAPI ? 'php' : $phpBin->find());
+ self::$phpBin = getenv('SYMFONY_PROCESS_PHP_TEST_BINARY') ?: ('phpdbg' ===
\
PHP_SAPI ? 'php' : $phpBin->find());
ob_start();
phpinfo(INFO_GENERAL);
ob_start();
phpinfo(INFO_GENERAL);
@@
-54,7
+54,7
@@
class ProcessTest extends TestCase
*/
public function testInvalidCwd()
{
*/
public function testInvalidCwd()
{
- if ('\\' === DIRECTORY_SEPARATOR) {
+ if ('\\' ===
\
DIRECTORY_SEPARATOR) {
$this->markTestSkipped('False-positive on Windows/appveyor.');
}
$this->markTestSkipped('False-positive on Windows/appveyor.');
}
@@
-68,7
+68,7
@@
class ProcessTest extends TestCase
public function testThatProcessDoesNotThrowWarningDuringRun()
{
public function testThatProcessDoesNotThrowWarningDuringRun()
{
- if ('\\' === DIRECTORY_SEPARATOR) {
+ if ('\\' ===
\
DIRECTORY_SEPARATOR) {
$this->markTestSkipped('This test is transient on Windows');
}
@trigger_error('Test Error', E_USER_NOTICE);
$this->markTestSkipped('This test is transient on Windows');
}
@trigger_error('Test Error', E_USER_NOTICE);
@@
-158,7
+158,7
@@
class ProcessTest extends TestCase
$o = $p->getOutput();
$o = $p->getOutput();
- $this->assertEquals($expectedOutputSize, strlen($o));
+ $this->assertEquals($expectedOutputSize,
\
strlen($o));
}
public function testCallbacksAreExecutedWithStart()
}
public function testCallbacksAreExecutedWithStart()
@@
-200,8
+200,8
@@
class ProcessTest extends TestCase
$p->setInput($expected);
$p->run();
$p->setInput($expected);
$p->run();
- $this->assertEquals($expectedLength, strlen($p->getOutput()));
- $this->assertEquals($expectedLength, strlen($p->getErrorOutput()));
+ $this->assertEquals($expectedLength,
\
strlen($p->getOutput()));
+ $this->assertEquals($expectedLength,
\
strlen($p->getErrorOutput()));
}
/**
}
/**
@@
-222,8
+222,8
@@
class ProcessTest extends TestCase
fclose($stream);
fclose($stream);
- $this->assertEquals($expectedLength, strlen($p->getOutput()));
- $this->assertEquals($expectedLength, strlen($p->getErrorOutput()));
+ $this->assertEquals($expectedLength,
\
strlen($p->getOutput()));
+ $this->assertEquals($expectedLength,
\
strlen($p->getErrorOutput()));
}
public function testLiveStreamAsInput()
}
public function testLiveStreamAsInput()
@@
-303,7
+303,7
@@
class ProcessTest extends TestCase
public function chainedCommandsOutputProvider()
{
public function chainedCommandsOutputProvider()
{
- if ('\\' === DIRECTORY_SEPARATOR) {
+ if ('\\' ===
\
DIRECTORY_SEPARATOR) {
return array(
array("2 \r\n2\r\n", '&&', '2'),
);
return array(
array("2 \r\n2\r\n", '&&', '2'),
);
@@
-422,7
+422,7
@@
class ProcessTest extends TestCase
public function testZeroAsOutput()
{
public function testZeroAsOutput()
{
- if ('\\' === DIRECTORY_SEPARATOR) {
+ if ('\\' ===
\
DIRECTORY_SEPARATOR) {
// see http://stackoverflow.com/questions/7105433/windows-batch-echo-without-new-line
$p = $this->getProcess('echo | set /p dummyName=0');
} else {
// see http://stackoverflow.com/questions/7105433/windows-batch-echo-without-new-line
$p = $this->getProcess('echo | set /p dummyName=0');
} else {
@@
-435,7
+435,7
@@
class ProcessTest extends TestCase
public function testExitCodeCommandFailed()
{
public function testExitCodeCommandFailed()
{
- if ('\\' === DIRECTORY_SEPARATOR) {
+ if ('\\' ===
\
DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does not support POSIX exit code');
}
$this->skipIfNotEnhancedSigchild();
$this->markTestSkipped('Windows does not support POSIX exit code');
}
$this->skipIfNotEnhancedSigchild();
@@
-447,12
+447,9
@@
class ProcessTest extends TestCase
$this->assertGreaterThan(0, $process->getExitCode());
}
$this->assertGreaterThan(0, $process->getExitCode());
}
- /**
- * @group tty
- */
public function testTTYCommand()
{
public function testTTYCommand()
{
- if ('\\' === DIRECTORY_SEPARATOR) {
+ if ('\\' ===
\
DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does not have /dev/tty support');
}
$this->markTestSkipped('Windows does not have /dev/tty support');
}
@@
-465,12
+462,9
@@
class ProcessTest extends TestCase
$this->assertSame(Process::STATUS_TERMINATED, $process->getStatus());
}
$this->assertSame(Process::STATUS_TERMINATED, $process->getStatus());
}
- /**
- * @group tty
- */
public function testTTYCommandExitCode()
{
public function testTTYCommandExitCode()
{
- if ('\\' === DIRECTORY_SEPARATOR) {
+ if ('\\' ===
\
DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does have /dev/tty support');
}
$this->skipIfNotEnhancedSigchild();
$this->markTestSkipped('Windows does have /dev/tty support');
}
$this->skipIfNotEnhancedSigchild();
@@
-488,7
+482,7
@@
class ProcessTest extends TestCase
*/
public function testTTYInWindowsEnvironment()
{
*/
public function testTTYInWindowsEnvironment()
{
- if ('\\' !== DIRECTORY_SEPARATOR) {
+ if ('\\' !==
\
DIRECTORY_SEPARATOR) {
$this->markTestSkipped('This test is for Windows platform only');
}
$this->markTestSkipped('This test is for Windows platform only');
}
@@
-575,7
+569,7
@@
class ProcessTest extends TestCase
{
$process = $this->getProcess('echo foo');
$process->run();
{
$process = $this->getProcess('echo foo');
$process->run();
- $this->assertGreaterThan(0, strlen($process->getOutput()));
+ $this->assertGreaterThan(0,
\
strlen($process->getOutput()));
}
public function testGetExitCodeIsNullOnStart()
}
public function testGetExitCodeIsNullOnStart()
@@
-674,7
+668,7
@@
class ProcessTest extends TestCase
public function testProcessIsNotSignaled()
{
public function testProcessIsNotSignaled()
{
- if ('\\' === DIRECTORY_SEPARATOR) {
+ if ('\\' ===
\
DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does not support POSIX signals');
}
$this->skipIfNotEnhancedSigchild();
$this->markTestSkipped('Windows does not support POSIX signals');
}
$this->skipIfNotEnhancedSigchild();
@@
-686,7
+680,7
@@
class ProcessTest extends TestCase
public function testProcessWithoutTermSignal()
{
public function testProcessWithoutTermSignal()
{
- if ('\\' === DIRECTORY_SEPARATOR) {
+ if ('\\' ===
\
DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does not support POSIX signals');
}
$this->skipIfNotEnhancedSigchild();
$this->markTestSkipped('Windows does not support POSIX signals');
}
$this->skipIfNotEnhancedSigchild();
@@
-698,7
+692,7
@@
class ProcessTest extends TestCase
public function testProcessIsSignaledIfStopped()
{
public function testProcessIsSignaledIfStopped()
{
- if ('\\' === DIRECTORY_SEPARATOR) {
+ if ('\\' ===
\
DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Windows does not support POSIX signals');
}
$this->skipIfNotEnhancedSigchild();
$this->markTestSkipped('Windows does not support POSIX signals');
}
$this->skipIfNotEnhancedSigchild();
@@
-716,7
+710,7
@@
class ProcessTest extends TestCase
*/
public function testProcessThrowsExceptionWhenExternallySignaled()
{
*/
public function testProcessThrowsExceptionWhenExternallySignaled()
{
- if (!function_exists('posix_kill')) {
+ if (!
\
function_exists('posix_kill')) {
$this->markTestSkipped('Function posix_kill is required.');
}
$this->skipIfNotEnhancedSigchild(false);
$this->markTestSkipped('Function posix_kill is required.');
}
$this->skipIfNotEnhancedSigchild(false);
@@
-1020,7
+1014,7
@@
class ProcessTest extends TestCase
*/
public function testWrongSignal($signal)
{
*/
public function testWrongSignal($signal)
{
- if ('\\' === DIRECTORY_SEPARATOR) {
+ if ('\\' ===
\
DIRECTORY_SEPARATOR) {
$this->markTestSkipped('POSIX signals do not work on Windows');
}
$this->markTestSkipped('POSIX signals do not work on Windows');
}
@@
-1183,7
+1177,7
@@
class ProcessTest extends TestCase
'include \''.__DIR__.'/PipeStdinInStdoutStdErrStreamSelect.php\';',
);
'include \''.__DIR__.'/PipeStdinInStdoutStdErrStreamSelect.php\';',
);
- if ('\\' === DIRECTORY_SEPARATOR) {
+ if ('\\' ===
\
DIRECTORY_SEPARATOR) {
// Avoid XL buffers on Windows because of https://bugs.php.net/bug.php?id=65650
$sizes = array(1, 2, 4, 8);
} else {
// Avoid XL buffers on Windows because of https://bugs.php.net/bug.php?id=65650
$sizes = array(1, 2, 4, 8);
} else {
@@
-1486,7
+1480,7
@@
class ProcessTest extends TestCase
{
$p = new Process(array('/usr/bin/php'));
{
$p = new Process(array('/usr/bin/php'));
- $expected = '\\' === DIRECTORY_SEPARATOR ? '"/usr/bin/php"' : "'/usr/bin/php'";
+ $expected = '\\' ===
\
DIRECTORY_SEPARATOR ? '"/usr/bin/php"' : "'/usr/bin/php'";
$this->assertSame($expected, $p->getCommandLine());
}
$this->assertSame($expected, $p->getCommandLine());
}
@@
-1498,7
+1492,7
@@
class ProcessTest extends TestCase
$p = new Process(array(self::$phpBin, '-r', 'echo $argv[1];', $arg));
$p->run();
$p = new Process(array(self::$phpBin, '-r', 'echo $argv[1];', $arg));
$p->run();
- $this->assertSame($arg, $p->getOutput());
+ $this->assertSame(
(string)
$arg, $p->getOutput());
}
/**
}
/**
@@
-1511,7
+1505,7
@@
class ProcessTest extends TestCase
$p->inheritEnvironmentVariables(false);
$p->run();
$p->inheritEnvironmentVariables(false);
$p->run();
- $this->assertSame($arg, $p->getOutput());
+ $this->assertSame(
(string)
$arg, $p->getOutput());
}
public function testRawCommandLine()
}
public function testRawCommandLine()
@@
-1541,12
+1535,15
@@
EOTXT;
yield array("a!b\tc");
yield array('a\\\\"\\"');
yield array('éÉèÈàÀöä');
yield array("a!b\tc");
yield array('a\\\\"\\"');
yield array('éÉèÈàÀöä');
+ yield array(null);
+ yield array(1);
+ yield array(1.1);
}
public function testEnvArgument()
{
$env = array('FOO' => 'Foo', 'BAR' => 'Bar');
}
public function testEnvArgument()
{
$env = array('FOO' => 'Foo', 'BAR' => 'Bar');
- $cmd = '\\' === DIRECTORY_SEPARATOR ? 'echo !FOO! !BAR! !BAZ!' : 'echo $FOO $BAR $BAZ';
+ $cmd = '\\' ===
\
DIRECTORY_SEPARATOR ? 'echo !FOO! !BAR! !BAZ!' : 'echo $FOO $BAR $BAZ';
$p = new Process($cmd, null, $env);
$p->run(null, array('BAR' => 'baR', 'BAZ' => 'baZ'));
$p = new Process($cmd, null, $env);
$p->run(null, array('BAR' => 'baR', 'BAZ' => 'baZ'));
@@
-1556,9
+1553,9
@@
EOTXT;
/**
* @param string $commandline
/**
* @param string $commandline
- * @param
null|string
$cwd
- * @param
null|array
$env
- * @param
null|string
$input
+ * @param
string|null
$cwd
+ * @param
array|null
$env
+ * @param
string|null
$input
* @param int $timeout
* @param array $options
*
* @param int $timeout
* @param array $options
*