Maestro updates to PHPUnit 9.0 (#20)

Author: dantleech

.gitignore

@@ -5,3 +5,4 @@
 /composer.lock
 /.php_cs.cache
 /stubs
+.phpunit.result.cache

composer.json

@@ -17,8 +17,9 @@
         "ergebnis/composer-normalize": "^2.0",
         "friendsofphp/php-cs-fixer": "^2.17",
         "phpstan/phpstan": "~0.12.0",
-        "phpunit/phpunit": "~7.0",
-        "symfony/filesystem": "^3.2"
+        "phpunit/phpunit": "^9.0",
+        "symfony/filesystem": "^4.2 || ^5.0",
+        "phpspec/prophecy-phpunit": "^2.0"
     },
     "extra": {
         "branch-alias": {

phpunit.xml.dist

@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit
-    colors="true"
-    bootstrap="vendor/autoload.php"
-    >
-
-    <testsuites>
-        <testsuite name="Composer Inflector">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory>.</directory>
-            <exclude>
-                <directory>vendor/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage includeUncoveredFiles="true">
+    <include>
+      <directory>.</directory>
+    </include>
+    <exclude>
+      <directory>vendor/</directory>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="Composer Inflector">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

tests/Integration/ClassToFileConverterTest.php

@@ -13,7 +13,7 @@ class ClassToFileConverterTest extends IntegrationTestCase
 {
     private $classLoader;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->classLoader = require __DIR__.'/../../vendor/autoload.php';
     }

tests/Integration/Composer/ComposerClassToFileTest.php

@@ -24,7 +24,7 @@ class ComposerClassToFileTest extends ComposerTestCase
      */
     private $converter;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->initWorkspace();
         $this->logger = $this->prophesize(LoggerInterface::class);

tests/Integration/Composer/ComposerFileToClassTest.php

@@ -12,7 +12,7 @@
  */
 class ComposerFileToClassTest extends ComposerTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->initWorkspace();
     }

tests/Integration/Composer/ComposerTestCase.php

@@ -10,7 +10,7 @@
  */
 abstract class ComposerTestCase extends IntegrationTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->initWorkspace();
     }

tests/Integration/Simple/SimpleClassToFileTest.php

@@ -14,7 +14,7 @@ class SimpleClassToFileTest extends SimpleTestCase
      */
     private $classToFile;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->initWorkspace();
         $this->copyProject();

tests/Integration/Simple/SimpleFileToClassTest.php

@@ -14,7 +14,7 @@ class SimpleFileToClassTest extends SimpleTestCase
      */
     private $fileToClass;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->initWorkspace();
         $this->copyProject();

tests/Unit/ChainClassToFileTest.php

@@ -14,7 +14,7 @@ class ChainClassToFileTest extends TestCase
     private $classToFile1;
     private $classToFile2;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->classToFile1 = $this->prophesize(ClassToFile::class);
         $this->classToFile2 = $this->prophesize(ClassToFile::class);