Merge branch '2.7' into 2.8

* 2.7:
  fixed CS
  fixed CS
  fixed CS
  Fix WebProfilerBundle compatiblity with HttpKernel < 2.7
  [Validator] Deprecated PHP7-incompatible constraints and related validators
  [DebugBundle] Allow alternative destination for dumps
  [DebugBundle] Use output mechanism of dumpers instead of echoing
  [DebugBundle] Always collect dumps
  [FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands
  Fix tests in HHVM
  CS: Pre incrementation/decrementation should be used if possible

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/composer.json

Author: fabpot

Command/AbstractConfigCommand.php

@@ -14,6 +14,7 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\StyleInterface;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
 /**
@@ -27,24 +28,21 @@ abstract class AbstractConfigCommand extends ContainerDebugCommand
 {
     protected function listBundles(OutputInterface $output)
     {
-        $output->writeln('Available registered bundles with their extension alias if available:');
-
-        if (class_exists('Symfony\Component\Console\Helper\Table')) {
-            $table = new Table($output);
-        } else {
-            $table = $this->getHelperSet()->get('table');
-        }
-
-        $table->setHeaders(array('Bundle name', 'Extension alias'));
+        $headers = array('Bundle name', 'Extension alias');
+        $rows = array();
         foreach ($this->getContainer()->get('kernel')->getBundles() as $bundle) {
             $extension = $bundle->getContainerExtension();
-            $table->addRow(array($bundle->getName(), $extension ? $extension->getAlias() : ''));
+            $rows[] = array($bundle->getName(), $extension ? $extension->getAlias() : '');
         }
 
-        if (class_exists('Symfony\Component\Console\Helper\Table')) {
-            $table->render();
+        $message = 'Available registered bundles with their extension alias if available:';
+        if ($output instanceof StyleInterface) {
+            $output->writeln(' '.$message);
+            $output->table($headers, $rows);
         } else {
-            $table->render($output);
+            $output->writeln($message);
+            $table = new Table($output);
+            $table->setHeaders($headers)->setRows($rows)->render($output);
         }
     }
 

Command/ConfigDebugCommand.php

@@ -15,6 +15,7 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Yaml\Yaml;
 
 /**
@@ -57,8 +58,9 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $output = new SymfonyStyle($input, $output);
         if (false !== strpos($input->getFirstArgument(), ':d')) {
-            $output->writeln('<comment>The use of "config:debug" command is deprecated since version 2.7 and will be removed in 3.0. Use the "debug:config" instead.</comment>');
+            $output->caution('The use of "config:debug" command is deprecated since version 2.7 and will be removed in 3.0. Use the "debug:config" instead.');
         }
 
         $name = $input->getArgument('name');

Command/ConfigDumpReferenceCommand.php

@@ -17,6 +17,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
  * A console command for dumping available configuration reference.
@@ -66,6 +67,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $output = new SymfonyStyle($input, $output);
         $name = $input->getArgument('name');
 
         if (empty($name)) {

Command/ContainerDebugCommand.php

@@ -145,7 +145,7 @@ protected function validateInput(InputInterface $input)
         $optionsCount = 0;
         foreach ($options as $option) {
             if ($input->getOption($option)) {
-                $optionsCount++;
+                ++$optionsCount;
             }
         }
 

Command/RouterDebugCommand.php

@@ -55,7 +55,7 @@ protected function configure()
             ))
             ->setDefinition(array(
                 new InputArgument('name', InputArgument::OPTIONAL, 'A route name'),
-                new InputOption('show-controllers', null,  InputOption::VALUE_NONE, 'Show assigned controllers in overview'),
+                new InputOption('show-controllers', null, InputOption::VALUE_NONE, 'Show assigned controllers in overview'),
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output route(s) in other formats', 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw route(s)'),
             ))

Console/Helper/DescriptorHelper.php

@@ -30,10 +30,10 @@ class DescriptorHelper extends BaseDescriptorHelper
     public function __construct()
     {
         $this
-            ->register('txt',  new TextDescriptor())
-            ->register('xml',  new XmlDescriptor())
+            ->register('txt', new TextDescriptor())
+            ->register('xml', new XmlDescriptor())
             ->register('json', new JsonDescriptor())
-            ->register('md',   new MarkdownDescriptor())
+            ->register('md', new MarkdownDescriptor())
         ;
     }
 }

Templating/Helper/CodeHelper.php

@@ -135,7 +135,7 @@ public function fileExcerpt($file, $line)
             $content = preg_split('#<br />#', $code);
 
             $lines = array();
-            for ($i = max($line - 3, 1), $max = min($line + 3, count($content)); $i <= $max; $i++) {
+            for ($i = max($line - 3, 1), $max = min($line + 3, count($content)); $i <= $max; ++$i) {
                 $lines[] = '<li'.($i == $line ? ' class="selected"' : '').'><code>'.self::fixCodeMarkup($content[$i - 1]).'</code></li>';
             }
 

Tests/Templating/Helper/AssetsHelper.php renamed to Tests/Templating/Helper/AssetsHelperTest.php

@@ -147,7 +147,7 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)
     {
         $tokenIterator = new \ArrayIterator($tokens);
 
-        for ($key = 0; $key < $tokenIterator->count(); $key++) {
+        for ($key = 0; $key < $tokenIterator->count(); ++$key) {
             foreach ($this->sequences as $sequence) {
                 $message = '';
                 $tokenIterator->seek($key);

Translation/PhpExtractor.php

@@ -35,7 +35,7 @@
     "require-dev": {
         "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/browser-kit": "~2.4|~3.0.0",
-        "symfony/console": "~2.6|~3.0.0",
+        "symfony/console": "~2.7|~3.0.0",
         "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
         "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
         "symfony/finder": "~2.0,>=2.0.5|~3.0.0",