merged 2.0
This commit is contained in:
commit
8c0517f305
@ -55,6 +55,10 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
|
||||
*/
|
||||
public function testProcessPipes($expected, $code)
|
||||
{
|
||||
if (strpos(PHP_OS, "WIN") === 0 && version_compare(phpversion(), "5.3.9", "<")) {
|
||||
$this->markTestSkipped('Test hangs on Windows & PHP due to https://bugs.php.net/bug.php?id=60120 fixed in http://svn.php.net/viewvc?view=revision&revision=318366');
|
||||
}
|
||||
|
||||
$p = new Process(sprintf('php -r %s', escapeshellarg($code)));
|
||||
$p->setStdin($expected);
|
||||
$p->run();
|
||||
|
@ -29,7 +29,7 @@ $deps = array(
|
||||
array('doctrine', 'http://github.com/doctrine/doctrine2.git', 'origin/master'),
|
||||
array('doctrine-dbal', 'http://github.com/doctrine/dbal.git', 'origin/master'),
|
||||
array('doctrine-common', 'http://github.com/doctrine/common.git', 'origin/master'),
|
||||
array('monolog', 'http://github.com/Seldaek/monolog.git', '1.0.1'),
|
||||
array('monolog', 'http://github.com/Seldaek/monolog.git', '1.0.2'),
|
||||
array('swiftmailer', 'http://github.com/swiftmailer/swiftmailer.git', 'origin/master'),
|
||||
array('twig', 'http://github.com/fabpot/Twig.git', 'origin/master'),
|
||||
);
|
||||
|
Reference in New Issue
Block a user