diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

attempts to fix tests on Travis

Browse Source
This commit is contained in:
Johannes M. Schmitt 2013-08-03 09:57:35 +02:00
parent 2ff187038a
commit 6c11207573
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Symfony/Component/Process/Process.php
View File

@ -120,6 +120,27 @@ class Process
159 => 'Bad syscall',
);
/**
* Returns whether PTY is supported on the current operating system.
*
* @return Boolean
*/
public static function isPtySupported()
{
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
return false;
}
$proc = @proc_open('echo 1', array(array('pty'), array('pty'), array('pty')), $pipes);
if (is_resource($proc)) {
proc_close($proc);
return true;
}
return false;
}
/**
* Constructor.
*
@ -1183,7 +1204,7 @@ class Process
array('file', '/dev/tty', 'w'),
array('file', '/dev/tty', 'w'),
);
} elseif ($this->pty) {
} elseif ($this->pty && self::isPtySupported()) {
$descriptors = array(
array('pty'),
array('pty'),

4
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
View File

@ -205,8 +205,8 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
*/
public function testPTYCommand()
{
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
$this->markTestSkipped('Windows does not have PTY support.');
if ( ! Process::isPtySupported()) {
$this->markTestSkipped('PTY is not supported on this operating system.');
}
$process = $this->getProcess('echo "foo"');