Merge pull request #9 from tvdijen/master

Fix PHP 8.4 deprecation notices

Author: oscarotero

.github/workflows/test.yaml

@@ -19,19 +19,22 @@ jobs:
           - 7.4
           - 8.0
           - 8.1
+          - 8.2
+          - 8.3
+          - 8.4
       fail-fast: false
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
 
       - name: Cache PHP dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: vendor
           key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
@@ -41,4 +44,4 @@ jobs:
         run: composer install --prefer-dist --no-progress --no-suggest
 
       - name: Tests
-        run: composer test
+        run: composer test

src/GettextTranslator.php

@@ -10,7 +10,7 @@ class GettextTranslator implements TranslatorInterface
     /**
      * Detects the current language using the environment variables.
      */
-    public function __construct(string $language = null)
+    public function __construct(?string $language = null)
     {
         if (!function_exists('gettext')) {
             throw new RuntimeException('This class require the gettext extension for PHP');
@@ -30,7 +30,7 @@ public function __construct(string $language = null)
     /**
      * Define the current locale.
      */
-    public function setLanguage(string $language, int $category = null): self
+    public function setLanguage(string $language, ?int $category = null): self
     {
         if ($category === null) {
             $category = defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL;
@@ -45,7 +45,7 @@ public function setLanguage(string $language, int $category = null): self
     /**
      * Loads a gettext domain.
      */
-    public function loadDomain(string $domain, string $path = null, bool $default = true): self
+    public function loadDomain(string $domain, ?string $path = null, bool $default = true): self
     {
         bindtextdomain($domain, $path);
         bind_textdomain_codeset($domain, 'UTF-8');

src/Loader/ArrayLoader.php

@@ -12,14 +12,14 @@
  */
 final class ArrayLoader extends Loader
 {
-    public function loadFile(string $filename, Translations $translations = null): Translations
+    public function loadFile(string $filename, ?Translations $translations = null): Translations
     {
         $array = self::includeSafe($filename);
 
         return $this->loadArray($array, $translations);
     }
 
-    public function loadString(string $string, Translations $translations = null): Translations
+    public function loadString(string $string, ?Translations $translations = null): Translations
     {
         throw new BadMethodCallException('Arrays cannot be loaded from string. Use ArrayLoader::loadFile() instead');
     }
@@ -29,7 +29,7 @@ private static function includeSafe($filename): array
         return include $filename;
     }
 
-    public function loadArray(array $array, Translations $translations = null): Translations
+    public function loadArray(array $array, ?Translations $translations = null): Translations
     {
         if (!$translations) {
             $translations = $this->createTranslations();

src/TranslatorFunctions.php

@@ -8,7 +8,7 @@ abstract class TranslatorFunctions
     private static $translator;
     private static $formatter;
 
-    public static function register(TranslatorInterface $translator, FormatterInterface $formatter = null): void
+    public static function register(TranslatorInterface $translator, ?FormatterInterface $formatter = null): void
     {
         self::$translator = $translator;
         self::$formatter = $formatter ?: new Formatter();