Merge pull request #1 from hppycoder/master-fixSpaceRewrite

Updated the code to have proper support for the URL's that have encoding...

Author: hppycoder

Formatter/LastPassingConditionFormatter.php

@@ -19,10 +19,12 @@ public function format(
     ) {
         return preg_replace_callback('/%(\d+)/', function(array $matches) use ($matchState)
         {
-            return $matchState->getMatchReference(
+            $reference = $matchState->getMatchReference(
                 (int)$matches[1],
                 MatchState::MATCH_REFERENCE_TYPE_CONDITION
             );
+
+            return (is_null($reference)) ? $matches[0] : $reference;
         }, $value);
     }
 }

Formatter/RewriteFormatter.php

@@ -19,10 +19,12 @@ public function format(
     ) {
         return preg_replace_callback('/\$(\d+)/', function(array $matches) use ($matchState)
         {
-            return $matchState->getMatchReference(
+            $reference = $matchState->getMatchReference(
                 $matches[1],
                 MatchState::MATCH_REFERENCE_TYPE_REWRITE
             );
+
+            return (is_null($reference)) ? $matches[0] : $reference;
         }, $value);
     }
 }

MatchState.php

@@ -72,7 +72,7 @@ public function clearMatchReferences($type)
 
     public function getMatchReference($key, $type)
     {
-        return isset($this->matchReferences[$type][$key]) ? $this->matchReferences[$type][$key] : '';
+        return isset($this->matchReferences[$type][$key]) ? $this->matchReferences[$type][$key] : null;
     }
 
     public function getMatchReferences($type)