Remove duplication of the handling of regex filters in the Finder

Author: stof

Iterator/FilecontentFilterIterator.php

@@ -41,25 +41,7 @@ public function accept()
             return false;
         }
 
-        // should at least not match one rule to exclude
-        foreach ($this->noMatchRegexps as $regex) {
-            if (preg_match($regex, $content)) {
-                return false;
-            }
-        }
-
-        // should at least match one rule
-        $match = true;
-        if ($this->matchRegexps) {
-            $match = false;
-            foreach ($this->matchRegexps as $regex) {
-                if (preg_match($regex, $content)) {
-                    return true;
-                }
-            }
-        }
-
-        return $match;
+        return $this->isAccepted($content);
     }
 
     /**

Iterator/FilenameFilterIterator.php

@@ -27,27 +27,7 @@ class FilenameFilterIterator extends MultiplePcreFilterIterator
      */
     public function accept()
     {
-        $filename = $this->current()->getFilename();
-
-        // should at least not match one rule to exclude
-        foreach ($this->noMatchRegexps as $regex) {
-            if (preg_match($regex, $filename)) {
-                return false;
-            }
-        }
-
-        // should at least match one rule
-        $match = true;
-        if ($this->matchRegexps) {
-            $match = false;
-            foreach ($this->matchRegexps as $regex) {
-                if (preg_match($regex, $filename)) {
-                    return true;
-                }
-            }
-        }
-
-        return $match;
+        return $this->isAccepted($this->current()->getFilename());
     }
 
     /**

Iterator/MultiplePcreFilterIterator.php

@@ -43,6 +43,41 @@ public function __construct(\Iterator $iterator, array $matchPatterns, array $no
         parent::__construct($iterator);
     }
 
+    /**
+     * Checks whether the string is accepted by the regex filters.
+     *
+     * If there is no regexps defined in the class, this method will accept the string.
+     * Such case can be handled by child classes before calling the method if they want to
+     * apply a different behavior.
+     *
+     * @param string $string The string to be matched against filters
+     *
+     * @return bool
+     */
+    protected function isAccepted($string)
+    {
+        // should at least not match one rule to exclude
+        foreach ($this->noMatchRegexps as $regex) {
+            if (preg_match($regex, $string)) {
+                return false;
+            }
+        }
+
+        // should at least match one rule
+        if ($this->matchRegexps) {
+            foreach ($this->matchRegexps as $regex) {
+                if (preg_match($regex, $string)) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        // If there is no match rules, the file is accepted
+        return true;
+    }
+
     /**
      * Checks whether the string is a regex.
      *

Iterator/PathFilterIterator.php

@@ -32,25 +32,7 @@ public function accept()
             $filename = str_replace('\\', '/', $filename);
         }
 
-        // should at least not match one rule to exclude
-        foreach ($this->noMatchRegexps as $regex) {
-            if (preg_match($regex, $filename)) {
-                return false;
-            }
-        }
-
-        // should at least match one rule
-        $match = true;
-        if ($this->matchRegexps) {
-            $match = false;
-            foreach ($this->matchRegexps as $regex) {
-                if (preg_match($regex, $filename)) {
-                    return true;
-                }
-            }
-        }
-
-        return $match;
+        return $this->isAccepted($filename);
     }
 
     /**