diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 2ae462d..04ca3c2 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -26,7 +26,7 @@ class Controller extends BaseController * * @param \Illuminate\Database\Eloquent\Builder $query The eloquent query builder. * @param string $search The query string. - * @param callable $searchQuery The query string. + * @param callable|null $searchQuery The query string. * @param string ...$fields Either a simple array or a string * in case of a string the two fields * would be concatenate to make the search. @@ -35,7 +35,7 @@ class Controller extends BaseController protected function searchQuery( Builder $query, string $search, - callable $searchQuery = null, + callable|null $searchQuery = null, string ...$fields ): \Illuminate\Database\Eloquent\Builder { if (count($fields)) { @@ -200,7 +200,7 @@ class Controller extends BaseController */ protected function paginate( Builder $query, - ItemsPerPaginationEnum $pagination = null + ItemsPerPaginationEnum|null $pagination = null ): \Illuminate\Contracts\Pagination\LengthAwarePaginator { $currentRoutePath = Str::slug(request()->route()->getName()); $cacheKey = "pagination.{$currentRoutePath}"; diff --git a/app/Lib/Helpers/FileStorageHelper.php b/app/Lib/Helpers/FileStorageHelper.php index 6d87992..c21395a 100644 --- a/app/Lib/Helpers/FileStorageHelper.php +++ b/app/Lib/Helpers/FileStorageHelper.php @@ -91,7 +91,7 @@ class FileStorageHelper Model $model, $file, bool $slugify = false, - string $filename = null, + string|null $filename = null, bool $private = false ): string { // phpcs:enable @@ -152,7 +152,7 @@ class FileStorageHelper public static function storeModelFilesFromHtml( Model $model, string $htmlString, - string $oldHtmlString = null + string|null $oldHtmlString = null ): string { \collect(self::onlyUploadedFilesWithFileManager(self::findFilesInHtml($htmlString))) ->each(function (string $path) use ($model, &$htmlString) {