Merge branch '2.5'

* 2.5: (43 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:
	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
	src/Symfony/Component/HttpKernel/HttpCache/Esi.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php
	src/Symfony/Component/Yaml/Parser.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php

Author: fabpot

Command/ServerRunCommand.php

@@ -130,6 +130,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) ?>