diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
index 1d01e04c12..d2255e50be 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
@@ -90,7 +90,7 @@ EOF
->locateResource(sprintf('@FrameworkBundle/Resources/config/router_%s.php', $env))
;
- $output->writeln(sprintf("Server running on %s\n", $input->getArgument('address')));
+ $output->writeln(sprintf("Server running on http://%s\n", $input->getArgument('address')));
$builder = new ProcessBuilder(array(PHP_BINARY, '-S', $input->getArgument('address'), $router));
$builder->setWorkingDirectory($input->getOption('docroot'));
diff --git a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
index a17119260a..be686c5cd7 100644
--- a/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
+++ b/src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
@@ -80,6 +80,7 @@ class XmlUtilsTest extends \PHPUnit_Framework_TestCase
array(array('foo' => null), ''),
array(array('foo' => 'bar'), 'bar'),
array(array('foo' => array('foo' => 'bar')), ''),
+ array(array('foo' => array('foo' => 0)), '0'),
array(array('foo' => array('foo' => 'bar')), 'bar'),
array(array('foo' => array('foo' => 'bar', 'value' => 'text')), 'text'),
array(array('foo' => array('attr' => 'bar', 'foo' => 'text')), 'text'),
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
index de3e230c4e..815fd3903e 100644
--- a/src/Symfony/Component/Config/Util/XmlUtils.php
+++ b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -132,7 +132,7 @@ class XmlUtils
$nodeValue = false;
foreach ($element->childNodes as $node) {
if ($node instanceof \DOMText) {
- if (trim($node->nodeValue)) {
+ if ('' !== trim($node->nodeValue)) {
$nodeValue = trim($node->nodeValue);
$empty = false;
}
diff --git a/src/Symfony/Component/Process/ProcessPipes.php b/src/Symfony/Component/Process/ProcessPipes.php
index c35d7bc96b..67b11e615b 100644
--- a/src/Symfony/Component/Process/ProcessPipes.php
+++ b/src/Symfony/Component/Process/ProcessPipes.php
@@ -289,9 +289,13 @@ class ProcessPipes
foreach ($r as $pipe) {
$type = array_search($pipe, $this->pipes);
- $data = fread($pipe, 8192);
- if (strlen($data) > 0) {
+ $data = '';
+ while ($dataread = fread($pipe, 8192)) {
+ $data .= $dataread;
+ }
+
+ if ($data) {
$read[$type] = $data;
}
diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
index b9e4d4e203..99239461b8 100644
--- a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -81,6 +81,32 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
$this->assertLessThan(1.8, $duration);
}
+ public function testAllOutputIsActuallyReadOnTermination()
+ {
+ // this code will result in a maximum of 2 reads of 8192 bytes by calling
+ // start() and isRunning(). by the time getOutput() is called the process
+ // has terminated so the internal pipes array is already empty. normally
+ // the call to start() will not read any data as the process will not have
+ // generated output, but this is non-deterministic so we must count it as
+ // a possibility. therefore we need 2 * 8192 plus another byte which will
+ // never be read.
+ $expectedOutputSize = 16385;
+
+ $code = sprintf('echo str_repeat(\'*\', %d);', $expectedOutputSize);
+ $p = $this->getProcess(sprintf('php -r %s', escapeshellarg($code)));
+
+ $p->start();
+ usleep(250000);
+
+ if ($p->isRunning()) {
+ $this->fail('Process execution did not complete in the required time frame');
+ }
+
+ $o = $p->getOutput();
+
+ $this->assertEquals($expectedOutputSize, strlen($o));
+ }
+
public function testCallbacksAreExecutedWithStart()
{
$data = '';