Merge branch '2.3' into 2.4

* 2.3: (35 commits)
  [Form] Fix PHPDoc for builder setData methods The underlying data variable is typed as mixed whereas the methods paramers where typed as array.
  fixed CS
  [Intl] Improved bundle reader implementations
  [Console] guarded against invalid aliases
  switch before_script to before_install and script to install
  fixed typo
  [HttpFoundation] Request - URI - comment improvements
  [Security] Added more tests
  remove `service` parameter type from XSD
  [Intl] Added exception handler to command line scripts
  [Intl] Fixed a few bugs in TextBundleWriter
  [Intl] Updated icu.ini up to ICU 53
  [Intl] Removed non-working $fallback argument from ArrayAccessibleResourceBundle
  Use separated function to resolve command and related arguments
  [SwiftmailerBridge] Bump allowed versions of swiftmailer
  [FrameworkBundle] Remove invalid markup
  [Intl] Added "internal" tag to all classes under Symfony\Component\Intl\ResourceBundle
  Remove routes for removed WebProfiler actions
  [Security] Fix usage of unexistent method in DoctrineAclCache.
  backport more error information from 2.6 to 2.3
  ...

Conflicts:
	.travis.yml
	src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
	src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Process/PhpExecutableFinder.php

Author: fabpot

Command/ServerRunCommand.php

@@ -101,15 +101,34 @@ protected function execute(InputInterface $input, OutputInterface $output)
             ->locateResource(sprintf('@FrameworkBundle/Resources/config/router_%s.php', $env))
         ;
 
+        if (!file_exists($router)) {
+            $output->writeln(sprintf('<error>The given router script "%s" does not exist</error>', $router));
+
+            return 1;
+        }
+
+        $router = realpath($router);
+
         $output->writeln(sprintf("Server running on <info>http://%s</info>\n", $input->getArgument('address')));
 
         $builder = new ProcessBuilder(array(PHP_BINARY, '-S', $input->getArgument('address'), $router));
         $builder->setWorkingDirectory($documentRoot);
         $builder->setTimeout(null);
-        $builder->getProcess()->run(function ($type, $buffer) use ($output) {
+        $process = $builder->getProcess();
+        $process->run(function ($type, $buffer) use ($output) {
             if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
                 $output->write($buffer);
             }
         });
+
+        if (!$process->isSuccessful()) {
+            $output->writeln('<error>Built-in server terminated unexpectedly</error>');
+
+            if (OutputInterface::VERBOSITY_VERBOSE > $output->getVerbosity()) {
+                $output->writeln('<error>Run the command again with -v option for more details</error>');
+            }
+        }
+
+        return $process->getExitCode();
     }
 }

Resources/views/Form/form_widget_compound.html.php

@@ -1,10 +1,6 @@
 <div <?php echo $view['form']->block($form, 'widget_container_attributes') ?>>
     <?php if (!$form->parent && $errors): ?>
-    <tr>
-        <td colspan="2">
-            <?php echo $view['form']->errors($form) ?>
-        </td>
-    </tr>
+    <?php echo $view['form']->errors($form) ?>
     <?php endif ?>
     <?php echo $view['form']->block($form, 'form_rows') ?>
     <?php echo $view['form']->rest($form) ?>

Resources/views/FormTable/form_widget_compound.html.php

@@ -1,6 +1,10 @@
 <table <?php echo $view['form']->block($form, 'widget_container_attributes') ?>>
-    <?php if (!$form->parent): ?>
-    <?php echo $view['form']->errors($form) ?>
+    <?php if (!$form->parent && $errors): ?>
+    <tr>
+        <td colspan="2">
+            <?php echo $view['form']->errors($form) ?>
+        </td>
+    </tr>
     <?php endif ?>
     <?php echo $view['form']->block($form, 'form_rows') ?>
     <?php echo $view['form']->rest($form) ?>