Add getFindPattern function

iranianpep · Jul 18, 2017 · f9dee39 · f9dee39
1 parent 4404fd0
commit f9dee39
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/Botonomous/utility/StringUtility.php b/src/Botonomous/utility/StringUtility.php
@@ -37,6 +37,11 @@ public function removeStringFromString($toRemove, $subject)
         return trim(preg_replace('!\s+!', ' ', str_replace($toRemove, '', $subject)));
     }
 
+    private function getFindPattern($toFind, $wordBoundary)
+    {
+        return $wordBoundary === true ? "/\b{$toFind}\b/" : "/{$toFind}/";
+    }
+
     /**
      * @param $toFind
      * @param $subject
@@ -46,8 +51,7 @@ public function removeStringFromString($toRemove, $subject)
      */
     public function findInString($toFind, $subject, $wordBoundary = true)
     {
-        $pattern = $wordBoundary === true ? "/\b{$toFind}\b/" : "/{$toFind}/";
-
+        $pattern = $this->getFindPattern($toFind, $wordBoundary);
         return preg_match($pattern, $subject) ? true : false;
     }
 
@@ -60,8 +64,7 @@ public function findInString($toFind, $subject, $wordBoundary = true)
      */
     public function findPositionInString($toFind, $subject, $wordBoundary = true)
     {
-        $pattern = $wordBoundary === true ? "/\b{$toFind}\b/" : "/{$toFind}/";
-
+        $pattern = $this->getFindPattern($toFind, $wordBoundary);
         $positions = [];
         if (preg_match_all($pattern, $subject, $matches, PREG_OFFSET_CAPTURE) && !empty($matches[0])) {
             foreach ($matches[0] as $match) {