[Console] HHVM read input stream bug

Author: Marvin Butkereit

src/Symfony/Bridge/PhpUnit/README.md

@@ -5,7 +5,6 @@ Provides utilities for PHPUnit, especially user deprecation notices management.
 
 It comes with the following features:
 
- * disable the garbage collector;
  * enforce a consistent `C` locale;
  * auto-register `class_exists` to load Doctrine annotations;
  * print a user deprecation notices summary at the end of the test suite;

src/Symfony/Bridge/PhpUnit/bootstrap.php

@@ -17,12 +17,6 @@
     return;
 }
 
-if (PHP_VERSION_ID >= 50400 && gc_enabled()) {
-    // Disabling Zend Garbage Collection to prevent segfaults with PHP5.4+
-    // https://bugs.php.net/bug.php?id=53976
-    gc_disable();
-}
-
 // Enforce a consistent locale
 setlocale(LC_ALL, 'C');
 

src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php

@@ -164,9 +164,18 @@ protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = tr
         }
 
         // fix references to kernel/container related classes
-        $search = $tempKernel->getName().ucfirst($tempKernel->getEnvironment());
-        $replace = $realKernel->getName().ucfirst($realKernel->getEnvironment());
-        foreach (Finder::create()->files()->name($search.'*')->in($warmupDir) as $file) {
+        $fileSearch = $tempKernel->getName().ucfirst($tempKernel->getEnvironment()).'*';
+        $search = array(
+            $tempKernel->getName().ucfirst($tempKernel->getEnvironment()),
+            sprintf('\'kernel.name\' => \'%s\'', $tempKernel->getName()),
+            sprintf('key="kernel.name">%s<', $tempKernel->getName()),
+        );
+        $replace = array(
+            $realKernel->getName().ucfirst($realKernel->getEnvironment()),
+            sprintf('\'kernel.name\' => \'%s\'', $realKernel->getName()),
+            sprintf('key="kernel.name">%s<', $realKernel->getName()),
+        );
+        foreach (Finder::create()->files()->name($fileSearch)->in($warmupDir) as $file) {
             $content = str_replace($search, $replace, file_get_contents($file));
             file_put_contents(str_replace($search, $replace, $file), $content);
             unlink($file);

src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml

@@ -46,7 +46,9 @@
             <deprecated>The "%service_id%" service is deprecated since Symfony 2.7 and will be removed in 3.0. Use the "request_stack" service instead.</deprecated>
         </service>
 
-        <service id="service_container" synthetic="true" />
+        <service id="service_container" synthetic="true">
+            <autowiring-type>Symfony\Component\DependencyInjection\ContainerInterface</autowiring-type>
+        </service>
 
         <service id="kernel" synthetic="true" />
 

src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php

@@ -80,10 +80,14 @@ private static function getPhpUnitCliConfigArgument()
             if (preg_match('/^-[^ \-]*c$/', $testArg) || $testArg === '--configuration') {
                 $dir = realpath($reversedArgs[$argIndex - 1]);
                 break;
-            } elseif (strpos($testArg, '--configuration=') === 0) {
+            } elseif (0 === strpos($testArg, '--configuration=')) {
                 $argPath = substr($testArg, strlen('--configuration='));
                 $dir = realpath($argPath);
                 break;
+            } elseif (0 === strpos($testArg, '-c')) {
+                $argPath = substr($testArg, strlen('-c'));
+                $dir = realpath($argPath);
+                break;
             }
         }
 

src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php

@@ -81,5 +81,6 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()
             }
         }
         $this->assertTrue($found, 'Kernel file should present as resource');
+        $this->assertRegExp(sprintf('/\'kernel.name\'\s*=>\s*\'%s\'/', $this->kernel->getName()), file_get_contents($containerFile), 'kernel.name is properly set on the dumped container');
     }
 }

src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig

@@ -98,7 +98,7 @@
 
         if (clazz) {
             var tags = document.getElementsByTagName('*');
-            for (i = tags.length - 1; i >= 0 ; i--) {
+            for (i = tags.length - 1; i >= 0; i--) {
                 if (tags[i].className === clazz) {
                     tags[i].style.display = 'none';
                 }

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig

@@ -184,7 +184,7 @@
 
         {% for index, call in stack if index > 1 %}
             {% if index == 2 %}
-                <ul class="sf-call-stack" id="{{ id }}" class="hidden">
+                <ul class="sf-call-stack hidden" id="{{ id }}">
             {% endif %}
 
             {% if call.class is defined %}

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig

@@ -188,6 +188,7 @@
                     Sfjs.removeClass(ajaxToolbarPanel, 'sf-toolbar-status-red');
                 } else if (state == 'error') {
                     Sfjs.addClass(ajaxToolbarPanel, 'sf-toolbar-status-red');
+                    Sfjs.removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading');
                 } else {
                     Sfjs.addClass(ajaxToolbarPanel, 'sf-ajax-request-loading');
                 }

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig

@@ -20,6 +20,7 @@
 .sf-minitoolbar img {
     max-height: 24px;
     max-width: 24px;
+    display: inline;
 }
 
 .sf-toolbarreset * {