Merge branch 'master' into php7

Author: Nico Oelgart

README.md

@@ -24,7 +24,7 @@ Find me on Twitter: @[nicoSWD](https://twitter.com/nicoSWD)
 Via Composer
 
 ```bash
-$ composer require "nicoswd/php-rule-parser": "0.3.*"
+$ composer require nicoswd/php-rule-parser
 ```
 
 Via git
@@ -71,6 +71,7 @@ $rule = new Rule($ruleStr, $variables);
 var_dump($rule->isTrue()); // bool(true)
 ```
 
+
 ## Custom Functions
 
 ```php
@@ -110,7 +111,7 @@ $variables = [
 $rule = new Rule($ruleStr, $variables);
 
 $rule->registerToken(Tokenizer::TOKEN_GREATER, '\bis\s+greater\s+than\b');
-$rule->registerToken(Tokenizer::TOKEN_VARIABLE, ':\w+');
+$rule->registerToken(Tokenizer::TOKEN_VARIABLE, ':[a-zA-Z_][\w-]*');
 
 var_dump($rule->isTrue()); // bool(true)
 ```

src/nicoSWD/Rules/Parser.php

@@ -121,6 +121,17 @@ public function assignVariables(array $variables)
     }
 
     /**
+     * @param string $class
+     * @param string $regex
+     * @param int    $priority
+     */
+    public function registerToken($class, $regex, $priority = null)
+    {
+        $this->tokenizer->registerToken($class, $regex, $priority);
+    }
+
+    /**
+     * @param Tokens\BaseToken $token
      * @throws Exceptions\ParserException
      */
     protected function assignVariableValueFromToken(BaseToken $token)

src/nicoSWD/Rules/Tokenizer.php

@@ -83,6 +83,7 @@ public function __construct()
         $this->registerToken(self::TOKEN_UNKNOWN, '.', 5);
     }
 
+
     public function tokenize(string $string) : Stack
     {
         $stack = new Stack();
@@ -128,6 +129,7 @@ private function getMatchedToken(array $matches) : string
         return 'Unknown';
     }
 
+
     private function getRegex() : string
     {
         if (!$this->regex || $this->regexRequiresReassembly) {
@@ -144,6 +146,7 @@ private function getRegex() : string
         return $this->regex;
     }
 
+
     private function getQueue() : SplPriorityQueue
     {
         $queue = new SplPriorityQueue();

tests/operators/CustomOperatorsTest.php

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @license     http://opensource.org/licenses/mit-license.php MIT
+ * @link        https://github.com/nicoSWD
+ * @since       0.4.0
+ * @author      Nicolas Oelgart <nico@oelgart.com>
+ */
+namespace nicoSWD\Rules\tests\operators;
+
+use nicoSWD\Rules\Rule;
+use nicoSWD\Rules\Tokenizer;
+
+/**
+ * Class OperatorsTest
+ */
+class CustomOperatorsTest extends \AbstractTestBase
+{
+    public function testCustomOperators()
+    {
+        $rule = new Rule(':this is greater than :that', [
+            ':this' => 8,
+            ':that' => 7
+        ]);
+
+        $rule->registerToken(Tokenizer::TOKEN_GREATER, '\bis\s+greater\s+than\b');
+        $rule->registerToken(Tokenizer::TOKEN_VARIABLE, ':\w+');
+
+        $this->assertTrue($rule->isTrue());
+    }
+}