Code updated to PHP 8

Author: remorhaz

src/Locator/Exception/LocatorAlreadyBuiltException.php

@@ -9,7 +9,7 @@
 
 final class LocatorAlreadyBuiltException extends LogicException implements ExceptionInterface
 {
-    public function __construct(Throwable $previous = null)
+    public function __construct(?Throwable $previous = null)
     {
         parent::__construct("Locator is already built", 0, $previous);
     }

src/Locator/IndexReference.php

@@ -6,11 +6,9 @@
 
 final class IndexReference implements IndexReferenceInterface
 {
-    private $elementIndex;
-
-    public function __construct(int $elementIndex)
-    {
-        $this->elementIndex = $elementIndex;
+    public function __construct(
+        private int $elementIndex,
+    ) {
     }
 
     public function getElementIndex(): int

src/Locator/ListedReference.php

@@ -6,14 +6,10 @@
 
 final class ListedReference implements ListedReferenceInterface
 {
-    private $reference;
-
-    private $isLast;
-
-    public function __construct(ReferenceInterface $reference, bool $isLast)
-    {
-        $this->reference = $reference;
-        $this->isLast = $isLast;
+    public function __construct(
+        private ReferenceInterface $reference,
+        private bool $isLast,
+    ) {
     }
 
     public function getReference(): ReferenceInterface

src/Locator/Locator.php

@@ -4,23 +4,27 @@
 
 namespace Remorhaz\JSON\Pointer\Locator;
 
+use function array_values;
 use function count;
 
 final class Locator implements LocatorInterface
 {
-    private $listedReferences;
+    /**
+     * @var list<ListedReferenceInterface>
+     */
+    private array $listedReferences;
 
     public function __construct(ReferenceInterface ...$references)
     {
         $listSize = count($references);
         $this->listedReferences = [];
-        foreach ($references as $index => $reference) {
+        foreach (array_values($references) as $index => $reference) {
             $this->listedReferences[] = new ListedReference($reference, $index + 1 == $listSize);
         }
     }
 
     /**
-     * @return array|ListedReferenceInterface[]
+     * @return list<ListedReferenceInterface>
      */
     public function references(): array
     {

src/Locator/LocatorBuilder.php

@@ -10,20 +10,21 @@
 
 final class LocatorBuilder implements LocatorBuilderInterface
 {
-    private $locator;
+    private ?LocatorInterface $locator = null;
 
-    private $referenceFactory;
-
-    private $references = [];
+    /**
+     * @var list<ReferenceInterface>
+     */
+    private array $references = [];
 
     public static function create(): LocatorBuilderInterface
     {
         return new self(new ReferenceFactory());
     }
 
-    public function __construct(ReferenceFactoryInterface $referenceFactory)
-    {
-        $this->referenceFactory = $referenceFactory;
+    public function __construct(
+        private ReferenceFactoryInterface $referenceFactory,
+    ) {
     }
 
     public function addReference(string $text): void
@@ -40,11 +41,7 @@ public function addReference(string $text): void
 
     public function getLocator(): LocatorInterface
     {
-        if (!isset($this->locator)) {
-            $this->locator = new Locator(...$this->references);
-        }
-
-        return $this->locator;
+        return $this->locator ??= new Locator(...$this->references);
     }
 
     public function export(): string
@@ -53,11 +50,9 @@ public function export(): string
             ->getLocator()
             ->references();
 
-        if (empty($references)) {
-            return '';
-        }
-
-        return '/' . implode('/', array_map([$this, 'escapeReference'], $references));
+        return empty($references)
+            ? ''
+            : '/' . implode('/', array_map([$this, 'escapeReference'], $references));
     }
 
     private function escapeReference(ListedReferenceInterface $reference): string

src/Locator/LocatorInterface.php

@@ -7,7 +7,7 @@
 interface LocatorInterface
 {
     /**
-     * @return array|ListedReferenceInterface[]
+     * @return list<ListedReferenceInterface>
      */
     public function references(): array;
 }

src/Locator/PropertyReference.php

@@ -6,11 +6,9 @@
 
 final class PropertyReference implements ReferenceInterface
 {
-    private $propertyName;
-
-    public function __construct(string $propertyName)
-    {
-        $this->propertyName = $propertyName;
+    public function __construct(
+        private string $propertyName,
+    ) {
     }
 
     public function getPropertyName(): string

src/Parser/Exception/LL1ParserNotCreatedException.php

@@ -9,7 +9,7 @@
 
 final class LL1ParserNotCreatedException extends LogicException implements ExceptionInterface
 {
-    public function __construct(Throwable $previous = null)
+    public function __construct(?Throwable $previous = null)
     {
         parent::__construct("Failed to create LL(1) parser", 0, $previous);
     }

src/Parser/Ll1ParserFactory.php

@@ -19,16 +19,16 @@
 
 final class Ll1ParserFactory implements Ll1ParserFactoryInterface
 {
-    private $grammar;
+    private ?GrammarInterface $grammar = null;
 
-    public function createParser(string $source, LocatorBuilderInterface $locatorBuilder): Ll1Parser
+    public function createParser(string $pointer, LocatorBuilderInterface $locatorBuilder): Ll1Parser
     {
         try {
             $scheme = new TranslationScheme($locatorBuilder);
             $parser = new Ll1Parser(
                 $this->getGrammar(),
-                $this->createSourceReader($source),
-                new TranslationSchemeApplier($scheme)
+                $this->createSourceReader($pointer),
+                new TranslationSchemeApplier($scheme),
             );
             $parser->loadLookupTable(__DIR__ . '/../../generated/LookupTable.php');
         } catch (Throwable $e) {
@@ -39,29 +39,22 @@ public function createParser(string $source, LocatorBuilderInterface $locatorBui
     }
 
     /**
-     * @return GrammarInterface
      * @throws UnilexException
      */
     private function getGrammar(): GrammarInterface
     {
-        if (!isset($this->grammar)) {
-            $this->grammar = GrammarLoader::loadFile(__DIR__ . '/../../spec/GrammarSpec.php');
-        }
-
-        return $this->grammar;
+        return $this->grammar ??= GrammarLoader::loadFile(__DIR__ . '/../../spec/GrammarSpec.php');
     }
 
     /**
-     * @param string $source
-     * @return TokenReaderInterface
      * @throws UnilexException
      */
     private function createSourceReader(string $source): TokenReaderInterface
     {
         return new TokenReader(
             CharBufferFactory::createFromString($source),
             new TokenMatcher(),
-            new TokenFactory($this->getGrammar())
+            new TokenFactory($this->getGrammar()),
         );
     }
 }

src/Parser/Parser.php

@@ -12,29 +12,21 @@
 
 final class Parser implements ParserInterface
 {
-    private $ll1ParserFactory;
-
-    private $referenceFactory;
-
     public static function create(): ParserInterface
     {
         return new self(
             new Ll1ParserFactory(),
-            new ReferenceFactory()
+            new ReferenceFactory(),
         );
     }
 
     public function __construct(
-        Ll1ParserFactoryInterface $ll1ParserFactory,
-        ReferenceFactoryInterface $referenceFactory
+        private Ll1ParserFactoryInterface $ll1ParserFactory,
+        private ReferenceFactoryInterface $referenceFactory,
     ) {
-        $this->ll1ParserFactory = $ll1ParserFactory;
-        $this->referenceFactory = $referenceFactory;
     }
 
     /**
-     * @param string $pointer
-     * @return LocatorInterface
      * @throws UniLexException
      */
     public function buildLocator(string $pointer): LocatorInterface