Merge branch 'master' into copilot/migrate-from-coveralls-to-codecov

Author: BenMorel

.github/workflows/ci.yml

@@ -16,12 +16,10 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.3"
-          - "7.4"
-          - "8.0"
-          - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
+          - "8.5"
 
     steps:
       - name: Checkout
@@ -49,3 +47,10 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         if: ${{ matrix.php-version == env.COVERAGE_PHP_VERSION }}
+
+  coding-standard:
+    name: Coding Standard
+    uses: brick/coding-standard/.github/workflows/coding-standard.yml@v4
+    with:
+      php-version: "8.2"
+      working-directory: "tools/ecs"

.gitignore

@@ -1,3 +1,7 @@
 /vendor
 /composer.lock
-/.phpunit.result.cache
+/.phpunit.cache
+
+/tools/*
+!/tools/ecs/composer.json
+!/tools/ecs/ecs.php

README.md

@@ -43,7 +43,7 @@ composer require brick/std
 Requirements
 ------------
 
-This library requires PHP 7.2 or later.
+This library requires PHP 8.2 or later.
 
 Overview
 --------

composer.json

@@ -8,12 +8,12 @@
   ],
   "license": "MIT",
   "require": {
-    "php": "^7.3 || ^8.0"
+    "php": "^8.2"
   },
   "require-dev": {
     "ext-curl": "*",
     "ext-json": "*",
-    "phpunit/phpunit": "^9.0"
+    "phpunit/phpunit": "^11.5"
   },
   "suggest": {
     "ext-json": "Required to use JsonEncoder and JsonDecoder"

phpunit.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
   <testsuites>
     <testsuite name="Std tests">
       <directory>tests</directory>
     </testsuite>
   </testsuites>
-  <coverage processUncoveredFiles="true">
+  <source>
     <include>
       <directory suffix=".php">src</directory>
     </include>
-  </coverage>
+  </source>
 </phpunit>

src/Curl/Curl.php

@@ -4,10 +4,21 @@
 
 namespace Brick\Std\Curl;
 
+use function curl_copy_handle;
+use function curl_error;
+use function curl_exec;
+use function curl_getinfo;
+use function curl_init;
+use function curl_setopt;
+use function curl_setopt_array;
+use function curl_version;
+
+use const CURLOPT_RETURNTRANSFER;
+
 /**
  * An object wrapper for cURL.
  */
-class Curl
+final class Curl
 {
     /**
      * The cURL handle.
@@ -18,38 +29,16 @@ class Curl
 
     /**
      * Class constructor.
-     *
-     * @param string|null $url
      */
     public function __construct(?string $url = null)
     {
         $this->curl = ($url === null) ? curl_init() : curl_init($url);
     }
 
     /**
-     * Class destructor.
-     */
-    public function __destruct()
-    {
-        curl_close($this->curl);
-    }
-
-    /**
-     * Clone handler.
-     *
-     * @return void
-     */
-    public function __clone()
-    {
-        $this->curl = curl_copy_handle($this->curl);
-    }
-
-    /**
-     * @return string
-     *
      * @throws CurlException
      */
-    public function execute() : string
+    public function execute(): string
     {
         // This option must always be set.
         curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
@@ -70,10 +59,8 @@ public function execute() : string
      * Otherwise, an associative array of values is returned.
      *
      * @param int|null $opt One of the CURLINFO_* constants, or null to return all.
-     *
-     * @return mixed
      */
-    public function getInfo(?int $opt = null)
+    public function getInfo(?int $opt = null): mixed
     {
         if ($opt === null) {
             return curl_getinfo($this->curl);
@@ -82,32 +69,26 @@ public function getInfo(?int $opt = null)
         return curl_getinfo($this->curl, $opt);
     }
 
-    /**
-     * @param int   $option
-     * @param mixed $value
-     *
-     * @return void
-     */
-    public function setOption(int $option, $value) : void
+    public function setOption(int $option, mixed $value): void
     {
         curl_setopt($this->curl, $option, $value);
     }
 
-    /**
-     * @param array $options
-     *
-     * @return void
-     */
-    public function setOptions(array $options) : void
+    public function setOptions(array $options): void
     {
         curl_setopt_array($this->curl, $options);
     }
 
+    public static function getVersion(): array
+    {
+        return curl_version();
+    }
+
     /**
-     * @return array
+     * Clone handler.
      */
-    public static function getVersion() : array
+    public function __clone()
     {
-        return curl_version();
+        $this->curl = curl_copy_handle($this->curl);
     }
 }

src/Curl/CurlException.php

@@ -4,17 +4,16 @@
 
 namespace Brick\Std\Curl;
 
+use RuntimeException;
+
+use function sprintf;
+
 /**
  * Exception thrown when a Curl request fails.
  */
-class CurlException extends \RuntimeException
+final class CurlException extends RuntimeException
 {
-    /**
-     * @param string $error
-     *
-     * @return CurlException
-     */
-    public static function error(string $error) : CurlException
+    public static function error(string $error): CurlException
     {
         return new self(sprintf('cURL request failed: %s.', $error));
     }