Added support for more external libs. Added preg_filter without error detection.

Author: mcustiel

README.md

@@ -90,14 +90,66 @@ try {
 }
 ```
 
+#### match:
+
+```php
+try {
+    if ($regexFacade->match('/\d+/', 'ab12cd34ef56')) {
+        echo 'String matches pattern.'. PHP_EOL;
+    } else {
+        echo 'String does not match pattern.'. PHP_EOL;
+    }
+} catch (\Exception $e) {
+    echo 'An error occurred executing match';
+}
+```
+
 #### replaceAndCount:
 
 ```php
 try {
+    // Subject can also be an array.
     $result = $this->executor->replaceAndCount('/\d+/', 'potato', 'ab12cd34ef56');
     echo 'Number of replacements: ' . $result->getReplacements() . PHP_EOL;
     echo 'Replaced string: ' . $result->getResult() . PHP_EOL;
 } catch (\Exception $e) {
     echo 'An error occurred executing replaceAndCount';
 }
 ```
+
+#### replace:
+
+```php
+try {
+    // Subject can also be a string.
+    $result = $this->executor->replaceAndCount('/\d+/', 'potato', ['ab12cd34ef56', 'ab12cd78ef90']);
+    echo 'Replaced strings: ' . print_r($result->getResult(), true) . PHP_EOL;
+} catch (\Exception $e) {
+    echo 'An error occurred executing replace';
+}
+```
+
+#### replaceCallback:
+
+```php
+try {
+    // Subject can also be an array.
+    $result = $this->executor->replaceCallback('/\d+/', function () { return 'potato'; }, 'ab12cd34ef56');
+    echo 'Replaced string: ' . $result->getResult() . PHP_EOL;
+} catch (\Exception $e) {
+    echo 'An error occurred executing replaceCallback';
+}
+```
+
+#### replaceCallbackAndCount:
+
+```php
+try {
+    // Subject can also be an array.
+    $result = $this->executor->replaceCallback('/\d+/', function () { return 'potato'; }, 'ab12cd34ef56');
+    echo 'Number of replacements: ' . $result->getReplacements() . PHP_EOL;
+    echo 'Replaced string: ' . $result->getResult() . PHP_EOL;
+} catch (\Exception $e) {
+    echo 'An error occurred executing replaceCallbackAndCount';
+}
+```

build.xml

@@ -130,14 +130,6 @@
 	<!-- ============================================ -->
 	<target name="unittests">
 		<echo msg="Running unit tests..." />
-		<phpunit>
-		  <formatter type="clover" toDir="build/reports/coverage" />
-		  <formatter type="xml" outfile="build/reports/phpunit.xml" />
-		  <formatter type="summary" outfile="build/reports/phpunit.xml" />
-		  <batchtest>
-		    <fileset dir="${dir.tests}" />
-		  </batchtest>
-		</phpunit>
 		<exec command="./vendor/bin/phpunit -d zend.enable_gc=0 --log-junit ${dir.reports}/phpunit/phpunit.xml --coverage-clover ${dir.reports.coverage}/clover.xml --coverage-html ${dir.reports.coverage}/ --testdox-html ${dir.reports}/phpunit/testdox.html -c ${dir.tests}" outputProperty="output" returnProperty="returnout" />
 		<echo msg="${output}" />
 		<if>

composer.json

@@ -6,11 +6,12 @@
 		"library"
 	],
 	"authors" : [{
-		"name" : "Mariano Custiel",
-		"email" : "jmcustiel@gmail.com",
-		"homepage" : "https://github.com/mcustiel",
-		"role" : "Developer"
-	}],
+			"name" : "Mariano Custiel",
+			"email" : "jmcustiel@gmail.com",
+			"homepage" : "https://github.com/mcustiel",
+			"role" : "Developer"
+		}
+	],
 	"autoload" : {
 		"psr-4" : {
 			"Mcustiel\\PhpSimpleRegex\\" : "src"
@@ -25,7 +26,7 @@
 	"type" : "library",
 	"description" : "This is a library with a set of utils to execute and get the response from regular expressions",
 	"license" : "GPL-3.0+",
-	"version" : "1.0.2", 
+	"version" : "1.0.2",
 	"require" : {
 		"php" : ">=5.5"
 	},
@@ -37,6 +38,8 @@
 		"sebastian/phpcpd" : ">=2.0.2",
 		"phploc/phploc" : ">=2.1.3",
 		"verbalexpressions/php-verbal-expressions" : "dev-master",
-		"selvinortiz/flux" : "dev-master"
+		"selvinortiz/flux" : "dev-master",
+		"markwilson/verbal-expressions-php": "dev-master",
+		"nordbjerg/verbal-expressions-php": "dev-master"
 	}
-}
+}

src/Executor.php

@@ -1,4 +1,20 @@
 <?php
+/**
+ * This file is part of php-simple-regex.
+ *
+ * php-simple-regex is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * php-simple-regex is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with php-simple-regex.  If not, see <http://www.gnu.org/licenses/>.
+ */
 namespace Mcustiel\PhpSimpleRegex;
 
 /**
@@ -12,7 +28,7 @@ class Executor
     /**
      * Searches for all matches for the given pattern.
      *
-     * @param string|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux
+     * @param string|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux|MarkWilson\VerbalExpression
      *          $pattern
      * @param string
      *          $subject
@@ -43,7 +59,7 @@ public function getAllMatches($pattern, $subject, $offset = 0)
     /**
      * Searches for matches for the given pattern and returns the first match.
      *
-     * @param string|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux
+     * @param string|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux|MarkWilson\VerbalExpression
      *          $pattern
      * @param string
      *          $subject
@@ -67,7 +83,7 @@ public function getOneMatch($pattern, $subject, $offset = 0)
     /**
      * Checks weather the string matches the given pattern.
      *
-     * @param string|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux
+     * @param string|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux|MarkWilson\VerbalExpression
      *          $pattern
      * @param string
      *          $subject
@@ -96,8 +112,9 @@ public function match($pattern, $subject, $offset = 0)
     /**
      * Replaces all occurrences of $pattern with $replacement in $subject and returns the result and number
      * of replacements done.
+     * See @link http://php.net/manual/en/function.preg-replace.php
      *
-     * @param string|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux
+     * @param string|array|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux|MarkWilson\VerbalExpression
      *          $pattern
      * @param string
      *          $replacement
@@ -115,7 +132,7 @@ public function replaceAndCount($pattern, $replacement, $subject, $limit = -1)
     {
         $count = 0;
         $replaced = @preg_replace(
-            $this->getPatternByType($pattern),
+            $this->getPatternForReplace($pattern),
             $replacement,
             $subject,
             $limit,
@@ -131,10 +148,44 @@ public function replaceAndCount($pattern, $replacement, $subject, $limit = -1)
         return new ReplaceResult($replaced, $count);
     }
 
+    /**
+     * Replaces all occurrences of $pattern with $replacement in $subject and returns the result and number
+     * of replacements done. Result will return only the modified subjects.
+     * See @link http://php.net/manual/en/function.preg-filter.php
+     *
+     * @param string|array|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux|MarkWilson\VerbalExpression
+     *          $pattern
+     * @param string
+     *          $replacement
+     * @param string|array
+     *          $subject
+     * @param number
+     *          $limit
+     *
+     * @throws \RuntimeException
+     * @throws \InvalidArgumentException
+     *
+     * @return \Mcustiel\PhpSimpleRegex\ReplaceResult
+     */
+    public function replaceAndCountAndOnlyGetChanged($pattern, $replacement, $subject, $limit = -1)
+    {
+        $count = 0;
+        // I must display error here, since I couldn't find a way to detect if error happened
+        $replaced = preg_filter(
+            $this->getPatternForReplace($pattern),
+            $replacement,
+            $subject,
+            $limit,
+            $count
+        );
+
+        return new ReplaceResult($replaced, $count);
+    }
+
     /**
      * Replaces all occurrences of $pattern with $replacement in $subject and returns the replaced subject.
      *
-     * @param string|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux
+     * @param string|array|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux|MarkWilson\VerbalExpression
      *          $pattern
      * @param string
      *          $replacement
@@ -151,7 +202,7 @@ public function replaceAndCount($pattern, $replacement, $subject, $limit = -1)
     public function replace($pattern, $replacement, $subject, $limit = -1)
     {
         $replaced = @preg_replace(
-            $this->getPatternByType($pattern),
+            $this->getPatternForReplace($pattern),
             $replacement,
             $subject,
             $limit
@@ -165,11 +216,39 @@ public function replace($pattern, $replacement, $subject, $limit = -1)
         return $replaced;
     }
 
+    /**
+     * Replaces all occurrences of $pattern with $replacement in $subject and returns the replaced subject.
+     *
+     * @param string|array|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux|MarkWilson\VerbalExpression
+     *          $pattern
+     * @param string
+     *          $replacement
+     * @param string|array
+     *          $subject
+     * @param number
+     *          $limit
+     *
+     * @throws \RuntimeException
+     * @throws \InvalidArgumentException
+     *
+     * @return string|array
+     */
+    public function replaceAndOnlyGetChanged($pattern, $replacement, $subject, $limit = -1)
+    {
+        // I must display error here, since I couldn't find a way to detect if error happened
+        return preg_filter(
+            $this->getPatternForReplace($pattern),
+            $replacement,
+            $subject,
+            $limit
+        );
+    }
+
     /**
      * Replaces all occurrences of $pattern using $callback function in $subject
      * and returns the replaced subject.
      *
-     * @param string|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux
+     * @param string|array|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux|MarkWilson\VerbalExpression
      *          $pattern
      * @param callable
      *          $callback
@@ -186,7 +265,7 @@ public function replace($pattern, $replacement, $subject, $limit = -1)
     public function replaceCallback($pattern, callable $callback, $subject, $limit = -1)
     {
         $replaced = @preg_replace_callback(
-            $this->getPatternByType($pattern),
+            $this->getPatternForReplace($pattern),
             $callback,
             $subject,
             $limit
@@ -204,7 +283,7 @@ public function replaceCallback($pattern, callable $callback, $subject, $limit =
      * Replaces all occurrences of $pattern using $callback function in $subject
      * and returns the replaced subject and the number of replacements done.
      *
-     * @param string|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux
+     * @param string|array|\VerbalExpressions\PHPVerbalExpressions\VerbalExpressions|SelvinOrtiz\Utils\Flux\Flux|MarkWilson\VerbalExpression
      *          $pattern
      * @param callable
      *          $callback
@@ -221,7 +300,7 @@ public function replaceCallbackAndCount($pattern, callable $callback, $subject,
     {
         $count = 0;
         $result = preg_replace_callback(
-            $this->getPatternByType($pattern),
+            $this->getPatternForReplace($pattern),
             $callback,
             $subject,
             $limit,
@@ -231,6 +310,20 @@ public function replaceCallbackAndCount($pattern, callable $callback, $subject,
         return new ReplaceResult($result, $count);
     }
 
+    /**
+     * @param mixed $pattern
+     * @throws \InvalidArgumentException
+     * @return string|array
+     */
+    private function getPatternForReplace($pattern)
+    {
+        if (is_array($pattern)) {
+            return $pattern;
+        }
+
+        return $this->getPatternByType($pattern);
+    }
+
     /**
      * @param mixed $pattern
      * @throws \InvalidArgumentException
@@ -244,14 +337,16 @@ private function getPatternByType($pattern)
         if (is_object($pattern)) {
             $class = get_class($pattern);
             if ($class == 'SelvinOrtiz\Utils\Flux\Flux'
-                || $class == 'VerbalExpressions\PHPVerbalExpressions\VerbalExpressions') {
+                || $class == 'VerbalExpressions\PHPVerbalExpressions\VerbalExpressions'
+                || $class == 'MarkWilson\VerbalExpression') {
                 return $pattern->__toString();
             }
         }
         throw new  \InvalidArgumentException(
             'Pattern must be a string, an instance of '
             . 'VerbalExpressions\PHPVerbalExpressions\VerbalExpressions '
-            . ' or an instance of SelvinOrtiz\Utils\Flux\Flux'
+            . ', SelvinOrtiz\Utils\Flux\Flux'
+            . ' or MarkWilson\VerbalExpression'
         );
     }
 
@@ -263,7 +358,9 @@ private function getPatternByType($pattern)
     private function checkResultIsOkOrThrowException($result, $pattern)
     {
         if ($result === false) {
-            throw new \RuntimeException('An error occurred executing the pattern ' . $pattern);
+            throw new \RuntimeException(
+                'An error occurred executing the pattern ' . var_export($pattern, true)
+            );
         }
     }
 }

src/Match.php

@@ -1,4 +1,20 @@
 <?php
+/**
+ * This file is part of php-simple-regex.
+ *
+ * php-simple-regex is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * php-simple-regex is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with php-simple-regex.  If not, see <http://www.gnu.org/licenses/>.
+ */
 namespace Mcustiel\PhpSimpleRegex;
 
 /**