Merge branch '2.7' into 2.8

* 2.7:
  added a comment about a workaround
  [Finder] no PHP warning on empty directory iteration
  fixed CS

Author: fabpot

src/Symfony/Bridge/Twig/Command/LintCommand.php

@@ -207,7 +207,7 @@ private function displayJson(OutputInterface $output, $filesInfo)
             }
         });
 
-        $output->writeln(json_encode($filesInfo, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES : 0));
+        $output->writeln(json_encode($filesInfo, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES : 0));
 
         return min($errors, 1);
     }

src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php

@@ -137,6 +137,11 @@ public function isRewindable()
             return $this->rewindable;
         }
 
+        // workaround for an HHVM bug, should be removed when https://github.com/facebook/hhvm/issues/7281 is fixed
+        if ('' === $this->getPath()) {
+            return $this->rewindable = false;
+        }
+
         if (false !== $stream = @opendir($this->getPath())) {
             $infos = stream_get_meta_data($stream);
             closedir($stream);