@@ -122,7 +122,7 @@ public function resolveUuidVersion(): string
122
122
*/
123
123
public function scopeWhereUuid ($ query , $ uuid , $ uuidColumn = null ): Builder
124
124
{
125
- $ uuidColumn = $ this ->guessUuidColumn ($ uuidColumn );
125
+ $ uuidColumn = $ this ->getUuidColumn ($ uuidColumn );
126
126
$ uuid = $ this ->prepareUuid ($ uuid , $ uuidColumn );
127
127
128
128
return $ query ->whereIn (
@@ -140,7 +140,7 @@ public function scopeWhereUuid($query, $uuid, $uuidColumn = null): Builder
140
140
*/
141
141
public function scopeWhereNotUuid ($ query , $ uuid , $ uuidColumn = null ): Builder
142
142
{
143
- $ uuidColumn = $ this ->guessUuidColumn ($ uuidColumn );
143
+ $ uuidColumn = $ this ->getUuidColumn ($ uuidColumn );
144
144
$ uuid = $ this ->prepareUuid ($ uuid , $ uuidColumn );
145
145
146
146
return $ query ->whereNotIn (
@@ -185,14 +185,12 @@ protected function normaliseUuids($uuid): array
185
185
return $ uuid ;
186
186
}
187
187
188
-
189
188
/**
190
189
* Guess UUID column based on model configurations or given uuid column
191
190
*
192
191
* @param ?string $uuidColumn
193
- * @return string
194
192
*/
195
- protected function guessUuidColumn ($ uuidColumn = null ): string
193
+ protected function getUuidColumn ($ uuidColumn = null ): string
196
194
{
197
195
return ! is_null ($ uuidColumn ) && in_array ($ uuidColumn , $ this ->uuidColumns ())
198
196
? $ uuidColumn
@@ -204,7 +202,6 @@ protected function guessUuidColumn($uuidColumn = null): string
204
202
*
205
203
* @param string|array $uuid
206
204
* @param string $uuidColumn
207
- * @return string|array
208
205
*/
209
206
protected function prepareUuid ($ uuid , $ uuidColumn ): array |string
210
207
{
0 commit comments