Update to PHPUnit 8

gdarko · gdarko · commit e6796e10586d · 2020-06-25T22:41:35.000Z
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 vendor/
 composer.lock
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 7.0
-  - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 before_script:
   - composer install
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 WP Validation - PHP Standalone Validation Library
 ======================================================
 
-[![Build Status](https://img.shields.io/travis/rakit/validation.svg?style=flat-square)](https://travis-ci.org/rakit/validation)
+[![Build Status](https://img.shields.io/travis/gdarko/wp-validation.svg?style=flat-square)](https://travis-ci.org/rakit/validation)
 [![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://doge.mit-license.org)
 
 
@@ -28,7 +28,7 @@ This is a fork of the original library written by [Rakit](https://github.com/rak
 #### Installation
 
 ```
-composer require "rakit/validation"
+composer require gdarko/wp-validation
 ```
 
 #### Usage
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "ext-mbstring": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.5",
+    "phpunit/phpunit": "^8.0",
     "squizlabs/php_codesniffer": "^3"
   },
   "scripts": {
diff --git a/tests/Rules/AcceptedTest.php b/tests/Rules/AcceptedTest.php
@@ -8,7 +8,7 @@
 class AcceptedTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Accepted;
     }
diff --git a/tests/Rules/AfterTest.php b/tests/Rules/AfterTest.php
@@ -14,7 +14,7 @@ class AfterTest extends TestCase
      */
     protected $validator;
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->validator = new After();
     }
@@ -31,18 +31,19 @@ public function testOnlyAWellFormedDateCanBeValidated($date)
 
     /**
      * @dataProvider getInvalidDates
-     * @expectedException Exception
      */
     public function testANonWellFormedDateCannotBeValidated($date)
     {
+        $this->expectException(\Exception::class);
+
         $this->validator->fillParameters(["tomorrow"])->check($date);
     }
 
-    /**
-     * @expectedException Exception
-     */
+
     public function testUserProvidedParamCannotBeValidatedBecauseItIsInvalid()
     {
+        $this->expectException(\Exception::class);
+
         $this->validator->fillParameters(["to,morrow"])->check("now");
     }
 
diff --git a/tests/Rules/AlphaDashTest.php b/tests/Rules/AlphaDashTest.php
@@ -8,7 +8,7 @@
 class AlphaDashTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new AlphaDash;
     }
diff --git a/tests/Rules/AlphaNumTest.php b/tests/Rules/AlphaNumTest.php
@@ -8,7 +8,7 @@
 class AlphaNumTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new AlphaNum;
     }
diff --git a/tests/Rules/AlphaSpacesTest.php b/tests/Rules/AlphaSpacesTest.php
@@ -8,7 +8,7 @@
 class AlphaSpacesTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new AlphaSpaces;
     }
diff --git a/tests/Rules/AlphaTest.php b/tests/Rules/AlphaTest.php
@@ -9,7 +9,7 @@
 class AlphaTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Alpha;
     }
diff --git a/tests/Rules/BeforeTest.php b/tests/Rules/BeforeTest.php
@@ -14,7 +14,7 @@ class BeforeTest extends TestCase
      */
     protected $validator;
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->validator = new Before();
     }
@@ -45,10 +45,10 @@ public function getValidDates()
 
     /**
      * @dataProvider getInvalidDates
-     * @expectedException Exception
      */
     public function testANonWellFormedDateCannotBeValidated($date)
     {
+        $this->expectException(\Exception::class);
         $this->validator->fillParameters(["tomorrow"])->check($date);
     }
 
@@ -82,10 +82,10 @@ public function testProvidedDateFailsValidation()
     }
 
     /**
-     * @expectedException Exception
      */
     public function testUserProvidedParamCannotBeValidatedBecauseItIsInvalid()
     {
+        $this->expectException(\Exception::class);
         $this->validator->fillParameters(["to,morrow"])->check("now");
     }
 }
diff --git a/tests/Rules/BetweenTest.php b/tests/Rules/BetweenTest.php
@@ -8,7 +8,7 @@
 class BetweenTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Between;
     }
diff --git a/tests/Rules/CallbackTest.php b/tests/Rules/CallbackTest.php
@@ -8,7 +8,7 @@
 class CallbackTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Callback;
         $this->rule->setCallback(function ($value) {
diff --git a/tests/Rules/DateTest.php b/tests/Rules/DateTest.php
@@ -8,7 +8,7 @@
 class DateTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Date;
     }
diff --git a/tests/Rules/DefaultsTest.php b/tests/Rules/DefaultsTest.php
@@ -7,7 +7,7 @@
 
 class DefaultsTest extends TestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Defaults;
     }
diff --git a/tests/Rules/DigitsBetweenTest.php b/tests/Rules/DigitsBetweenTest.php
@@ -8,7 +8,7 @@
 class DigitsBetweenTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new DigitsBetween;
     }
diff --git a/tests/Rules/DigitsTest.php b/tests/Rules/DigitsTest.php
@@ -8,7 +8,7 @@
 class DigitsTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Digits;
     }
diff --git a/tests/Rules/EmailTest.php b/tests/Rules/EmailTest.php
@@ -8,7 +8,7 @@
 class EmailTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Email;
     }
diff --git a/tests/Rules/ExtensionTest.php b/tests/Rules/ExtensionTest.php
@@ -8,7 +8,7 @@
 class ExtensionTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Extension;
     }
diff --git a/tests/Rules/InTest.php b/tests/Rules/InTest.php
@@ -8,7 +8,7 @@
 class InTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new In;
     }
diff --git a/tests/Rules/IntegerTest.php b/tests/Rules/IntegerTest.php
@@ -8,7 +8,7 @@
 class IntegerTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Integer;
     }
diff --git a/tests/Rules/IpTest.php b/tests/Rules/IpTest.php
@@ -8,7 +8,7 @@
 class IpTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Ip;
     }
diff --git a/tests/Rules/Ipv4Test.php b/tests/Rules/Ipv4Test.php
@@ -8,7 +8,7 @@
 class Ipv4Test extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Ipv4;
     }
diff --git a/tests/Rules/Ipv6Test.php b/tests/Rules/Ipv6Test.php
@@ -8,7 +8,7 @@
 class Ipv6Test extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Ipv6;
     }
diff --git a/tests/Rules/JsonTest.php b/tests/Rules/JsonTest.php
@@ -8,7 +8,7 @@
 class JsonTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Json;
     }
diff --git a/tests/Rules/LowercaseTest.php b/tests/Rules/LowercaseTest.php
@@ -8,7 +8,7 @@
 class LowercaseTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Lowercase;
     }
diff --git a/tests/Rules/MaxTest.php b/tests/Rules/MaxTest.php
@@ -8,7 +8,7 @@
 class MaxTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Max;
     }
diff --git a/tests/Rules/MimesTest.php b/tests/Rules/MimesTest.php
@@ -8,7 +8,7 @@
 class MimesTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Mimes();
     }
diff --git a/tests/Rules/MinTest.php b/tests/Rules/MinTest.php
@@ -8,7 +8,7 @@
 class MinTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Min;
     }
diff --git a/tests/Rules/NotInTest.php b/tests/Rules/NotInTest.php
@@ -8,7 +8,7 @@
 class NotInTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new NotIn;
     }
diff --git a/tests/Rules/NumericTest.php b/tests/Rules/NumericTest.php
@@ -8,7 +8,7 @@
 class NumericTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Numeric;
     }
diff --git a/tests/Rules/RegexTest.php b/tests/Rules/RegexTest.php
@@ -8,7 +8,7 @@
 class RegexTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Regex;
     }
diff --git a/tests/Rules/RequiredTest.php b/tests/Rules/RequiredTest.php
@@ -9,7 +9,7 @@
 class RequiredTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Required;
     }
diff --git a/tests/Rules/TypeArrayTest.php b/tests/Rules/TypeArrayTest.php
@@ -8,7 +8,7 @@
 class TypeArrayTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new TypeArray;
     }
diff --git a/tests/Rules/UploadedFileTest.php b/tests/Rules/UploadedFileTest.php
@@ -8,7 +8,7 @@
 class UploadedFileTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new UploadedFile();
     }
diff --git a/tests/Rules/UppercaseTest.php b/tests/Rules/UppercaseTest.php
@@ -8,7 +8,7 @@
 class UppercaseTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Uppercase;
     }
diff --git a/tests/Rules/UrlTest.php b/tests/Rules/UrlTest.php
@@ -8,7 +8,7 @@
 class UrlTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->rule = new Url;
     }
diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`vendor/`
`2`	`2`	`composer.lock`
	`3`	`+.phpunit.result.cache`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`class AcceptedTest extends TestCase`
`9`	`9`	`{`
`10`	`10`
`11`		`- public function setUp()`
	`11`	`+ public function setUp() : void`
`12`	`12`	`{`
`13`	`13`	`$this->rule = new Accepted;`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class AfterTest extends TestCase`
`14`	`14`	`*/`
`15`	`15`	`protected $validator;`
`16`	`16`
`17`		`- public function setUp()`
	`17`	`+ public function setUp() : void`
`18`	`18`	`{`
`19`	`19`	`$this->validator = new After();`
`20`	`20`	`}`
`@@ -31,18 +31,19 @@ public function testOnlyAWellFormedDateCanBeValidated($date)`
`31`	`31`
`32`	`32`	`/**`
`33`	`33`	`* @dataProvider getInvalidDates`
`34`		`- * @expectedException Exception`
`35`	`34`	`*/`
`36`	`35`	`public function testANonWellFormedDateCannotBeValidated($date)`
`37`	`36`	`{`
	`37`	`+ $this->expectException(\Exception::class);`
	`38`	`+`
`38`	`39`	`$this->validator->fillParameters(["tomorrow"])->check($date);`
`39`	`40`	`}`
`40`	`41`
`41`		`- /**`
`42`		`- * @expectedException Exception`
`43`		`- */`
	`42`	`+`
`44`	`43`	`public function testUserProvidedParamCannotBeValidatedBecauseItIsInvalid()`
`45`	`44`	`{`
	`45`	`+ $this->expectException(\Exception::class);`
	`46`	`+`
`46`	`47`	`$this->validator->fillParameters(["to,morrow"])->check("now");`
`47`	`48`	`}`
`48`	`49`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`class AlphaDashTest extends TestCase`
`9`	`9`	`{`
`10`	`10`
`11`		`- public function setUp()`
	`11`	`+ public function setUp() : void`
`12`	`12`	`{`
`13`	`13`	`$this->rule = new AlphaDash;`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`class AlphaNumTest extends TestCase`
`9`	`9`	`{`
`10`	`10`
`11`		`- public function setUp()`
	`11`	`+ public function setUp() : void`
`12`	`12`	`{`
`13`	`13`	`$this->rule = new AlphaNum;`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`class AlphaSpacesTest extends TestCase`
`9`	`9`	`{`
`10`	`10`
`11`		`- public function setUp()`
	`11`	`+ public function setUp() : void`
`12`	`12`	`{`
`13`	`13`	`$this->rule = new AlphaSpaces;`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`class AlphaTest extends TestCase`
`10`	`10`	`{`
`11`	`11`
`12`		`- public function setUp()`
	`12`	`+ public function setUp() : void`
`13`	`13`	`{`
`14`	`14`	`$this->rule = new Alpha;`
`15`	`15`	`}`