Merge branch '4.4' into 5.1

fabpot · fabpot · commit ceae6bb90e48 · 2021-01-11T10:50:50.000+01:00
* 4.4:
  Use ::class keyword when possible
diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
diff --git a/Tests/CommandLoader/ContainerCommandLoaderTest.php b/Tests/CommandLoader/ContainerCommandLoaderTest.php
@@ -43,7 +43,7 @@ public function testGet()
 
     public function testGetUnknownCommandThrows()
     {
-        $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');
+        $this->expectException(\Symfony\Component\Console\Exception\CommandNotFoundException::class);
         (new ContainerCommandLoader(new ServiceLocator([]), []))->get('unknown');
     }
 
diff --git a/Tests/CommandLoader/FactoryCommandLoaderTest.php b/Tests/CommandLoader/FactoryCommandLoaderTest.php
@@ -42,7 +42,7 @@ public function testGet()
 
     public function testGetUnknownCommandThrows()
     {
-        $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');
+        $this->expectException(\Symfony\Component\Console\Exception\CommandNotFoundException::class);
         (new FactoryCommandLoader([]))->get('unknown');
     }
 
diff --git a/Tests/DependencyInjection/AddConsoleCommandPassTest.php b/Tests/DependencyInjection/AddConsoleCommandPassTest.php
@@ -120,7 +120,7 @@ public function visibilityProvider()
 
     public function testProcessThrowAnExceptionIfTheServiceIsAbstract()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('The service "my-command" tagged "console.command" must not be abstract.');
         $container = new ContainerBuilder();
         $container->setResourceTracking(false);
@@ -136,7 +136,7 @@ public function testProcessThrowAnExceptionIfTheServiceIsAbstract()
 
     public function testProcessThrowAnExceptionIfTheServiceIsNotASubclassOfCommand()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('The service "my-command" tagged "console.command" must be a subclass of "Symfony\Component\Console\Command\Command".');
         $container = new ContainerBuilder();
         $container->setResourceTracking(false);
@@ -221,7 +221,7 @@ public function testProcessOnChildDefinitionWithParentClass()
 
     public function testProcessOnChildDefinitionWithoutClass()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessage('The definition for "my-child-command" has no class.');
         $container = new ContainerBuilder();
         $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
diff --git a/Tests/Formatter/OutputFormatterStyleStackTest.php b/Tests/Formatter/OutputFormatterStyleStackTest.php
@@ -61,7 +61,7 @@ public function testPopNotLast()
 
     public function testInvalidPop()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $stack = new OutputFormatterStyleStack();
         $stack->push(new OutputFormatterStyle('white', 'black'));
         $stack->pop(new OutputFormatterStyle('yellow', 'blue'));
diff --git a/Tests/Formatter/OutputFormatterStyleTest.php b/Tests/Formatter/OutputFormatterStyleTest.php
@@ -41,7 +41,7 @@ public function testForeground()
         $style->setForeground('default');
         $this->assertEquals("\033[39mfoo\033[39m", $style->apply('foo'));
 
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $style->setForeground('undefined-color');
     }
 
@@ -58,7 +58,7 @@ public function testBackground()
         $style->setBackground('default');
         $this->assertEquals("\033[49mfoo\033[49m", $style->apply('foo'));
 
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $style->setBackground('undefined-color');
     }
 
diff --git a/Tests/Helper/HelperSetTest.php b/Tests/Helper/HelperSetTest.php
@@ -68,7 +68,7 @@ public function testGet()
             $this->fail('->get() throws InvalidArgumentException when helper not found');
         } catch (\Exception $e) {
             $this->assertInstanceOf(\InvalidArgumentException::class, $e, '->get() throws InvalidArgumentException when helper not found');
-            $this->assertInstanceOf('Symfony\Component\Console\Exception\ExceptionInterface', $e, '->get() throws domain specific exception when helper not found');
+            $this->assertInstanceOf(\Symfony\Component\Console\Exception\ExceptionInterface::class, $e, '->get() throws domain specific exception when helper not found');
             $this->assertStringContainsString('The helper "foo" is not defined.', $e->getMessage(), '->get() throws InvalidArgumentException when helper not found');
         }
     }
diff --git a/Tests/Helper/ProgressIndicatorTest.php b/Tests/Helper/ProgressIndicatorTest.php
@@ -102,14 +102,14 @@ public function testCustomIndicatorValues()
 
     public function testCannotSetInvalidIndicatorCharacters()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('Must have at least 2 indicator value characters.');
         new ProgressIndicator($this->getOutputStream(), null, 100, ['1']);
     }
 
     public function testCannotStartAlreadyStartedIndicator()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Progress indicator already started.');
         $bar = new ProgressIndicator($this->getOutputStream());
         $bar->start('Starting...');
@@ -118,15 +118,15 @@ public function testCannotStartAlreadyStartedIndicator()
 
     public function testCannotAdvanceUnstartedIndicator()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Progress indicator has not yet been started.');
         $bar = new ProgressIndicator($this->getOutputStream());
         $bar->advance();
     }
 
     public function testCannotFinishUnstartedIndicator()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Progress indicator has not yet been started.');
         $bar = new ProgressIndicator($this->getOutputStream());
         $bar->finish('Finished');
diff --git a/Tests/Helper/QuestionHelperTest.php b/Tests/Helper/QuestionHelperTest.php
@@ -633,7 +633,7 @@ public function testSelectChoiceFromChoiceList($providedAnswer, $expectedValue)
 
     public function testAmbiguousChoiceFromChoicelist()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('The provided answer is ambiguous. Value should be one of "env_2" or "env_3".');
         $possibleChoices = [
             'env_1' => 'My first environment',
@@ -700,23 +700,23 @@ public function testChoiceOutputFormattingQuestionForUtf8Keys()
 
     public function testAskThrowsExceptionOnMissingInput()
     {
-        $this->expectException('Symfony\Component\Console\Exception\MissingInputException');
+        $this->expectException(\Symfony\Component\Console\Exception\MissingInputException::class);
         $this->expectExceptionMessage('Aborted.');
         $dialog = new QuestionHelper();
         $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new Question('What\'s your name?'));
     }
 
     public function testAskThrowsExceptionOnMissingInputForChoiceQuestion()
     {
-        $this->expectException('Symfony\Component\Console\Exception\MissingInputException');
+        $this->expectException(\Symfony\Component\Console\Exception\MissingInputException::class);
         $this->expectExceptionMessage('Aborted.');
         $dialog = new QuestionHelper();
         $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new ChoiceQuestion('Choice', ['a', 'b']));
     }
 
     public function testAskThrowsExceptionOnMissingInputWithValidator()
     {
-        $this->expectException('Symfony\Component\Console\Exception\MissingInputException');
+        $this->expectException(\Symfony\Component\Console\Exception\MissingInputException::class);
         $this->expectExceptionMessage('Aborted.');
         $dialog = new QuestionHelper();
 
@@ -764,7 +764,7 @@ public function testQuestionValidatorRepeatsThePrompt()
 
     public function testEmptyChoices()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Choice question must have at least 1 choice available.');
         new ChoiceQuestion('Question', [], 'irrelevant');
     }
@@ -897,7 +897,7 @@ protected function createOutputInterface()
 
     protected function createInputInterfaceMock($interactive = true)
     {
-        $mock = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock();
+        $mock = $this->getMockBuilder(\Symfony\Component\Console\Input\InputInterface::class)->getMock();
         $mock->expects($this->any())
             ->method('isInteractive')
             ->willReturn($interactive);
diff --git a/Tests/Helper/SymfonyQuestionHelperTest.php b/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -124,7 +124,7 @@ public function testLabelTrailingBackslash()
 
     public function testAskThrowsExceptionOnMissingInput()
     {
-        $this->expectException('Symfony\Component\Console\Exception\RuntimeException');
+        $this->expectException(\Symfony\Component\Console\Exception\RuntimeException::class);
         $this->expectExceptionMessage('Aborted.');
         $dialog = new SymfonyQuestionHelper();
         $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new Question('What\'s your name?'));
@@ -192,7 +192,7 @@ protected function createOutputInterface()
 
     protected function createInputInterfaceMock($interactive = true)
     {
-        $mock = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock();
+        $mock = $this->getMockBuilder(\Symfony\Component\Console\Input\InputInterface::class)->getMock();
         $mock->expects($this->any())
             ->method('isInteractive')
             ->willReturn($interactive);
diff --git a/Tests/Helper/TableStyleTest.php b/Tests/Helper/TableStyleTest.php
@@ -18,7 +18,7 @@ class TableStyleTest extends TestCase
 {
     public function testSetPadTypeWithInvalidType()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid padding type. Expected one of (STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH).');
         $style = new TableStyle();
         $style->setPadType(31);
diff --git a/Tests/Helper/TableTest.php b/Tests/Helper/TableTest.php
@@ -808,7 +808,7 @@ public function testColumnStyle()
 
     public function testThrowsWhenTheCellInAnArray()
     {
-        $this->expectException('Symfony\Component\Console\Exception\InvalidArgumentException');
+        $this->expectException(\Symfony\Component\Console\Exception\InvalidArgumentException::class);
         $this->expectExceptionMessage('A cell must be a TableCell, a scalar or an object implementing "__toString()", "array" given.');
         $table = new Table($output = $this->getOutputStream());
         $table
@@ -983,7 +983,7 @@ public function testSectionOutputWithoutDecoration()
 
     public function testAppendRowWithoutSectionOutput()
     {
-        $this->expectException('Symfony\Component\Console\Exception\RuntimeException');
+        $this->expectException(\Symfony\Component\Console\Exception\RuntimeException::class);
         $this->expectExceptionMessage('Output should be an instance of "Symfony\Component\Console\Output\ConsoleSectionOutput" when calling "Symfony\Component\Console\Helper\Table::appendRow".');
         $table = new Table($this->getOutputStream());
 
@@ -1024,15 +1024,15 @@ public function testSectionOutputHandlesZeroRowsAfterRender()
 
     public function testIsNotDefinedStyleException()
     {
-        $this->expectException('Symfony\Component\Console\Exception\InvalidArgumentException');
+        $this->expectException(\Symfony\Component\Console\Exception\InvalidArgumentException::class);
         $this->expectExceptionMessage('Style "absent" is not defined.');
         $table = new Table($this->getOutputStream());
         $table->setStyle('absent');
     }
 
     public function testGetStyleDefinition()
     {
-        $this->expectException('Symfony\Component\Console\Exception\InvalidArgumentException');
+        $this->expectException(\Symfony\Component\Console\Exception\InvalidArgumentException::class);
         $this->expectExceptionMessage('Style "absent" is not defined.');
         Table::getStyleDefinition('absent');
     }
diff --git a/Tests/Input/ArgvInputTest.php b/Tests/Input/ArgvInputTest.php
@@ -182,7 +182,7 @@ public function provideOptions()
      */
     public function testInvalidInput($argv, $definition, $expectedExceptionMessage)
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessage($expectedExceptionMessage);
 
         $input = new ArgvInput($argv);
diff --git a/Tests/Input/ArrayInputTest.php b/Tests/Input/ArrayInputTest.php
@@ -127,7 +127,7 @@ public function provideOptions()
      */
     public function testParseInvalidInput($parameters, $definition, $expectedExceptionMessage)
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage($expectedExceptionMessage);
 
         new ArrayInput($parameters, $definition);
diff --git a/Tests/Input/InputArgumentTest.php b/Tests/Input/InputArgumentTest.php
@@ -39,7 +39,7 @@ public function testModes()
 
     public function testInvalidModes()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('Argument mode "-1" is not valid.');
 
         new InputArgument('foo', '-1');
@@ -82,15 +82,15 @@ public function testSetDefault()
 
     public function testSetDefaultWithRequiredArgument()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Cannot set a default value except for InputArgument::OPTIONAL mode.');
         $argument = new InputArgument('foo', InputArgument::REQUIRED);
         $argument->setDefault('default');
     }
 
     public function testSetDefaultWithArrayArgument()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('A default value for an array argument must be an array.');
         $argument = new InputArgument('foo', InputArgument::IS_ARRAY);
         $argument->setDefault('default');
diff --git a/Tests/Input/InputDefinitionTest.php b/Tests/Input/InputDefinitionTest.php
@@ -89,7 +89,7 @@ public function testAddArgument()
 
     public function testArgumentsMustHaveDifferentNames()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('An argument with name "foo" already exists.');
         $this->initializeArguments();
 
@@ -100,7 +100,7 @@ public function testArgumentsMustHaveDifferentNames()
 
     public function testArrayArgumentHasToBeLast()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Cannot add an argument after an array argument.');
         $this->initializeArguments();
 
@@ -111,7 +111,7 @@ public function testArrayArgumentHasToBeLast()
 
     public function testRequiredArgumentCannotFollowAnOptionalOne()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('Cannot add a required argument after an optional one.');
         $this->initializeArguments();
 
@@ -131,7 +131,7 @@ public function testGetArgument()
 
     public function testGetInvalidArgument()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('The "bar" argument does not exist.');
         $this->initializeArguments();
 
@@ -201,7 +201,7 @@ public function testSetOptions()
 
     public function testSetOptionsClearsOptions()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('The "-f" option does not exist.');
         $this->initializeOptions();
 
@@ -233,7 +233,7 @@ public function testAddOption()
 
     public function testAddDuplicateOption()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('An option named "foo" already exists.');
         $this->initializeOptions();
 
@@ -244,7 +244,7 @@ public function testAddDuplicateOption()
 
     public function testAddDuplicateShortcutOption()
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('An option with shortcut "f" already exists.');
         $this->initializeOptions();
 
@@ -263,7 +263,7 @@ public function testGetOption()
 
     public function testGetInvalidOption()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('The "--bar" option does not exist.');
         $this->initializeOptions();
 
@@ -308,7 +308,7 @@ public function testGetOptionForMultiShortcut()
 
     public function testGetOptionForInvalidShortcut()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('The "-l" option does not exist.');
         $this->initializeOptions();
 
diff --git a/Tests/Input/InputOptionTest.php b/Tests/Input/InputOptionTest.php
diff --git a/Tests/Input/InputTest.php b/Tests/Input/InputTest.php
diff --git a/Tests/Input/StringInputTest.php b/Tests/Input/StringInputTest.php
diff --git a/Tests/Logger/ConsoleLoggerTest.php b/Tests/Logger/ConsoleLoggerTest.php
diff --git a/Tests/Output/StreamOutputTest.php b/Tests/Output/StreamOutputTest.php
diff --git a/Tests/Tester/CommandTesterTest.php b/Tests/Tester/CommandTesterTest.php

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function testGet()`
`43`	`43`
`44`	`44`	`public function testGetUnknownCommandThrows()`
`45`	`45`	`{`
`46`		`- $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');`
	`46`	`+ $this->expectException(\Symfony\Component\Console\Exception\CommandNotFoundException::class);`
`47`	`47`	`(new ContainerCommandLoader(new ServiceLocator([]), []))->get('unknown');`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function testGet()`
`42`	`42`
`43`	`43`	`public function testGetUnknownCommandThrows()`
`44`	`44`	`{`
`45`		`- $this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');`
	`45`	`+ $this->expectException(\Symfony\Component\Console\Exception\CommandNotFoundException::class);`
`46`	`46`	`(new FactoryCommandLoader([]))->get('unknown');`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function testPopNotLast()`
`61`	`61`
`62`	`62`	`public function testInvalidPop()`
`63`	`63`	`{`
`64`		`- $this->expectException('InvalidArgumentException');`
	`64`	`+ $this->expectException(\InvalidArgumentException::class);`
`65`	`65`	`$stack = new OutputFormatterStyleStack();`
`66`	`66`	`$stack->push(new OutputFormatterStyle('white', 'black'));`
`67`	`67`	`$stack->pop(new OutputFormatterStyle('yellow', 'blue'));`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function testForeground()`
`41`	`41`	`$style->setForeground('default');`
`42`	`42`	`$this->assertEquals("\033[39mfoo\033[39m", $style->apply('foo'));`
`43`	`43`
`44`		`- $this->expectException('InvalidArgumentException');`
	`44`	`+ $this->expectException(\InvalidArgumentException::class);`
`45`	`45`	`$style->setForeground('undefined-color');`
`46`	`46`	`}`
`47`	`47`
`@@ -58,7 +58,7 @@ public function testBackground()`
`58`	`58`	`$style->setBackground('default');`
`59`	`59`	`$this->assertEquals("\033[49mfoo\033[49m", $style->apply('foo'));`
`60`	`60`
`61`		`- $this->expectException('InvalidArgumentException');`
	`61`	`+ $this->expectException(\InvalidArgumentException::class);`
`62`	`62`	`$style->setBackground('undefined-color');`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function testGet()`
`68`	`68`	`$this->fail('->get() throws InvalidArgumentException when helper not found');`
`69`	`69`	`} catch (\Exception $e) {`
`70`	`70`	`$this->assertInstanceOf(\InvalidArgumentException::class, $e, '->get() throws InvalidArgumentException when helper not found');`
`71`		`- $this->assertInstanceOf('Symfony\Component\Console\Exception\ExceptionInterface', $e, '->get() throws domain specific exception when helper not found');`
	`71`	`+ $this->assertInstanceOf(\Symfony\Component\Console\Exception\ExceptionInterface::class, $e, '->get() throws domain specific exception when helper not found');`
`72`	`72`	`$this->assertStringContainsString('The helper "foo" is not defined.', $e->getMessage(), '->get() throws InvalidArgumentException when helper not found');`
`73`	`73`	`}`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,14 +102,14 @@ public function testCustomIndicatorValues()`
`102`	`102`
`103`	`103`	`public function testCannotSetInvalidIndicatorCharacters()`
`104`	`104`	`{`
`105`		`- $this->expectException('InvalidArgumentException');`
	`105`	`+ $this->expectException(\InvalidArgumentException::class);`
`106`	`106`	`$this->expectExceptionMessage('Must have at least 2 indicator value characters.');`
`107`	`107`	`new ProgressIndicator($this->getOutputStream(), null, 100, ['1']);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`public function testCannotStartAlreadyStartedIndicator()`
`111`	`111`	`{`
`112`		`- $this->expectException('LogicException');`
	`112`	`+ $this->expectException(\LogicException::class);`
`113`	`113`	`$this->expectExceptionMessage('Progress indicator already started.');`
`114`	`114`	`$bar = new ProgressIndicator($this->getOutputStream());`
`115`	`115`	`$bar->start('Starting...');`
`@@ -118,15 +118,15 @@ public function testCannotStartAlreadyStartedIndicator()`
`118`	`118`
`119`	`119`	`public function testCannotAdvanceUnstartedIndicator()`
`120`	`120`	`{`
`121`		`- $this->expectException('LogicException');`
	`121`	`+ $this->expectException(\LogicException::class);`
`122`	`122`	`$this->expectExceptionMessage('Progress indicator has not yet been started.');`
`123`	`123`	`$bar = new ProgressIndicator($this->getOutputStream());`
`124`	`124`	`$bar->advance();`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`public function testCannotFinishUnstartedIndicator()`
`128`	`128`	`{`
`129`		`- $this->expectException('LogicException');`
	`129`	`+ $this->expectException(\LogicException::class);`
`130`	`130`	`$this->expectExceptionMessage('Progress indicator has not yet been started.');`
`131`	`131`	`$bar = new ProgressIndicator($this->getOutputStream());`
`132`	`132`	`$bar->finish('Finished');`
Original file line number	Diff line number	Diff line change
`@@ -633,7 +633,7 @@ public function testSelectChoiceFromChoiceList($providedAnswer, $expectedValue)`
`633`	`633`
`634`	`634`	`public function testAmbiguousChoiceFromChoicelist()`
`635`	`635`	`{`
`636`		`- $this->expectException('InvalidArgumentException');`
	`636`	`+ $this->expectException(\InvalidArgumentException::class);`
`637`	`637`	`$this->expectExceptionMessage('The provided answer is ambiguous. Value should be one of "env_2" or "env_3".');`
`638`	`638`	`$possibleChoices = [`
`639`	`639`	`'env_1' => 'My first environment',`
`@@ -700,23 +700,23 @@ public function testChoiceOutputFormattingQuestionForUtf8Keys()`
`700`	`700`
`701`	`701`	`public function testAskThrowsExceptionOnMissingInput()`
`702`	`702`	`{`
`703`		`- $this->expectException('Symfony\Component\Console\Exception\MissingInputException');`
	`703`	`+ $this->expectException(\Symfony\Component\Console\Exception\MissingInputException::class);`
`704`	`704`	`$this->expectExceptionMessage('Aborted.');`
`705`	`705`	`$dialog = new QuestionHelper();`
`706`	`706`	`$dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new Question('What\'s your name?'));`
`707`	`707`	`}`
`708`	`708`
`709`	`709`	`public function testAskThrowsExceptionOnMissingInputForChoiceQuestion()`
`710`	`710`	`{`
`711`		`- $this->expectException('Symfony\Component\Console\Exception\MissingInputException');`
	`711`	`+ $this->expectException(\Symfony\Component\Console\Exception\MissingInputException::class);`
`712`	`712`	`$this->expectExceptionMessage('Aborted.');`
`713`	`713`	`$dialog = new QuestionHelper();`
`714`	`714`	`$dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new ChoiceQuestion('Choice', ['a', 'b']));`
`715`	`715`	`}`
`716`	`716`
`717`	`717`	`public function testAskThrowsExceptionOnMissingInputWithValidator()`
`718`	`718`	`{`
`719`		`- $this->expectException('Symfony\Component\Console\Exception\MissingInputException');`
	`719`	`+ $this->expectException(\Symfony\Component\Console\Exception\MissingInputException::class);`
`720`	`720`	`$this->expectExceptionMessage('Aborted.');`
`721`	`721`	`$dialog = new QuestionHelper();`
`722`	`722`
`@@ -764,7 +764,7 @@ public function testQuestionValidatorRepeatsThePrompt()`
`764`	`764`
`765`	`765`	`public function testEmptyChoices()`
`766`	`766`	`{`
`767`		`- $this->expectException('LogicException');`
	`767`	`+ $this->expectException(\LogicException::class);`
`768`	`768`	`$this->expectExceptionMessage('Choice question must have at least 1 choice available.');`
`769`	`769`	`new ChoiceQuestion('Question', [], 'irrelevant');`
`770`	`770`	`}`
`@@ -897,7 +897,7 @@ protected function createOutputInterface()`
`897`	`897`
`898`	`898`	`protected function createInputInterfaceMock($interactive = true)`
`899`	`899`	`{`
`900`		`- $mock = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')->getMock();`
	`900`	`+ $mock = $this->getMockBuilder(\Symfony\Component\Console\Input\InputInterface::class)->getMock();`
`901`	`901`	`$mock->expects($this->any())`
`902`	`902`	`->method('isInteractive')`
`903`	`903`	`->willReturn($interactive);`