Fixes for PHP 8.4 deprecations

.github/workflows/tests.yml

@@ -16,7 +16,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: ['8.1', '8.2', '8.3']
+                php-version: ['8.1', '8.2', '8.3', '8.4']
 
         steps:
             - uses: actions/checkout@v4

CHANGELOG.md

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+2024-11-27
+----------
+
+ * fix deprecation notices for PHP 8.4
+
 2024-08-01
 ----------
 
@@ -31,7 +36,7 @@ Change Log
 2024-03-02
 ----------
 
- * required PHP 8.1+
+ * require PHP 8.1+
  * update dependencies
  * fix missing return types
 

src/Attribute.php

@@ -22,7 +22,7 @@ class Attribute
     public function __construct(
         Validation $validation,
         string $key,
-        string $alias = null,
+        ?string $alias = null,
         array $rules = []
     ) {
         $this->validation = $validation;
@@ -115,7 +115,7 @@ public function validation(): Validation
         return $this->validation;
     }
 
-    public function value(string $key = null): mixed
+    public function value(?string $key = null): mixed
     {
         if ($key && $this->isArrayAttribute()) {
             $key = $this->resolveSiblingKey($key);

src/ErrorBag.php

@@ -90,7 +90,7 @@ private function isWildcardKey(string $key): bool
         return str_contains($key, '*');
     }
 
-    private function filterMessagesForWildcardKey(string $key, $ruleName = null): array
+    private function filterMessagesForWildcardKey(string $key, ?string $ruleName = null): array
     {
         $messages = $this->errors;
         $pattern  = preg_quote($key, '#');

src/Factory.php

@@ -126,7 +126,7 @@ protected function registerDefaultMessages(): void
      * @return void
      * @throws MessageException
      */
-    public function registerLanguageMessages(string $lang, string $file = null): void
+    public function registerLanguageMessages(string $lang, ?string $file = null): void
     {
         $file ??= sprintf('%s/Resources/i18n/%s.php', __DIR__, preg_replace('/[^A-Za-z0-9\-]/', '', $lang));
 

src/Helper.php

@@ -203,7 +203,7 @@ public static function flattenValues(array $values): string
      *
      * @return string
      */
-    public static function join(array $pieces, string $separator, string $lastSeparator = null): string
+    public static function join(array $pieces, string $separator, ?string $lastSeparator = null): string
     {
         if (is_null($lastSeparator)) {
             $lastSeparator = $separator;
@@ -227,7 +227,7 @@ public static function join(array $pieces, string $separator, string $lastSepara
      *
      * @return array
      */
-    public static function wraps(array $strings, string $prefix, string $suffix = null): array
+    public static function wraps(array $strings, string $prefix, ?string $suffix = null): array
     {
         if (is_null($suffix)) {
             $suffix = $prefix;

src/MessageBag.php

@@ -41,7 +41,7 @@ public function replace(string $lang, string $key, string $message): self
         return $this;
     }
 
-    public function firstOf(array $keys, string $lang = null): string
+    public function firstOf(array $keys, ?string $lang = null): string
     {
         foreach ($keys as $key) {
             if ($this->has($key, $lang)) {
@@ -52,17 +52,17 @@ public function firstOf(array $keys, string $lang = null): string
         throw MessageException::noMessageForKeys($lang ?? $this->defaultLang, $keys);
     }
 
-    public function get(string $key, string $lang = null): ?string
+    public function get(string $key, ?string $lang = null): ?string
     {
         return $this->messages[$lang ?? $this->defaultLang][$key] ?? null;
     }
 
-    public function has(string $key, string $lang = null): bool
+    public function has(string $key, ?string $lang = null): bool
     {
         return isset($this->messages[$lang ?? $this->defaultLang][$key]);
     }
 
-    public function hasAnyOf(array $keys, string $lang = null): bool
+    public function hasAnyOf(array $keys, ?string $lang = null): bool
     {
         foreach ($keys as $key) {
             if ($this->has($key, $lang)) {

src/Rules/Mimes.php

@@ -14,7 +14,7 @@ class Mimes extends Rule
     protected string $message = 'rule.mimes';
     protected MimeTypeGuesserContract $guesser;
 
-    public function __construct(MimeTypeGuesserContract $guesser = null)
+    public function __construct(?MimeTypeGuesserContract $guesser = null)
     {
         $this->guesser = $guesser ?? new MimeTypeGuesser();
     }

src/Rules/Unique.php

@@ -29,7 +29,7 @@ public function column(string $column): self
         return $this;
     }
 
-    public function ignore(mixed $value, string $column = null): self
+    public function ignore(mixed $value, ?string $column = null): self
     {
         $this->params['ignore']        = $value;
         $this->params['ignore_column'] = $column;

src/Rules/UploadedFile.php

@@ -17,7 +17,7 @@ class UploadedFile extends Rule implements BeforeValidate
     protected string $message = 'rule.uploaded_file';
     protected MimeTypeGuesserContract $guesser;
 
-    public function __construct(MimeTypeGuesserContract $guesser = null)
+    public function __construct(?MimeTypeGuesserContract $guesser = null)
     {
         $this->guesser = $guesser ?? new MimeTypeGuesser();
     }

src/Rules/Url.php

@@ -44,7 +44,7 @@ public function check(mixed $value): bool
     /**
      * Validate $value has a scheme or has the specified scheme
      */
-    private function validateCommonScheme(string $value, string $scheme = null): bool
+    private function validateCommonScheme(string $value, ?string $scheme = null): bool
     {
         if ($scheme) {
             return $this->validateBasic($value) && preg_match("/^$scheme:\/\//", $value);

src/Validation.php

@@ -174,7 +174,7 @@ protected function parseRule(string $rule): array
         if (in_array($ruleName, ['matches', 'regex'])) {
             $params = [$exp[1]];
         } else {
-            $params = isset($exp[1]) ? str_getcsv($exp[1]) : [];
+            $params = isset($exp[1]) ? str_getcsv($exp[1], escape: '\\') : [];
         }
 
         return [$ruleName, $params];