Merge branch '8.x'

driesvints · driesvints · commit 45113cf4ce4f · 2021-09-29T15:30:11.000+02:00
# Conflicts:
#	tests/Mail/MailSesTransportTest.php
diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/Str.php
@@ -265,11 +265,15 @@ public static function is($pattern, $value)
     {
         $patterns = Arr::wrap($pattern);
 
+        $value = (string) $value;
+
         if (empty($patterns)) {
             return false;
         }
 
         foreach ($patterns as $pattern) {
+            $pattern = (string) $pattern;
+
             // If the given value is an exact match we can of course return true right
             // from the beginning. Otherwise, we will translate asterisks and do an
             // actual pattern match against the two strings to see if they match.

Original file line number	Diff line number	Diff line change
`@@ -265,11 +265,15 @@ public static function is($pattern, $value)`
`265`	`265`	`{`
`266`	`266`	`$patterns = Arr::wrap($pattern);`
`267`	`267`
	`268`	`+ $value = (string) $value;`
	`269`	`+`
`268`	`270`	`if (empty($patterns)) {`
`269`	`271`	`return false;`
`270`	`272`	`}`
`271`	`273`
`272`	`274`	`foreach ($patterns as $pattern) {`
	`275`	`+ $pattern = (string) $pattern;`
	`276`	`+`
`273`	`277`	`// If the given value is an exact match we can of course return true right`
`274`	`278`	`// from the beginning. Otherwise, we will translate asterisks and do an`
`275`	`279`	`// actual pattern match against the two strings to see if they match.`