task: bump minimum php release to 8.1 (#68)

Signed-off-by: Alan Brault <[email protected]>

Author: xaevik

composer.json

@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^8.0"
+        "php": "^8.1"
     },
     "require-dev": {
         "ext-ctype": "*",

composer.lock

@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd">

psalm.xml

@@ -14,9 +14,6 @@
  */
 final class Counter
 {
-    /**
-     * @var Counter|null
-     */
     private static ?Counter $instance = null;
 
     /**
@@ -32,6 +29,11 @@ private function __construct()
         $this->value = (int)(random_int(PHP_INT_MIN, PHP_INT_MAX) * 476782367);
     }
 
+    /**
+     * Gets the current instance.
+     *
+     * @return Counter
+     */
     public static function getInstance(): Counter
     {
         if (is_null(self::$instance)) {
@@ -41,6 +43,11 @@ public static function getInstance(): Counter
         return self::$instance;
     }
 
+    /**
+     * Gets the next value from the current instance.
+     *
+     * @return int
+     */
     public function getNextValue(): int
     {
         return $this->value++;

src/Counter.php

@@ -10,32 +10,26 @@
 
 final class Cuid2 implements JsonSerializable
 {
-    /** @readonly */
-    private int $counter;
+    private readonly int $counter;
 
     /**
      * @var array<array-key, mixed>
-     * @readonly
      */
-    private array $fingerprint;
+    private readonly array $fingerprint;
 
     /**
      * @var int<1, max>
-     * @readonly
      */
-    private int $length;
+    private readonly int $length;
 
-    /** @readonly */
-    private string $prefix;
+    private readonly string $prefix;
 
     /**
      * @var array<array-key, mixed>
-     * @readonly
      */
-    private array $random;
+    private readonly array $random;
 
-    /** @readonly */
-    private int $timestamp;
+    private readonly int $timestamp;
 
     /**
      * Initializes a new instance of Cuid2.

src/Cuid2.php

@@ -14,15 +14,12 @@
  */
 final class Fingerprint
 {
-    /** @var ?Fingerprint */
     private static ?Fingerprint $instance = null;
 
     /**
      * @var array<array-key, mixed>
-     * @psalm-readonly-allow-private-mutation
-     * @readonly
      */
-    private array $value;
+    private readonly array $value;
 
     /**
      * @throws Exception
@@ -32,6 +29,11 @@ private function __construct()
         $this->value = $this->generateFingerprint();
     }
 
+    /**
+     * Gets the current instance.
+     *
+     * @return Fingerprint
+     */
     public static function getInstance(): Fingerprint
     {
         if (is_null(self::$instance)) {
@@ -42,17 +44,16 @@ public static function getInstance(): Fingerprint
     }
 
     /**
+     * Gets the value from the instance.
+     *
      * @return array<array-key, mixed>
      */
     public function getValue(): array
     {
         return $this->value;
     }
 
-    /**
-     * @return string|bool
-     */
-    private function getRemoteHostAddr()
+    private function getRemoteHostAddr(): bool|string
     {
         $fields = [
             'HTTP_X_FORWARDED_FOR',
@@ -73,7 +74,6 @@ private function getRemoteHostAddr()
                 continue;
             }
 
-            /** @var string|bool $result */
             $result = filter_var($_SERVER[$field], FILTER_VALIDATE_IP);
 
             if (!$result) {