Tests and autoloading updates, use variadic parameters (#26)

* Tests and autoloading updates

- Removed tests/bootstrap.php as redundant

- Added autoload-dev to composer.json

- Added namespace to test

- Use new PHPUnit structure

* Use variadic parameters instead of func_get_args()

This breaks compatibilty with <PHP5.6

Advantages: up to 3 times faster than func_get_args()

* Update from fabpot/php-cs-fixer to friendsofphp/php-cs-fixer

fabpot/php-cs-fixer package is abandoned and no longer maintained

* Add composer scripts (custom commands)

# To run the tests

composer test

# To check project for PSR-2 compliance

composer check-style

# To check and fix style accordingly to PSR-2 standards

composer fix-style

* PSR-2 compliant fixes

* Use squizlabs/php_codesniffer instead

Bugfix: Non-existing command

* Travis should run tests as well

Author: xZero707

.travis.yml

@@ -1,14 +1,11 @@
 language: php
 php:
-  - '5.3'
-  - '5.4'
-  - '5.5'
   - '5.6'
   - '7.0'
   - hhvm
   - nightly
 before_script:
   - composer install
 script:
-  - vendor/bin/php-cs-fixer fix --level=psr2 --dry-run src
-  - vendor/bin/php-cs-fixer fix --level=psr2 --dry-run tests/VerbalExpressionsTest.php
+  - composer check-style
+  - composer test

composer.json

@@ -4,19 +4,26 @@
     "type": "project",
     "description": "PHP Regular expressions made easy",
     "require": {
-        "php": ">=5.3"
+        "php": ">=5.6",
+        "squizlabs/php_codesniffer": "^3.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "* >=4",
-        "fabpot/php-cs-fixer": "^1.11"
-    },
-    "suggest": {
-        "fabpot/php-cs-fixer": "PHP CS Fixer (testing for PSR-2 compliance)"
+        "phpunit/phpunit": "* >=4"
     },
     "minimum-stability": "stable",
     "autoload": {
         "psr-4": {
             "VerbalExpressions\\PHPVerbalExpressions\\": "src/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "VerbalExpressions\\PHPVerbalExpressions\\Tests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "test": "vendor/bin/phpunit",
+        "check-style": "phpcs -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
+        "fix-style": "phpcbf -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests"
     }
 }

phpunit.xml.dist

@@ -11,7 +11,7 @@
     stopOnIncomplete="false"
     stopOnSkipped="false"
     syntaxCheck="false"
-    bootstrap="tests/bootstrap.php">
+    bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="Application Test Suite">
             <directory>./tests/</directory>

src/VerbalExpressions.php

@@ -297,19 +297,18 @@ public function any($value)
      * @return VerbalExpressions
      * @throws \InvalidArgumentException
      */
-    public function range()
+    public function range(... $args)
     {
-        $arg_num = func_num_args();
+        $arg_num = count($args);
 
         if ($arg_num%2 != 0) {
             throw new \InvalidArgumentException('Number of args must be even', 1);
         }
 
         $value = '[';
-        $arg_list = func_get_args();
 
         for ($i = 0; $i < $arg_num;) {
-            $value .= self::sanitize($arg_list[$i++]) . '-' . self::sanitize($arg_list[$i++]);
+            $value .= self::sanitize($args[$i++]) . '-' . self::sanitize($args[$i++]);
         }
 
         $value .= ']';

tests/VerbalExpressionsTest.php

@@ -1,8 +1,11 @@
 <?php
 
+namespace VerbalExpressions\PHPVerbalExpressions\Tests;
+
 use VerbalExpressions\PHPVerbalExpressions\VerbalExpressions;
+use PHPUnit\Framework\TestCase;
 
-class VerbalExpressionsTest extends PHPUnit_Framework_TestCase
+class VerbalExpressionsTest extends TestCase
 {
     /**
      * @dataProvider provideValidUrls
@@ -314,7 +317,7 @@ public function testGetRegex()
     /**
     * @depends testGetRegex
     */
-    public function testGetRegex_multiple()
+    public function testGetRegexMultiple()
     {
         $regex = new VerbalExpressions();
         $regex->startOfLine()
@@ -326,7 +329,7 @@ public function testGetRegex_multiple()
     /**
     * @expectedException InvalidArgumentException
     */
-    public function testRange_throwsException()
+    public function testRangeThrowsException()
     {
         $regex = new VerbalExpressions();
         $regex->range(1, 2, 3);
@@ -335,7 +338,7 @@ public function testRange_throwsException()
     /**
     * @depends testGetRegex
     */
-    public function testRange_lowercase()
+    public function testRangeLowercase()
     {
         $lowercaseAlpha = new VerbalExpressions();
         $lowercaseAlpha->range('a', 'z')
@@ -360,7 +363,7 @@ public function testRange_lowercase()
     /**
     * @depends testGetRegex
     */
-    public function testRange_uppercase()
+    public function testRangeUppercase()
     {
         $uppercaseAlpha = new VerbalExpressions();
         $uppercaseAlpha->range('A', 'Z')
@@ -387,7 +390,7 @@ public function testRange_uppercase()
     /**
     * @depends testGetRegex
     */
-    public function testRange_numerical()
+    public function testRangeNumerical()
     {
         $zeroToNine = new VerbalExpressions();
         $zeroToNine->range(0, 9)
@@ -418,7 +421,7 @@ public function testRange_numerical()
     /**
     * @depends testGetRegex
     */
-    public function testRange_hexadecimal()
+    public function testRangeHexadecimal()
     {
         $hexadecimal = new VerbalExpressions();
         $hexadecimal->startOfLine()
@@ -435,9 +438,9 @@ public function testRange_hexadecimal()
     }
 
     /**
-    * @depends testRange_hexadecimal
+    * @depends testRangeHexadecimal
     */
-    public function testRange_md5()
+    public function testRangeMd5()
     {
         $md5 = new VerbalExpressions();
         $md5->startOfLine()
@@ -454,9 +457,9 @@ public function testRange_md5()
     }
 
     /*
-    * @depends testRange_hexadecimal
+    * @depends testRangeHexadecimal
     */
-    public function testRange_sha1()
+    public function testRangeSha1()
     {
         $sha1 = new VerbalExpressions();
         $sha1->startOfLine()