diff --git a/tests/Symfony/Tests/Component/Process/ProcessTest.php b/tests/Symfony/Tests/Component/Process/ProcessTest.php index 361701c814..cf72886794 100644 --- a/tests/Symfony/Tests/Component/Process/ProcessTest.php +++ b/tests/Symfony/Tests/Component/Process/ProcessTest.php @@ -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(); diff --git a/vendors.php b/vendors.php index 171c3e99e9..eae0820b73 100755 --- a/vendors.php +++ b/vendors.php @@ -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'), );