Let Str::is handles many patterns.

laravel · Jul 17, 2017 · ceb59c1 · ceb59c1
1 parent d607b9c
commit ceb59c1
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/Str.php
@@ -149,18 +149,30 @@ public static function finish($value, $cap)
      */
     public static function is($pattern, $value)
     {
-        if ($pattern == $value) {
-            return true;
+        $patterns = is_array($pattern) ? $pattern : (array) $pattern;
+
+        if (empty($patterns)) {
+            return false;
         }
 
-        $pattern = preg_quote($pattern, '#');
+        foreach ($patterns as $pattern) {
+            if ($pattern == $value) {
+                return true;
+            }
 
-        // Asterisks are translated into zero-or-more regular expression wildcards
-        // to make it convenient to check if the strings starts with the given
-        // pattern such as "library/*", making any string check convenient.
-        $pattern = str_replace('\*', '.*', $pattern);
+            $pattern = preg_quote($pattern, '#');
 
-        return (bool) preg_match('#^'.$pattern.'\z#u', $value);
+            // Asterisks are translated into zero-or-more regular expression wildcards
+            // to make it convenient to check if the strings starts with the given
+            // pattern such as "library/*", making any string check convenient.
+            $pattern = str_replace('\*', '.*', $pattern);
+
+            if (preg_match('#^'.$pattern.'\z#u', $value) === 1) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     /**

diff --git a/tests/Support/SupportHelpersTest.php b/tests/Support/SupportHelpersTest.php
@@ -220,6 +220,18 @@ public function testStrIs()
         $this->assertFalse(Str::is('foo.ar', 'foobar'));
         $this->assertFalse(Str::is('foo?bar', 'foobar'));
         $this->assertFalse(Str::is('foo?bar', 'fobar'));
+
+        $this->assertTrue(Str::is([
+            '*.dev',
+            '*oc*',
+        ], 'localhost.dev'));
+
+        $this->assertFalse(Str::is([
+            '/',
+            'a*',
+        ], 'localhost.dev'));
+
+        $this->assertFalse(Str::is([], 'localhost.dev'));
     }
 
     public function testStrRandom()