Merge branch '2.4' into 2.5

* 2.4: (39 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
  [Validator] The ratio of the ImageValidator is rounded to two decimals now
  [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.
  ...

Conflicts:
	.travis.yml
	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Process/PhpExecutableFinder.php

Author: fabpot

Command/ServerRunCommand.php

@@ -113,6 +113,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $process->run($callback);
+
+        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();
     }
 
     private function createPhpProcessBuilder(InputInterface $input, OutputInterface $output, $env)
@@ -123,6 +133,14 @@ private function createPhpProcessBuilder(InputInterface $input, OutputInterface
             ->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);
+
         return new ProcessBuilder(array(PHP_BINARY, '-S', $input->getArgument('address'), $router));
     }
 }

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) ?>