[12.x] Simplify conditional returns

src/Illuminate/Database/Eloquent/Casts/AsEnumCollection.php

@@ -71,11 +71,9 @@ public function serialize($model, string $key, $value, array $attributes)
 
             protected function getStorableEnumValue($enum)
             {
-                if (is_string($enum) || is_int($enum)) {
-                    return $enum;
-                }
-
-                return enum_value($enum);
+                return is_string($enum) || is_int($enum)
+                    ? $enum
+                    : enum_value($enum);
             }
         };
     }

src/Illuminate/Database/Grammar.php

@@ -147,11 +147,9 @@ protected function wrapSegments($segments)
      */
     protected function wrapValue($value)
     {
-        if ($value !== '*') {
-            return '"'.str_replace('"', '""', $value).'"';
-        }
-
-        return $value;
+        return $value !== '*'
+            ? '"'.str_replace('"', '""', $value).'"'
+            : $value;
     }
 
     /**

src/Illuminate/Http/Client/PendingRequest.php

@@ -991,13 +991,12 @@ protected function parseHttpOptions(array $options)
             $options[$this->bodyFormat] = $this->pendingBody;
         }
 
-        return (new Collection($options))->map(function ($value, $key) {
-            if ($key === 'json' && $value instanceof JsonSerializable) {
-                return $value;
-            }
-
-            return $value instanceof Arrayable ? $value->toArray() : $value;
-        })->all();
+        return (new Collection($options))
+            ->map(fn ($value, $key) => match (true) {
+                $key === 'json' && $value instanceof JsonSerializable => $value,
+                $value instanceof Arrayable => $value->toArray(),
+                default => $value,
+            })->all();
     }
 
     /**

src/Illuminate/Http/Middleware/SetCacheHeaders.php

@@ -24,12 +24,11 @@ public static function using($options)
         }
 
         return (new Collection($options))
-            ->map(function ($value, $key) {
-                if (is_bool($value)) {
-                    return $value ? $key : null;
-                }
-
-                return is_int($key) ? $value : "{$key}={$value}";
+            ->map(fn ($value, $key) => match (true) {
+                $value === true => $key,
+                $value === false => null,
+                is_int($key) => $value,
+                default => "{$key}={$value}",
             })
             ->filter()
             ->map(fn ($value) => Str::finish($value, ';'))

src/Illuminate/Mail/Message.php

@@ -226,21 +226,14 @@ protected function addAddresses($address, $name, $type)
         if (is_array($address)) {
             $type = lcfirst($type);
 
-            $addresses = (new Collection($address))->map(function ($address, $key) {
-                if (is_string($key) && is_string($address)) {
-                    return new Address($key, $address);
-                }
-
-                if (is_array($address)) {
-                    return new Address($address['email'] ?? $address['address'], $address['name'] ?? null);
-                }
-
-                if (is_null($address)) {
-                    return new Address($key);
-                }
-
-                return $address;
-            })->all();
+            $addresses = (new Collection($address))
+                ->map(fn ($address, $key) => match (true) {
+                    is_string($key) && is_string($address) => new Address($key, $address),
+                    is_array($address) => new Address($address['email'] ?? $address['address'], $address['name'] ?? null),
+                    is_null($address) => new Address($key),
+                    default => $address,
+                })
+                ->all();
 
             $this->message->{"{$type}"}(...$addresses);
         } else {