From da91bdea708ee00f38c0579f2c88f578b1fc4e84 Mon Sep 17 00:00:00 2001
From: Willem Wollebrants <willem@studiow.be>
Date: Wed, 7 Jul 2021 11:44:08 +0200
Subject: [PATCH] make tests compatible with phpunit for php8

---
 .github/workflows/test.yml              | 4 ++--
 .gitignore                              | 1 +
 composer.json                           | 2 +-
 tests/Valitron/BaseTestCase.php         | 5 ++---
 tests/Valitron/LangTest.php             | 9 ++++-----
 tests/Valitron/StaticVsInstanceTest.php | 1 +
 tests/Valitron/ValidateTest.php         | 1 -
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f5a4b05..b1c329e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,8 +17,8 @@ jobs:
         - '7.2'
         - '7.3'
         - '7.4'
-#        - '8.0'
-#        - '8.1'
+        - '8.0'
+        - '8.1'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/.gitignore b/.gitignore
index 17193f5..12d6107 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ composer.phar
 composer.lock
 vendor
 .idea/
+.phpunit.result.cache
\ No newline at end of file
diff --git a/composer.json b/composer.json
index c05eb0f..0937440 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
         "php": ">=5.3.2"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=4.8.35 <8"
+        "phpunit/phpunit": ">=4.8.35 <9"
     },
     "suggest": {
         "ext-mbstring": "It can support the multiple bytes string length."
diff --git a/tests/Valitron/BaseTestCase.php b/tests/Valitron/BaseTestCase.php
index 40cf559..5a0d42e 100644
--- a/tests/Valitron/BaseTestCase.php
+++ b/tests/Valitron/BaseTestCase.php
@@ -4,10 +4,8 @@ use PHPUnit\Framework\TestCase;
 
 class BaseTestCase extends TestCase
 {
-	public function setUp()
-	{
-	}
 
+/*
 	public function tearDown()
 	{
 		$this->resetProperty('_lang');
@@ -23,4 +21,5 @@ class BaseTestCase extends TestCase
 		$prop->setValue($value);
 		$prop->setAccessible(false);
 	}
+*/
 }
diff --git a/tests/Valitron/LangTest.php b/tests/Valitron/LangTest.php
index 7cd99c0..61bab65 100644
--- a/tests/Valitron/LangTest.php
+++ b/tests/Valitron/LangTest.php
@@ -15,8 +15,8 @@ class LangTest extends BaseTestCase
     {
     	$lang = 'ar';
     	Validator::lang($lang);
-    	$validator = new Validator(array());
     	$this->assertEquals($lang, Validator::lang());
+        Validator::lang('en');
 	}
 
 	/**
@@ -42,12 +42,11 @@ class LangTest extends BaseTestCase
 		$this->assertEquals(realpath($this->getLangDir()), realpath(Validator::langDir()));
 	}
 
-	/**
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Fail to load language file '/this/dir/does/not/exists/en.php'
-     */
+
 	public function testLangException()
 	{
+	    $this->expectException("InvalidArgumentException");
+        $this->expectExceptionMessage("Fail to load language file '/this/dir/does/not/exists/en.php'");
 		new Validator(array(), array(), 'en', '/this/dir/does/not/exists');
 	}
 
diff --git a/tests/Valitron/StaticVsInstanceTest.php b/tests/Valitron/StaticVsInstanceTest.php
index 174334c..44bf5c6 100644
--- a/tests/Valitron/StaticVsInstanceTest.php
+++ b/tests/Valitron/StaticVsInstanceTest.php
@@ -10,6 +10,7 @@ class StaticVsInstanceTest extends BaseTestCase
 		$this->assertEquals(
 		    'ar', Validator::lang(), 'instance defined lang should not replace static global lang'
         );
+		Validator::lang('en');
 	}
 
 	/**
diff --git a/tests/Valitron/ValidateTest.php b/tests/Valitron/ValidateTest.php
index de06b61..a7f7158 100644
--- a/tests/Valitron/ValidateTest.php
+++ b/tests/Valitron/ValidateTest.php
@@ -4,7 +4,6 @@ use Valitron\Validator;
 
 class ValidateTest extends BaseTestCase
 {
-
     public function testValidWithNoRules()
     {
         $v = new Validator(array('name' => 'Chester Tester'));