Merge pull request #20 from SignpostMarv/phpunit-update

phpunit update

Author: mihai-vlc

.gitignore

@@ -1,2 +1,3 @@
 /vendor
 composer.lock
+/phpunit/

composer.json

@@ -6,7 +6,10 @@
     "require": {
     },
     "require-dev": {
-        "phpunit/phpunit": "~3.7"
+        "phpunit/phpunit": "^5.1"
+    },
+    "suggest": {
+        "fabpot/php-cs-fixer": "PHP CS Fixer (testing for PSR-2 compliance)"
     },
     "minimum-stability": "stable",
     "autoload": {

phpunit.xml.dist

@@ -23,4 +23,24 @@
             <directory>./src</directory>
         </whitelist>
     </filter>
+
+
+    <logging>
+        <log
+            type="coverage-html"
+            target="phpunit"
+            logIncompleteSkipped="true"
+        />
+        <log
+            type="testdox-text"
+            target="phpunit/testdox.txt"
+            logIncompleteSkipped="true"
+        />
+        <log
+            type="coverage-text"
+            target="php://stdout"
+            showUncoveredFiles="true"
+            showOnlySummary="false"
+        />
+    </logging>
 </phpunit>

src/VerbalExpressions/PHPVerbalExpressions/VerbalExpressions.php

@@ -286,7 +286,6 @@ public function any($value)
      */
     public function range()
     {
-
         $arg_num = func_num_args();
 
         if ($arg_num%2 != 0) {
@@ -394,13 +393,10 @@ public function multiple($value)
     {
         $value = self::sanitize($value);
 
-        switch (substr($value, -1)) {
-            case '+':
-            case '*':
-                break;
-            default:
-                $value .= '+';
-                break;
+        $last = substr($value, -1);
+
+        if ($last !== '+' && $last !== '*') {
+            $value .= '+';
         }
 
         return $this->add($value);
@@ -538,7 +534,7 @@ public function limit($min, $max = 0)
         // check if the expression has * or + for the last expression
         if (preg_match('/\*|\+/', $this->lastAdded)) {
             $l = 1;
-            $this->source = strrev(str_replace(array('+','*'), strrev($value), strrev($this->source), $l));
+            $this->source = strrev(str_replace(array('+', '*'), strrev($value), strrev($this->source), $l));
 
             return $this;
         }