[11.x] Add Macroable and fill() to Support\Fluent (#54404)

* Add ability to add macros to Fluent instance

* Remove accidental imports

* Add `fill` method and Macroable to Fluent

* Add tests for fill and macroable

* CS fix

Author: stevebauman

src/Illuminate/Support/Fluent.php

@@ -6,6 +6,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Support\Traits\InteractsWithData;
+use Illuminate\Support\Traits\Macroable;
 use JsonSerializable;
 
 /**
@@ -17,7 +18,9 @@
  */
 class Fluent implements Arrayable, ArrayAccess, Jsonable, JsonSerializable
 {
-    use InteractsWithData;
+    use InteractsWithData, Macroable {
+        __call as macroCall;
+    }
 
     /**
      * All of the attributes set on the fluent instance.
@@ -34,9 +37,7 @@ class Fluent implements Arrayable, ArrayAccess, Jsonable, JsonSerializable
      */
     public function __construct($attributes = [])
     {
-        foreach ($attributes as $key => $value) {
-            $this->attributes[$key] = $value;
-        }
+        $this->fill($attributes);
     }
 
     /**
@@ -67,6 +68,21 @@ public function set($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 an attribute from the fluent instance.
      *
@@ -227,6 +243,10 @@ public function offsetUnset($offset): void
      */
     public function __call($method, $parameters)
     {
+        if (static::hasMacro($method)) {
+            return $this->macroCall($method, $parameters);
+        }
+
         $this->attributes[$method] = count($parameters) > 0 ? reset($parameters) : true;
 
         return $this;

tests/Support/SupportFluentTest.php

@@ -416,6 +416,42 @@ public function testEnumsMethod()
         $this->assertEquals([TestBackedEnum::B], $fluent->enums('int.b', TestBackedEnum::class));
         $this->assertEmpty($fluent->enums('int.doesnt_exist', TestBackedEnum::class));
     }
+
+    public function testFill()
+    {
+        $fluent = new Fluent(['name' => 'John Doe']);
+
+        $fluent->fill([
+            'email' => '[email protected]',
+            'age' => 30,
+        ]);
+
+        $this->assertEquals([
+            'name' => 'John Doe',
+            'email' => '[email protected]',
+            'age' => 30,
+        ], $fluent->getAttributes());
+    }
+
+    public function testMacroable()
+    {
+        Fluent::macro('foo', function () {
+            return $this->fill([
+                'foo' => 'bar',
+                'baz' => 'zal',
+            ]);
+        });
+
+        $fluent = new Fluent([
+            'bee' => 'ser',
+        ]);
+
+        $this->assertSame([
+            'bee' => 'ser',
+            'foo' => 'bar',
+            'baz' => 'zal',
+        ], $fluent->foo()->all());
+    }
 }
 
 class FluentArrayIteratorStub implements IteratorAggregate