Updating to phpunit 10

Author: mamazu

composer.json

@@ -18,15 +18,17 @@
         "symfony/yaml": "^4|^5",
         "mamazu/rst": "^2.0",
         "symfony/filesystem": "^4|^5.3",
-        "symfony/dotenv": "^4|^5"
+        "symfony/dotenv": "^4|^5",
+        "webmozart/assert": "^1.11"
     },
     "require-dev": {
         "mikey179/vfsstream": "^1.6",
         "phpstan/phpstan": "^0.12.78",
         "phpstan/phpstan-strict-rules": "^0.12.9",
         "phpstan/phpstan-webmozart-assert": "^0.12.12",
         "symplify/easy-coding-standard": "^10.2.4",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^10.0",
+        "rector/rector": "^0.11.60"
     },
     "autoload": {
         "psr-4": {

rector.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Core\Configuration\Option;
+use Rector\Set\ValueObject\SetList;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    // get parameters
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::PATHS, [
+        __DIR__ . '/src'
+    ]);
+
+    // Define what rule sets will be applied
+    $containerConfigurator->import(SetList::DEAD_CODE);
+    $containerConfigurator->import(SetList::CODE_QUALITY);
+
+    // get services (needed for register a single rule)
+     //$services = $containerConfigurator->services();
+
+    // register a single rule
+     //$services->set(WithConsecutiveRector::class);
+};

src/Application.php

@@ -76,7 +76,7 @@ public function run(FormatterInterface $formatter, FileList $fileList): void
 			exit($throwable->getCode());
 		}
 
-		if (count($output) > 0) {
+		if ($output !== []) {
 			exit(1);
 		}
 	}

src/Output/JsonFormatter.php

@@ -10,7 +10,7 @@ final class JsonFormatter implements FormatterInterface
 {
 	public function format(array $output): string
 	{
-		if (count($output) === 0) {
+		if ($output === []) {
 			return '';
 		}
 

src/Utils/PhpCodeEnsurer.php

@@ -24,10 +24,6 @@ public function putPhpCodeToFile(string $sourceCode, string $fileName): void
 	public function getPHPCode(string $sourceCode): string
 	{
 		$sourceCode = trim($sourceCode);
-
-		// Finding partial classes: meaning the documentation only contains class bodies
-		// in this case we just define a class around it for it to be valid php
-		$matches = [];
 		if ($this->needsToBeWrappedInClass($sourceCode)) {
 			if ($this->hasPhpTag($sourceCode)) {
 				$sourceCode = substr($sourceCode, 5);

src/Validator/CompositeValidator.php

@@ -35,7 +35,7 @@ public function validate(Block $block): array
 		$error = [];
 		foreach ($this->validators as $validator) {
 			$newErrors = $validator->validate($block);
-			if ($this->continueValidationOnFailure || count($newErrors) === 0) {
+			if ($this->continueValidationOnFailure || $newErrors === []) {
 				$error = array_merge($error, $newErrors);
 			} else {
 				return $newErrors;

src/Validator/JSON/JsonValidator.php

@@ -14,7 +14,7 @@ class JsonValidator implements ValidatorInterface
 	public function validate(Block $block): array
 	{
 		try {
-			$content = json_decode($block->getContent(), true, 1024, JSON_THROW_ON_ERROR);
+			json_decode($block->getContent(), true, 1024, JSON_THROW_ON_ERROR);
 		} catch (JsonException $e) {
 			return [
 				Error::errorFromBlock($block, 1, $e->getMessage()),

src/Validator/Php/PhpClassExistsValidator.php

@@ -26,11 +26,6 @@ final class PhpClassExistsValidator implements ValidatorInterface
 
 	private PhpCodeEnsurerInterface $codeEnsurer;
 
-	/**
-	 * @var false|string
-	 */
-	private $phpVersion;
-
 	public function __construct(
 		callable $classExists,
 		?Parser $parser = null,

tests/Mamazu/DocumentationParser/CLITest.php

@@ -23,14 +23,18 @@ protected function setUp(): void
 
 	public function testParsesAFilesOnlyParameters(): void
 	{
+		$matcher = $this->exactly(2);
 		/** @var FileList|MockObject $fileList */
 		$fileList = $this->createMock(FileList::class);
-		$fileList->expects($this->exactly(2))
+		$fileList->expects($matcher)
 			->method('addFile')
-			->withConsecutive(
-				['abc.php'],
-				['cde.md']
-			);
+			->willReturnCallback(function (...$args) use ($matcher) {
+				$expected = [
+					['abc.php'],
+					['cde.md'],
+				];
+				$this->assertEquals($expected[$matcher->numberOfInvocations() - 1], $args);
+			});
 
 		$this->cLI = new CLI($fileList, ['abc.php', 'cde.md']);
 		$this->assertSame($fileList, $this->cLI->getFilesToParse());
@@ -39,14 +43,18 @@ public function testParsesAFilesOnlyParameters(): void
 
 	public function testParsesAFileAnIncludeFileMix(): void
 	{
+		$matcher = $this->exactly(2);
 		/** @var FileList|MockObject $fileList */
 		$fileList = $this->createMock(FileList::class);
-		$fileList->expects($this->exactly(2))
+		$fileList->expects($matcher)
 			->method('addFile')
-			->withConsecutive(
-				['abc.php'],
-				['cde.md']
-			);
+			->willReturnCallback(function (...$args) use ($matcher) {
+				$expected = [
+					['abc.php'],
+					['cde.md'],
+				];
+				$this->assertEquals($expected[$matcher->numberOfInvocations() - 1], $args);
+			});
 
 		$this->workDir->addChild(vfsStream::newFile('bananas.php'));
 		$this->cLI = new CLI($fileList, ['abc.php', '-i', 'vfs://workDir/bananas.php', 'cde.md']);
@@ -56,14 +64,18 @@ public function testParsesAFileAnIncludeFileMix(): void
 
 	public function testHasNoIncludeFileIfNoValueWasGiven(): void
 	{
+		$matcher = $this->exactly(2);
 		/** @var FileList|MockObject $fileList */
 		$fileList = $this->createMock(FileList::class);
-		$fileList->expects($this->exactly(2))
+		$fileList->expects($matcher)
 			->method('addFile')
-			->withConsecutive(
-				['abc.php'],
-				['cde.md']
-			);
+			->willReturnCallback(function (...$args) use ($matcher) {
+				$expected = [
+					['abc.php'],
+					['cde.md'],
+				];
+				$this->assertEquals($expected[$matcher->numberOfInvocations() - 1], $args);
+			});
 
 		$this->cLI = new CLI($fileList, ['abc.php', 'cde.md', '-i']);
 		$this->assertSame($fileList, $this->cLI->getFilesToParse());

tests/Mamazu/DocumentationParser/FileListTest.php

@@ -35,7 +35,7 @@ public function testGetsAllValidFiles(): void
 		$this->fileList->addFile('vfs://workDir/test.php');
 		$this->fileList->addFile('vfs://workDir/bananas.php');
 
-		$this->fileList->getAllValidFiles();
+		$this->assertSame(['vfs://workDir/test.php'], iterator_to_array($this->fileList->getAllValidFiles()));
 	}
 
 	public function testAddsAFile(): void