Upgrade PHPUnit

Author: Jean85

composer.json

@@ -40,7 +40,7 @@
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12.55",
         "phpstan/phpstan-phpunit": "^0.12.16",
-        "phpunit/phpunit": "^8.5.14 | ^9.5.2",
+        "phpunit/phpunit": "^9.6.6",
         "phpspec/prophecy-phpunit": "^2.0",
         "symfony/phpunit-bridge": "^5.2",
         "vimeo/psalm": "^4.6"

phpunit.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          executionOrder="depends,defects"
          cacheResult="false"
          colors="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutTodoAnnotatedTests="true"
          verbose="true">
-    <testsuites>
-        <testsuite name="default">
-            <directory suffix="Test.php">tests</directory>
-        </testsuite>
-    </testsuites>
+  <testsuites>
+    <testsuite name="default">
+      <directory suffix="Test.php">tests</directory>
+    </testsuite>
+  </testsuites>
 
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </coverage>
 </phpunit>

tests/E2E/TerminateCommandTest.php

@@ -106,7 +106,7 @@ public function testSigTermDuringSleep(): void
         $this->assertCommandIsFound($process);
         $this->assertStringContainsString('Starting ' . self::STUB_COMMAND, $process->getOutput());
         $this->assertStringNotContainsString('Signal received, skipping execution', $process->getOutput());
-        $this->assertRegExp('/Slept (0|1) second\(s\)/', $process->getOutput());
+        $this->assertMatchesRegularExpression('/Slept (0|1) second\(s\)/', $process->getOutput());
         $this->assertSame(143, $process->getExitCode());
     }
 

tests/Unit/AbstractTerminableCommandTest.php

@@ -9,6 +9,7 @@
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bridge\PhpUnit\ClockMock;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -39,7 +40,6 @@ protected function commandBody(InputInterface $input, OutputInterface $output):
             }
         };
 
-        $input = $this->prophesize(InputInterface::class);
         $output = $this->prophesize(OutputInterface::class);
         $output->writeln(Argument::containingString('Starting'), OutputInterface::VERBOSITY_VERBOSE)
             ->shouldBeCalledTimes(1);
@@ -50,7 +50,7 @@ protected function commandBody(InputInterface $input, OutputInterface $output):
 
         ClockMock::withClockMock(true);
         $start = ClockMock::time();
-        $exitCode = $stubCommand->run($input->reveal(), $output->reveal());
+        $exitCode = $stubCommand->run(new ArrayInput([]), $output->reveal());
         $end = ClockMock::time();
 
         $this->assertSame(0, $exitCode);
@@ -69,14 +69,13 @@ protected function commandBody(InputInterface $input, OutputInterface $output):
             }
         };
 
-        $input = $this->prophesize(InputInterface::class);
         $output = $this->prophesize(OutputInterface::class);
         $output->writeln(Argument::containingString('Starting'), OutputInterface::VERBOSITY_VERBOSE)
             ->shouldBeCalledTimes(1);
 
         $this->expectException(\InvalidArgumentException::class);
 
-        $stubCommand->run($input->reveal(), $output->reveal());
+        $stubCommand->run(new ArrayInput([]), $output->reveal());
     }
 
     /**
@@ -102,14 +101,13 @@ protected function commandBody(InputInterface $input, OutputInterface $output):
             }
         };
 
-        $input = $this->prophesize(InputInterface::class);
         $output = $this->prophesize(OutputInterface::class);
         $output->writeln(Argument::containingString('Starting'), OutputInterface::VERBOSITY_VERBOSE)
             ->shouldBeCalledTimes(1);
         $output->writeln('Signal received, terminating with exit code 143', OutputInterface::VERBOSITY_NORMAL)
             ->shouldBeCalledTimes(1);
 
-        $exitCode = $stubCommand->run($input->reveal(), $output->reveal());
+        $exitCode = $stubCommand->run(new ArrayInput([]), $output->reveal());
 
         $this->assertSame(143, $exitCode);
     }
@@ -126,7 +124,6 @@ protected function commandBody(InputInterface $input, OutputInterface $output):
             }
         };
 
-        $input = $this->prophesize(InputInterface::class);
         $output = $this->prophesize(OutputInterface::class);
         $output->writeln(Argument::containingString('Starting'), OutputInterface::VERBOSITY_VERBOSE)
             ->shouldBeCalledTimes(1)
@@ -136,7 +133,7 @@ protected function commandBody(InputInterface $input, OutputInterface $output):
         $output->writeln('Signal received, skipping execution', OutputInterface::VERBOSITY_NORMAL)
             ->shouldBeCalledTimes(1);
 
-        $exitCode = $stubCommand->run($input->reveal(), $output->reveal());
+        $exitCode = $stubCommand->run(new ArrayInput([]), $output->reveal());
 
         $this->assertSame(143, $exitCode);
     }