Merge pull request #344 from vlucas/issue-326

Test against PHP 8

.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

.gitignore

@@ -3,3 +3,4 @@ composer.phar
 composer.lock
 vendor
 .idea/
+.phpunit.result.cache

composer.json

@@ -16,7 +16,7 @@
         "php": ">=5.3.2"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=4.8.35 <8"
+        "phpunit/phpunit": ">=4.8.35"
     },
     "suggest": {
         "ext-mbstring": "It can support the multiple bytes string length."

tests/Valitron/BaseTestCase.php

@@ -4,10 +4,8 @@
 
 class BaseTestCase extends TestCase
 {
-	public function setUp()
-	{
-	}
 
+/*
 	public function tearDown()
 	{
 		$this->resetProperty('_lang');
@@ -23,4 +21,5 @@ protected function resetProperty($name, $value = null)
 		$prop->setValue($value);
 		$prop->setAccessible(false);
 	}
+*/
 }

tests/Valitron/LangTest.php

@@ -15,8 +15,8 @@ public function testLangDefinedStatically()
     {
     	$lang = 'ar';
     	Validator::lang($lang);
-    	$validator = new Validator(array());
     	$this->assertEquals($lang, Validator::lang());
+        Validator::lang('en');
 	}
 
 	/**
@@ -42,13 +42,15 @@ public function testDefaultLangDirShouldBePackageLangDir()
 		$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()
 	{
+        try{
 		new Validator(array(), array(), 'en', '/this/dir/does/not/exists');
+        } catch (Exception $exception){
+            $this->assertInstanceOf("InvalidArgumentException", $exception);
+            $this->assertEquals("Fail to load language file '/this/dir/does/not/exists/en.php'", $exception->getMessage());
+        }
 	}
 
 

tests/Valitron/StaticVsInstanceTest.php

@@ -10,6 +10,7 @@ public function testInstanceOverrideStaticLang()
 		$this->assertEquals(
 		    'ar', Validator::lang(), 'instance defined lang should not replace static global lang'
         );
+		Validator::lang('en');
 	}
 
 	/**

tests/Valitron/ValidateTest.php

@@ -4,7 +4,6 @@
 
 class ValidateTest extends BaseTestCase
 {
-
     public function testValidWithNoRules()
     {
         $v = new Validator(array('name' => 'Chester Tester'));