Added new method to allow default values when a match is not set

Author: mcustiel

src/Executor.php

@@ -57,10 +57,9 @@ private function getPatternByType($pattern)
             return $pattern;
         }
         if (is_object($pattern)) {
-            $class = get_class($pattern);
-            if ($class == 'SelvinOrtiz\Utils\Flux\Flux'
-                || $class == 'VerbalExpressions\PHPVerbalExpressions\VerbalExpressions'
-                || $class == 'MarkWilson\VerbalExpression') {
+            if (is_a($pattern, 'SelvinOrtiz\Utils\Flux\Flux')
+                || is_a($pattern, 'VerbalExpressions\PHPVerbalExpressions\VerbalExpressions')
+                || is_a($pattern, 'MarkWilson\VerbalExpression')) {
                 return $pattern->__toString();
             }
         }

src/Match.php

@@ -77,6 +77,19 @@ public function getSubMatchAt($index)
         return $this->element[$index][0];
     }
 
+    /**
+     * Returns the string matching a subpattern of a pattern, giving it's index. If there
+     * is no submatch at that index, return the default value.
+     *
+     * @param int $index
+     *
+     * @return string|mixed
+     */
+    public function getSubMatchOrDefaultAt($index, $default = null)
+    {
+        return isset($this->element[$index][0]) ? $this->element[$index][0] : $default;
+    }
+
     /**
      * Returns the offset of the string matching a subpattern of a pattern, giving it's index.
      *