WIP cleanup tests

Author: helhum

.github/workflows/tests.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
 
     steps:
       - uses: actions/checkout@v2

composer.json

@@ -21,12 +21,12 @@
     },
     "require": {
         "php": ">=7.1",
-        "composer-plugin-api": "^1.0 || ^2.0"
+        "composer-plugin-api": "^2.0"
     },
     "require-dev": {
-        "composer/composer": "^1.1@dev || ^2.0@dev",
+        "composer/composer": "^2.0@dev",
         "mikey179/vfsstream": "~1.4.0@dev",
-        "phpunit/phpunit": ">4.8 <9"
+        "phpunit/phpunit": "^8 || ^9"
     },
     "replace": {
         "helhum/class-alias-loader": "*"

tests/Unit/BaseTestCase.php

@@ -12,36 +12,31 @@
 
 use Composer\Autoload\ClassLoader as ComposerClassLoader;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use TYPO3\ClassAliasLoader\ClassAliasLoader;
 
 /**
  * Test case for ClassAliasLoader
  */
-class ClassAliasLoaderTest extends BaseTestCase
+class ClassAliasLoaderTest extends TestCase
 {
     /**
      * @var ClassAliasLoader
      */
     protected $subject;
 
     /**
-     * @var ComposerClassLoader|MockObject|PHPUnit_Framework_MockObject_MockObject
+     * @var ComposerClassLoader|MockObject
      */
     protected $composerClassLoaderMock;
 
-    /**
-     * @before
-     */
-    public function setMeUp()
+    public function setUp(): void
     {
         $this->composerClassLoaderMock = $this->getMockBuilder('Composer\\Autoload\\ClassLoader')->getMock();
         $this->subject = new ClassAliasLoader($this->composerClassLoaderMock);
     }
 
-    /**
-     * @after
-     */
-    public function tearMeDown()
+    public function tearDown(): void
     {
         $this->subject->unregister();
     }

tests/Unit/ClassAliasLoaderTest.php

@@ -12,36 +12,34 @@
 
 use Composer\IO\IOInterface;
 use Composer\Package\PackageInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use TYPO3\ClassAliasLoader\Config;
 
 /**
  * Test case for Config
  */
-class ConfigTest extends BaseTestCase
+class ConfigTest extends TestCase
 {
     /**
      * @var Config
      */
     protected $subject;
 
     /**
-     * @var IOInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var IOInterface|MockObject
      */
     protected $ioMock;
 
     /**
-     * @var PackageInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var PackageInterface|MockObject
      */
     protected $packageMock;
 
-    /**
-     * @before
-     */
-    public function setMeUp()
+    public function setUp(): void
     {
         $this->ioMock = $this->getMockBuilder('Composer\\IO\\IOInterface')->getMock();
         $this->packageMock = $this->getMockBuilder('Composer\\Package\\PackageInterface')->getMock();
-
         $this->subject = new Config($this->packageMock, $this->ioMock);
     }
 

tests/Unit/ConfigTest.php

@@ -14,13 +14,14 @@
 use Composer\IO\IOInterface;
 use Composer\Package\PackageInterface;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use TYPO3\ClassAliasLoader\Config;
 use TYPO3\ClassAliasLoader\IncludeFile;
 
 /**
  * Test case for IncludeFile
  */
-final class IncludeFileTest extends BaseTestCase
+final class IncludeFileTest extends TestCase
 {
     /**
      * @var IncludeFile
@@ -44,10 +45,7 @@ final class IncludeFileTest extends BaseTestCase
 
     private $testDir = __DIR__;
 
-    /**
-     * @before
-     */
-    public function setMeUp()
+    public function setUp(): void
     {
         $this->ioMock = $this->getMockBuilder('Composer\\IO\\IOInterface')->getMock();
         $this->packageMock = $this->getMockBuilder('Composer\\Package\\RootPackageInterface')->getMock();
@@ -84,10 +82,7 @@ public function setMeUp()
         );
     }
 
-    /**
-     * @after
-     */
-    public function tearMeDown()
+    public function tearDown(): void
     {
         unlink($this->testDir . IncludeFile::INCLUDE_FILE);
         rmdir(dirname($this->testDir . IncludeFile::INCLUDE_FILE));