Merge branch '2.5'

* 2.5: (33 commits)
  [Validator] Added Swedish translations
  [Validator] Fixed ExpressionValidator when the validation root is not an object
  [Validator] Fixed: Made it possible (again) to pass a class name to Validator::validatePropertyValue()
  Fix incorrect romanian plural translations
  fix axes handling in Crawler::filterXPath()
  fix some docblocks
  Fixed self-reference in 'service_container' service breaks garbage collection (and clone).
  [Process] Fix tests when pcntl is not available.
  [DependencyInjection] Roll back changes made to generated files.
  [Console] Roll back changes made to fixture files.
  Issue #11489 Added some CA and ES translations
  [Validator] Added more detailed inline documentation
  [Validator] Removed information from the violation output if the value is an array, object or resource
  partially reverted previous commit
  fixed CS
  Add point about ConsoleLogger to Console 2.5 changelog
  [Validator] Fixed failing tests
  [Validator] CS fixes
  [FrameworkBundle] Made ConstraintValidatorFactory aware of the legacy validators
  [Validator] Added extensive test coverage for the constraint validators for the different APIs
  ...

Conflicts:
	src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf

Author: webmozart

Application.php

@@ -876,6 +876,8 @@ protected function configureIO(InputInterface $input, OutputInterface $output)
      * @param OutputInterface $output  An Output instance
      *
      * @return int 0 if everything went fine, or an error code
+     *
+     * @throws \Exception when the command being run threw an exception
      */
     protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output)
     {

CHANGELOG.md

@@ -13,6 +13,7 @@ CHANGELOG
  * deprecated the dialog helper (use the question helper instead)
  * deprecated TableHelper in favor of Table
  * deprecated ProgressHelper in favor of ProgressBar
+ * added ConsoleLogger
  * added a question helper
  * added a way to set the process name of a command
  * added a way to set a default command instead of `ListCommand`

Helper/DescriptorHelper.php

@@ -54,7 +54,7 @@ public function __construct()
      * @param object          $object
      * @param array           $options
      *
-     * @throws \InvalidArgumentException
+     * @throws \InvalidArgumentException when the given format is not supported
      */
     public function describe(OutputInterface $output, $object, array $options = array())
     {

Helper/DialogHelper.php

@@ -328,7 +328,7 @@ public function askHiddenResponse(OutputInterface $output, $question, $fallback
      * @param OutputInterface $output       An Output instance
      * @param string|array    $question     The question to ask
      * @param callable        $validator    A PHP callback
-     * @param int             $attempts     Max number of times to ask before giving up (false by default, which means infinite)
+     * @param int|false       $attempts     Max number of times to ask before giving up (false by default, which means infinite)
      * @param string          $default      The default answer if none is given by the user
      * @param array           $autocomplete List of values to autocomplete
      *
@@ -357,7 +357,7 @@ public function askAndValidate(OutputInterface $output, $question, $validator, $
      * @param OutputInterface $output    An Output instance
      * @param string|array    $question  The question to ask
      * @param callable        $validator A PHP callback
-     * @param int             $attempts  Max number of times to ask before giving up (false by default, which means infinite)
+     * @param int|false       $attempts  Max number of times to ask before giving up (false by default, which means infinite)
      * @param bool            $fallback  In case the response can not be hidden, whether to fallback on non-hidden question or not
      *
      * @return string         The response
@@ -451,7 +451,7 @@ private function hasSttyAvailable()
      * @param callable         $interviewer  A callable that will ask for a question and return the result
      * @param OutputInterface  $output       An Output instance
      * @param callable         $validator    A PHP callback
-     * @param int              $attempts     Max number of times to ask before giving up ; false will ask infinitely
+     * @param int|false        $attempts     Max number of times to ask before giving up ; false will ask infinitely
      *
      * @return string   The validated response
      *

Helper/TableHelper.php

@@ -44,6 +44,8 @@ public function __construct()
      * @param int $layout self::LAYOUT_*
      *
      * @return TableHelper
+     *
+     * @throws InvalidArgumentException when the table layout is not known
      */
     public function setLayout($layout)
     {

Tests/Command/ListCommandTest.php

@@ -50,7 +50,7 @@ public function testExecuteListsCommandsWithRawOption()
     public function testExecuteListsCommandsWithNamespaceArgument()
     {
 
-        require_once(realpath(__DIR__.'/../Fixtures/FooCommand.php'));
+        require_once realpath(__DIR__.'/../Fixtures/FooCommand.php');
         $application = new Application();
         $application->add(new \FooCommand());
         $commandTester = new CommandTester($command = $application->get('list'));