Merge branch '4.1' into 4.2

* 4.1: [Twig] Replace for-loops with blocks for attributes fixed CS [Tests] Change to willThrowException [Console] fix PHPDoc in Command Update FileLoaderLoadException.php Fix wrong calls to clearstatcache Add Vietnamese translation for validators Allow running PHPUnit with "xdebug.scream" ON [VarDumper] Add descriptors tests [Yaml] detect circular references [DI] fix reporting bindings on overriden services as unused [Routing] minor fix or previous PR
symfony · Dec 24, 2018 · cf525d2 · cf525d2
2 parents 5af798a + a54d00a
commit cf525d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Command/Command.php b/Command/Command.php
@@ -361,9 +361,9 @@ public function getNativeDefinition()
      * Adds an argument.
      *
      * @param string               $name        The argument name
-     * @param int|null             $mode        The argument mode: self::REQUIRED or self::OPTIONAL
+     * @param int|null             $mode        The argument mode: InputArgument::REQUIRED or InputArgument::OPTIONAL
      * @param string               $description A description text
-     * @param string|string[]|null $default     The default value (for self::OPTIONAL mode only)
+     * @param string|string[]|null $default     The default value (for InputArgument::OPTIONAL mode only)
      *
      * @throws InvalidArgumentException When argument mode is not valid
      *
@@ -381,9 +381,9 @@ public function addArgument($name, $mode = null, $description = '', $default = n
      *
      * @param string                        $name        The option name
      * @param string|array                  $shortcut    The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
-     * @param int|null                      $mode        The option mode: One of the VALUE_* constants
+     * @param int|null                      $mode        The option mode: One of the InputOption::VALUE_* constants
      * @param string                        $description A description text
-     * @param string|string[]|int|bool|null $default     The default value (must be null for self::VALUE_NONE)
+     * @param string|string[]|int|bool|null $default     The default value (must be null for InputOption::VALUE_NONE)
      *
      * @throws InvalidArgumentException If option mode is invalid or incompatible
      *

diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
@@ -1003,7 +1003,7 @@ public function testRunReturnsIntegerExitCode()
         $application->setAutoExit(false);
         $application->expects($this->once())
             ->method('doRun')
-            ->will($this->throwException($exception));
+            ->willThrowException($exception);
 
         $exitCode = $application->run(new ArrayInput(array()), new NullOutput());
 
@@ -1042,7 +1042,7 @@ public function testRunReturnsExitCodeOneForExceptionCodeZero()
         $application->setAutoExit(false);
         $application->expects($this->once())
             ->method('doRun')
-            ->will($this->throwException($exception));
+            ->willThrowException($exception);
 
         $exitCode = $application->run(new ArrayInput(array()), new NullOutput());