Merge branch '4.x' into 5.x

danharrin · danharrin · commit 8081bb491e92 · 2026-01-29T20:46:15.000Z
diff --git a/packages/actions/src/Concerns/CanExportRecords.php b/packages/actions/src/Concerns/CanExportRecords.php
@@ -607,7 +607,7 @@ public function getAuthGuard(): string
     }
 
     /**
-     * @param Model | array<string, mixed> | null $record
+     * @param  Model | array<string, mixed> | null  $record
      * @return Model | array<string, mixed> | null
      */
     protected function ensureCorrectRecordType(Model | array | null $record): Model | array | null
diff --git a/packages/actions/src/Concerns/InteractsWithRecord.php b/packages/actions/src/Concerns/InteractsWithRecord.php
@@ -132,7 +132,7 @@ public function getRecord(bool $withDefault = true): Model | array | null
     }
 
     /**
-     * @param Model | array<string, mixed> | null $record
+     * @param  Model | array<string, mixed> | null  $record
      * @return Model | array<string, mixed> | null
      */
     protected function ensureCorrectRecordType(Model | array | null $record): Model | array | null
diff --git a/packages/actions/src/ImportAction.php b/packages/actions/src/ImportAction.php
@@ -706,7 +706,7 @@ public function getAuthGuard(): string
     }
 
     /**
-     * @param Model | array<string, mixed> | null $record
+     * @param  Model | array<string, mixed> | null  $record
      * @return Model | array<string, mixed> | null
      */
     protected function ensureCorrectRecordType(Model | array | null $record): Model | array | null

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,7 @@ public function getAuthGuard(): string`
`607`	`607`	`}`
`608`	`608`
`609`	`609`	`/**`
`610`		`- * @param Model \| array<string, mixed> \| null $record`
	`610`	`+ * @param Model \| array<string, mixed> \| null $record`
`611`	`611`	`* @return Model \| array<string, mixed> \| null`
`612`	`612`	`*/`
`613`	`613`	`protected function ensureCorrectRecordType(Model \| array \| null $record): Model \| array \| null`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public function getRecord(bool $withDefault = true): Model \| array \| null`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`/**`
`135`		`- * @param Model \| array<string, mixed> \| null $record`
	`135`	`+ * @param Model \| array<string, mixed> \| null $record`
`136`	`136`	`* @return Model \| array<string, mixed> \| null`
`137`	`137`	`*/`
`138`	`138`	`protected function ensureCorrectRecordType(Model \| array \| null $record): Model \| array \| null`
Original file line number	Diff line number	Diff line change
`@@ -706,7 +706,7 @@ public function getAuthGuard(): string`
`706`	`706`	`}`
`707`	`707`
`708`	`708`	`/**`
`709`		`- * @param Model \| array<string, mixed> \| null $record`
	`709`	`+ * @param Model \| array<string, mixed> \| null $record`
`710`	`710`	`* @return Model \| array<string, mixed> \| null`
`711`	`711`	`*/`
`712`	`712`	`protected function ensureCorrectRecordType(Model \| array \| null $record): Model \| array \| null`