PHP 8.4 updates

Author: Torann

composer.json

@@ -16,15 +16,15 @@
     }
   ],
   "require": {
-    "php": "^8.0",
+    "php": "^8.2",
     "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
     "illuminate/database": "^8.0|^9.0|^10.0|^11.0",
     "illuminate/cache": "^8.0|^9.0|^10.0|^11.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.0",
     "mockery/mockery": "^1.4",
-    "phpstan/phpstan": "^1.6",
+    "phpstan/phpstan": "^2.0",
     "squizlabs/php_codesniffer": "^3.6"
   },
   "autoload": {

src/Concerns/Cacheable.php

@@ -67,7 +67,7 @@ public function skippedCache(): bool
      *
      * @return string
      */
-    public function getCacheKey(string $method, array $args = null, string $tag = ''): string
+    public function getCacheKey(string $method, array|null $args = null, string $tag = ''): string
     {
         // Sort through arguments
         foreach ($args as &$a) {
@@ -98,7 +98,7 @@ public function getCacheKey(string $method, array $args = null, string $tag = ''
      *
      * @return mixed
      */
-    public function cacheCallback(string $method, array $args, Closure $callback, int $time = null): mixed
+    public function cacheCallback(string $method, array $args, Closure $callback, int|null $time = null): mixed
     {
         // Cache disabled, just execute query & return result
         if ($this->skippedCache() === true) {

src/Concerns/Messages.php

@@ -41,7 +41,7 @@ public function hasMessage(string $key = 'message'): bool
     /**
      * {@inheritDoc}
      */
-    public function getMessage(string $key = null, string $format = null, string $default = ''): string
+    public function getMessage(string|null $key = null, string|null $format = null, string $default = ''): string
     {
         return $this->getMessageBag()->first($key, $format) ?: $default;
     }
@@ -67,7 +67,7 @@ public function hasErrors(): bool
     /**
      * {@inheritDoc}
      */
-    public function getErrors(string $format = null): array
+    public function getErrors(string|null $format = null): array
     {
         return $this->getMessageBag()->get('error', $format);
     }

src/Concerns/Ordering.php

@@ -161,11 +161,11 @@ protected function applyOrderableScope(string $column, string $direction): stati
      * @return string
      */
     public function addOrderByJoin(
-        Builder $query,
-        string  $joining_table,
-        string  $foreign_key,
-        string  $related_key,
-        string  $alias = null
+        Builder     $query,
+        string      $joining_table,
+        string      $foreign_key,
+        string      $related_key,
+        string|null $alias = null
     ): string {
         // We need to join to the intermediate table
         $local_table = $this->getModel()->getTable();

src/Concerns/Scopes.php

@@ -92,7 +92,7 @@ public function getScopeQuery(): array
      *
      * @return static
      */
-    public function addScopeQuery(Closure|Scope $scope, string $key = null): static
+    public function addScopeQuery(Closure|Scope $scope, string|null $key = null): static
     {
         if ($scope instanceof Scope && $scope->shouldSkip()) {
             return $this;

src/Concerns/Searching.php

@@ -135,11 +135,11 @@ public function createSearchClause(
      * @return string
      */
     public function addSearchJoin(
-        Builder $query,
-        string  $joining_table,
-        string  $foreign_key,
-        string  $related_key,
-        string  $alias = null
+        Builder     $query,
+        string      $joining_table,
+        string      $foreign_key,
+        string      $related_key,
+        string|null $alias = null
     ): string {
         // We need to join to the intermediate table
         $local_table = $this->getModel()->getTable();

src/Contracts/Repository.php

@@ -120,7 +120,7 @@ public function count(array $columns = ['*']): int;
      *
      * @return array<TKey, TValue>
      */
-    public function pluck(string $value, string $key = null): array;
+    public function pluck(string $value, string|null $key = null): array;
 
     /**
      * Retrieve all data of repository, paginated
@@ -205,7 +205,7 @@ public function hasMessage(string $key = 'message'): bool;
      *
      * @return string
      */
-    public function getMessage(string $key = null, string $format = null, string $default = ''): string;
+    public function getMessage(string|null $key = null, string|null $format = null, string $default = ''): string;
 
     /**
      * Add an error to the message bag

src/Repository.php

@@ -219,7 +219,7 @@ public function count(array $columns = ['*']): int
     /**
      * {@inheritDoc}
      */
-    public function pluck(string $value, string $key = null): array
+    public function pluck(string $value, string|null $key = null): array
     {
         $this->newQuery();