chore: PHP 8.4+ modernization and housekeeping

.github/workflows/php.yml

@@ -18,7 +18,7 @@ jobs:
         php: ['8.4', '8.5']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -32,7 +32,7 @@ jobs:
 
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: vendor
         key: ${{ runner.os }}-php-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" colors="true" bootstrap="src/autoload.php" cacheDirectory=".phpunit.cache">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/13.0/phpunit.xsd" colors="true" bootstrap="src/autoload.php" cacheDirectory=".phpunit.cache">
   <coverage>
     <report>
       <clover outputFile="build/logs/clover.xml"/>

src/ReCaptcha/ReCaptcha.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *

src/ReCaptcha/RequestMethod.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *

src/ReCaptcha/RequestMethod/CurlPost.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *
@@ -89,12 +91,16 @@ public function submit(RequestParameters $params): string
         ];
         curl_setopt_array($handle, $options);
 
-        $response = curl_exec($handle);
+        try {
+            $response = curl_exec($handle);
 
-        if (is_string($response)) {
-            return $response;
-        }
+            if (is_string($response)) {
+                return $response;
+            }
 
-        return '{"success": false, "error-codes": ["'.ReCaptcha::E_CONNECTION_FAILED.'"]}';
+            return '{"success": false, "error-codes": ["'.ReCaptcha::E_CONNECTION_FAILED.'"]}';
+        } finally {
+            curl_close($handle);
+        }
     }
 }

src/ReCaptcha/RequestMethod/Post.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *

src/ReCaptcha/RequestMethod/SocketPost.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *

src/ReCaptcha/RequestParameters.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *

src/ReCaptcha/Response.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *

src/autoload.php

@@ -35,7 +35,7 @@
  */
 
 spl_autoload_register(function ($class) {
-    if ('ReCaptcha\\' !== substr($class, 0, 10)) {
+    if (!str_starts_with($class, 'ReCaptcha\\')) {
         /* If the class does not lie under the "ReCaptcha" namespace,
          * then we can exit immediately.
          */

tests/ReCaptcha/ReCaptchaTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *
@@ -90,6 +92,7 @@ public static function invalidSecretProvider(): array
             [null],
             [new \stdClass()],
             [[]],
+            [0],
         ];
     }
 
@@ -109,7 +112,6 @@ public static function emptySecretProvider(): array
     {
         return [
             [''],
-            [0],
         ];
     }
 

tests/ReCaptcha/RequestMethod/CurlPostTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *
@@ -86,6 +88,14 @@ function curl_exec(\stdClass $ch): bool|string
     return CurlPostGlobalState::$execResponse;
 }
 
+/**
+ * Mock curl_close in the ReCaptcha\RequestMethod namespace.
+ */
+function curl_close(\stdClass $ch): void
+{
+    // no-op mock
+}
+
 /**
  * @internal
  *

tests/ReCaptcha/RequestMethod/PostTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *

tests/ReCaptcha/RequestMethod/SocketPostTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *

tests/ReCaptcha/RequestParametersTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *

tests/ReCaptcha/ResponseTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This is a PHP library that handles calling reCAPTCHA.
  *