Add support for PHP 8.5

veewee · veewee · commit 80121fd52ddf · 2025-10-25T10:24:12.000+02:00
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.4"
+          - "8.5"
         operating-system:
           - "ubuntu-latest"
 
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -17,7 +17,7 @@ jobs:
       - name: "installing PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.4"
+          php-version: "8.5"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
           extensions: bcmath, mbstring, intl, sodium, json
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -15,7 +15,7 @@ jobs:
       - name: "installing PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.4"
+          php-version: "8.5"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
           extensions: bcmath, mbstring, intl, sodium, json
diff --git a/.github/workflows/documentation-check.yml b/.github/workflows/documentation-check.yml
@@ -15,7 +15,7 @@ jobs:
       - name: "installing PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.4"
+          php-version: "8.5"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
           extensions: bcmath, mbstring, intl, sodium, json
diff --git a/.github/workflows/preload-check.yml b/.github/workflows/preload-check.yml
@@ -15,7 +15,7 @@ jobs:
       - name: "installing PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.4"
+          php-version: "8.5"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
           extensions: bcmath, mbstring, intl, sodium, json
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -17,7 +17,7 @@ jobs:
       - name: "installing PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.4"
+          php-version: "8.5"
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
           extensions: bcmath, mbstring, intl, sodium, json
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -16,13 +16,11 @@ jobs:
         php-version:
           - "8.3"
           - "8.4"
+          - "8.5"
         operating-system:
           - "macos-latest"
           - "ubuntu-latest"
           - "windows-latest"
-        exclude:
-          - php-version: "8.4"
-            operating-system: "ubuntu-latest"
 
     steps:
       - name: "checkout"
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "~8.3.0 || ~8.4.0",
+        "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
         "ext-bcmath": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
diff --git a/docs/component/str.md b/docs/component/str.md
@@ -68,7 +68,7 @@
 - [starts_with_ci](./../../src/Psl/Str/starts_with_ci.php#L12)
 - [strip_prefix](./../../src/Psl/Str/strip_prefix.php#L13)
 - [strip_suffix](./../../src/Psl/Str/strip_suffix.php#L13)
-- [to_int](./../../src/Psl/Str/to_int.php#L12)
+- [to_int](./../../src/Psl/Str/to_int.php#L14)
 - [trim](./../../src/Psl/Str/trim.php#L21)
 - [trim_left](./../../src/Psl/Str/trim_left.php#L21)
 - [trim_right](./../../src/Psl/Str/trim_right.php#L21)
diff --git a/src/Psl/Async/Internal/State.php b/src/Psl/Async/Internal/State.php
@@ -11,6 +11,8 @@
 use Revolt\EventLoop;
 use Throwable;
 
+use function str_increment;
+
 /**
  * The following class was derived from code of Amphp.
  *
@@ -69,7 +71,8 @@ public function __destruct()
      */
     public function subscribe(Closure $callback): string
     {
-        $id = self::$nextId++;
+        $id = self::$nextId;
+        self::$nextId = str_increment(self::$nextId);
 
         $this->handled = true;
 
diff --git a/src/Psl/Str/Byte/chr.php b/src/Psl/Str/Byte/chr.php
@@ -13,5 +13,5 @@
  */
 function chr(int $ascii): string
 {
-    return php_chr($ascii);
+    return php_chr($ascii % 256);
 }
diff --git a/src/Psl/Str/Byte/ord.php b/src/Psl/Str/Byte/ord.php
@@ -13,5 +13,5 @@
  */
 function ord(string $character): int
 {
-    return \ord($character);
+    return $character !== '' ? \ord($character[0]) : 0;
 }
diff --git a/src/Psl/Str/to_int.php b/src/Psl/Str/to_int.php
@@ -4,15 +4,20 @@
 
 namespace Psl\Str;
 
+use Psl\Internal;
+
 /**
  * Returns the given string as an integer, or null if the string isn't numeric.
  *
  * @pure
  */
 function to_int(string $string): null|int
 {
-    if ((string) (int) $string === $string) {
-        return (int) $string;
+    // Prevent Deprecated: float-string "1e123" is not representable as an int, cast occurred.
+    $int_value = Internal\suppress(static fn(): int => (int) $string);
+
+    if ((string) $int_value === $string) {
+        return $int_value;
     }
 
     return null;
diff --git a/src/Psl/Type/Internal/IntRangeType.php b/src/Psl/Type/Internal/IntRangeType.php
@@ -4,6 +4,7 @@
 
 namespace Psl\Type\Internal;
 
+use Psl\Str;
 use Psl\Type;
 use Psl\Type\Exception\AssertException;
 use Psl\Type\Exception\CoercionException;
@@ -66,14 +67,14 @@ private function coerceToInt(mixed $value): int
 
         if (is_string($value) || $value instanceof Stringable) {
             $str = (string) $value;
-            $int = (int) $str;
-            if ($str === (string) $int) {
+            $int = Str\to_int($str);
+            if ($int !== null && $str === (string) $int) {
                 return $int;
             }
 
             $trimmed = ltrim($str, '0');
-            $int = (int) $trimmed;
-            if ($trimmed === (string) $int) {
+            $int = Str\to_int($trimmed);
+            if ($int !== null && $trimmed === (string) $int) {
                 return $int;
             }
 
diff --git a/src/Psl/Type/Internal/IntType.php b/src/Psl/Type/Internal/IntType.php
@@ -4,6 +4,7 @@
 
 namespace Psl\Type\Internal;
 
+use Psl\Str;
 use Psl\Type;
 use Psl\Type\Exception\AssertException;
 use Psl\Type\Exception\CoercionException;
@@ -49,14 +50,14 @@ public function coerce(mixed $value): int
 
         if (is_string($value) || $value instanceof Stringable) {
             $str = (string) $value;
-            $int = (int) $str;
-            if ($str === (string) $int) {
+            $int = Str\to_int($str);
+            if ($int !== null && $str === (string) $int) {
                 return $int;
             }
 
             $trimmed = ltrim($str, '0');
-            $int = (int) $trimmed;
-            if ($trimmed === (string) $int) {
+            $int = Str\to_int($trimmed);
+            if ($int !== null && $trimmed === (string) $int) {
                 return $int;
             }
 
diff --git a/src/Psl/Type/Internal/UIntType.php b/src/Psl/Type/Internal/UIntType.php
@@ -4,6 +4,7 @@
 
 namespace Psl\Type\Internal;
 
+use Psl\Str;
 use Psl\Type;
 use Psl\Type\Exception\AssertException;
 use Psl\Type\Exception\CoercionException;
@@ -53,14 +54,14 @@ public function coerce(mixed $value): int
 
         if (is_string($value) || $value instanceof Stringable) {
             $str = (string) $value;
-            $int = (int) $str;
-            if ($str === (string) $int && $int >= 0) {
+            $int = Str\to_int($str);
+            if ($int !== null && $str === (string) $int && $int >= 0) {
                 return $int;
             }
 
             $trimmed = ltrim($str, '0');
-            $int = (int) $trimmed;
-            if ($trimmed === (string) $int && $int >= 0) {
+            $int = Str\to_int($trimmed);
+            if ($int !== null && $trimmed === (string) $int && $int >= 0) {
                 return $int;
             }
 
diff --git a/tests/unit/DateTime/DateTimeTest.php b/tests/unit/DateTime/DateTimeTest.php
@@ -31,7 +31,7 @@ public function testNow(): void
     {
         $timestamp = DateTime::now()->getTimestamp();
 
-        static::assertEqualsWithDelta(time(), $timestamp->getSeconds(), 1);
+        static::assertEqualsWithDelta(time(), $timestamp->getSeconds(), 3);
     }
 
     public function testTodayAt(): void
diff --git a/tests/unit/Str/Byte/OrdTest.php b/tests/unit/Str/Byte/OrdTest.php
@@ -20,6 +20,7 @@ public function testOrd(int $expected, string $value): void
     public function provideData(): array
     {
         return [
+            [0, ''],
             [217, 'م'],
             [48, '0'],
             [38, '&'],
diff --git a/tests/unit/Type/ShapeTypeTest.php b/tests/unit/Type/ShapeTypeTest.php
@@ -53,7 +53,7 @@ public function getValidCoercions(): iterable
         foreach ($this->validCoercions() as $row) {
             yield $row;
             yield [
-                new ArrayIterator($row[0]),
+                new ArrayIterator((array) $row[0]),
                 $row[1],
             ];
         }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"require": {`
`13`		`- "php": "~8.3.0 \|\| ~8.4.0",`
	`13`	`+ "php": "~8.3.0 \|\| ~8.4.0 \|\| ~8.5.0",`
`14`	`14`	`"ext-bcmath": "*",`
`15`	`15`	`"ext-json": "*",`
`16`	`16`	`"ext-mbstring": "*",`