Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase (#…

…155) * Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase * Use installed PHPUnit version not global
egulias · Nov 15, 2017 · 1bec00a · 1bec00a
1 parent 3abad65
commit 1bec00a
Show file tree

Hide file tree

Showing 11 changed files with 232 additions and 73 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,8 +27,7 @@ install:
 
 script:
  - mkdir -p build/logs
- - phpunit --coverage-clover build/logs/clover.xml
+ - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 
 after_script:
  - php vendor/bin/coveralls
-
diff --git a/Tests/EmailValidator/EmailLexerTest.php b/Tests/EmailValidator/EmailLexerTest.php
@@ -3,8 +3,9 @@
 namespace Egulias\Tests\EmailValidator;
 
 use Egulias\EmailValidator\EmailLexer;
+use PHPUnit\Framework\TestCase;
 
-class EmailLexerTests extends \PHPUnit_Framework_TestCase
+class EmailLexerTests extends TestCase
 {
 
     public function testLexerExtendsLib()

diff --git a/Tests/EmailValidator/EmailValidatorTest.php b/Tests/EmailValidator/EmailValidatorTest.php
@@ -4,8 +4,9 @@
 
 use Egulias\EmailValidator\EmailValidator;
 use Egulias\EmailValidator\Validation\MultipleValidationWithAnd;
+use PHPUnit\Framework\TestCase;
 
-class EmailValidatorTest extends \PHPUnit_Framework_TestCase
+class EmailValidatorTest extends TestCase
 {
     public function testValidationIsUsed()
     {

diff --git a/Tests/EmailValidator/Validation/DNSCheckValidationTest.php b/Tests/EmailValidator/Validation/DNSCheckValidationTest.php
@@ -6,8 +6,9 @@
 use Egulias\EmailValidator\Exception\NoDNSRecord;
 use Egulias\EmailValidator\Validation\DNSCheckValidation;
 use Egulias\EmailValidator\Warning\NoDNSMXRecord;
+use PHPUnit\Framework\TestCase;
 
-class DNSCheckValidationTest extends \PHPUnit_Framework_TestCase
+class DNSCheckValidationTest extends TestCase
 {
     public function validEmailsProvider()
     {

diff --git a/Tests/EmailValidator/Validation/IsEmailFunctionTests.php b/Tests/EmailValidator/Validation/IsEmailFunctionTests.php
@@ -7,8 +7,9 @@
 use Egulias\EmailValidator\Validation\MultipleValidationWithAnd;
 use Egulias\EmailValidator\Validation\NoRFCWarningsValidation;
 use Egulias\EmailValidator\Validation\RFCValidation;
+use PHPUnit\Framework\TestCase;
 
-class IsEmailFunctionTests extends \PHPUnit_Framework_TestCase
+class IsEmailFunctionTests extends TestCase
 {
     /**
      * @dataProvider isEmailTestSuite

diff --git a/Tests/EmailValidator/Validation/MultipleValidationWitAndTest.php b/Tests/EmailValidator/Validation/MultipleValidationWitAndTest.php
@@ -8,8 +8,9 @@
 use Egulias\EmailValidator\Validation\MultipleValidationWithAnd;
 use Egulias\EmailValidator\Warning\AddressLiteral;
 use Egulias\EmailValidator\Warning\DomainLiteral;
+use PHPUnit\Framework\TestCase;
 
-class MultipleValidationWitAndTest extends \PHPUnit_Framework_TestCase
+class MultipleValidationWitAndTest extends TestCase
 {
     public function testUsesAndLogicalOperation()
     {

diff --git a/Tests/EmailValidator/Validation/NoRFCWarningsValidationTest.php b/Tests/EmailValidator/Validation/NoRFCWarningsValidationTest.php
@@ -6,8 +6,9 @@
 use Egulias\EmailValidator\Exception\NoDomainPart;
 use Egulias\EmailValidator\Validation\Error\RFCWarnings;
 use Egulias\EmailValidator\Validation\NoRFCWarningsValidation;
+use PHPUnit\Framework\TestCase;
 
-class NoRFCWarningsValidationTest extends \PHPUnit_Framework_TestCase
+class NoRFCWarningsValidationTest extends TestCase
 {
     public function testInvalidEmailIsInvalid()
     {

diff --git a/Tests/EmailValidator/Validation/RFCValidationTest.php b/Tests/EmailValidator/Validation/RFCValidationTest.php
@@ -35,8 +35,9 @@
 use Egulias\EmailValidator\Warning\LocalTooLong;
 use Egulias\EmailValidator\Warning\ObsoleteDTEXT;
 use Egulias\EmailValidator\Warning\QuotedString;
+use PHPUnit\Framework\TestCase;
 
-class RFCValidationTest extends \PHPUnit_Framework_TestCase
+class RFCValidationTest extends TestCase
 {
     /**
      * @var RFCValidation

diff --git a/Tests/EmailValidator/Validation/SpoofCheckValidationTest.php b/Tests/EmailValidator/Validation/SpoofCheckValidationTest.php
@@ -4,8 +4,9 @@
 
 use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\Validation\SpoofCheckValidation;
+use PHPUnit\Framework\TestCase;
 
-class SpoofCheckValidationTest extends \PHPUnit_Framework_TestCase
+class SpoofCheckValidationTest extends TestCase
 {
     /**
      * @dataProvider validUTF8EmailsProvider

diff --git a/composer.json b/composer.json
@@ -24,8 +24,8 @@
     "doctrine/lexer": "^1.0.1"
   },
   "require-dev" :   {
-    "satooshi/php-coveralls": "dev-master",
-    "phpunit/phpunit": "^4.8.0",
+    "satooshi/php-coveralls": "^1.0.1",
+    "phpunit/phpunit": "^4.8.35",
     "dominicsayers/isemail": "dev-master"
   },
   "suggest": {