PHP 8.4 support (#84)

* Mark parameters explicit nullable

* Test on PHP 8.4

* Update composer.json

* Update CHANGELOG.md

---------

Co-authored-by: Graham Campbell <[email protected]>

Author: Jubeki

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Checkout Code
@@ -43,7 +43,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Configure Git

CHANGELOG.md

@@ -1,8 +1,12 @@
 # CHANGELOG
 
+## 2.8.0 - UPCOMING
+
+* Add support for PHP 8.4.
+
 ## 2.7.0 - 2023-08-15
 
-* Fixed flattening in arrays starting with null
+* Fixed flattening in arrays starting with null.
 * Drop support for HHVM and PHP earlier than 7.2.5.
 * Add support for PHP 8.1, 8.2, and 8.3.
 

composer.json

@@ -32,7 +32,7 @@
     "bin": ["bin/jp.php"],
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev"
+            "dev-master": "2.8-dev"
         }
     }
 }

src/AstRuntime.php

@@ -12,8 +12,8 @@ class AstRuntime
     private $cachedCount = 0;
 
     public function __construct(
-        Parser $parser = null,
-        callable $fnDispatcher = null
+        ?Parser $parser = null,
+        ?callable $fnDispatcher = null
     ) {
         $fnDispatcher = $fnDispatcher ?: FnDispatcher::getInstance();
         $this->interpreter = new TreeInterpreter($fnDispatcher);

src/CompilerRuntime.php

@@ -23,7 +23,7 @@ class CompilerRuntime
      * @param Parser|null $parser JMESPath parser to utilize
      * @throws \RuntimeException if the cache directory cannot be created
      */
-    public function __construct($dir = null, Parser $parser = null)
+    public function __construct($dir = null, ?Parser $parser = null)
     {
         $this->parser = $parser ?: new Parser();
         $this->compiler = new TreeCompiler();

src/Parser.php

@@ -57,7 +57,7 @@ class Parser
     /**
      * @param Lexer|null $lexer Lexer used to tokenize expressions
      */
-    public function __construct(Lexer $lexer = null)
+    public function __construct(?Lexer $lexer = null)
     {
         $this->lexer = $lexer ?: new Lexer();
     }
@@ -366,7 +366,7 @@ private function parseKeyValuePair()
         ];
     }
 
-    private function parseWildcardObject(array $left = null)
+    private function parseWildcardObject(?array $left = null)
     {
         $this->next();
 
@@ -380,7 +380,7 @@ private function parseWildcardObject(array $left = null)
         ];
     }
 
-    private function parseWildcardArray(array $left = null)
+    private function parseWildcardArray(?array $left = null)
     {
         static $getRbracket = [T::T_RBRACKET => true];
         $this->next($getRbracket);
@@ -473,7 +473,7 @@ private function lookahead()
             : $this->tokens[$this->tpos + 1]['type'];
     }
 
-    private function next(array $match = null)
+    private function next(?array $match = null)
     {
         if (!isset($this->tokens[$this->tpos + 1])) {
             $this->token = self::$nullToken;

src/TreeInterpreter.php

@@ -14,7 +14,7 @@ class TreeInterpreter
      *                                    a function name argument and an array of
      *                                    function arguments and returns the result.
      */
-    public function __construct(callable $fnDispatcher = null)
+    public function __construct(?callable $fnDispatcher = null)
     {
         $this->fnDispatcher = $fnDispatcher ?: FnDispatcher::getInstance();
     }