Browse Source

Allow str_contains to take an array.

Signed-off-by: Taylor Otwell <taylorotwell@gmail.com>
Taylor Otwell 12 years ago
parent
commit
609920b0d0
1 changed files with 8 additions and 14 deletions
  1. 8 14
      laravel/helpers.php

+ 8 - 14
laravel/helpers.php

@@ -340,13 +340,18 @@ function ends_with($haystack, $needle)
 /**
 /**
  * Determine if a given string contains a given sub-string.
  * Determine if a given string contains a given sub-string.
  *
  *
- * @param  string  $haystack
- * @param  string  $needle
+ * @param  string        $haystack
+ * @param  string|array  $needle
  * @return bool
  * @return bool
  */
  */
 function str_contains($haystack, $needle)
 function str_contains($haystack, $needle)
 {
 {
-	return strpos($haystack, $needle) !== false;
+	foreach ((array) $needle as $n)
+	{
+		if (strpos($haystack, $n) !== false) return true;
+	}
+
+	return false;
 }
 }
 
 
 /**
 /**
@@ -361,17 +366,6 @@ function str_finish($value, $cap)
 	return rtrim($value, $cap).$cap;
 	return rtrim($value, $cap).$cap;
 }
 }
 
 
-/**
- * Determine if the given object has a toString method.
- *
- * @param  object  $value
- * @return bool
- */
-function str_object($value)
-{
-	return is_object($value) and method_exists($value, '__toString');
-}
-
 /**
 /**
  * Get the root namespace of a given class.
  * Get the root namespace of a given class.
  *
  *