avoid duplicates in fillable/guarded on merge (#47351)

onlime · web-flow · commit 6ba1b832c0a0 · 2023-06-05T07:47:27.000-05:00
diff --git a/src/Illuminate/Database/Eloquent/Concerns/GuardsAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/GuardsAttributes.php
@@ -63,7 +63,7 @@ public function fillable(array $fillable)
      */
     public function mergeFillable(array $fillable)
     {
-        $this->fillable = array_merge($this->fillable, $fillable);
+        $this->fillable = array_values(array_unique(array_merge($this->fillable, $fillable)));
 
         return $this;
     }
@@ -101,7 +101,7 @@ public function guard(array $guarded)
      */
     public function mergeGuarded(array $guarded)
     {
-        $this->guarded = array_merge($this->guarded, $guarded);
+        $this->guarded = array_values(array_unique(array_merge($this->guarded, $guarded)));
 
         return $this;
     }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function fillable(array $fillable)`
`63`	`63`	`*/`
`64`	`64`	`public function mergeFillable(array $fillable)`
`65`	`65`	`{`
`66`		`- $this->fillable = array_merge($this->fillable, $fillable);`
	`66`	`+ $this->fillable = array_values(array_unique(array_merge($this->fillable, $fillable)));`
`67`	`67`
`68`	`68`	`return $this;`
`69`	`69`	`}`
`@@ -101,7 +101,7 @@ public function guard(array $guarded)`
`101`	`101`	`*/`
`102`	`102`	`public function mergeGuarded(array $guarded)`
`103`	`103`	`{`
`104`		`- $this->guarded = array_merge($this->guarded, $guarded);`
	`104`	`+ $this->guarded = array_values(array_unique(array_merge($this->guarded, $guarded)));`
`105`	`105`
`106`	`106`	`return $this;`
`107`	`107`	`}`