Improve Hyperf\Support\Fluent (#7214)

Author: huangdijia

src/Fluent.php

@@ -14,10 +14,15 @@
 
 use ArrayAccess;
 use Closure;
+use Hyperf\Collection\Arr;
 use Hyperf\Contract\Arrayable;
 use Hyperf\Contract\Jsonable;
+use Hyperf\Macroable\Macroable;
 use JsonSerializable;
 
+use function Hyperf\Collection\data_get;
+use function Hyperf\Collection\data_set;
+
 /**
  * Most of the methods in this file come from illuminate/support,
  * thanks Laravel Team provide such a useful class.
@@ -30,6 +35,11 @@
  */
 class Fluent implements ArrayAccess, Arrayable, Jsonable, JsonSerializable
 {
+    use Traits\InteractsWithData;
+    use Macroable{
+        __call as macroCall;
+    }
+
     /**
      * All the attributes set on the fluent instance.
      *
@@ -44,9 +54,7 @@ class Fluent implements ArrayAccess, Arrayable, Jsonable, JsonSerializable
      */
     public function __construct($attributes = [])
     {
-        foreach ($attributes as $key => $value) {
-            $this->attributes[$key] = $value;
-        }
+        $this->fill($attributes);
     }
 
     /**
@@ -58,6 +66,10 @@ public function __construct($attributes = [])
      */
     public function __call($method, $parameters)
     {
+        if (static::hasMacro($method)) {
+            return $this->macroCall($method, $parameters);
+        }
+
         $this->attributes[$method] = count($parameters) > 0 ? $parameters[0] : true;
 
         return $this;
@@ -121,6 +133,20 @@ public function __toString(): string
      * @return TGetDefault|TValue
      */
     public function get($key, $default = null)
+    {
+        return data_get($this->attributes, $key, $default);
+    }
+
+    /**
+     * Get an attribute from the fluent instance.
+     *
+     * @template TGetDefault
+     *
+     * @param TKey $key
+     * @param (Closure(): TGetDefault)|TGetDefault $default
+     * @return TGetDefault|TValue
+     */
+    public function value($key, $default = null)
     {
         if (array_key_exists($key, $this->attributes)) {
             return $this->attributes[$key];
@@ -129,6 +155,68 @@ public function get($key, $default = null)
         return value($default);
     }
 
+    /**
+     * Set an attribute on the fluent instance using "dot" notation.
+     *
+     * @param TKey $key
+     * @param TValue $value
+     * @return $this
+     */
+    public function set($key, $value)
+    {
+        data_set($this->attributes, $key, $value);
+
+        return $this;
+    }
+
+    /**
+     * Fill the fluent instance with an array of attributes.
+     *
+     * @param iterable<TKey, TValue> $attributes
+     * @return $this
+     */
+    public function fill($attributes)
+    {
+        foreach ($attributes as $key => $value) {
+            $this->attributes[$key] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the value of the given key as a new Fluent instance.
+     *
+     * @param string $key
+     * @param mixed $default
+     * @return static
+     */
+    public function scope($key, $default = null)
+    {
+        return new static(
+            (array) $this->get($key, $default)
+        );
+    }
+
+    /**
+     * Get all of the attributes from the fluent instance.
+     *
+     * @param null|array|mixed $keys
+     * @return array
+     */
+    public function all($keys = null)
+    {
+        $data = $this->data();
+        if (! $keys) {
+            return $data;
+        }
+        $results = [];
+        foreach (is_array($keys) ? $keys : func_get_args() as $key) {
+            Arr::set($results, $key, Arr::get($data, $key));
+        }
+        return $results;
+    }
+
     /**
      * Get the attributes from the fluent instance.
      *
@@ -211,4 +299,16 @@ public function offsetUnset(mixed $offset): void
     {
         unset($this->attributes[$offset]);
     }
+
+    /**
+     * Get data from the fluent instance.
+     *
+     * @param string $key
+     * @param mixed $default
+     * @return mixed
+     */
+    protected function data($key = null, $default = null)
+    {
+        return $this->get($key, $default);
+    }
 }