Merge remote-tracking branch 'origin/master'

split: 5b726dc15ef2bacbe76a8e2f20731238f5a7ecfe

Author: kylekatarnls

Parser/Node.php

@@ -34,11 +34,11 @@ class Node extends AstNode implements NodeInterface
      * @param TokenInterface               $token          the token that created the node
      */
     public function __construct(
-        TokenInterface $token = null,
-        SourceLocationInterface $sourceLocation = null,
+        ?TokenInterface $token = null,
+        ?SourceLocationInterface $sourceLocation = null,
         $level = null,
-        NodeInterface $parent = null,
-        array $children = null
+        ?NodeInterface $parent = null,
+        ?array $children = null
     ) {
         parent::__construct($parent, $children);
 
@@ -77,7 +77,7 @@ public function getToken()
      *
      * @return $this
      */
-    public function setOuterNode(NodeInterface $node = null)
+    public function setOuterNode(?NodeInterface $node = null)
     {
         $this->outerNode = $node;
 

Parser/State.php

@@ -101,7 +101,7 @@ class State implements OptionInterface, EventManagerInterface
      */
     private $interpolationNodes;
 
-    public function __construct(Parser $parser, \Iterator $tokens, array $options = null)
+    public function __construct(Parser $parser, \Iterator $tokens, ?array $options = null)
     {
         $this->parser = $parser;
         $this->level = 0;
@@ -329,7 +329,7 @@ private function getNamedHandler($handler)
      *
      * @return $this
      */
-    public function handleToken(TokenInterface $token = null)
+    public function handleToken(?TokenInterface $token = null)
     {
         $token = $token ?: $this->getToken();
         $className = get_class($token);
@@ -534,7 +534,7 @@ public function parentNodeIs(array $classNames)
      *
      * @return Node The newly created node
      */
-    public function createNode($className, TokenInterface $token = null)
+    public function createNode($className, ?TokenInterface $token = null)
     {
         if (!is_subclass_of($className, Node::class)) {
             throw new \InvalidArgumentException(
@@ -630,7 +630,7 @@ public function store()
      *
      * @throws ParserException
      */
-    public function throwException($message, $code = 0, TokenInterface $relatedToken = null, $previous = null)
+    public function throwException($message, $code = 0, ?TokenInterface $relatedToken = null, $previous = null)
     {
         $lexer = $this->parser->getLexer();
         //This will basically check for a source location for this Node. The process is like:

ParserException.php

@@ -17,7 +17,7 @@ public function __construct(
         SourceLocation $location,
         $message = '',
         $code = 0,
-        TokenInterface $relatedToken = null,
+        ?TokenInterface $relatedToken = null,
         $previous = null
     ) {
         parent::__construct($location, $message, $code, $previous);