Require phpunit 5.4|6.0

Author: Nicolas Oelgart

composer.json

@@ -21,7 +21,7 @@
     "php": "^7.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.1"
+    "phpunit/phpunit": "^5.4.0|^6.0"
   },
   "scripts": {
     "test": "phpunit"

tests/AbstractTestBase.php

@@ -12,7 +12,7 @@
 use nicoSWD\Rules\Tokenizer;
 use nicoSWD\Rules\Expressions\Factory as ExpressionFactory;
 
-abstract class AbstractTestBase extends \PHPUnit_Framework_TestCase
+abstract class AbstractTestBase extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Parser

tests/EvaluatorTest.php

@@ -9,7 +9,7 @@
  */
 use nicoSWD\Rules\Evaluator;
 
-class EvaluatorTest extends \PHPUnit_Framework_TestCase
+class EvaluatorTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Evaluator

tests/ExpressionFactoryTest.php

@@ -9,7 +9,7 @@
  */
 use nicoSWD\Rules\Expressions\Factory;
 
-class ExpressionFactoryTest extends \PHPUnit_Framework_TestCase
+class ExpressionFactoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Factory

tests/HighlighterTest.php

@@ -9,7 +9,7 @@
  */
 use nicoSWD\Rules;
 
-class HighlighterTest extends \PHPUnit_Framework_TestCase
+class HighlighterTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Rules\Highlighter

tests/RuleTest.php

@@ -9,7 +9,7 @@
 
 use nicoSWD\Rules;
 
-class RuleTest extends \PHPUnit_Framework_TestCase
+class RuleTest extends \PHPUnit\Framework\TestCase
 {
     public function testBasicRuleWithCommentsEvaluatesCorrectly()
     {

tests/TokenizerTest.php

@@ -9,7 +9,7 @@
  */
 use nicoSWD\Rules;
 
-class TokenizerTest extends \PHPUnit_Framework_TestCase
+class TokenizerTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Rules\Tokenizer

tests/methods/ToUpperCaseTest.php

@@ -22,14 +22,6 @@ public function testSpacesBetweenVariableAndMethodWork()
         ));
     }
 
-    /**
-     * @todo : Rethink tokenizer
-     */
-    public function testCommentsBeforeAndAfterPeriodWord()
-    {
-      //  $this->assertTrue($this->evaluate('"bar" /* what */ . /*what */ toUpperCase() === "BAR"'));
-    }
-
     public function testIfCallOnStringLiteralsWorks()
     {
         $this->assertTrue($this->evaluate('"bar".toUpperCase() === "BAR"'));