Merge pull request #81 from mpesari/main

SoftCreatR · web-flow · commit 09379ce13b4c · 2025-11-24T23:11:24.000+01:00
Fix deprecation warning on PHP 8.5
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
@@ -23,6 +23,7 @@ jobs:
         - '8.2'
         - '8.3'
         - '8.4'
+        - '8.5'
     continue-on-error: ${{ matrix.php == '8.4' }}
     name: PHP ${{ matrix.php }} Test
 
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     "source": "https://github.com/SoftCreatR/JSONPath"
   },
   "require": {
-    "php": "8.1 - 8.4",
+    "php": "8.1 - 8.5",
     "ext-json": "*"
   },
   "require-dev": {
diff --git a/src/AccessHelper.php b/src/AccessHelper.php
@@ -37,7 +37,7 @@ public static function keyExists(mixed $collection, $key, bool $magicIsAllowed =
         }
 
         if (\is_array($collection)) {
-            return \array_key_exists($key, $collection);
+            return \array_key_exists($key ?? '', $collection);
         }
 
         if ($collection instanceof ArrayAccess) {
diff --git a/tests/QueryTest.php b/tests/QueryTest.php
@@ -102,7 +102,7 @@ public function testQueries(
                     );
                 }
             }
-        } catch (JSONPathException | RuntimeException $e) {
+        } catch (JSONPathException|RuntimeException $e) {
             if (!\in_array($id, self::$baselineFailedQueries, true)) {
                 throw new RuntimeException(
                     $e->getMessage() . "\nQuery: {$query}\n\nMore information: {$url}",

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public static function keyExists(mixed $collection, $key, bool $magicIsAllowed =`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`if (\is_array($collection)) {`
`40`		`- return \array_key_exists($key, $collection);`
	`40`	`+ return \array_key_exists($key ?? '', $collection);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`if ($collection instanceof ArrayAccess) {`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function testQueries(`
`102`	`102`	`);`
`103`	`103`	`}`
`104`	`104`	`}`
`105`		`- } catch (JSONPathException \| RuntimeException $e) {`
	`105`	`+ } catch (JSONPathException\|RuntimeException $e) {`
`106`	`106`	`if (!\in_array($id, self::$baselineFailedQueries, true)) {`
`107`	`107`	`throw new RuntimeException(`
`108`	`108`	`$e->getMessage() . "\nQuery: {$query}\n\nMore information: {$url}",`