Fixed the wrong count of changes.

hyperf · Jan 7, 2021 · bc5e02e · bc5e02e
1 parent 9b568dd
commit bc5e02e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/Model/Concerns/HasAttributes.php b/src/Model/Concerns/HasAttributes.php
@@ -594,9 +594,11 @@ public function syncOriginalAttributes($attributes)
      *
      * @return $this
      */
-    public function syncChanges()
+    public function syncChanges(array $columns = null)
     {
-        $this->changes = $this->getDirty();
+        $changes = $this->getDirty();
+
+        $this->changes = is_array($columns) ? Arr::only($changes, $columns) : $changes;
 
         return $this;
     }

diff --git a/src/Model/Model.php b/src/Model/Model.php
@@ -1303,7 +1303,7 @@ protected function incrementOrDecrement($column, $amount, $extra, $method)
 
         $columns = array_merge(array_keys($extra), [$column]);
         return tap($this->setKeysForSaveQuery($query)->{$method}($column, $amount, $extra), function () use ($columns) {
-            $this->syncChanges();
+            $this->syncChanges($columns);
 
             $this->syncOriginalAttributes($columns);
         });

diff --git a/tests/ModelRealBuilderTest.php b/tests/ModelRealBuilderTest.php
@@ -146,19 +146,18 @@ public function testIncrement()
         $this->assertArrayHasKey('count', $ext->getChanges());
         $this->assertSame(2, count($ext->getChanges()));
 
-        // TODO: Don't effect.
+        // Don't effect.
         $ext->str = uniqid();
         $this->assertTrue($ext->isDirty('str'));
 
         $ext->increment('count', 1, [
             'float_num' => (string) ($ext->float_num + 1),
         ]);
         $this->assertTrue($ext->isDirty('str'));
-        $this->assertArrayHasKey('str', $ext->getChanges());
+        $this->assertArrayHasKey('count', $ext->getChanges());
         $this->assertArrayHasKey('float_num', $ext->getChanges());
 
-        // TODO: It should be 2.
-        $this->assertSame(3, count($ext->getChanges()));
+        $this->assertSame(2, count($ext->getChanges()));
         $this->assertTrue($ext->save());
         $this->assertArrayHasKey('str', $ext->getChanges());
         $this->assertSame(1, count($ext->getChanges()));