Merge pull request #20 from andreamk/20251118_upate_for_php_8.5

Update PHP versions in PHPUnit workflow to include 8.4

Author: andreamk

.github/workflows/phpunit.yml

@@ -8,12 +8,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [7.4, 8.0, 8.2, 8.3]
+        php-versions: [7.4, 8.0, 8.2, 8.3, 8.4]
     name: PHP ${{ matrix.php-versions }}
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Install PHP
       uses: shivammathur/setup-php@v2
@@ -33,7 +33,7 @@ jobs:
 
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: vendor
         key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}

.github/workflows/phpunit_php5.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Install PHP
       uses: shivammathur/setup-php@v2

src/AbstractJsonSerializeObjData.php

@@ -69,7 +69,9 @@ final protected static function objectToJsonData($obj, $flags = 0, $objParents =
             if ($includeProps !==  true && !in_array($propName, $includeProps)) {
                 continue;
             }
-            $prop->setAccessible(true);
+            if (PHP_VERSION_ID < 80100) {
+                $prop->setAccessible(true);
+            }
             $propValue = $prop->getValue($obj);
             $result[$propName] = self::valueToJsonData($propValue, $flags, $objParents);
         }
@@ -237,7 +239,9 @@ final protected static function fillObjFromValue($value, $obj, $flags = 0, $map
             } else {
                 $reflect = new ReflectionObject($obj);
                 foreach ($reflect->getProperties() as $prop) {
-                    $prop->setAccessible(true);
+                    if (PHP_VERSION_ID < 80100) {
+                        $prop->setAccessible(true);
+                    }
                     $propName = $prop->getName();
                     if ($map !== null) {
                         $map->setCurrent($propName, $current);

src/JsonSerialize.php

@@ -114,7 +114,7 @@ public static function unserializeWithMap($json, JsonUnserializeMap $map, $depth
     public static function unserializeToObj($json, $obj, $depth = 512, $flags = 0)
     {
         if (is_object($obj)) {
-        } elseif (is_string($obj) && class_exists($obj)) {
+        } elseif (is_string($obj) && class_exists($obj)) { // @phpstan-ignore function.alreadyNarrowedType
             $obj = self::getObjFromClass($obj);
         } else {
             throw new Exception('invalid obj param');
@@ -210,7 +210,7 @@ protected static function convertString($string)
         if ($use_mb) {
             $encoding = mb_detect_encoding($string, null, true);
             if ($encoding) {
-                return mb_convert_encoding($string, 'UTF-8', $encoding);
+                return (string) mb_convert_encoding($string, 'UTF-8', $encoding);
             } else {
                 return mb_convert_encoding($string, 'UTF-8', 'UTF-8');
             }

src/JsonUnserializeMap.php

@@ -46,11 +46,11 @@ class JsonUnserializeMap
     /**
      * Class constructor
      *
-     * @param array<string, string> $map values map
+     * @param array<string,string> $map values map
      */
     public function __construct($map = [])
     {
-        if (!is_array($map)) {
+        if (!is_array($map)) { // @phpstan-ignore function.alreadyNarrowedType
             throw new Exception('map must be an array');
         }
         $this->map = new MapItem();

tests/StdClassTest.php

@@ -51,7 +51,7 @@ public function testStdClass()
         $serializedValue = JsonSerialize::serialize($value);
         $this->assertTrue(is_string($serializedValue), 'Value is string');
         $unserializedValue = JsonSerialize::unserialize($serializedValue);
-        $this->assertSame($unserializedValue->c->e, null, 'Test stdClass object recursion'); /** @phpstan-ignore-line */
+        $this->assertSame($unserializedValue->c->e, null, 'Test stdClass object recursion');
 
         $obj = new stdClass();
         $obj->a = 1;

tests/phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-    level: 9
+    level: 8
     paths:
         - ..
     excludePaths: