Initial draft of expander mechanism with StartsWith expander example

Replaced [] with array() in AST\Expander class for php 5.3 support

Refactoring

Added Boolean and Null argument types support

Added negative numbers support

Added  argument to StartsWith expander

Set Lexer as a dependency of Parser and Parser as a dependency of StringMatcher

Added possibility to add new expander definitions

Added notBlank expander

Changed expanderName definition

Added lowerThan expander

Implement expanders in IntegerMatcher

Added expanders to DoubleMatcher

Added GreaterThan expander

Added EndsWith expander

Renamed NotBlank into NotEmpty

Added array argument type support

Added InArray expander

Added Contains expander

Author: norberttech

composer.json

@@ -17,7 +17,8 @@
         "php": ">=5.3.0",
         "coduo/php-to-string": "~1.0",
         "symfony/property-access": "~2.3",
-        "symfony/expression-language": "~2.4"
+        "symfony/expression-language": "~2.4",
+        "doctrine/lexer": "1.0.*"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*"

src/Coduo/PHPMatcher/AST/Expander.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Coduo\PHPMatcher\AST;
+
+class Expander implements Node
+{
+    /**
+     * @var
+     */
+    private $name;
+
+    /**
+     * @var array
+     */
+    private $arguments;
+
+    /**
+     * @param $name
+     */
+    public function __construct($name)
+    {
+        $this->name = $name;
+        $this->arguments = array();
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param $argument
+     */
+    public function addArgument($argument)
+    {
+        $this->arguments[] = $argument;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasArguments()
+    {
+        return (boolean) count($this->arguments);
+    }
+
+    /**
+     * @return array
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+}

src/Coduo/PHPMatcher/AST/Node.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Coduo\PHPMatcher\AST;
+
+interface Node
+{
+
+}

src/Coduo/PHPMatcher/AST/Pattern.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Coduo\PHPMatcher\AST;
+
+class Pattern implements Node
+{
+    /**
+     * @var Type
+     */
+    private $type;
+
+    /**
+     * @var Expander[]|array
+     */
+    private $expanders;
+
+    /**
+     * @param Type $type
+     */
+    public function __construct(Type $type)
+    {
+        $this->expanders = array();
+        $this->type = $type;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasExpanders()
+    {
+        return (boolean) count($this->expanders);
+    }
+
+    /**
+     * @return Expander[]|array
+     */
+    public function getExpanders()
+    {
+        return $this->expanders;
+    }
+
+    /**
+     * @param Expander $expander
+     */
+    public function addExpander(Expander $expander)
+    {
+        $this->expanders[] = $expander;
+    }
+}

src/Coduo/PHPMatcher/AST/Type.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Coduo\PHPMatcher\AST;
+
+class Type implements Node
+{
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @param string $type
+     */
+    public function __construct($type)
+    {
+        $this->type = $type;
+    }
+
+    public function __toString()
+    {
+        return $this->type;
+    }
+}

src/Coduo/PHPMatcher/Exception/Exception.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Coduo\PHPMatcher\Exception;
+
+class Exception extends \Exception
+{
+}

src/Coduo/PHPMatcher/Exception/InvalidExpanderTypeException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Coduo\PHPMatcher\Exception;
+
+class InvalidExpanderTypeException extends Exception
+{
+}

src/Coduo/PHPMatcher/Exception/PatternException.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Coduo\PHPMatcher\Exception;
+
+class PatternException extends Exception
+{
+    public static function syntaxError($message, $previous = null)
+    {
+        return new self('[Syntax Error] ' . $message, 0, $previous);
+    }
+}

src/Coduo/PHPMatcher/Exception/UnknownExpanderClassException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Coduo\PHPMatcher\Exception;
+
+class UnknownExpanderClassException extends Exception
+{
+}

src/Coduo/PHPMatcher/Exception/UnknownExpanderException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Coduo\PHPMatcher\Exception;
+
+class UnknownExpanderException extends Exception
+{
+}

src/Coduo/PHPMatcher/Factory.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Coduo\PHPMatcher;
 
 interface Factory

src/Coduo/PHPMatcher/Factory/SimpleFactory.php

@@ -3,7 +3,9 @@
 namespace Coduo\PHPMatcher\Factory;
 
 use Coduo\PHPMatcher\Factory;
+use Coduo\PHPMatcher\Lexer;
 use Coduo\PHPMatcher\Matcher;
+use Coduo\PHPMatcher\Parser;
 
 class SimpleFactory implements Factory
 {
@@ -21,7 +23,7 @@ public function createMatcher()
     protected function buildMatchers()
     {
         $scalarMatchers = $this->buildScalarMatchers();
-        $arrayMatcher = new Matcher\ArrayMatcher($scalarMatchers);
+        $arrayMatcher = new Matcher\ArrayMatcher($scalarMatchers, $this->buildParser());
 
         return new Matcher\ChainMatcher(array(
             $scalarMatchers,
@@ -35,17 +37,27 @@ protected function buildMatchers()
      */
     protected function buildScalarMatchers()
     {
+        $parser = $this->buildParser();
+
         return new Matcher\ChainMatcher(array(
             new Matcher\CallbackMatcher(),
             new Matcher\ExpressionMatcher(),
             new Matcher\NullMatcher(),
-            new Matcher\StringMatcher(),
-            new Matcher\IntegerMatcher(),
+            new Matcher\StringMatcher($parser),
+            new Matcher\IntegerMatcher($parser),
             new Matcher\BooleanMatcher(),
-            new Matcher\DoubleMatcher(),
+            new Matcher\DoubleMatcher($parser),
             new Matcher\NumberMatcher(),
             new Matcher\ScalarMatcher(),
             new Matcher\WildcardMatcher()
         ));
     }
+
+    /**
+     * @return Parser
+     */
+    protected function buildParser()
+    {
+        return new Parser(new Lexer());
+    }
 }