Refactoring

Author: norberttech

src/Coduo/PHPMatcher/Exception/InvalidExpanderTypeException.php

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

src/Coduo/PHPMatcher/Exception/UnknownExpanderException.php

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

src/Coduo/PHPMatcher/Matcher/ArrayMatcher.php

@@ -206,7 +206,7 @@ private function setMissingElementInError($place, $path)
      */
     private function formatAccessPath($key)
     {
-        return sprintf("[%s]", $key);;
+        return sprintf("[%s]", $key);
     }
 
     /**

src/Coduo/PHPMatcher/Matcher/Pattern.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Coduo\PHPMatcher\Matcher\Pattern\Expander;
+
+use Coduo\PHPMatcher\Matcher\Pattern\PatternExpander;
+use Coduo\ToString\String;
+
+class StartsWith implements PatternExpander
+{
+    /**
+     * @var
+     */
+    private $stringBeginning;
+
+    /**
+     * @var null|string
+     */
+    private $error;
+
+    /**
+     * @param string $stringBeginning
+     */
+    public function __construct($stringBeginning)
+    {
+        $this->stringBeginning = $stringBeginning;
+    }
+
+    /**
+     * @param $value
+     * @return boolean
+     */
+    public function match($value)
+    {
+        if (!is_string($value)) {
+            $this->error = sprintf("StartsWith expander require \"string\", got \"%s\".", new String($value));
+            return false;
+        }
+
+        if (!empty($this->stringBeginning) && strpos($value, $this->stringBeginning) !== 0) {
+            $this->error = sprintf("string \"%s\" doesn't starts with string \"%s\".", $value, $this->stringBeginning);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+}

src/Coduo/PHPMatcher/Matcher/Pattern/Expander/StartsWith.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Coduo\PHPMatcher\Matcher\Pattern;
+
+interface Pattern
+{
+    /**
+     * @param PatternExpander $expander
+     */
+    public function addExpander(PatternExpander $expander);
+
+    /**
+     * @param $value
+     * @return boolean
+     */
+    public function matchExpanders($value);
+
+    /**
+     * Return error message from first expander that doesn't match.
+     *
+     * @return null|string
+     */
+    public function getError();
+}

src/Coduo/PHPMatcher/Matcher/Pattern/Pattern.php

@@ -2,11 +2,16 @@
 
 namespace Coduo\PHPMatcher\Matcher\Pattern;
 
-interface Expander
+interface PatternExpander
 {
     /**
      * @param $value
      * @return boolean
      */
     public function match($value);
+
+    /**
+     * @return string|null
+     */
+    public function getError();
 }

src/Coduo/PHPMatcher/Matcher/Pattern/Expander.php renamed to src/Coduo/PHPMatcher/Matcher/Pattern/PatternExpander.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Coduo\PHPMatcher\Matcher\Pattern;
+
+class TypePattern implements Pattern
+{
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @var PatternExpander[]|array
+     */
+    private $expanders;
+
+    /**
+     * @var null|string
+     */
+    private $error;
+
+    /**
+     * @param string $type
+     */
+    public function __construct($type)
+    {
+        $this->type = $type;
+        $this->expanders = array();
+    }
+
+    /**
+     * @param $type
+     * @return boolean
+     */
+    public function is($type)
+    {
+        return strtolower($this->type) === strtolower($type);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function addExpander(PatternExpander $expander)
+    {
+        $this->expanders[] = $expander;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function matchExpanders($value)
+    {
+        foreach ($this->expanders as $expander) {
+            if (!$expander->match($value)) {
+                $this->error = $expander->getError();
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+}

src/Coduo/PHPMatcher/Matcher/Pattern/StartsWith.php

@@ -17,8 +17,14 @@ public function match($value, $pattern)
             return false;
         }
 
-        $parser = new Parser($pattern);
-        return $parser->parse()->match($value);
+        $parser  = new Parser($pattern);
+        $typePattern = $parser->parse();
+        if (!$typePattern->matchExpanders($value)) {
+            $this->error = $typePattern->getError();
+            return false;
+        }
+
+        return true;
     }
 
     /**
@@ -29,8 +35,9 @@ public function canMatch($pattern)
         if (!is_string($pattern)) {
             return false;
         }
+
         $parser = new Parser($pattern);
 
-        return $parser->patternSyntaxIsValid() && $parser->parse()->getType() === 'string';
+        return $parser->patternSyntaxIsValid() && $parser->parse()->is('string');
     }
 }