Skip to content

Commit 6fa9b33

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: (22 commits) 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. [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 [Validator] Fixed and simplified IsbnValidator [Validator] Simplified IBAN validation algorithm ... Conflicts: src/Symfony/Component/Console/Helper/DescriptorHelper.php src/Symfony/Component/DependencyInjection/Container.php src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php src/Symfony/Component/HttpFoundation/File/UploadedFile.php src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php src/Symfony/Component/Validator/Constraints/CollectionValidator.php src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/NotIdenticalToValidatorTest.php
2 parents 29ef7af + af5ff96 commit 6fa9b33

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

Application.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,8 @@ protected function configureIO(InputInterface $input, OutputInterface $output)
872872
* @param OutputInterface $output An Output instance
873873
*
874874
* @return int 0 if everything went fine, or an error code
875+
*
876+
* @throws \Exception when the command being run threw an exception
875877
*/
876878
protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output)
877879
{

Helper/DescriptorHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function __construct()
5454
* @param object $object
5555
* @param array $options
5656
*
57-
* @throws \InvalidArgumentException
57+
* @throws \InvalidArgumentException when the given format is not supported
5858
*/
5959
public function describe(OutputInterface $output, $object, array $options = array())
6060
{

Helper/DialogHelper.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ public function askHiddenResponse(OutputInterface $output, $question, $fallback
325325
* @param OutputInterface $output An Output instance
326326
* @param string|array $question The question to ask
327327
* @param callable $validator A PHP callback
328-
* @param int $attempts Max number of times to ask before giving up (false by default, which means infinite)
328+
* @param int|false $attempts Max number of times to ask before giving up (false by default, which means infinite)
329329
* @param string $default The default answer if none is given by the user
330330
* @param array $autocomplete List of values to autocomplete
331331
*
@@ -354,7 +354,7 @@ public function askAndValidate(OutputInterface $output, $question, $validator, $
354354
* @param OutputInterface $output An Output instance
355355
* @param string|array $question The question to ask
356356
* @param callable $validator A PHP callback
357-
* @param int $attempts Max number of times to ask before giving up (false by default, which means infinite)
357+
* @param int|false $attempts Max number of times to ask before giving up (false by default, which means infinite)
358358
* @param bool $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not
359359
*
360360
* @return string The response
@@ -448,7 +448,7 @@ private function hasSttyAvailable()
448448
* @param callable $interviewer A callable that will ask for a question and return the result
449449
* @param OutputInterface $output An Output instance
450450
* @param callable $validator A PHP callback
451-
* @param int $attempts Max number of times to ask before giving up ; false will ask infinitely
451+
* @param int|false $attempts Max number of times to ask before giving up ; false will ask infinitely
452452
*
453453
* @return string The validated response
454454
*

Helper/TableHelper.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ public function __construct()
8080
* @param int $layout self::LAYOUT_*
8181
*
8282
* @return TableHelper
83+
*
84+
* @throws InvalidArgumentException when the table layout is not known
8385
*/
8486
public function setLayout($layout)
8587
{

Tests/Command/ListCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function testExecuteListsCommandsWithRawOption()
5050
public function testExecuteListsCommandsWithNamespaceArgument()
5151
{
5252

53-
require_once(realpath(__DIR__.'/../Fixtures/FooCommand.php'));
53+
require_once realpath(__DIR__.'/../Fixtures/FooCommand.php');
5454
$application = new Application();
5555
$application->add(new \FooCommand());
5656
$commandTester = new CommandTester($command = $application->get('list'));

0 commit comments

Comments
 (0)