Merge pull request #216 from prakash/master

PHP 8.4 compatibility

Author: Stichoza

.github/workflows/php.yml

@@ -20,13 +20,14 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         dependency-versions:
           - "lowest"
           - "highest"
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -35,9 +36,7 @@ jobs:
           coverage: none
 
       - name: Install composer dependencies
-        uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: ${{ matrix.dependency-versions }}
+        run: composer install --prefer-dist --no-progress
 
       - name: Run PHPUnit
         run: vendor/bin/phpunit

.gitignore

@@ -1,2 +1,4 @@
+/.idea/
 /vendor/
-composer.lock
+composer.lock
+.phpunit.result.cache

src/GoogleTranslate.php

@@ -117,7 +117,13 @@ class GoogleTranslate
      * @param TokenProviderInterface|null $tokenProvider
      * @param bool|string $preserveParameters Boolean or custom regex pattern to match parameters
      */
-    public function __construct(string $target = 'en', string $source = null, array $options = [], TokenProviderInterface $tokenProvider = null, bool|string $preserveParameters = false)
+    public function __construct(
+        string                  $target = 'en',
+        ?string                 $source = null,
+        array                   $options = [],
+        ?TokenProviderInterface $tokenProvider = null,
+        bool|string             $preserveParameters = false
+    )
     {
         $this->client = new Client();
         $this->setTokenProvider($tokenProvider ?? new GoogleTokenGenerator)
@@ -145,7 +151,7 @@ public function setTarget(string $target): self
      * @param string|null $source Source language code (null for automatic language detection)
      * @return GoogleTranslate
      */
-    public function setSource(string $source = null): self
+    public function setSource(?string $source = null): self
     {
         $this->source = $source ?? 'auto';
         return $this;
@@ -224,7 +230,14 @@ public function getLastDetectedSource(): ?string
      * @throws TranslationRequestException If any other HTTP related error occurs
      * @throws TranslationDecodingException If response JSON cannot be decoded
      */
-    public static function trans(string $string, string $target = 'en', string $source = null, array $options = [], TokenProviderInterface $tokenProvider = null, bool|string $preserveParameters = false): ?string
+    public static function trans(
+        string                  $string,
+        string                  $target = 'en',
+        ?string                 $source = null,
+        array                   $options = [],
+        ?TokenProviderInterface $tokenProvider = null,
+        bool|string             $preserveParameters = false
+    ): ?string
     {
         return (new self)
             ->setTokenProvider($tokenProvider ?? new GoogleTokenGenerator)

tests/UtilityTest.php

@@ -14,6 +14,8 @@ class UtilityTest extends TestCase
 
     public ReflectionMethod $method;
 
+    private ReflectionClass $reflection;
+
     public function setUp(): void
     {
         $this->tr = new GoogleTranslate();