Merge branch '2.4' into 2.5

webmozart · webmozart · commit cd2d1e4bac22 · 2014-08-05T11:00:40.000+02:00
* 2.4: (24 commits)
  [Validator] Added Swedish translations
  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
  properly handle null data when denormalizing
  [Validator] Renamed valueToString() to formatValue(); added missing formatValue() calls
  [Validator] Fixed CS
  [Validator] Fixed date-to-string conversion tests to match ICU 51
  [Validator] Added "{{ value }}" parameters where they were missing
  [Validator] Simplified and explained the LuhnValidator
  [Validator] Simplified IssnValidator
  ...

Conflicts:
	src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
	src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
	src/Symfony/Component/Validator/Constraints/CollectionValidator.php
	src/Symfony/Component/Validator/Constraints/FileValidator.php
	src/Symfony/Component/Validator/Constraints/Isbn.php
	src/Symfony/Component/Validator/Constraints/IsbnValidator.php
	src/Symfony/Component/Validator/Constraints/LengthValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
	src/Symfony/Component/Validator/Tests/Constraints/BlankValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/FalseValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/FileValidatorPathTest.php
	src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/NullValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/TrueValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
diff --git a/Application.php b/Application.php
@@ -874,6 +874,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)
     {
diff --git a/Helper/DescriptorHelper.php b/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())
     {
diff --git a/Helper/DialogHelper.php b/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
      *
diff --git a/Helper/TableHelper.php b/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)
     {
diff --git a/Tests/Command/ListCommandTest.php b/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'));

Original file line number	Diff line number	Diff line change
`@@ -874,6 +874,8 @@ protected function configureIO(InputInterface $input, OutputInterface $output)`
`874`	`874`	`* @param OutputInterface $output An Output instance`
`875`	`875`	`*`
`876`	`876`	`* @return int 0 if everything went fine, or an error code`
	`877`	`+ *`
	`878`	`+ * @throws \Exception when the command being run threw an exception`
`877`	`879`	`*/`
`878`	`880`	`protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output)`
`879`	`881`	`{`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function __construct()`
`54`	`54`	`* @param object $object`
`55`	`55`	`* @param array $options`
`56`	`56`	`*`
`57`		`- * @throws \InvalidArgumentException`
	`57`	`+ * @throws \InvalidArgumentException when the given format is not supported`
`58`	`58`	`*/`
`59`	`59`	`public function describe(OutputInterface $output, $object, array $options = array())`
`60`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ public function __construct()`
`44`	`44`	`* @param int $layout self::LAYOUT_*`
`45`	`45`	`*`
`46`	`46`	`* @return TableHelper`
	`47`	`+ *`
	`48`	`+ * @throws InvalidArgumentException when the table layout is not known`
`47`	`49`	`*/`
`48`	`50`	`public function setLayout($layout)`
`49`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function testExecuteListsCommandsWithRawOption()`
`50`	`50`	`public function testExecuteListsCommandsWithNamespaceArgument()`
`51`	`51`	`{`
`52`	`52`
`53`		`- require_once(realpath(__DIR__.'/../Fixtures/FooCommand.php'));`
	`53`	`+ require_once realpath(__DIR__.'/../Fixtures/FooCommand.php');`
`54`	`54`	`$application = new Application();`
`55`	`55`	`$application->add(new \FooCommand());`
`56`	`56`	`$commandTester = new CommandTester($command = $application->get('list'));`