Use explicit variadic params instead of func_get_args() in HasAttributes::isDirty/isClean/wasChanged. (#7803)

Author: xiaoyin199

src/Model/Concerns/HasAttributes.php

@@ -566,36 +566,41 @@ public function syncChanges(?array $columns = null): static
      * Determine if the model or given attribute(s) have been modified.
      *
      * @param null|array|string $attributes
+     * @param string ...$extra
      */
-    public function isDirty($attributes = null): bool
+    public function isDirty($attributes = null, ...$extra): bool
     {
-        return $this->hasChanges(
-            $this->getDirty(),
-            is_array($attributes) ? $attributes : func_get_args()
-        );
+        if (! is_array($attributes)) {
+            $attributes = is_null($attributes) && $extra === [] ? [] : [$attributes, ...$extra];
+        }
+
+        return $this->hasChanges($this->getDirty(), $attributes);
     }
 
     /**
      * Determine if the model or given attribute(s) have remained the same.
      *
      * @param null|array|string $attributes
+     * @param string ...$extra
      */
-    public function isClean($attributes = null): bool
+    public function isClean($attributes = null, ...$extra): bool
     {
-        return ! $this->isDirty(...func_get_args());
+        return ! $this->isDirty($attributes, ...$extra);
     }
 
     /**
      * Determine if the model or given attribute(s) have been modified.
      *
      * @param null|array|string $attributes
+     * @param string ...$extra
      */
-    public function wasChanged($attributes = null): bool
+    public function wasChanged($attributes = null, ...$extra): bool
     {
-        return $this->hasChanges(
-            $this->getChanges(),
-            is_array($attributes) ? $attributes : func_get_args()
-        );
+        if (! is_array($attributes)) {
+            $attributes = is_null($attributes) && $extra === [] ? [] : [$attributes, ...$extra];
+        }
+
+        return $this->hasChanges($this->getChanges(), $attributes);
     }
 
     /**

tests/ModelTest.php

@@ -178,6 +178,36 @@ public function testCleanAttributes()
         $this->assertFalse($model->isClean(['foo', 'bar']));
     }
 
+    public function testWasChangedAttributes()
+    {
+        $model = new ModelStub(['foo' => '1', 'bar' => 2, 'baz' => 3]);
+        $model->syncOriginal();
+        $model->foo = 1;
+        $model->bar = 20;
+        $model->baz = 30;
+
+        // Changes have not been synced yet, so no attribute was changed.
+        $this->assertFalse($model->wasChanged());
+        $this->assertFalse($model->wasChanged('bar'));
+
+        $model->syncChanges();
+
+        $this->assertTrue($model->wasChanged());
+        $this->assertFalse($model->wasChanged('foo'));
+        $this->assertTrue($model->wasChanged('bar'));
+        $this->assertTrue($model->wasChanged('foo', 'bar'));
+        $this->assertTrue($model->wasChanged(['foo', 'bar']));
+
+        // All attributes are equivalent to their original values.
+        $model->syncOriginal();
+        $model->syncChanges();
+
+        $this->assertFalse($model->wasChanged());
+        $this->assertFalse($model->wasChanged('bar'));
+        $this->assertFalse($model->wasChanged('foo', 'bar'));
+        $this->assertFalse($model->wasChanged(['foo', 'bar']));
+    }
+
     public function testCalculatedAttributes()
     {
         $model = new ModelStub();