find method fixed. added new method 'contains'.

0x1881 · Aug 4, 2022 · 671559e · 671559e
1 parent 38cc06d
commit 671559e
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/src/Curl.php b/src/Curl.php
@@ -882,7 +882,7 @@ public function getCookiesArray(int $header_id = null): array
      * @return mixed 
      * @throws Exception 
      */
-    public function find($search_datas, $source = null, bool $remove_line_break = false)
+    public function find($search_datas, $source = null, bool $remove_line_break = false): object
     {
         $json = (object)[];
         $json->result = false;
@@ -893,21 +893,41 @@ public function find($search_datas, $source = null, bool $remove_line_break = fa
         if (\is_array($search_datas)) {
             foreach ($search_datas as $search_data) {
                 $search_data_regex = \preg_quote($search_data, '/');
-                if (\preg_match('/' . $search_data_regex . '/si', $source) || $this->contains($search_data_regex, $source)) {
+                if (\preg_match('/' . $search_data_regex . '/si', $source) || $this->contains($search_data)) {
                     $json->result = true;
                     $json->finded[] = $search_data;
                 }
             }
         } else {
             $search_data = \preg_quote($search_datas, '/');
-            if (\preg_match('/' . $search_data . '/si', $source) || $this->contains($search_data, $source)) {
+            if (\preg_match('/' . $search_data . '/si', $source) || $this->contains($search_data)) {
                 $json->result = true;
                 $json->finded = $search_datas;
             }
         }
 
         return $json;
     }
+
+    /**
+     * Find string from text
+     * 
+     * @param mixed $texttosearch 
+     * @param mixed $source 
+     * @return bool 
+     */
+    public function contains($search_data, $source = null): bool
+    {
+        if (\is_null($source)) {
+            $source = $this->getResponse();
+        }
+
+        if (\function_exists('str_contains')) {
+            return str_contains($source, $search_data);
+        }
+
+        return strpos($source, $search_data) !== false;
+    }
 
     /**
      * Getting string from request response or text data
@@ -1013,18 +1033,6 @@ private function minifyHTML(string $buffer): string
         return $buffer;
     }
 
-    /**
-     * Find string from text
-     * 
-     * @param mixed $needle 
-     * @param mixed $haystack 
-     * @return bool 
-     */
-    private function contains($needle, $haystack)
-    {
-        return strpos($haystack, $needle) !== false;
-    }
-
     /**
      * Get const name in class
      *