Merge remote-tracking branch 'origin/master'

split: 5b726dc15ef2bacbe76a8e2f20731238f5a7ecfe

Author: kylekatarnls

Lexer/AbstractToken.php

@@ -13,7 +13,7 @@ abstract class AbstractToken implements TokenInterface, HandleTokenInterface
     private $indentation;
     private $handled = false;
 
-    public function __construct(SourceLocationInterface $sourceLocation = null, $level = null, $indentation = null)
+    public function __construct(?SourceLocationInterface $sourceLocation = null, $level = null, $indentation = null)
     {
         $this->sourceLocation = $sourceLocation;
         $this->level = $level ?: 0;

Lexer/Scanner/AttributeScanner.php

@@ -103,7 +103,7 @@ private function isExpressionPartial(Reader $reader, $expression)
         $this->isTruncatedValue($expression);
     }
 
-    private function getAttributeValue(Reader $reader, array $chars = null)
+    private function getAttributeValue(Reader $reader, ?array $chars = null)
     {
         $chars = $chars ?: [
             ' ', "\t", "\n", ',', ')', '//',

Lexer/Scanner/IndentationScanner.php

@@ -53,7 +53,7 @@ protected function formatIndentChar(State $state, $indentChar)
         return $indentChar;
     }
 
-    public function getIndentLevel(State $state, $maxLevel = INF, callable $getIndentChar = null)
+    public function getIndentLevel(State $state, $maxLevel = INF, ?callable $getIndentChar = null)
     {
         if ($maxLevel <= 0) {
             return 0;

Lexer/TokenInterface.php

@@ -6,7 +6,7 @@
 
 interface TokenInterface
 {
-    public function __construct(SourceLocationInterface $sourceLocation = null, $level = null, $indentation = null);
+    public function __construct(?SourceLocationInterface $sourceLocation = null, $level = null, $indentation = null);
 
     /**
      * @return SourceLocationInterface|null