Merge branch '4.4' into 5.1

* 4.4: Use createMock() and use import instead of FQCN
symfony · Jan 27, 2021 · d9a267b · d9a267b
2 parents d6ecfe3 + 24026c4
commit d9a267b
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 37 deletions.
diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Command\HelpCommand;
 use Symfony\Component\Console\CommandLoader\FactoryCommandLoader;
 use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
@@ -29,6 +30,7 @@
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -134,7 +136,7 @@ public function testAll()
     {
         $application = new Application();
         $commands = $application->all();
-        $this->assertInstanceOf(\Symfony\Component\Console\Command\HelpCommand::class, $commands['help'], '->all() returns the registered commands');
+        $this->assertInstanceOf(HelpCommand::class, $commands['help'], '->all() returns the registered commands');
 
         $application->add(new \FooCommand());
         $commands = $application->all('foo');
@@ -145,7 +147,7 @@ public function testAllWithCommandLoader()
     {
         $application = new Application();
         $commands = $application->all();
-        $this->assertInstanceOf(\Symfony\Component\Console\Command\HelpCommand::class, $commands['help'], '->all() returns the registered commands');
+        $this->assertInstanceOf(HelpCommand::class, $commands['help'], '->all() returns the registered commands');
 
         $application->add(new \FooCommand());
         $commands = $application->all('foo');
@@ -229,7 +231,7 @@ public function testHasGet()
         $p->setAccessible(true);
         $p->setValue($application, true);
         $command = $application->get('foo:bar');
-        $this->assertInstanceOf(\Symfony\Component\Console\Command\HelpCommand::class, $command, '->get() returns the help command if --help is provided as the input');
+        $this->assertInstanceOf(HelpCommand::class, $command, '->get() returns the help command if --help is provided as the input');
     }
 
     public function testHasGetWithCommandLoader()
@@ -351,7 +353,7 @@ public function testFind()
         $application->add(new \FooCommand());
 
         $this->assertInstanceOf(\FooCommand::class, $application->find('foo:bar'), '->find() returns a command if its name exists');
-        $this->assertInstanceOf(\Symfony\Component\Console\Command\HelpCommand::class, $application->find('h'), '->find() returns a command if its name exists');
+        $this->assertInstanceOf(HelpCommand::class, $application->find('h'), '->find() returns a command if its name exists');
         $this->assertInstanceOf(\FooCommand::class, $application->find('f:bar'), '->find() returns a command if the abbreviation for the namespace exists');
         $this->assertInstanceOf(\FooCommand::class, $application->find('f:b'), '->find() returns a command if the abbreviation for the namespace and the command name exist');
         $this->assertInstanceOf(\FooCommand::class, $application->find('a'), '->find() returns a command if the abbreviation exists for an alias');
@@ -398,7 +400,7 @@ public function testFindWithCommandLoader()
         ]));
 
         $this->assertInstanceOf(\FooCommand::class, $application->find('foo:bar'), '->find() returns a command if its name exists');
-        $this->assertInstanceOf(\Symfony\Component\Console\Command\HelpCommand::class, $application->find('h'), '->find() returns a command if its name exists');
+        $this->assertInstanceOf(HelpCommand::class, $application->find('h'), '->find() returns a command if its name exists');
         $this->assertInstanceOf(\FooCommand::class, $application->find('f:bar'), '->find() returns a command if the abbreviation for the namespace exists');
         $this->assertInstanceOf(\FooCommand::class, $application->find('f:b'), '->find() returns a command if the abbreviation for the namespace and the command name exist');
         $this->assertInstanceOf(\FooCommand::class, $application->find('a'), '->find() returns a command if the abbreviation exists for an alias');
@@ -937,7 +939,7 @@ public function testRun()
         ob_end_clean();
 
         $this->assertInstanceOf(ArgvInput::class, $command->input, '->run() creates an ArgvInput by default if none is given');
-        $this->assertInstanceOf(\Symfony\Component\Console\Output\ConsoleOutput::class, $command->output, '->run() creates a ConsoleOutput by default if none is given');
+        $this->assertInstanceOf(ConsoleOutput::class, $command->output, '->run() creates a ConsoleOutput by default if none is given');
 
         $application = new Application();
         $application->setAutoExit(false);

diff --git a/Tests/Command/CommandTest.php b/Tests/Command/CommandTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\InvalidOptionException;
 use Symfony\Component\Console\Helper\FormatterHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputDefinition;
@@ -286,7 +287,7 @@ public function testExecuteMethodNeedsToBeOverridden()
 
     public function testRunWithInvalidOption()
     {
-        $this->expectException(\Symfony\Component\Console\Exception\InvalidOptionException::class);
+        $this->expectException(InvalidOptionException::class);
         $this->expectExceptionMessage('The "--bar" option does not exist.');
         $command = new \TestCommand();
         $tester = new CommandTester($command);

diff --git a/Tests/CommandLoader/ContainerCommandLoaderTest.php b/Tests/CommandLoader/ContainerCommandLoaderTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
+use Symfony\Component\Console\Exception\CommandNotFoundException;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 
 class ContainerCommandLoaderTest extends TestCase
@@ -43,7 +44,7 @@ public function testGet()
 
     public function testGetUnknownCommandThrows()
     {
-        $this->expectException(\Symfony\Component\Console\Exception\CommandNotFoundException::class);
+        $this->expectException(CommandNotFoundException::class);
         (new ContainerCommandLoader(new ServiceLocator([]), []))->get('unknown');
     }
 

diff --git a/Tests/CommandLoader/FactoryCommandLoaderTest.php b/Tests/CommandLoader/FactoryCommandLoaderTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\CommandLoader\FactoryCommandLoader;
+use Symfony\Component\Console\Exception\CommandNotFoundException;
 
 class FactoryCommandLoaderTest extends TestCase
 {
@@ -42,7 +43,7 @@ public function testGet()
 
     public function testGetUnknownCommandThrows()
     {
-        $this->expectException(\Symfony\Component\Console\Exception\CommandNotFoundException::class);
+        $this->expectException(CommandNotFoundException::class);
         (new FactoryCommandLoader([]))->get('unknown');
     }
 

diff --git a/Tests/EventListener/ErrorListenerTest.php b/Tests/EventListener/ErrorListenerTest.php
@@ -117,7 +117,7 @@ public function testCommandNameIsDisplayedForNonStringableInput()
         ;
 
         $listener = new ErrorListener($logger);
-        $listener->onConsoleTerminate($this->getConsoleTerminateEvent($this->getMockBuilder(InputInterface::class)->getMock(), 255));
+        $listener->onConsoleTerminate($this->getConsoleTerminateEvent($this->createMock(InputInterface::class), 255));
     }
 
     private function getLogger()
@@ -132,7 +132,7 @@ private function getConsoleTerminateEvent(InputInterface $input, $exitCode)
 
     private function getOutput()
     {
-        return $this->getMockBuilder(OutputInterface::class)->getMock();
+        return $this->createMock(OutputInterface::class);
     }
 }
 

diff --git a/Tests/Helper/AbstractQuestionHelperTest.php b/Tests/Helper/AbstractQuestionHelperTest.php
@@ -18,7 +18,7 @@ abstract class AbstractQuestionHelperTest extends TestCase
 {
     protected function createStreamableInputInterfaceMock($stream = null, $interactive = true)
     {
-        $mock = $this->getMockBuilder(StreamableInputInterface::class)->getMock();
+        $mock = $this->createMock(StreamableInputInterface::class);
         $mock->expects($this->any())
             ->method('isInteractive')
             ->willReturn($interactive);

diff --git a/Tests/Helper/DumperNativeFallbackTest.php b/Tests/Helper/DumperNativeFallbackTest.php
@@ -37,7 +37,7 @@ public static function tearDownAfterClass(): void
      */
     public function testInvoke($variable, $primitiveString)
     {
-        $dumper = new Dumper($this->getMockBuilder(OutputInterface::class)->getMock());
+        $dumper = new Dumper($this->createMock(OutputInterface::class));
 
         $this->assertSame($primitiveString, $dumper($variable));
     }

diff --git a/Tests/Helper/DumperTest.php b/Tests/Helper/DumperTest.php
@@ -37,7 +37,7 @@ public static function tearDownAfterClass(): void
      */
     public function testInvoke($variable)
     {
-        $output = $this->getMockBuilder(OutputInterface::class)->getMock();
+        $output = $this->createMock(OutputInterface::class);
         $output->method('isDecorated')->willReturn(false);
 
         $dumper = new Dumper($output);

diff --git a/Tests/Helper/HelperSetTest.php b/Tests/Helper/HelperSetTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\ExceptionInterface;
 use Symfony\Component\Console\Helper\HelperInterface;
 use Symfony\Component\Console\Helper\HelperSet;
 
@@ -68,7 +69,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::class, $e, '->get() throws domain specific exception when helper not found');
+            $this->assertInstanceOf(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');
         }
     }
@@ -112,7 +113,7 @@ public function testIteration()
 
     private function getGenericMockHelper($name, HelperSet $helperset = null)
     {
-        $mock_helper = $this->getMockBuilder(HelperInterface::class)->getMock();
+        $mock_helper = $this->createMock(HelperInterface::class);
         $mock_helper->expects($this->any())
             ->method('getName')
             ->willReturn($name);

diff --git a/Tests/Helper/QuestionHelperTest.php b/Tests/Helper/QuestionHelperTest.php
@@ -13,10 +13,12 @@
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Exception\MissingInputException;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\FormatterHelper;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\Console\Question\ChoiceQuestion;
@@ -685,7 +687,7 @@ public function testChoiceOutputFormattingQuestionForUtf8Keys()
             '  [<info>żółw  </info>] bar',
             '  [<info>łabądź</info>] baz',
         ];
-        $output = $this->getMockBuilder(OutputInterface::class)->getMock();
+        $output = $this->createMock(OutputInterface::class);
         $output->method('getFormatter')->willReturn(new OutputFormatter());
 
         $dialog = new QuestionHelper();
@@ -700,23 +702,23 @@ public function testChoiceOutputFormattingQuestionForUtf8Keys()
 
     public function testAskThrowsExceptionOnMissingInput()
     {
-        $this->expectException(\Symfony\Component\Console\Exception\MissingInputException::class);
+        $this->expectException(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::class);
+        $this->expectException(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::class);
+        $this->expectException(MissingInputException::class);
         $this->expectExceptionMessage('Aborted.');
         $dialog = new QuestionHelper();
 
@@ -897,7 +899,7 @@ protected function createOutputInterface()
 
     protected function createInputInterfaceMock($interactive = true)
     {
-        $mock = $this->getMockBuilder(\Symfony\Component\Console\Input\InputInterface::class)->getMock();
+        $mock = $this->createMock(InputInterface::class);
         $mock->expects($this->any())
             ->method('isInteractive')
             ->willReturn($interactive);

diff --git a/Tests/Helper/SymfonyQuestionHelperTest.php b/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -2,9 +2,11 @@
 
 namespace Symfony\Component\Console\Tests\Helper;
 
+use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Helper\FormatterHelper;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Helper\SymfonyQuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\Question;
@@ -124,7 +126,7 @@ public function testLabelTrailingBackslash()
 
     public function testAskThrowsExceptionOnMissingInput()
     {
-        $this->expectException(\Symfony\Component\Console\Exception\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Aborted.');
         $dialog = new SymfonyQuestionHelper();
         $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new Question('What\'s your name?'));
@@ -149,7 +151,7 @@ public function testChoiceQuestionPadding()
   [foo   ] foo
   [żółw  ] bar
   [łabądź] baz
- > 
+ >
 EOT
         , $output, true);
     }
@@ -168,7 +170,7 @@ public function testChoiceQuestionCustomPrompt()
         $this->assertOutputContains(<<<EOT
  qqq:
   [0] foo
- >ccc> 
+ >ccc>
 EOT
         , $output, true);
     }
@@ -192,7 +194,7 @@ protected function createOutputInterface()
 
     protected function createInputInterfaceMock($interactive = true)
     {
-        $mock = $this->getMockBuilder(\Symfony\Component\Console\Input\InputInterface::class)->getMock();
+        $mock = $this->createMock(InputInterface::class);
         $mock->expects($this->any())
             ->method('isInteractive')
             ->willReturn($interactive);

diff --git a/Tests/Helper/TableTest.php b/Tests/Helper/TableTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Console\Tests\Helper;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Helper\TableCell;
@@ -808,7 +810,7 @@ public function testColumnStyle()
 
     public function testThrowsWhenTheCellInAnArray()
     {
-        $this->expectException(\Symfony\Component\Console\Exception\InvalidArgumentException::class);
+        $this->expectException(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 +985,7 @@ public function testSectionOutputWithoutDecoration()
 
     public function testAppendRowWithoutSectionOutput()
     {
-        $this->expectException(\Symfony\Component\Console\Exception\RuntimeException::class);
+        $this->expectException(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 +1026,15 @@ public function testSectionOutputHandlesZeroRowsAfterRender()
 
     public function testIsNotDefinedStyleException()
     {
-        $this->expectException(\Symfony\Component\Console\Exception\InvalidArgumentException::class);
+        $this->expectException(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::class);
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Style "absent" is not defined.');
         Table::getStyleDefinition('absent');
     }

diff --git a/Tests/Input/StringInputTest.php b/Tests/Input/StringInputTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Console\Tests\Input;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\StringInput;
@@ -24,7 +25,7 @@ class StringInputTest extends TestCase
     public function testTokenize($input, $tokens, $message)
     {
         $input = new StringInput($input);
-        $r = new \ReflectionClass(\Symfony\Component\Console\Input\ArgvInput::class);
+        $r = new \ReflectionClass(ArgvInput::class);
         $p = $r->getProperty('tokens');
         $p->setAccessible(true);
         $this->assertEquals($tokens, $p->getValue($input), $message);

diff --git a/Tests/Logger/ConsoleLoggerTest.php b/Tests/Logger/ConsoleLoggerTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Console\Tests\Logger;
 
 use PHPUnit\Framework\TestCase;
+use Psr\Log\InvalidArgumentException;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 use Symfony\Component\Console\Logger\ConsoleLogger;
@@ -138,7 +139,7 @@ public function provideLevelsAndMessages()
 
     public function testThrowsOnInvalidLevel()
     {
-        $this->expectException(\Psr\Log\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $logger = $this->getLogger();
         $logger->log('invalid level', 'Foo');
     }

diff --git a/Tests/Output/ConsoleSectionOutputTest.php b/Tests/Output/ConsoleSectionOutputTest.php
@@ -147,7 +147,7 @@ public function testClearSectionContainingQuestion()
         fwrite($inputStream, "Batman & Robin\n");
         rewind($inputStream);
 
-        $input = $this->getMockBuilder(StreamableInputInterface::class)->getMock();
+        $input = $this->createMock(StreamableInputInterface::class);
         $input->expects($this->once())->method('isInteractive')->willReturn(true);
         $input->expects($this->once())->method('getStream')->willReturn($inputStream);