Skip to content

Commit a54d00a

Browse files
committed
Merge branch '3.4' into 4.1
* 3.4: [Tests] Change to willThrowException [Console] fix PHPDoc in Command Fix wrong calls to clearstatcache Add Vietnamese translation for validators Allow running PHPUnit with "xdebug.scream" ON [Yaml] detect circular references
2 parents ef06be5 + 3017962 commit a54d00a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Command/Command.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,9 +361,9 @@ public function getNativeDefinition()
361361
* Adds an argument.
362362
*
363363
* @param string $name The argument name
364-
* @param int|null $mode The argument mode: self::REQUIRED or self::OPTIONAL
364+
* @param int|null $mode The argument mode: InputArgument::REQUIRED or InputArgument::OPTIONAL
365365
* @param string $description A description text
366-
* @param string|string[]|null $default The default value (for self::OPTIONAL mode only)
366+
* @param string|string[]|null $default The default value (for InputArgument::OPTIONAL mode only)
367367
*
368368
* @throws InvalidArgumentException When argument mode is not valid
369369
*
@@ -381,9 +381,9 @@ public function addArgument($name, $mode = null, $description = '', $default = n
381381
*
382382
* @param string $name The option name
383383
* @param string|array $shortcut The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
384-
* @param int|null $mode The option mode: One of the VALUE_* constants
384+
* @param int|null $mode The option mode: One of the InputOption::VALUE_* constants
385385
* @param string $description A description text
386-
* @param string|string[]|int|bool|null $default The default value (must be null for self::VALUE_NONE)
386+
* @param string|string[]|int|bool|null $default The default value (must be null for InputOption::VALUE_NONE)
387387
*
388388
* @throws InvalidArgumentException If option mode is invalid or incompatible
389389
*

Tests/ApplicationTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ public function testRunReturnsIntegerExitCode()
967967
$application->setAutoExit(false);
968968
$application->expects($this->once())
969969
->method('doRun')
970-
->will($this->throwException($exception));
970+
->willThrowException($exception);
971971

972972
$exitCode = $application->run(new ArrayInput(array()), new NullOutput());
973973

@@ -1006,7 +1006,7 @@ public function testRunReturnsExitCodeOneForExceptionCodeZero()
10061006
$application->setAutoExit(false);
10071007
$application->expects($this->once())
10081008
->method('doRun')
1009-
->will($this->throwException($exception));
1009+
->willThrowException($exception);
10101010

10111011
$exitCode = $application->run(new ArrayInput(array()), new NullOutput());
10121012

0 commit comments

Comments
 (0)