fix super minor nitpicks (#77)

* fix super minor nitpicks

* Fully update PHPUnit to latest 9.x

Author: mmoll

composer.json

@@ -30,7 +30,7 @@
         "phploc/phploc": "*",
         "phpmd/phpmd": "1.5.*||~2.6",
         "phpstan/phpstan": "^0.12.5",
-        "phpunit/phpunit": "~8.4||^9.0",
+        "phpunit/phpunit": "^9.5",
         "sebastian/phpcpd": "*"
     },
     "autoload": {

phpunit.xml.dist

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
@@ -9,26 +8,30 @@
          processIsolation="false"
          stopOnFailure="false"
          bootstrap="./vendor/autoload.php"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
 >
     <testsuites>
         <testsuite name="PHP_CodeBrowser">
             <directory>./src/PHPCodeBrowser/Tests</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./src</directory>
-            <exclude>
-                <directory>./src/PHPCodeBrowser/Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+        </include>
+        <exclude>
+            <directory>./src/PHPCodeBrowser/Tests</directory>
+        </exclude>
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
+  </coverage>
 
     <logging>
-        <!--<log type="coverage-html" target="build/coverage" lowUpperBound="35" highLowerBound="70"/>-->
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="junit" target="build/logs/junit.xml"/>
+    <!--<log type="coverage-html" target="build/coverage" lowUpperBound="35" highLowerBound="70"/>-->
+        <junit outputFile="build/logs/junit.xml"/>
     </logging>
 
     <php>

src/PHPCodeBrowser/IssueXML.php

@@ -178,10 +178,10 @@ public function addXMLFile(DOMDocument $domDocument): void
      *
      * @see DOMXPath::query
      *
-     * @param string  $expression  Xpath expression to query for.
-     * @param DOMNode $contextNode Node to use as context (optional)
+     * @param string       $expression  Xpath expression to query for.
+     * @param DOMNode|null $contextNode Node to use as context (optional)
      *
-     * @return DOMNodeList         List of all matching nodes.
+     * @return DOMNodeList List of all matching nodes.
      */
     public function query(string $expression, ?DOMNode $contextNode = null): DOMNodeList
     {

src/PHPCodeBrowser/SourceHandler.php

@@ -131,7 +131,7 @@ public function addPlugin(AbstractPlugin $plugin): void
     /**
      * Add source files to the list.
      *
-     * @param array<SplFileInfo>|array<string>|\AppendIterator $files The files to add
+     * @param array<SplFileInfo|string>|\AppendIterator $files The files to add
      */
     public function addSourceFiles($files): void
     {

src/PHPCodeBrowser/Tests/CLIControllerTest.php

@@ -147,8 +147,8 @@ public function testRunCleansExistingOutputDir(): void
         $this->controller->run();
 
         $this->assertOutputIsPresent();
-        $this->assertDirectoryNotExists(self::$testOutputDir.'/clear-directory');
-        $this->assertFileNotExists(self::$testOutputDir.'/clear-file');
+        $this->assertDirectoryDoesNotExist(self::$testOutputDir.'/clear-directory');
+        $this->assertFileDoesNotExist(self::$testOutputDir.'/clear-file');
     }
 
     /**
@@ -184,10 +184,10 @@ public function testRunExcludingAllSources(): void
         $this->controller->run();
 
         $this->assertFileExists(self::$testOutputDir.'/index.html');
-        $this->assertFileNotExists(self::$testOutputDir.'/Bad.php.html');
-        $this->assertFileNotExists(self::$testOutputDir.'/Good.php.html');
-        $this->assertDirectoryNotExists(self::$testOutputDir.'/css');
-        $this->assertDirectoryNotExists(self::$testOutputDir.'/img');
-        $this->assertDirectoryNotExists(self::$testOutputDir.'/js');
+        $this->assertFileDoesNotExist(self::$testOutputDir.'/Bad.php.html');
+        $this->assertFileDoesNotExist(self::$testOutputDir.'/Good.php.html');
+        $this->assertDirectoryDoesNotExist(self::$testOutputDir.'/css');
+        $this->assertDirectoryDoesNotExist(self::$testOutputDir.'/img');
+        $this->assertDirectoryDoesNotExist(self::$testOutputDir.'/js');
     }
 }

src/PHPCodeBrowser/Tests/Helper/IOHelperTest.php

@@ -155,7 +155,7 @@ public function testFileDeletion(): void
         }
 
         $this->ioHelper->deleteFile($filename);
-        $this->assertFileNotExists($filename);
+        $this->assertFileDoesNotExist($filename);
     }
 
     /**
@@ -174,7 +174,7 @@ public function testDirectoryDeletion(): void
         \touch($file);
 
         $this->ioHelper->deleteDirectory($dir);
-        $this->assertFileNotExists($dir);
+        $this->assertFileDoesNotExist($dir);
     }
 
     /**

src/PHPCodeBrowser/View/ViewReview.php

@@ -337,8 +337,8 @@ private function formatSourceCode(string $filename, array $outputIssues): string
 
         foreach ($lines as $line) {
             /**
- * @var DOMElement $line
-*/
+             * @var DOMElement $line
+             */
             $line = $line;
             ++$lineNumber;
             $line->setAttribute('id', 'line_'.$lineNumber);