upgrade phpunit to version 8

Author: cebe

.github/workflows/test.yml

@@ -1,9 +1,9 @@
 name: yii2-openapi
 on:
   push:
-    branches: [ master, wip]
+    branches: [ master ]
   pull_request:
-    branches: [ master, wip ]
+    branches: [ master ]
     paths-ignore:
       - 'docs/**'
       - '*.md'

.gitignore

@@ -3,3 +3,4 @@
 /phpunit.xml
 /.php_cs.cache
 /.env
+/.phpunit.result.cache

Makefile

@@ -42,18 +42,18 @@ up:
 	docker-compose exec -T mysql timeout 60s sh -c "while ! (mysql --execute \"ALTER USER 'dbuser'@'%' IDENTIFIED WITH mysql_native_password BY 'dbpass';\" > /dev/null 2>&1); do echo -n '.'; sleep 0.1 ; done; echo 'ok'" || (docker-compose ps; docker-compose logs; exit 1)
 
 cli:
-	docker-compose exec php bash
+	docker-compose exec --user=$$(id -u) php bash
 
 migrate:
-	docker-compose run --rm php sh -c 'mkdir -p "tests/tmp/app"'
-	docker-compose run --rm php sh -c 'mkdir -p "tests/tmp/docker_app"'
-	docker-compose run --rm php sh -c 'cd /app/tests && ./yii migrate  --interactive=0'
+	docker-compose run --user=$$(id -u) --rm php sh -c 'mkdir -p "tests/tmp/app"'
+	docker-compose run --user=$$(id -u) --rm php sh -c 'mkdir -p "tests/tmp/docker_app"'
+	docker-compose run --user=$$(id -u) --rm php sh -c 'cd /app/tests && ./yii migrate  --interactive=0'
 
 installdocker:
-	docker-compose run --rm php composer install && chmod +x tests/yii
+	docker-compose run --user=$$(id -u) --rm php composer install && chmod +x tests/yii
 
 testdocker:
-	docker-compose run --rm php sh -c 'vendor/bin/phpunit'
+	docker-compose run --user=$$(id -u) --rm php sh -c 'vendor/bin/phpunit'
 
 efs: clean_all up migrate # Everything From Scratch
 

composer.json

@@ -30,7 +30,7 @@
 	"require-dev": {
 		"cebe/indent": "*",
 		"friendsofphp/php-cs-fixer": "~2.16",
-		"phpunit/phpunit": "^6.5|^8.0|^9.0",
+		"phpunit/phpunit": "^8.0",
 		"yiisoft/yii2-gii": ">=2.1.0"
 	},
 	"autoload": {

phpunit.xml.dist

@@ -5,15 +5,18 @@
 		convertNoticesToExceptions="true"
 		convertWarningsToExceptions="true"
 		stopOnFailure="false">
-		<testsuites>
-			<testsuite name="Test Suite">
-				<directory suffix="Test.php">./tests/unit</directory>
-			</testsuite>
-		</testsuites>
-		<filter>
-			<blacklist>
+	<testsuites>
+		<testsuite name="Test Suite">
+			<directory suffix="Test.php">./tests/unit</directory>
+		</testsuite>
+	</testsuites>
+	<filter>
+		<whitelist processUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">./src</directory>
+			<exclude>
 				<directory>./vendor</directory>
 				<directory>./tests</directory>
-			</blacklist>
-		</filter>
+			</exclude>
+		</whitelist>
+	</filter>
 </phpunit>

tests/DbTestCase.php

@@ -35,7 +35,7 @@ protected function destroyApplication()
         Yii::$container = new Container();
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         if (getenv('IN_DOCKER') !== 'docker') {
             $this->markTestSkipped('For docker env only');
@@ -45,7 +45,7 @@ protected function setUp()
         parent::setUp();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         if (getenv('IN_DOCKER') === 'docker') {

tests/TestCase.php

@@ -13,16 +13,6 @@
 
 class TestCase extends \PHPUnit\Framework\TestCase
 {
-    public static function assertEqualsCanonicalizing($expected, $actual, string $message = '')
-    {
-        if ((int)Version::id()[0] >= 8) {
-            parent::assertEqualsCanonicalizing($expected, $actual, $message);
-        } else {
-            self::assertTrue(empty(array_diff($expected, $actual)) && empty(array_diff($actual, $expected)));
-        }
-
-    }
-
     protected function prepareTempDir()
     {
         FileHelper::removeDirectory(__DIR__ . '/tmp/app');

tests/unit/MultiDbFreshMigrationTest.php

@@ -58,7 +58,7 @@ public function testMysql()
         $this->compareFiles($expectedFiles, $testFile);
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         if (getenv('IN_DOCKER') !== 'docker') {
             $this->markTestSkipped('For docker env only');
@@ -68,7 +68,7 @@ protected function setUp()
         parent::setUp();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         if (getenv('IN_DOCKER') === 'docker') {

tests/unit/MultiDbSecondaryMigrationTest.php

@@ -67,7 +67,7 @@ public function testMysql()
         $this->compareFiles($expectedFiles, $testFile);
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         if (getenv('IN_DOCKER') !== 'docker') {
             $this->markTestSkipped('For docker env only');
@@ -77,7 +77,7 @@ protected function setUp()
         parent::setUp();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         if (getenv('IN_DOCKER') === 'docker') {