From 68c7606871be7d9534d0167e43abde51a28e2c1b Mon Sep 17 00:00:00 2001 From: Takayasu Oyama Date: Mon, 9 Jun 2025 15:44:40 +0900 Subject: [PATCH] fix: add generics to Model attribute related methods --- .../Eloquent/Concerns/GuardsAttributes.php | 4 +- .../Eloquent/Concerns/HasAttributes.php | 56 +++++++++---------- src/Illuminate/Database/Eloquent/Model.php | 26 ++++----- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/Illuminate/Database/Eloquent/Concerns/GuardsAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/GuardsAttributes.php index 1db6248af54f..435c4947f769 100644 --- a/src/Illuminate/Database/Eloquent/Concerns/GuardsAttributes.php +++ b/src/Illuminate/Database/Eloquent/Concerns/GuardsAttributes.php @@ -248,8 +248,8 @@ public function totallyGuarded() /** * Get the fillable attributes of a given array. * - * @param array $attributes - * @return array + * @param array $attributes + * @return array */ protected function fillableFromArray(array $attributes) { diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php index a56cfe4ca575..5f8d99ce133e 100644 --- a/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php +++ b/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php @@ -50,28 +50,28 @@ trait HasAttributes /** * The model's attributes. * - * @var array + * @var array */ protected $attributes = []; /** * The model attribute's original state. * - * @var array + * @var array */ protected $original = []; /** * The changed model attributes. * - * @var array + * @var array */ protected $changes = []; /** * The previous state of the changed model attributes. * - * @var array + * @var array */ protected $previous = []; @@ -209,7 +209,7 @@ protected function initializeHasAttributes() /** * Convert the model's attributes to an array. * - * @return array + * @return array */ public function attributesToArray() { @@ -244,8 +244,8 @@ public function attributesToArray() /** * Add the date attributes to the attributes array. * - * @param array $attributes - * @return array + * @param array $attributes + * @return array */ protected function addDateAttributesToArray(array $attributes) { @@ -265,9 +265,9 @@ protected function addDateAttributesToArray(array $attributes) /** * Add the mutated attributes to the attributes array. * - * @param array $attributes - * @param array $mutatedAttributes - * @return array + * @param array $attributes + * @param array $mutatedAttributes + * @return array */ protected function addMutatedAttributesToArray(array $attributes, array $mutatedAttributes) { @@ -293,9 +293,9 @@ protected function addMutatedAttributesToArray(array $attributes, array $mutated /** * Add the casted attributes to the attributes array. * - * @param array $attributes - * @param array $mutatedAttributes - * @return array + * @param array $attributes + * @param array $mutatedAttributes + * @return array */ protected function addCastAttributesToArray(array $attributes, array $mutatedAttributes) { @@ -348,7 +348,7 @@ protected function addCastAttributesToArray(array $attributes, array $mutatedAtt /** * Get an attribute array of all arrayable attributes. * - * @return array + * @return array */ protected function getArrayableAttributes() { @@ -2032,8 +2032,8 @@ public function getRawOriginal($key = null, $default = null) /** * Get a subset of the model's attributes. * - * @param array|mixed $attributes - * @return array + * @param array|mixed $attributes + * @return array */ public function only($attributes) { @@ -2049,7 +2049,7 @@ public function only($attributes) /** * Get all attributes except the given ones. * - * @param array|mixed $attributes + * @param array|mixed $attributes * @return array */ public function except($attributes) @@ -2093,7 +2093,7 @@ public function syncOriginalAttribute($attribute) /** * Sync multiple original attribute with their current values. * - * @param array|string $attributes + * @param array|string $attributes * @return $this */ public function syncOriginalAttributes($attributes) @@ -2125,7 +2125,7 @@ public function syncChanges() /** * Determine if the model or any of the given attribute(s) have been modified. * - * @param array|string|null $attributes + * @param array|string|null $attributes * @return bool */ public function isDirty($attributes = null) @@ -2138,7 +2138,7 @@ public function isDirty($attributes = null) /** * Determine if the model or all the given attribute(s) have remained the same. * - * @param array|string|null $attributes + * @param array|string|null $attributes * @return bool */ public function isClean($attributes = null) @@ -2161,7 +2161,7 @@ public function discardChanges() /** * Determine if the model or any of the given attribute(s) were changed when the model was last saved. * - * @param array|string|null $attributes + * @param array|string|null $attributes * @return bool */ public function wasChanged($attributes = null) @@ -2174,8 +2174,8 @@ public function wasChanged($attributes = null) /** * Determine if any of the given attributes were changed when the model was last saved. * - * @param array $changes - * @param array|string|null $attributes + * @param array $changes + * @param array|string|null $attributes * @return bool */ protected function hasChanges($changes, $attributes = null) @@ -2202,7 +2202,7 @@ protected function hasChanges($changes, $attributes = null) /** * Get the attributes that have been changed since the last sync. * - * @return array + * @return array */ public function getDirty() { @@ -2220,7 +2220,7 @@ public function getDirty() /** * Get the attributes that have been changed since the last sync for an update operation. * - * @return array + * @return array */ protected function getDirtyForUpdate() { @@ -2230,7 +2230,7 @@ protected function getDirtyForUpdate() /** * Get the attributes that were changed when the model was last saved. * - * @return array + * @return array */ public function getChanges() { @@ -2240,7 +2240,7 @@ public function getChanges() /** * Get the attributes that were previously original before the model was last saved. * - * @return array + * @return array */ public function getPrevious() { @@ -2347,7 +2347,7 @@ protected function transformModelValue($key, $value) /** * Append attributes to query when building a query. * - * @param array|string $attributes + * @param array|string $attributes * @return $this */ public function append($attributes) diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php index 72d7e3315e36..affedb7e345e 100644 --- a/src/Illuminate/Database/Eloquent/Model.php +++ b/src/Illuminate/Database/Eloquent/Model.php @@ -265,7 +265,7 @@ abstract class Model implements Arrayable, ArrayAccess, CanBeEscapedWhenCastToSt /** * Create a new Eloquent model instance. * - * @param array $attributes + * @param array $attributes */ public function __construct(array $attributes = []) { @@ -568,7 +568,7 @@ public static function withoutBroadcasting(callable $callback) /** * Fill the model with an array of attributes. * - * @param array $attributes + * @param array $attributes * @return $this * * @throws \Illuminate\Database\Eloquent\MassAssignmentException @@ -618,7 +618,7 @@ public function fill(array $attributes) /** * Fill the model with an array of attributes. Force mass assignment. * - * @param array $attributes + * @param array $attributes * @return $this */ public function forceFill(array $attributes) @@ -657,7 +657,7 @@ public function qualifyColumns($columns) /** * Create a new instance of the given model. * - * @param array $attributes + * @param array $attributes * @param bool $exists * @return static */ @@ -686,7 +686,7 @@ public function newInstance($attributes = [], $exists = false) /** * Create a new model instance that is existing. * - * @param array $attributes + * @param array $attributes * @param string|null $connection * @return static */ @@ -1049,8 +1049,8 @@ protected function incrementOrDecrement($column, $amount, $extra, $method) /** * Update the model in the database. * - * @param array $attributes - * @param array $options + * @param array $attributes + * @param array $options * @return bool */ public function update(array $attributes = [], array $options = []) @@ -1065,8 +1065,8 @@ public function update(array $attributes = [], array $options = []) /** * Update the model in the database within a transaction. * - * @param array $attributes - * @param array $options + * @param array $attributes + * @param array $options * @return bool * * @throws \Throwable @@ -1083,8 +1083,8 @@ public function updateOrFail(array $attributes = [], array $options = []) /** * Update the model in the database without raising any events. * - * @param array $attributes - * @param array $options + * @param array $attributes + * @param array $options * @return bool */ public function updateQuietly(array $attributes = [], array $options = []) @@ -1400,7 +1400,7 @@ protected function performInsert(Builder $query) * Insert the given attributes and set the ID on the model. * * @param \Illuminate\Database\Eloquent\Builder $query - * @param array $attributes + * @param array $attributes * @return void */ protected function insertAndSetId(Builder $query, $attributes) @@ -1668,7 +1668,7 @@ protected function newBaseQueryBuilder() * Create a new pivot model instance. * * @param \Illuminate\Database\Eloquent\Model $parent - * @param array $attributes + * @param array $attributes * @param string $table * @param bool $exists * @param string|null $using