Merge branch 'master' into 3.2-merge

# Conflicts:
#	.github/workflows/test.yml
#	src/collection/tests/ArrTest.php
#	src/pipeline/composer.json
#	src/pipeline/tests/PipelineTest.php
#	src/support/src/Fluent.php
#	src/support/src/Traits/InteractsWithData.php
#	src/support/tests/FluentTest.php

Author: limingxinleo

src/Fluent.php

@@ -19,6 +19,7 @@
 use Hyperf\Contract\Arrayable;
 use Hyperf\Contract\Jsonable;
 use Hyperf\Macroable\Macroable;
+use Hyperf\Support\Traits\InteractsWithData;
 use IteratorAggregate;
 use JsonSerializable;
 use Traversable;
@@ -38,8 +39,8 @@
  */
 class Fluent implements ArrayAccess, Arrayable, IteratorAggregate, Jsonable, JsonSerializable
 {
-    use Traits\InteractsWithData;
-    use Macroable {
+    use InteractsWithData;
+    use Macroable{
         __call as macroCall;
     }
 

src/Functions.php

@@ -12,6 +12,7 @@
 
 namespace Hyperf\Support;
 
+use BackedEnum;
 use Carbon\Carbon;
 use Closure;
 use DateTimeZone;
@@ -21,6 +22,7 @@
 use Hyperf\Stringable\StrCache;
 use Hyperf\Support\Backoff\ArrayBackoff;
 use Throwable;
+use UnitEnum;
 
 /**
  * Return the default value of the given value.
@@ -312,3 +314,25 @@ function today($tz = null)
 {
     return Carbon::today($tz);
 }
+
+/**
+ * Return a scalar value for the given value that might be an enum.
+ *
+ * @internal
+ *
+ * @template TValue
+ * @template TDefault
+ *
+ * @param TValue $value
+ * @param callable(TValue): TDefault|TDefault $default
+ * @return ($value is empty ? TDefault : mixed)
+ */
+function enum_value($value, $default = null)
+{
+    return match (true) {
+        $value instanceof BackedEnum => $value->value,
+        $value instanceof UnitEnum => $value->name,
+
+        default => $value ?? value($default),
+    };
+}

src/Traits/InteractsWithData.php

@@ -19,8 +19,11 @@
 use Hyperf\Stringable\Str;
 use Hyperf\Stringable\Stringable;
 use stdClass;
+use UnitEnum;
 
 use function Hyperf\Collection\data_get;
+use function Hyperf\Support\enum_value;
+use function Hyperf\Support\value;
 
 trait InteractsWithData
 {
@@ -207,7 +210,7 @@ public function whenMissing($key, callable $callback, ?callable $default = null)
     }
 
     /**
-     * Retrieve data from the instnce as a Stringable instance.
+     * Retrieve data from the instance as a Stringable instance.
      *
      * @param string $key
      * @param mixed $default
@@ -273,13 +276,14 @@ public function float($key, $default = 0.0)
      *
      * @param string $key
      * @param null|string $format
-     * @param null|string $tz
+     * @param null|string|UnitEnum $tz
      * @return null|Carbon
      *
      * @throws InvalidFormatException
      */
     public function date($key, $format = null, $tz = null)
     {
+        $tz = enum_value($tz);
         if ($this->isNotFilled($key)) {
             return null;
         }
@@ -298,15 +302,16 @@ public function date($key, $format = null, $tz = null)
      *
      * @param string $key
      * @param class-string<TEnum> $enumClass
+     * @param null|mixed $default
      * @return null|TEnum
      */
-    public function enum($key, $enumClass)
+    public function enum($key, $enumClass, $default = null)
     {
         if ($this->isNotFilled($key) || ! $this->isBackedEnum($enumClass)) {
-            return null;
+            return value($default);
         }
 
-        return $enumClass::tryFrom($this->data($key));
+        return $enumClass::tryFrom($this->data($key)) ?? value($default);
     }
 
     /**
@@ -324,9 +329,10 @@ public function enums($key, $enumClass)
             return [];
         }
 
-        return $this->collect($key)->map(function ($value) use ($enumClass) {
-            return $enumClass::tryFrom($value);
-        })->filter()->all();
+        return $this->collect($key)
+            ->map(fn ($value) => $enumClass::tryFrom($value))
+            ->filter()
+            ->all();
     }
 
     /**