Merge pull request #300 from cracksalad/master

Fix PHP 8.4 explicit nullable compatibility
php-gettext · Oct 11, 2024 · f5b0221 · f5b0221
2 parents a9f89e0 + dc5d398
commit f5b0221
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/src/Loader/Loader.php b/src/Loader/Loader.php
@@ -12,14 +12,14 @@
  */
 abstract class Loader implements LoaderInterface
 {
-    public function loadFile(string $filename, Translations $translations = null): Translations
+    public function loadFile(string $filename, ?Translations $translations = null): Translations
     {
         $string = static::readFile($filename);
 
         return $this->loadString($string, $translations);
     }
 
-    public function loadString(string $string, Translations $translations = null): Translations
+    public function loadString(string $string, ?Translations $translations = null): Translations
     {
         return $translations ?: $this->createTranslations();
     }
@@ -29,7 +29,7 @@ protected function createTranslations(): Translations
         return Translations::create();
     }
 
-    protected function createTranslation(?string $context, string $original, string $plural = null): ?Translation
+    protected function createTranslation(?string $context, string $original, ?string $plural = null): ?Translation
     {
         $translation = Translation::create($context, $original);
 

diff --git a/src/Loader/LoaderInterface.php b/src/Loader/LoaderInterface.php
@@ -7,7 +7,7 @@
 
 interface LoaderInterface
 {
-    public function loadFile(string $filename, Translations $translations = null): Translations;
+    public function loadFile(string $filename, ?Translations $translations = null): Translations;
 
-    public function loadString(string $string, Translations $translations = null): Translations;
+    public function loadString(string $string, ?Translations $translations = null): Translations;
 }
diff --git a/src/Loader/MoLoader.php b/src/Loader/MoLoader.php
@@ -19,7 +19,7 @@ final class MoLoader extends Loader
     private const MAGIC2 = -569244523;
     private const MAGIC3 = 2500072158;
 
-    public function loadString(string $string, Translations $translations = null): Translations
+    public function loadString(string $string, ?Translations $translations = null): Translations
     {
         $translations = parent::loadString($string, $translations);
         $this->init($string);

diff --git a/src/Loader/PoLoader.php b/src/Loader/PoLoader.php
@@ -11,7 +11,7 @@
  */
 final class PoLoader extends Loader
 {
-    public function loadString(string $string, Translations $translations = null): Translations
+    public function loadString(string $string, ?Translations $translations = null): Translations
     {
         $translations = parent::loadString($string, $translations);
 

diff --git a/src/Loader/StrictPoLoader.php b/src/Loader/StrictPoLoader.php
@@ -41,7 +41,7 @@ final class StrictPoLoader extends Loader
     /**
      * Generates a Translations object from a .po based string
      */
-    public function loadString(string $data, Translations $translations = null): Translations
+    public function loadString(string $data, ?Translations $translations = null): Translations
     {
         $this->data = $data;
         $this->position = 0;

diff --git a/src/References.php b/src/References.php
@@ -29,7 +29,7 @@ public function __debugInfo()
         return $this->toArray();
     }
 
-    public function add(string $filename, int $line = null): self
+    public function add(string $filename, ?int $line = null): self
     {
         $fileReferences = $this->references[$filename] ?? [];
 

diff --git a/src/Scanner/ParsedFunction.php b/src/Scanner/ParsedFunction.php
@@ -16,7 +16,7 @@ final class ParsedFunction
     private $comments = [];
     private $flags = [];
 
-    public function __construct(string $name, string $filename, int $line, int $lastLine = null)
+    public function __construct(string $name, string $filename, int $line, ?int $lastLine = null)
     {
         $this->name = $name;
         $this->filename = $filename;

diff --git a/src/Translation.php b/src/Translation.php
@@ -194,7 +194,7 @@ public function translatePlural(string ...$translations): self
         return $this;
     }
 
-    public function getPluralTranslations(int $size = null): array
+    public function getPluralTranslations(?int $size = null): array
     {
         if ($size === null) {
             return $this->pluralTranslations;

diff --git a/src/Translations.php b/src/Translations.php
@@ -20,7 +20,7 @@ class Translations implements Countable, IteratorAggregate
     protected $headers;
     protected $flags;
 
-    public static function create(string $domain = null, string $language = null): Translations
+    public static function create(?string $domain = null, ?string $language = null): Translations
     {
         $translations = new static();