Update test dependencies and add php 8.5 to ci tests

.github/workflows/ci.yaml

@@ -2,14 +2,13 @@ name: ci
 
 on:
   push:
-    branches:
-      - main
+
 jobs:
   run:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ["8.2", "8.3", "8.4"]
+        php-versions: ["8.2", "8.3", "8.4", "8.5"]
     name: PHP ${{ matrix.php-versions }}
     steps:
       - name: Checkout

composer.json

@@ -19,9 +19,9 @@
     },
     "require-dev": {
         "laravel/pint": "^1.17.3",
-        "pestphp/pest": "^2.35.1",
-        "phpstan/phpstan": "^1.12.2",
-        "rector/rector": "^1.2.4",
+        "pestphp/pest": "^v3.8.6",
+        "phpstan/phpstan": "^2.2.5",
+        "rector/rector": "^2.5.3",
         "symfony/var-dumper": "^6.4|^7.1.4"
     },
     "autoload": {

src/Nodes/ArrayNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/ArrayTableNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/BareNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/BooleanNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/FloatNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/InlineTableNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/IntegerNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/KeyNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/KeyValuePairNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/LocalDateNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 use Devium\Toml\TomlLocalDate;

src/Nodes/LocalDateTimeNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 use Devium\Toml\TomlLocalDateTime;

src/Nodes/LocalTimeNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 use Devium\Toml\TomlLocalTime;

src/Nodes/Node.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/NumericNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/OffsetDateTimeNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 use Devium\Toml\TomlDateTime;

src/Nodes/RootTableNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/StringNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/TableNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/TomlDateTimeNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Nodes/ValuableNode.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml\Nodes;
 
 /**

src/Toml.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml;
 
 use stdClass;

src/TomlDateTimeInterface.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml;
 
 interface TomlDateTimeInterface {}

src/TomlDecoder.php

@@ -35,7 +35,7 @@ protected static function toArray(mixed $object): mixed
         }
 
         if (is_array($object) || is_object($object)) {
-            return array_map(static fn ($value) => self::toArray($value), (array) $object);
+            return array_map(self::toArray(...), (array) $object);
         }
 
         return $object;

src/TomlEncoder.php

@@ -83,7 +83,7 @@ protected static function stringifyTable(object $obj, string $prefix = ''): stri
             }
 
             $type = self::extendedTypeOf($obj->{$k});
-            $key = preg_match(self::BARE_KEY, $k) ? $k : self::formatString($k);
+            $key = preg_match(self::BARE_KEY, (string) $k) ? $k : self::formatString($k);
             if ($type === 'array' && self::isArrayOfTables($obj->{$k})) {
                 $tables .= self::stringifyArrayTable($obj->{$k}, $prefix !== '' && $prefix !== '0' ? "$prefix.$key" : $key);
             } elseif ($type === 'object') {
@@ -205,7 +205,7 @@ protected static function stringifyInlineTable(array|stdClass $obj): string
             if ($i !== 0) {
                 $res .= ', ';
             }
-            $res .= preg_match(self::BARE_KEY, $k) ? $k : self::formatString($k);
+            $res .= preg_match(self::BARE_KEY, (string) $k) ? $k : self::formatString($k);
             $res .= ' = ';
             $res .= self::stringifyValue($obj->{$k});
         }

src/TomlInputIterator.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml;
 
 /**

src/TomlLocalDate.php

@@ -19,7 +19,7 @@ public static function fromString($value): self
             throw new TomlError("invalid local date format \"$value\"");
         }
 
-        [$year, $month, $day] = array_map('intval', explode('-', (string) $value));
+        [$year, $month, $day] = array_map(intval(...), explode('-', (string) $value));
 
         if (! self::isYear($year) || ! self::isMonth($month) || ! self::isDay($day)) {
             throw new TomlError("invalid local date format \"$value\"");

src/TomlLocalTime.php

@@ -25,8 +25,8 @@ public static function fromString($value): self
         }
 
         $components = explode(':', (string) $value);
-        [$hour, $minute] = array_map('intval', array_slice($components, 0, 2));
-        $p = array_map('intval', explode('.', $components[2]));
+        [$hour, $minute] = array_map(intval(...), array_slice($components, 0, 2));
+        $p = array_map(intval(...), explode('.', $components[2]));
         $second = $p[0];
         $millisecond = $p[1] ?? 0;
 

src/TomlNormalizer.php

@@ -82,7 +82,7 @@ public static function normalize(Nodes\Node $node): mixed
      */
     protected static function mapNormalize(array $items): array
     {
-        return array_map(static fn ($element) => self::normalize($element), $items);
+        return array_map(self::normalize(...), $items);
     }
 
     /**

src/TomlObject.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml;
 
 use ArrayObject;

src/TomlParser.php

@@ -254,7 +254,7 @@ protected function dateOrDateTime(string $value): OffsetDateTimeNode|LocalDateTi
         );
         $value .= implode('', array_map(static fn (TomlToken $token) => $token->value, $tokens));
 
-        $lastTokenValue = strtolower($tokens[count($tokens) - 1]->value);
+        $lastTokenValue = strtolower((string) $tokens[count($tokens) - 1]->value);
 
         if (str_ends_with($lastTokenValue, 'z')) {
             return new OffsetDateTimeNode($this->parseDate($value));
@@ -429,7 +429,7 @@ protected function parseInteger(
             }
 
             $octalOrBinary = ($radix === 8 && $char === 'o') || ($radix === 2 && $char === 'b');
-            if (! ($i === 1 && $octalOrBinary) && ! $this->digitalChecks($radix, $char)) {
+            if (($i !== 1 || ! $octalOrBinary) && ! $this->digitalChecks($radix, $char)) {
                 break;
             }
 

src/TomlTag.php

@@ -61,7 +61,7 @@ public static function tagObject(mixed $obj): array|stdClass
         }
 
         if (is_array($obj)) {
-            return array_map(static fn ($item) => self::tagObject($item), $obj);
+            return array_map(self::tagObject(...), $obj);
         }
 
         $tagged = new stdClass;
@@ -84,7 +84,7 @@ public static function tagObject(mixed $obj): array|stdClass
     public static function untagObject($obj)
     {
         if (is_array($obj)) {
-            return array_map(static fn ($item) => self::untagObject($item), $obj);
+            return array_map(self::untagObject(...), $obj);
         }
 
         if (property_exists($obj, 'type') && property_exists($obj, 'value') && count(get_object_vars($obj)) === 2) {

src/TomlTokenizer.php

@@ -355,7 +355,7 @@ protected function scanBasicString(): TomlToken
      */
     public function sequence(...$types): array
     {
-        return array_map(fn ($type) => $this->expect($type), $types);
+        return array_map($this->expect(...), $types);
     }
 
     /**

src/TomlUtils.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Devium\Toml;
 
 /**

src/helpers.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Devium\Toml\Toml;
 use Devium\Toml\TomlError;
 

tests/TestCase.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests;
 
 use PHPUnit\Framework\TestCase as BaseTestCase;

tests/Unit/TomlDecodeTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Devium\Toml\TomlError;
 
 it('can decode TOML',

tests/Unit/TomlEncodeTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Devium\Toml\TomlError;
 
 it('can encode TOML',

tests/Unit/TomlErrorTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Devium\Toml\TomlError;
 
 it('shows code block and caret',