Improve code quality with Rector PHP

src/AST/Expander.php

@@ -6,15 +6,12 @@
 
 final class Expander implements Node
 {
-    /**
-     * @var string
-     */
-    private $name;
+    private string $name;
 
     /**
      * @var mixed[]
      */
-    private $arguments;
+    private array $arguments = [];
 
     public function __construct(string $name)
     {
@@ -37,6 +34,9 @@ public function hasArguments() : bool
         return (bool) \count($this->arguments);
     }
 
+    /**
+     * @return mixed[]
+     */
     public function getArguments() : array
     {
         return $this->arguments;

src/AST/Pattern.php

@@ -6,15 +6,12 @@
 
 final class Pattern implements Node
 {
-    /**
-     * @var Type
-     */
-    private $type;
+    private Type $type;
 
     /**
      * @var mixed[]
      */
-    private $expanders;
+    private array $expanders = [];
 
     public function __construct(Type $type)
     {

src/AST/Type.php

@@ -6,10 +6,7 @@
 
 final class Type implements Node
 {
-    /**
-     * @var string
-     */
-    private $type;
+    private string $type;
 
     public function __construct(string $type)
     {

src/Backtrace/InMemoryBacktrace.php

@@ -11,9 +11,9 @@
 final class InMemoryBacktrace implements Backtrace
 {
     /**
-     * @var mixed[]
+     * @var string[]
      */
-    private $trace;
+    private array $trace = [];
 
     public function __construct()
     {
@@ -31,7 +31,7 @@ public function matcherCanMatch(string $name, $value, bool $result) : void
             '#%d Matcher %s %s match pattern "%s"',
             $this->entriesCount(),
             $name,
-            $result ? 'can' : 'can\'t',
+            $result ? 'can' : "can't",
             new SingleLineString((string) new StringConverter($value))
         );
     }
@@ -118,6 +118,9 @@ public function isEmpty() : bool
         return \count($this->trace) === 0;
     }
 
+    /**
+     * @return mixed[]
+     */
     public function raw() : array
     {
         return $this->trace;

src/Backtrace/VoidBacktrace.php

@@ -46,6 +46,9 @@ public function isEmpty() : bool
         return true;
     }
 
+    /**
+     * @return mixed[]
+     */
     public function raw() : array
     {
         return [];

src/Exception/UnknownTypeException.php

@@ -6,10 +6,7 @@
 
 class UnknownTypeException extends Exception
 {
-    /**
-     * @var string
-     */
-    private $type;
+    private string $type;
 
     public function __construct(string $type)
     {

src/Factory/MatcherFactory.php

@@ -32,7 +32,7 @@ private function buildMatchers(Parser $parser, Backtrace $backtrace) : Matcher\C
         $matchers = [$scalarMatchers];
         $matchers[] = new Matcher\JsonMatcher($arrayMatcher, $backtrace);
 
-        if (\class_exists('LSS\XML2Array')) {
+        if (\class_exists(\LSS\XML2Array::class)) {
             $matchers[] = new Matcher\XmlMatcher($arrayMatcher, $backtrace);
         }
 

src/Lexer.php

@@ -8,28 +8,64 @@
 
 final class Lexer extends AbstractLexer
 {
+    /**
+     * @var int
+     */
     public const T_NONE = 1;
 
+    /**
+     * @var int
+     */
     public const T_EXPANDER_NAME = 2;
 
+    /**
+     * @var int
+     */
     public const T_CLOSE_PARENTHESIS = 3;
 
+    /**
+     * @var int
+     */
     public const T_OPEN_CURLY_BRACE    = 4;
 
+    /**
+     * @var int
+     */
     public const T_CLOSE_CURLY_BRACE   = 5;
 
+    /**
+     * @var int
+     */
     public const T_STRING = 6;
 
+    /**
+     * @var int
+     */
     public const T_NUMBER = 7;
 
+    /**
+     * @var int
+     */
     public const T_BOOLEAN = 8;
 
+    /**
+     * @var int
+     */
     public const T_NULL = 9;
 
+    /**
+     * @var int
+     */
     public const T_COMMA  = 10;
 
+    /**
+     * @var int
+     */
     public const T_COLON = 11;
 
+    /**
+     * @var int
+     */
     public const T_TYPE_PATTERN = 12;
 
     /**
@@ -49,6 +85,8 @@ protected function getCatchablePatterns() : array
 
     /**
      * Lexical non-catchable patterns.
+     *
+     * @return string[]
      */
     protected function getNonCatchablePatterns() : array
     {

src/Matcher.php

@@ -8,15 +8,9 @@
 
 final class Matcher
 {
-    /**
-     * @var ValueMatcher
-     */
-    private $valueMatcher;
+    private ValueMatcher $valueMatcher;
 
-    /**
-     * @var Backtrace
-     */
-    private $backtrace;
+    private Backtrace $backtrace;
 
     public function __construct(ValueMatcher $valueMatcher, Backtrace $backtrace)
     {

src/Matcher/ArrayMatcher.php

@@ -11,26 +11,26 @@
 
 final class ArrayMatcher extends Matcher
 {
-    public const PATTERN = 'array';
-
-    public const UNBOUNDED_PATTERN = '@...@';
-
-    public const UNIVERSAL_KEY = '@*@';
-
     /**
-     * @var ValueMatcher
+     * @var string
      */
-    private $propertyMatcher;
+    public const PATTERN = 'array';
 
     /**
-     * @var Parser
+     * @var string
      */
-    private $parser;
+    public const UNBOUNDED_PATTERN = '@...@';
 
     /**
-     * @var Backtrace
+     * @var string
      */
-    private $backtrace;
+    public const UNIVERSAL_KEY = '@*@';
+
+    private ValueMatcher $propertyMatcher;
+
+    private Parser $parser;
+
+    private Backtrace $backtrace;
 
     public function __construct(ValueMatcher $propertyMatcher, Backtrace $backtrace, Parser $parser)
     {
@@ -140,9 +140,7 @@ private function isPatternValid(array $pattern, array $values, string $parentPat
 
         $pattern = \array_filter(
             $pattern,
-            function ($item) use ($skipPattern) {
-                return $item !== $skipPattern;
-            }
+            fn ($item) => $item !== $skipPattern
         );
 
         $notExistingKeys = $this->findNotExistingKeys($pattern, $values);
@@ -158,11 +156,14 @@ function ($item) use ($skipPattern) {
         return true;
     }
 
+    /**
+     * @return mixed[]
+     */
     private function findNotExistingKeys(array $patterns, array $values) : array
     {
         $notExistingKeys = \array_diff_key($patterns, $values);
 
-        return \array_filter($notExistingKeys, function ($pattern, $key) use ($values) {
+        return \array_filter($notExistingKeys, function ($pattern, $key) use ($values) : bool {
             if ($key === self::UNIVERSAL_KEY) {
                 return false;
             }

src/Matcher/BooleanMatcher.php

@@ -10,17 +10,14 @@
 
 final class BooleanMatcher extends Matcher
 {
-    public const PATTERN = 'boolean';
-
     /**
-     * @var Backtrace
+     * @var string
      */
-    private $backtrace;
+    public const PATTERN = 'boolean';
 
-    /**
-     * @var Parser
-     */
-    private $parser;
+    private Backtrace $backtrace;
+
+    private Parser $parser;
 
     public function __construct(Backtrace $backtrace, Parser $parser)
     {

src/Matcher/CallbackMatcher.php

@@ -9,10 +9,7 @@
 
 final class CallbackMatcher extends Matcher
 {
-    /**
-     * @var Backtrace
-     */
-    private $backtrace;
+    private Backtrace $backtrace;
 
     public function __construct(Backtrace $backtrace)
     {

src/Matcher/ChainMatcher.php

@@ -10,20 +10,14 @@
 
 final class ChainMatcher extends Matcher
 {
-    /**
-     * @var string
-     */
-    private $name;
+    private string $name;
 
-    /**
-     * @var Backtrace
-     */
-    private $backtrace;
+    private Backtrace $backtrace;
 
     /**
      * @var ValueMatcher[]
      */
-    private $matchers;
+    private array $matchers = [];
 
     /**
      * @param Backtrace $backtrace

src/Matcher/DateMatcher.php

@@ -11,6 +11,9 @@
 
 final class DateMatcher extends Matcher
 {
+    /**
+     * @var string
+     */
     public const PATTERN = 'date';
 
     private Backtrace $backtrace;

src/Matcher/DateTimeMatcher.php

@@ -11,6 +11,9 @@
 
 final class DateTimeMatcher extends Matcher
 {
+    /**
+     * @var string
+     */
     public const PATTERN = 'datetime';
 
     private Backtrace $backtrace;

src/Matcher/DoubleMatcher.php

@@ -10,17 +10,14 @@
 
 final class DoubleMatcher extends Matcher
 {
-    public const PATTERN = 'double';
-
     /**
-     * @var Backtrace
+     * @var string
      */
-    private $backtrace;
+    public const PATTERN = 'double';
 
-    /**
-     * @var Parser
-     */
-    private $parser;
+    private Backtrace $backtrace;
+
+    private Parser $parser;
 
     public function __construct(Backtrace $backtrace, Parser $parser)
     {

src/Matcher/ExpressionMatcher.php

@@ -10,12 +10,12 @@
 
 final class ExpressionMatcher extends Matcher
 {
-    public const MATCH_PATTERN = "/^expr\((.*?)\)$/";
-
     /**
-     * @var Backtrace
+     * @var string
      */
-    private $backtrace;
+    public const MATCH_PATTERN = "/^expr\((.*?)\)$/";
+
+    private Backtrace $backtrace;
 
     public function __construct(Backtrace $backtrace)
     {