nextcloud / fulltextsearch_elasticsearch

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NumericLiteralSeparatorEmulator.php

Indentation +96 added lines, -96 removed lines

@@ -6,100 +6,100 @@
 
 final class NumericLiteralSeparatorEmulator extends TokenEmulator
 {
-    const BIN = '(?:0b[01]+(?:_[01]+)*)';
-    const HEX = '(?:0x[0-9a-f]+(?:_[0-9a-f]+)*)';
-    const DEC = '(?:[0-9]+(?:_[0-9]+)*)';
-    const SIMPLE_FLOAT = '(?:' . self::DEC . '\.' . self::DEC . '?|\.' . self::DEC . ')';
-    const EXP = '(?:e[+-]?' . self::DEC . ')';
-    const FLOAT = '(?:' . self::SIMPLE_FLOAT . self::EXP . '?|' . self::DEC . self::EXP . ')';
-    const NUMBER = '~' . self::FLOAT . '|' . self::BIN . '|' . self::HEX . '|' . self::DEC . '~iA';
-
-    public function getPhpVersion(): string
-    {
-        return Emulative::PHP_7_4;
-    }
-
-    public function isEmulationNeeded(string $code) : bool
-    {
-        return preg_match('~[0-9]_[0-9]~', $code)
-            || preg_match('~0x[0-9a-f]+_[0-9a-f]~i', $code);
-    }
-
-    public function emulate(string $code, array $tokens): array
-    {
-        // We need to manually iterate and manage a count because we'll change
-        // the tokens array on the way
-        $codeOffset = 0;
-        for ($i = 0, $c = count($tokens); $i < $c; ++$i) {
-            $token = $tokens[$i];
-            $tokenLen = \strlen(\is_array($token) ? $token[1] : $token);
-
-            if ($token[0] !== T_LNUMBER && $token[0] !== T_DNUMBER) {
-                $codeOffset += $tokenLen;
-                continue;
-            }
-
-            $res = preg_match(self::NUMBER, $code, $matches, 0, $codeOffset);
-            assert($res, "No number at number token position");
-
-            $match = $matches[0];
-            $matchLen = \strlen($match);
-            if ($matchLen === $tokenLen) {
-                // Original token already holds the full number.
-                $codeOffset += $tokenLen;
-                continue;
-            }
-
-            $tokenKind = $this->resolveIntegerOrFloatToken($match);
-            $newTokens = [[$tokenKind, $match, $token[2]]];
-
-            $numTokens = 1;
-            $len = $tokenLen;
-            while ($matchLen > $len) {
-                $nextToken = $tokens[$i + $numTokens];
-                $nextTokenText = \is_array($nextToken) ? $nextToken[1] : $nextToken;
-                $nextTokenLen = \strlen($nextTokenText);
-
-                $numTokens++;
-                if ($matchLen < $len + $nextTokenLen) {
-                    // Split trailing characters into a partial token.
-                    assert(is_array($nextToken), "Partial token should be an array token");
-                    $partialText = substr($nextTokenText, $matchLen - $len);
-                    $newTokens[] = [$nextToken[0], $partialText, $nextToken[2]];
-                    break;
-                }
-
-                $len += $nextTokenLen;
-            }
-
-            array_splice($tokens, $i, $numTokens, $newTokens);
-            $c -= $numTokens - \count($newTokens);
-            $codeOffset += $matchLen;
-        }
-
-        return $tokens;
-    }
-
-    private function resolveIntegerOrFloatToken(string $str): int
-    {
-        $str = str_replace('_', '', $str);
-
-        if (stripos($str, '0b') === 0) {
-            $num = bindec($str);
-        } elseif (stripos($str, '0x') === 0) {
-            $num = hexdec($str);
-        } elseif (stripos($str, '0') === 0 && ctype_digit($str)) {
-            $num = octdec($str);
-        } else {
-            $num = +$str;
-        }
-
-        return is_float($num) ? T_DNUMBER : T_LNUMBER;
-    }
-
-    public function reverseEmulate(string $code, array $tokens): array
-    {
-        // Numeric separators were not legal code previously, don't bother.
-        return $tokens;
-    }
+	const BIN = '(?:0b[01]+(?:_[01]+)*)';
+	const HEX = '(?:0x[0-9a-f]+(?:_[0-9a-f]+)*)';
+	const DEC = '(?:[0-9]+(?:_[0-9]+)*)';
+	const SIMPLE_FLOAT = '(?:' . self::DEC . '\.' . self::DEC . '?|\.' . self::DEC . ')';
+	const EXP = '(?:e[+-]?' . self::DEC . ')';
+	const FLOAT = '(?:' . self::SIMPLE_FLOAT . self::EXP . '?|' . self::DEC . self::EXP . ')';
+	const NUMBER = '~' . self::FLOAT . '|' . self::BIN . '|' . self::HEX . '|' . self::DEC . '~iA';
+
+	public function getPhpVersion(): string
+	{
+		return Emulative::PHP_7_4;
+	}
+
+	public function isEmulationNeeded(string $code) : bool
+	{
+		return preg_match('~[0-9]_[0-9]~', $code)
+			|| preg_match('~0x[0-9a-f]+_[0-9a-f]~i', $code);
+	}
+
+	public function emulate(string $code, array $tokens): array
+	{
+		// We need to manually iterate and manage a count because we'll change
+		// the tokens array on the way
+		$codeOffset = 0;
+		for ($i = 0, $c = count($tokens); $i < $c; ++$i) {
+			$token = $tokens[$i];
+			$tokenLen = \strlen(\is_array($token) ? $token[1] : $token);
+
+			if ($token[0] !== T_LNUMBER && $token[0] !== T_DNUMBER) {
+				$codeOffset += $tokenLen;
+				continue;
+			}
+
+			$res = preg_match(self::NUMBER, $code, $matches, 0, $codeOffset);
+			assert($res, "No number at number token position");
+
+			$match = $matches[0];
+			$matchLen = \strlen($match);
+			if ($matchLen === $tokenLen) {
+				// Original token already holds the full number.
+				$codeOffset += $tokenLen;
+				continue;
+			}
+
+			$tokenKind = $this->resolveIntegerOrFloatToken($match);
+			$newTokens = [[$tokenKind, $match, $token[2]]];
+
+			$numTokens = 1;
+			$len = $tokenLen;
+			while ($matchLen > $len) {
+				$nextToken = $tokens[$i + $numTokens];
+				$nextTokenText = \is_array($nextToken) ? $nextToken[1] : $nextToken;
+				$nextTokenLen = \strlen($nextTokenText);
+
+				$numTokens++;
+				if ($matchLen < $len + $nextTokenLen) {
+					// Split trailing characters into a partial token.
+					assert(is_array($nextToken), "Partial token should be an array token");
+					$partialText = substr($nextTokenText, $matchLen - $len);
+					$newTokens[] = [$nextToken[0], $partialText, $nextToken[2]];
+					break;
+				}
+
+				$len += $nextTokenLen;
+			}
+
+			array_splice($tokens, $i, $numTokens, $newTokens);
+			$c -= $numTokens - \count($newTokens);
+			$codeOffset += $matchLen;
+		}
+
+		return $tokens;
+	}
+
+	private function resolveIntegerOrFloatToken(string $str): int
+	{
+		$str = str_replace('_', '', $str);
+
+		if (stripos($str, '0b') === 0) {
+			$num = bindec($str);
+		} elseif (stripos($str, '0x') === 0) {
+			$num = hexdec($str);
+		} elseif (stripos($str, '0') === 0 && ctype_digit($str)) {
+			$num = octdec($str);
+		} else {
+			$num = +$str;
+		}
+
+		return is_float($num) ? T_DNUMBER : T_LNUMBER;
+	}
+
+	public function reverseEmulate(string $code, array $tokens): array
+	{
+		// Numeric separators were not legal code previously, don't bother.
+		return $tokens;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -9,10 +9,10 @@
     const BIN = '(?:0b[01]+(?:_[01]+)*)';
     const HEX = '(?:0x[0-9a-f]+(?:_[0-9a-f]+)*)';
     const DEC = '(?:[0-9]+(?:_[0-9]+)*)';
-    const SIMPLE_FLOAT = '(?:' . self::DEC . '\.' . self::DEC . '?|\.' . self::DEC . ')';
-    const EXP = '(?:e[+-]?' . self::DEC . ')';
-    const FLOAT = '(?:' . self::SIMPLE_FLOAT . self::EXP . '?|' . self::DEC . self::EXP . ')';
-    const NUMBER = '~' . self::FLOAT . '|' . self::BIN . '|' . self::HEX . '|' . self::DEC . '~iA';
+    const SIMPLE_FLOAT = '(?:'.self::DEC.'\.'.self::DEC.'?|\.'.self::DEC.')';
+    const EXP = '(?:e[+-]?'.self::DEC.')';
+    const FLOAT = '(?:'.self::SIMPLE_FLOAT.self::EXP.'?|'.self::DEC.self::EXP.')';
+    const NUMBER = '~'.self::FLOAT.'|'.self::BIN.'|'.self::HEX.'|'.self::DEC.'~iA';
 
     public function getPhpVersion(): string
     {

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 use PhpParser\Lexer\Emulative;
 
-final class NumericLiteralSeparatorEmulator extends TokenEmulator
-{
+final class NumericLiteralSeparatorEmulator extends TokenEmulator {
     const BIN = '(?:0b[01]+(?:_[01]+)*)';
     const HEX = '(?:0x[0-9a-f]+(?:_[0-9a-f]+)*)';
     const DEC = '(?:[0-9]+(?:_[0-9]+)*)';

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FlexibleDocStringEmulator.php

Indentation +52 added lines, -52 removed lines

@@ -6,71 +6,71 @@
 
 final class FlexibleDocStringEmulator extends TokenEmulator
 {
-    const FLEXIBLE_DOC_STRING_REGEX = <<<'REGEX'
+	const FLEXIBLE_DOC_STRING_REGEX = <<<'REGEX'
 /<<<[ \t]*(['"]?)([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)\1\r?\n
 (?:.*\r?\n)*?
 (?<indentation>\h*)\2(?![a-zA-Z0-9_\x80-\xff])(?<separator>(?:;?[\r\n])?)/x
 REGEX;
 
-    public function getPhpVersion(): string
-    {
-        return Emulative::PHP_7_3;
-    }
+	public function getPhpVersion(): string
+	{
+		return Emulative::PHP_7_3;
+	}
 
-    public function isEmulationNeeded(string $code) : bool
-    {
-        return strpos($code, '<<<') !== false;
-    }
+	public function isEmulationNeeded(string $code) : bool
+	{
+		return strpos($code, '<<<') !== false;
+	}
 
-    public function emulate(string $code, array $tokens): array
-    {
-        // Handled by preprocessing + fixup.
-        return $tokens;
-    }
+	public function emulate(string $code, array $tokens): array
+	{
+		// Handled by preprocessing + fixup.
+		return $tokens;
+	}
 
-    public function reverseEmulate(string $code, array $tokens): array
-    {
-        // Not supported.
-        return $tokens;
-    }
+	public function reverseEmulate(string $code, array $tokens): array
+	{
+		// Not supported.
+		return $tokens;
+	}
 
-    public function preprocessCode(string $code, array &$patches): string {
-        if (!preg_match_all(self::FLEXIBLE_DOC_STRING_REGEX, $code, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE)) {
-            // No heredoc/nowdoc found
-            return $code;
-        }
+	public function preprocessCode(string $code, array &$patches): string {
+		if (!preg_match_all(self::FLEXIBLE_DOC_STRING_REGEX, $code, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE)) {
+			// No heredoc/nowdoc found
+			return $code;
+		}
 
-        // Keep track of how much we need to adjust string offsets due to the modifications we
-        // already made
-        $posDelta = 0;
-        foreach ($matches as $match) {
-            $indentation = $match['indentation'][0];
-            $indentationStart = $match['indentation'][1];
+		// Keep track of how much we need to adjust string offsets due to the modifications we
+		// already made
+		$posDelta = 0;
+		foreach ($matches as $match) {
+			$indentation = $match['indentation'][0];
+			$indentationStart = $match['indentation'][1];
 
-            $separator = $match['separator'][0];
-            $separatorStart = $match['separator'][1];
+			$separator = $match['separator'][0];
+			$separatorStart = $match['separator'][1];
 
-            if ($indentation === '' && $separator !== '') {
-                // Ordinary heredoc/nowdoc
-                continue;
-            }
+			if ($indentation === '' && $separator !== '') {
+				// Ordinary heredoc/nowdoc
+				continue;
+			}
 
-            if ($indentation !== '') {
-                // Remove indentation
-                $indentationLen = strlen($indentation);
-                $code = substr_replace($code, '', $indentationStart + $posDelta, $indentationLen);
-                $patches[] = [$indentationStart + $posDelta, 'add', $indentation];
-                $posDelta -= $indentationLen;
-            }
+			if ($indentation !== '') {
+				// Remove indentation
+				$indentationLen = strlen($indentation);
+				$code = substr_replace($code, '', $indentationStart + $posDelta, $indentationLen);
+				$patches[] = [$indentationStart + $posDelta, 'add', $indentation];
+				$posDelta -= $indentationLen;
+			}
 
-            if ($separator === '') {
-                // Insert newline as separator
-                $code = substr_replace($code, "\n", $separatorStart + $posDelta, 0);
-                $patches[] = [$separatorStart + $posDelta, 'remove', "\n"];
-                $posDelta += 1;
-            }
-        }
+			if ($separator === '') {
+				// Insert newline as separator
+				$code = substr_replace($code, "\n", $separatorStart + $posDelta, 0);
+				$patches[] = [$separatorStart + $posDelta, 'remove', "\n"];
+				$posDelta += 1;
+			}
+		}
 
-        return $code;
-    }
+		return $code;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     }
 
     public function preprocessCode(string $code, array &$patches): string {
-        if (!preg_match_all(self::FLEXIBLE_DOC_STRING_REGEX, $code, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE)) {
+        if (!preg_match_all(self::FLEXIBLE_DOC_STRING_REGEX, $code, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
             // No heredoc/nowdoc found
             return $code;
         }

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 use PhpParser\Lexer\Emulative;
 
-final class FlexibleDocStringEmulator extends TokenEmulator
-{
+final class FlexibleDocStringEmulator extends TokenEmulator {
     const FLEXIBLE_DOC_STRING_REGEX = <<<'REGEX'
 /<<<[ \t]*(['"]?)([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)\1\r?\n
 (?:.*\r?\n)*?

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php

Indentation +55 added lines, -55 removed lines

@@ -4,59 +4,59 @@
 
 abstract class KeywordEmulator extends TokenEmulator
 {
-    abstract function getKeywordString(): string;
-    abstract function getKeywordToken(): int;
-
-    public function isEmulationNeeded(string $code): bool
-    {
-        return strpos(strtolower($code), $this->getKeywordString()) !== false;
-    }
-
-    protected function isKeywordContext(array $tokens, int $pos): bool
-    {
-        $previousNonSpaceToken = $this->getPreviousNonSpaceToken($tokens, $pos);
-        return $previousNonSpaceToken === null || $previousNonSpaceToken[0] !== \T_OBJECT_OPERATOR;
-    }
-
-    public function emulate(string $code, array $tokens): array
-    {
-        $keywordString = $this->getKeywordString();
-        foreach ($tokens as $i => $token) {
-            if ($token[0] === T_STRING && strtolower($token[1]) === $keywordString
-                    && $this->isKeywordContext($tokens, $i)) {
-                $tokens[$i][0] = $this->getKeywordToken();
-            }
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * @param mixed[] $tokens
-     * @return array|string|null
-     */
-    private function getPreviousNonSpaceToken(array $tokens, int $start)
-    {
-        for ($i = $start - 1; $i >= 0; --$i) {
-            if ($tokens[$i][0] === T_WHITESPACE) {
-                continue;
-            }
-
-            return $tokens[$i];
-        }
-
-        return null;
-    }
-
-    public function reverseEmulate(string $code, array $tokens): array
-    {
-        $keywordToken = $this->getKeywordToken();
-        foreach ($tokens as $i => $token) {
-            if ($token[0] === $keywordToken) {
-                $tokens[$i][0] = \T_STRING;
-            }
-        }
-
-        return $tokens;
-    }
+	abstract function getKeywordString(): string;
+	abstract function getKeywordToken(): int;
+
+	public function isEmulationNeeded(string $code): bool
+	{
+		return strpos(strtolower($code), $this->getKeywordString()) !== false;
+	}
+
+	protected function isKeywordContext(array $tokens, int $pos): bool
+	{
+		$previousNonSpaceToken = $this->getPreviousNonSpaceToken($tokens, $pos);
+		return $previousNonSpaceToken === null || $previousNonSpaceToken[0] !== \T_OBJECT_OPERATOR;
+	}
+
+	public function emulate(string $code, array $tokens): array
+	{
+		$keywordString = $this->getKeywordString();
+		foreach ($tokens as $i => $token) {
+			if ($token[0] === T_STRING && strtolower($token[1]) === $keywordString
+					&& $this->isKeywordContext($tokens, $i)) {
+				$tokens[$i][0] = $this->getKeywordToken();
+			}
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * @param mixed[] $tokens
+	 * @return array|string|null
+	 */
+	private function getPreviousNonSpaceToken(array $tokens, int $start)
+	{
+		for ($i = $start - 1; $i >= 0; --$i) {
+			if ($tokens[$i][0] === T_WHITESPACE) {
+				continue;
+			}
+
+			return $tokens[$i];
+		}
+
+		return null;
+	}
+
+	public function reverseEmulate(string $code, array $tokens): array
+	{
+		$keywordToken = $this->getKeywordToken();
+		foreach ($tokens as $i => $token) {
+			if ($token[0] === $keywordToken) {
+				$tokens[$i][0] = \T_STRING;
+			}
+		}
+
+		return $tokens;
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 namespace PhpParser\Lexer\TokenEmulator;
 
-abstract class KeywordEmulator extends TokenEmulator
-{
+abstract class KeywordEmulator extends TokenEmulator {
     abstract function getKeywordString(): string;
     abstract function getKeywordToken(): int;
 

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FnTokenEmulator.php

Indentation +12 added lines, -12 removed lines

@@ -6,18 +6,18 @@
 
 final class FnTokenEmulator extends KeywordEmulator
 {
-    public function getPhpVersion(): string
-    {
-        return Emulative::PHP_7_4;
-    }
+	public function getPhpVersion(): string
+	{
+		return Emulative::PHP_7_4;
+	}
 
-    public function getKeywordString(): string
-    {
-        return 'fn';
-    }
+	public function getKeywordString(): string
+	{
+		return 'fn';
+	}
 
-    public function getKeywordToken(): int
-    {
-        return \T_FN;
-    }
+	public function getKeywordToken(): int
+	{
+		return \T_FN;
+	}
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 use PhpParser\Lexer\Emulative;
 
-final class FnTokenEmulator extends KeywordEmulator
-{
+final class FnTokenEmulator extends KeywordEmulator {
     public function getPhpVersion(): string
     {
         return Emulative::PHP_7_4;

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php

Indentation +227 added lines, -227 removed lines

@@ -21,231 +21,231 @@
 
 class Emulative extends Lexer
 {
-    const PHP_7_3 = '7.3dev';
-    const PHP_7_4 = '7.4dev';
-    const PHP_8_0 = '8.0dev';
-    const PHP_8_1 = '8.1dev';
-    const PHP_8_2 = '8.2dev';
-
-    /** @var mixed[] Patches used to reverse changes introduced in the code */
-    private $patches = [];
-
-    /** @var TokenEmulator[] */
-    private $emulators = [];
-
-    /** @var string */
-    private $targetPhpVersion;
-
-    /**
-     * @param mixed[] $options Lexer options. In addition to the usual options,
-     *                         accepts a 'phpVersion' string that specifies the
-     *                         version to emulate. Defaults to newest supported.
-     */
-    public function __construct(array $options = [])
-    {
-        $this->targetPhpVersion = $options['phpVersion'] ?? Emulative::PHP_8_2;
-        unset($options['phpVersion']);
-
-        parent::__construct($options);
-
-        $emulators = [
-            new FlexibleDocStringEmulator(),
-            new FnTokenEmulator(),
-            new MatchTokenEmulator(),
-            new CoaleseEqualTokenEmulator(),
-            new NumericLiteralSeparatorEmulator(),
-            new NullsafeTokenEmulator(),
-            new AttributeEmulator(),
-            new EnumTokenEmulator(),
-            new ReadonlyTokenEmulator(),
-            new ExplicitOctalEmulator(),
-            new ReadonlyFunctionTokenEmulator(),
-        ];
-
-        // Collect emulators that are relevant for the PHP version we're running
-        // and the PHP version we're targeting for emulation.
-        foreach ($emulators as $emulator) {
-            $emulatorPhpVersion = $emulator->getPhpVersion();
-            if ($this->isForwardEmulationNeeded($emulatorPhpVersion)) {
-                $this->emulators[] = $emulator;
-            } else if ($this->isReverseEmulationNeeded($emulatorPhpVersion)) {
-                $this->emulators[] = new ReverseEmulator($emulator);
-            }
-        }
-    }
-
-    public function startLexing(string $code, ?ErrorHandler $errorHandler = null) {
-        $emulators = array_filter($this->emulators, function($emulator) use($code) {
-            return $emulator->isEmulationNeeded($code);
-        });
-
-        if (empty($emulators)) {
-            // Nothing to emulate, yay
-            parent::startLexing($code, $errorHandler);
-            return;
-        }
-
-        $this->patches = [];
-        foreach ($emulators as $emulator) {
-            $code = $emulator->preprocessCode($code, $this->patches);
-        }
-
-        $collector = new ErrorHandler\Collecting();
-        parent::startLexing($code, $collector);
-        $this->sortPatches();
-        $this->fixupTokens();
-
-        $errors = $collector->getErrors();
-        if (!empty($errors)) {
-            $this->fixupErrors($errors);
-            foreach ($errors as $error) {
-                $errorHandler->handleError($error);
-            }
-        }
-
-        foreach ($emulators as $emulator) {
-            $this->tokens = $emulator->emulate($code, $this->tokens);
-        }
-    }
-
-    private function isForwardEmulationNeeded(string $emulatorPhpVersion): bool {
-        return version_compare(\PHP_VERSION, $emulatorPhpVersion, '<')
-            && version_compare($this->targetPhpVersion, $emulatorPhpVersion, '>=');
-    }
-
-    private function isReverseEmulationNeeded(string $emulatorPhpVersion): bool {
-        return version_compare(\PHP_VERSION, $emulatorPhpVersion, '>=')
-            && version_compare($this->targetPhpVersion, $emulatorPhpVersion, '<');
-    }
-
-    private function sortPatches()
-    {
-        // Patches may be contributed by different emulators.
-        // Make sure they are sorted by increasing patch position.
-        usort($this->patches, function($p1, $p2) {
-            return $p1[0] <=> $p2[0];
-        });
-    }
-
-    private function fixupTokens()
-    {
-        if (\count($this->patches) === 0) {
-            return;
-        }
-
-        // Load first patch
-        $patchIdx = 0;
-
-        list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
-
-        // We use a manual loop over the tokens, because we modify the array on the fly
-        $pos = 0;
-        for ($i = 0, $c = \count($this->tokens); $i < $c; $i++) {
-            $token = $this->tokens[$i];
-            if (\is_string($token)) {
-                if ($patchPos === $pos) {
-                    // Only support replacement for string tokens.
-                    assert($patchType === 'replace');
-                    $this->tokens[$i] = $patchText;
-
-                    // Fetch the next patch
-                    $patchIdx++;
-                    if ($patchIdx >= \count($this->patches)) {
-                        // No more patches, we're done
-                        return;
-                    }
-                    list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
-                }
-
-                $pos += \strlen($token);
-                continue;
-            }
-
-            $len = \strlen($token[1]);
-            $posDelta = 0;
-            while ($patchPos >= $pos && $patchPos < $pos + $len) {
-                $patchTextLen = \strlen($patchText);
-                if ($patchType === 'remove') {
-                    if ($patchPos === $pos && $patchTextLen === $len) {
-                        // Remove token entirely
-                        array_splice($this->tokens, $i, 1, []);
-                        $i--;
-                        $c--;
-                    } else {
-                        // Remove from token string
-                        $this->tokens[$i][1] = substr_replace(
-                            $token[1], '', $patchPos - $pos + $posDelta, $patchTextLen
-                        );
-                        $posDelta -= $patchTextLen;
-                    }
-                } elseif ($patchType === 'add') {
-                    // Insert into the token string
-                    $this->tokens[$i][1] = substr_replace(
-                        $token[1], $patchText, $patchPos - $pos + $posDelta, 0
-                    );
-                    $posDelta += $patchTextLen;
-                } else if ($patchType === 'replace') {
-                    // Replace inside the token string
-                    $this->tokens[$i][1] = substr_replace(
-                        $token[1], $patchText, $patchPos - $pos + $posDelta, $patchTextLen
-                    );
-                } else {
-                    assert(false);
-                }
-
-                // Fetch the next patch
-                $patchIdx++;
-                if ($patchIdx >= \count($this->patches)) {
-                    // No more patches, we're done
-                    return;
-                }
-
-                list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
-
-                // Multiple patches may apply to the same token. Reload the current one to check
-                // If the new patch applies
-                $token = $this->tokens[$i];
-            }
-
-            $pos += $len;
-        }
-
-        // A patch did not apply
-        assert(false);
-    }
-
-    /**
-     * Fixup line and position information in errors.
-     *
-     * @param Error[] $errors
-     */
-    private function fixupErrors(array $errors) {
-        foreach ($errors as $error) {
-            $attrs = $error->getAttributes();
-
-            $posDelta = 0;
-            $lineDelta = 0;
-            foreach ($this->patches as $patch) {
-                list($patchPos, $patchType, $patchText) = $patch;
-                if ($patchPos >= $attrs['startFilePos']) {
-                    // No longer relevant
-                    break;
-                }
-
-                if ($patchType === 'add') {
-                    $posDelta += strlen($patchText);
-                    $lineDelta += substr_count($patchText, "\n");
-                } else if ($patchType === 'remove') {
-                    $posDelta -= strlen($patchText);
-                    $lineDelta -= substr_count($patchText, "\n");
-                }
-            }
-
-            $attrs['startFilePos'] += $posDelta;
-            $attrs['endFilePos'] += $posDelta;
-            $attrs['startLine'] += $lineDelta;
-            $attrs['endLine'] += $lineDelta;
-            $error->setAttributes($attrs);
-        }
-    }
+	const PHP_7_3 = '7.3dev';
+	const PHP_7_4 = '7.4dev';
+	const PHP_8_0 = '8.0dev';
+	const PHP_8_1 = '8.1dev';
+	const PHP_8_2 = '8.2dev';
+
+	/** @var mixed[] Patches used to reverse changes introduced in the code */
+	private $patches = [];
+
+	/** @var TokenEmulator[] */
+	private $emulators = [];
+
+	/** @var string */
+	private $targetPhpVersion;
+
+	/**
+	 * @param mixed[] $options Lexer options. In addition to the usual options,
+	 *                         accepts a 'phpVersion' string that specifies the
+	 *                         version to emulate. Defaults to newest supported.
+	 */
+	public function __construct(array $options = [])
+	{
+		$this->targetPhpVersion = $options['phpVersion'] ?? Emulative::PHP_8_2;
+		unset($options['phpVersion']);
+
+		parent::__construct($options);
+
+		$emulators = [
+			new FlexibleDocStringEmulator(),
+			new FnTokenEmulator(),
+			new MatchTokenEmulator(),
+			new CoaleseEqualTokenEmulator(),
+			new NumericLiteralSeparatorEmulator(),
+			new NullsafeTokenEmulator(),
+			new AttributeEmulator(),
+			new EnumTokenEmulator(),
+			new ReadonlyTokenEmulator(),
+			new ExplicitOctalEmulator(),
+			new ReadonlyFunctionTokenEmulator(),
+		];
+
+		// Collect emulators that are relevant for the PHP version we're running
+		// and the PHP version we're targeting for emulation.
+		foreach ($emulators as $emulator) {
+			$emulatorPhpVersion = $emulator->getPhpVersion();
+			if ($this->isForwardEmulationNeeded($emulatorPhpVersion)) {
+				$this->emulators[] = $emulator;
+			} else if ($this->isReverseEmulationNeeded($emulatorPhpVersion)) {
+				$this->emulators[] = new ReverseEmulator($emulator);
+			}
+		}
+	}
+
+	public function startLexing(string $code, ?ErrorHandler $errorHandler = null) {
+		$emulators = array_filter($this->emulators, function($emulator) use($code) {
+			return $emulator->isEmulationNeeded($code);
+		});
+
+		if (empty($emulators)) {
+			// Nothing to emulate, yay
+			parent::startLexing($code, $errorHandler);
+			return;
+		}
+
+		$this->patches = [];
+		foreach ($emulators as $emulator) {
+			$code = $emulator->preprocessCode($code, $this->patches);
+		}
+
+		$collector = new ErrorHandler\Collecting();
+		parent::startLexing($code, $collector);
+		$this->sortPatches();
+		$this->fixupTokens();
+
+		$errors = $collector->getErrors();
+		if (!empty($errors)) {
+			$this->fixupErrors($errors);
+			foreach ($errors as $error) {
+				$errorHandler->handleError($error);
+			}
+		}
+
+		foreach ($emulators as $emulator) {
+			$this->tokens = $emulator->emulate($code, $this->tokens);
+		}
+	}
+
+	private function isForwardEmulationNeeded(string $emulatorPhpVersion): bool {
+		return version_compare(\PHP_VERSION, $emulatorPhpVersion, '<')
+			&& version_compare($this->targetPhpVersion, $emulatorPhpVersion, '>=');
+	}
+
+	private function isReverseEmulationNeeded(string $emulatorPhpVersion): bool {
+		return version_compare(\PHP_VERSION, $emulatorPhpVersion, '>=')
+			&& version_compare($this->targetPhpVersion, $emulatorPhpVersion, '<');
+	}
+
+	private function sortPatches()
+	{
+		// Patches may be contributed by different emulators.
+		// Make sure they are sorted by increasing patch position.
+		usort($this->patches, function($p1, $p2) {
+			return $p1[0] <=> $p2[0];
+		});
+	}
+
+	private function fixupTokens()
+	{
+		if (\count($this->patches) === 0) {
+			return;
+		}
+
+		// Load first patch
+		$patchIdx = 0;
+
+		list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
+
+		// We use a manual loop over the tokens, because we modify the array on the fly
+		$pos = 0;
+		for ($i = 0, $c = \count($this->tokens); $i < $c; $i++) {
+			$token = $this->tokens[$i];
+			if (\is_string($token)) {
+				if ($patchPos === $pos) {
+					// Only support replacement for string tokens.
+					assert($patchType === 'replace');
+					$this->tokens[$i] = $patchText;
+
+					// Fetch the next patch
+					$patchIdx++;
+					if ($patchIdx >= \count($this->patches)) {
+						// No more patches, we're done
+						return;
+					}
+					list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
+				}
+
+				$pos += \strlen($token);
+				continue;
+			}
+
+			$len = \strlen($token[1]);
+			$posDelta = 0;
+			while ($patchPos >= $pos && $patchPos < $pos + $len) {
+				$patchTextLen = \strlen($patchText);
+				if ($patchType === 'remove') {
+					if ($patchPos === $pos && $patchTextLen === $len) {
+						// Remove token entirely
+						array_splice($this->tokens, $i, 1, []);
+						$i--;
+						$c--;
+					} else {
+						// Remove from token string
+						$this->tokens[$i][1] = substr_replace(
+							$token[1], '', $patchPos - $pos + $posDelta, $patchTextLen
+						);
+						$posDelta -= $patchTextLen;
+					}
+				} elseif ($patchType === 'add') {
+					// Insert into the token string
+					$this->tokens[$i][1] = substr_replace(
+						$token[1], $patchText, $patchPos - $pos + $posDelta, 0
+					);
+					$posDelta += $patchTextLen;
+				} else if ($patchType === 'replace') {
+					// Replace inside the token string
+					$this->tokens[$i][1] = substr_replace(
+						$token[1], $patchText, $patchPos - $pos + $posDelta, $patchTextLen
+					);
+				} else {
+					assert(false);
+				}
+
+				// Fetch the next patch
+				$patchIdx++;
+				if ($patchIdx >= \count($this->patches)) {
+					// No more patches, we're done
+					return;
+				}
+
+				list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
+
+				// Multiple patches may apply to the same token. Reload the current one to check
+				// If the new patch applies
+				$token = $this->tokens[$i];
+			}
+
+			$pos += $len;
+		}
+
+		// A patch did not apply
+		assert(false);
+	}
+
+	/**
+	 * Fixup line and position information in errors.
+	 *
+	 * @param Error[] $errors
+	 */
+	private function fixupErrors(array $errors) {
+		foreach ($errors as $error) {
+			$attrs = $error->getAttributes();
+
+			$posDelta = 0;
+			$lineDelta = 0;
+			foreach ($this->patches as $patch) {
+				list($patchPos, $patchType, $patchText) = $patch;
+				if ($patchPos >= $attrs['startFilePos']) {
+					// No longer relevant
+					break;
+				}
+
+				if ($patchType === 'add') {
+					$posDelta += strlen($patchText);
+					$lineDelta += substr_count($patchText, "\n");
+				} else if ($patchType === 'remove') {
+					$posDelta -= strlen($patchText);
+					$lineDelta -= substr_count($patchText, "\n");
+				}
+			}
+
+			$attrs['startFilePos'] += $posDelta;
+			$attrs['endFilePos'] += $posDelta;
+			$attrs['startLine'] += $lineDelta;
+			$attrs['endLine'] += $lineDelta;
+			$error->setAttributes($attrs);
+		}
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
 use PhpParser\Lexer\TokenEmulator\ReverseEmulator;
 use PhpParser\Lexer\TokenEmulator\TokenEmulator;
 
-class Emulative extends Lexer
-{
+class Emulative extends Lexer {
     const PHP_7_3 = '7.3dev';
     const PHP_7_4 = '7.4dev';
     const PHP_8_0 = '8.0dev';

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/ParentConnectingVisitor.php

Indentation +19 added lines, -19 removed lines

@@ -15,27 +15,27 @@
  */
 final class ParentConnectingVisitor extends NodeVisitorAbstract
 {
-    /**
-     * @var Node[]
-     */
-    private $stack = [];
+	/**
+	 * @var Node[]
+	 */
+	private $stack = [];
 
-    public function beforeTraverse(array $nodes)
-    {
-        $this->stack = [];
-    }
+	public function beforeTraverse(array $nodes)
+	{
+		$this->stack = [];
+	}
 
-    public function enterNode(Node $node)
-    {
-        if (!empty($this->stack)) {
-            $node->setAttribute('parent', $this->stack[count($this->stack) - 1]);
-        }
+	public function enterNode(Node $node)
+	{
+		if (!empty($this->stack)) {
+			$node->setAttribute('parent', $this->stack[count($this->stack) - 1]);
+		}
 
-        $this->stack[] = $node;
-    }
+		$this->stack[] = $node;
+	}
 
-    public function leaveNode(Node $node)
-    {
-        array_pop($this->stack);
-    }
+	public function leaveNode(Node $node)
+	{
+		array_pop($this->stack);
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
  * On the child node, the parent node can be accessed through
  * <code>$node->getAttribute('parent')</code>.
  */
-final class ParentConnectingVisitor extends NodeVisitorAbstract
-{
+final class ParentConnectingVisitor extends NodeVisitorAbstract {
     /**
      * @var Node[]
      */

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/NodeConnectingVisitor.php

Indentation +33 added lines, -33 removed lines

@@ -16,37 +16,37 @@
  */
 final class NodeConnectingVisitor extends NodeVisitorAbstract
 {
-    /**
-     * @var Node[]
-     */
-    private $stack = [];
-
-    /**
-     * @var ?Node
-     */
-    private $previous;
-
-    public function beforeTraverse(array $nodes) {
-        $this->stack    = [];
-        $this->previous = null;
-    }
-
-    public function enterNode(Node $node) {
-        if (!empty($this->stack)) {
-            $node->setAttribute('parent', $this->stack[count($this->stack) - 1]);
-        }
-
-        if ($this->previous !== null && $this->previous->getAttribute('parent') === $node->getAttribute('parent')) {
-            $node->setAttribute('previous', $this->previous);
-            $this->previous->setAttribute('next', $node);
-        }
-
-        $this->stack[] = $node;
-    }
-
-    public function leaveNode(Node $node) {
-        $this->previous = $node;
-
-        array_pop($this->stack);
-    }
+	/**
+	 * @var Node[]
+	 */
+	private $stack = [];
+
+	/**
+	 * @var ?Node
+	 */
+	private $previous;
+
+	public function beforeTraverse(array $nodes) {
+		$this->stack    = [];
+		$this->previous = null;
+	}
+
+	public function enterNode(Node $node) {
+		if (!empty($this->stack)) {
+			$node->setAttribute('parent', $this->stack[count($this->stack) - 1]);
+		}
+
+		if ($this->previous !== null && $this->previous->getAttribute('parent') === $node->getAttribute('parent')) {
+			$node->setAttribute('previous', $this->previous);
+			$this->previous->setAttribute('next', $node);
+		}
+
+		$this->stack[] = $node;
+	}
+
+	public function leaveNode(Node $node) {
+		$this->previous = $node;
+
+		array_pop($this->stack);
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
  * node can be accessed through <code>$node->getAttribute('previous')</code>,
  * and the next node can be accessed through <code>$node->getAttribute('next')</code>.
  */
-final class NodeConnectingVisitor extends NodeVisitorAbstract
-{
+final class NodeConnectingVisitor extends NodeVisitorAbstract {
     /**
      * @var Node[]
      */

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php

Indentation +34 added lines, -34 removed lines

@@ -11,38 +11,38 @@
  */
 class FindingVisitor extends NodeVisitorAbstract
 {
-    /** @var callable Filter callback */
-    protected $filterCallback;
-    /** @var Node[] Found nodes */
-    protected $foundNodes;
-
-    public function __construct(callable $filterCallback) {
-        $this->filterCallback = $filterCallback;
-    }
-
-    /**
-     * Get found nodes satisfying the filter callback.
-     *
-     * Nodes are returned in pre-order.
-     *
-     * @return Node[] Found nodes
-     */
-    public function getFoundNodes() : array {
-        return $this->foundNodes;
-    }
-
-    public function beforeTraverse(array $nodes) {
-        $this->foundNodes = [];
-
-        return null;
-    }
-
-    public function enterNode(Node $node) {
-        $filterCallback = $this->filterCallback;
-        if ($filterCallback($node)) {
-            $this->foundNodes[] = $node;
-        }
-
-        return null;
-    }
+	/** @var callable Filter callback */
+	protected $filterCallback;
+	/** @var Node[] Found nodes */
+	protected $foundNodes;
+
+	public function __construct(callable $filterCallback) {
+		$this->filterCallback = $filterCallback;
+	}
+
+	/**
+	 * Get found nodes satisfying the filter callback.
+	 *
+	 * Nodes are returned in pre-order.
+	 *
+	 * @return Node[] Found nodes
+	 */
+	public function getFoundNodes() : array {
+		return $this->foundNodes;
+	}
+
+	public function beforeTraverse(array $nodes) {
+		$this->foundNodes = [];
+
+		return null;
+	}
+
+	public function enterNode(Node $node) {
+		$filterCallback = $this->filterCallback;
+		if ($filterCallback($node)) {
+			$this->foundNodes[] = $node;
+		}
+
+		return null;
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -9,8 +9,7 @@
  * This visitor can be used to find and collect all nodes satisfying some criterion determined by
  * a filter callback.
  */
-class FindingVisitor extends NodeVisitorAbstract
-{
+class FindingVisitor extends NodeVisitorAbstract {
     /** @var callable Filter callback */
     protected $filterCallback;
     /** @var Node[] Found nodes */

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php

Indentation +220 added lines, -220 removed lines

@@ -13,248 +13,248 @@
 
 class NameResolver extends NodeVisitorAbstract
 {
-    /** @var NameContext Naming context */
-    protected $nameContext;
+	/** @var NameContext Naming context */
+	protected $nameContext;
 
-    /** @var bool Whether to preserve original names */
-    protected $preserveOriginalNames;
+	/** @var bool Whether to preserve original names */
+	protected $preserveOriginalNames;
 
-    /** @var bool Whether to replace resolved nodes in place, or to add resolvedNode attributes */
-    protected $replaceNodes;
+	/** @var bool Whether to replace resolved nodes in place, or to add resolvedNode attributes */
+	protected $replaceNodes;
 
-    /**
-     * Constructs a name resolution visitor.
-     *
-     * Options:
-     *  * preserveOriginalNames (default false): An "originalName" attribute will be added to
-     *    all name nodes that underwent resolution.
-     *  * replaceNodes (default true): Resolved names are replaced in-place. Otherwise, a
-     *    resolvedName attribute is added. (Names that cannot be statically resolved receive a
-     *    namespacedName attribute, as usual.)
-     *
-     * @param ErrorHandler|null $errorHandler Error handler
-     * @param array $options Options
-     */
-    public function __construct(?ErrorHandler $errorHandler = null, array $options = []) {
-        $this->nameContext = new NameContext($errorHandler ?? new ErrorHandler\Throwing);
-        $this->preserveOriginalNames = $options['preserveOriginalNames'] ?? false;
-        $this->replaceNodes = $options['replaceNodes'] ?? true;
-    }
+	/**
+	 * Constructs a name resolution visitor.
+	 *
+	 * Options:
+	 *  * preserveOriginalNames (default false): An "originalName" attribute will be added to
+	 *    all name nodes that underwent resolution.
+	 *  * replaceNodes (default true): Resolved names are replaced in-place. Otherwise, a
+	 *    resolvedName attribute is added. (Names that cannot be statically resolved receive a
+	 *    namespacedName attribute, as usual.)
+	 *
+	 * @param ErrorHandler|null $errorHandler Error handler
+	 * @param array $options Options
+	 */
+	public function __construct(?ErrorHandler $errorHandler = null, array $options = []) {
+		$this->nameContext = new NameContext($errorHandler ?? new ErrorHandler\Throwing);
+		$this->preserveOriginalNames = $options['preserveOriginalNames'] ?? false;
+		$this->replaceNodes = $options['replaceNodes'] ?? true;
+	}
 
-    /**
-     * Get name resolution context.
-     *
-     * @return NameContext
-     */
-    public function getNameContext() : NameContext {
-        return $this->nameContext;
-    }
+	/**
+	 * Get name resolution context.
+	 *
+	 * @return NameContext
+	 */
+	public function getNameContext() : NameContext {
+		return $this->nameContext;
+	}
 
-    public function beforeTraverse(array $nodes) {
-        $this->nameContext->startNamespace();
-        return null;
-    }
+	public function beforeTraverse(array $nodes) {
+		$this->nameContext->startNamespace();
+		return null;
+	}
 
-    public function enterNode(Node $node) {
-        if ($node instanceof Stmt\Namespace_) {
-            $this->nameContext->startNamespace($node->name);
-        } elseif ($node instanceof Stmt\Use_) {
-            foreach ($node->uses as $use) {
-                $this->addAlias($use, $node->type, null);
-            }
-        } elseif ($node instanceof Stmt\GroupUse) {
-            foreach ($node->uses as $use) {
-                $this->addAlias($use, $node->type, $node->prefix);
-            }
-        } elseif ($node instanceof Stmt\Class_) {
-            if (null !== $node->extends) {
-                $node->extends = $this->resolveClassName($node->extends);
-            }
+	public function enterNode(Node $node) {
+		if ($node instanceof Stmt\Namespace_) {
+			$this->nameContext->startNamespace($node->name);
+		} elseif ($node instanceof Stmt\Use_) {
+			foreach ($node->uses as $use) {
+				$this->addAlias($use, $node->type, null);
+			}
+		} elseif ($node instanceof Stmt\GroupUse) {
+			foreach ($node->uses as $use) {
+				$this->addAlias($use, $node->type, $node->prefix);
+			}
+		} elseif ($node instanceof Stmt\Class_) {
+			if (null !== $node->extends) {
+				$node->extends = $this->resolveClassName($node->extends);
+			}
 
-            foreach ($node->implements as &$interface) {
-                $interface = $this->resolveClassName($interface);
-            }
+			foreach ($node->implements as &$interface) {
+				$interface = $this->resolveClassName($interface);
+			}
 
-            $this->resolveAttrGroups($node);
-            if (null !== $node->name) {
-                $this->addNamespacedName($node);
-            }
-        } elseif ($node instanceof Stmt\Interface_) {
-            foreach ($node->extends as &$interface) {
-                $interface = $this->resolveClassName($interface);
-            }
+			$this->resolveAttrGroups($node);
+			if (null !== $node->name) {
+				$this->addNamespacedName($node);
+			}
+		} elseif ($node instanceof Stmt\Interface_) {
+			foreach ($node->extends as &$interface) {
+				$interface = $this->resolveClassName($interface);
+			}
 
-            $this->resolveAttrGroups($node);
-            $this->addNamespacedName($node);
-         } elseif ($node instanceof Stmt\Enum_) {
-            foreach ($node->implements as &$interface) {
-                $interface = $this->resolveClassName($interface);
-            }
+			$this->resolveAttrGroups($node);
+			$this->addNamespacedName($node);
+		 } elseif ($node instanceof Stmt\Enum_) {
+			foreach ($node->implements as &$interface) {
+				$interface = $this->resolveClassName($interface);
+			}
 
-            $this->resolveAttrGroups($node);
-            if (null !== $node->name) {
-                $this->addNamespacedName($node);
-            }
-        } elseif ($node instanceof Stmt\Trait_) {
-            $this->resolveAttrGroups($node);
-            $this->addNamespacedName($node);
-        } elseif ($node instanceof Stmt\Function_) {
-            $this->resolveSignature($node);
-            $this->resolveAttrGroups($node);
-            $this->addNamespacedName($node);
-        } elseif ($node instanceof Stmt\ClassMethod
-                  || $node instanceof Expr\Closure
-                  || $node instanceof Expr\ArrowFunction
-        ) {
-            $this->resolveSignature($node);
-            $this->resolveAttrGroups($node);
-        } elseif ($node instanceof Stmt\Property) {
-            if (null !== $node->type) {
-                $node->type = $this->resolveType($node->type);
-            }
-            $this->resolveAttrGroups($node);
-        } elseif ($node instanceof Stmt\Const_) {
-            foreach ($node->consts as $const) {
-                $this->addNamespacedName($const);
-            }
-        } else if ($node instanceof Stmt\ClassConst) {
-            if (null !== $node->type) {
-                $node->type = $this->resolveType($node->type);
-            }
-            $this->resolveAttrGroups($node);
-        } else if ($node instanceof Stmt\EnumCase) {
-            $this->resolveAttrGroups($node);
-        } elseif ($node instanceof Expr\StaticCall
-                  || $node instanceof Expr\StaticPropertyFetch
-                  || $node instanceof Expr\ClassConstFetch
-                  || $node instanceof Expr\New_
-                  || $node instanceof Expr\Instanceof_
-        ) {
-            if ($node->class instanceof Name) {
-                $node->class = $this->resolveClassName($node->class);
-            }
-        } elseif ($node instanceof Stmt\Catch_) {
-            foreach ($node->types as &$type) {
-                $type = $this->resolveClassName($type);
-            }
-        } elseif ($node instanceof Expr\FuncCall) {
-            if ($node->name instanceof Name) {
-                $node->name = $this->resolveName($node->name, Stmt\Use_::TYPE_FUNCTION);
-            }
-        } elseif ($node instanceof Expr\ConstFetch) {
-            $node->name = $this->resolveName($node->name, Stmt\Use_::TYPE_CONSTANT);
-        } elseif ($node instanceof Stmt\TraitUse) {
-            foreach ($node->traits as &$trait) {
-                $trait = $this->resolveClassName($trait);
-            }
+			$this->resolveAttrGroups($node);
+			if (null !== $node->name) {
+				$this->addNamespacedName($node);
+			}
+		} elseif ($node instanceof Stmt\Trait_) {
+			$this->resolveAttrGroups($node);
+			$this->addNamespacedName($node);
+		} elseif ($node instanceof Stmt\Function_) {
+			$this->resolveSignature($node);
+			$this->resolveAttrGroups($node);
+			$this->addNamespacedName($node);
+		} elseif ($node instanceof Stmt\ClassMethod
+				  || $node instanceof Expr\Closure
+				  || $node instanceof Expr\ArrowFunction
+		) {
+			$this->resolveSignature($node);
+			$this->resolveAttrGroups($node);
+		} elseif ($node instanceof Stmt\Property) {
+			if (null !== $node->type) {
+				$node->type = $this->resolveType($node->type);
+			}
+			$this->resolveAttrGroups($node);
+		} elseif ($node instanceof Stmt\Const_) {
+			foreach ($node->consts as $const) {
+				$this->addNamespacedName($const);
+			}
+		} else if ($node instanceof Stmt\ClassConst) {
+			if (null !== $node->type) {
+				$node->type = $this->resolveType($node->type);
+			}
+			$this->resolveAttrGroups($node);
+		} else if ($node instanceof Stmt\EnumCase) {
+			$this->resolveAttrGroups($node);
+		} elseif ($node instanceof Expr\StaticCall
+				  || $node instanceof Expr\StaticPropertyFetch
+				  || $node instanceof Expr\ClassConstFetch
+				  || $node instanceof Expr\New_
+				  || $node instanceof Expr\Instanceof_
+		) {
+			if ($node->class instanceof Name) {
+				$node->class = $this->resolveClassName($node->class);
+			}
+		} elseif ($node instanceof Stmt\Catch_) {
+			foreach ($node->types as &$type) {
+				$type = $this->resolveClassName($type);
+			}
+		} elseif ($node instanceof Expr\FuncCall) {
+			if ($node->name instanceof Name) {
+				$node->name = $this->resolveName($node->name, Stmt\Use_::TYPE_FUNCTION);
+			}
+		} elseif ($node instanceof Expr\ConstFetch) {
+			$node->name = $this->resolveName($node->name, Stmt\Use_::TYPE_CONSTANT);
+		} elseif ($node instanceof Stmt\TraitUse) {
+			foreach ($node->traits as &$trait) {
+				$trait = $this->resolveClassName($trait);
+			}
 
-            foreach ($node->adaptations as $adaptation) {
-                if (null !== $adaptation->trait) {
-                    $adaptation->trait = $this->resolveClassName($adaptation->trait);
-                }
+			foreach ($node->adaptations as $adaptation) {
+				if (null !== $adaptation->trait) {
+					$adaptation->trait = $this->resolveClassName($adaptation->trait);
+				}
 
-                if ($adaptation instanceof Stmt\TraitUseAdaptation\Precedence) {
-                    foreach ($adaptation->insteadof as &$insteadof) {
-                        $insteadof = $this->resolveClassName($insteadof);
-                    }
-                }
-            }
-        }
+				if ($adaptation instanceof Stmt\TraitUseAdaptation\Precedence) {
+					foreach ($adaptation->insteadof as &$insteadof) {
+						$insteadof = $this->resolveClassName($insteadof);
+					}
+				}
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    private function addAlias(Stmt\UseUse $use, int $type, ?Name $prefix = null) {
-        // Add prefix for group uses
-        $name = $prefix ? Name::concat($prefix, $use->name) : $use->name;
-        // Type is determined either by individual element or whole use declaration
-        $type |= $use->type;
+	private function addAlias(Stmt\UseUse $use, int $type, ?Name $prefix = null) {
+		// Add prefix for group uses
+		$name = $prefix ? Name::concat($prefix, $use->name) : $use->name;
+		// Type is determined either by individual element or whole use declaration
+		$type |= $use->type;
 
-        $this->nameContext->addAlias(
-            $name, (string) $use->getAlias(), $type, $use->getAttributes()
-        );
-    }
+		$this->nameContext->addAlias(
+			$name, (string) $use->getAlias(), $type, $use->getAttributes()
+		);
+	}
 
-    /** @param Stmt\Function_|Stmt\ClassMethod|Expr\Closure $node */
-    private function resolveSignature($node) {
-        foreach ($node->params as $param) {
-            $param->type = $this->resolveType($param->type);
-            $this->resolveAttrGroups($param);
-        }
-        $node->returnType = $this->resolveType($node->returnType);
-    }
+	/** @param Stmt\Function_|Stmt\ClassMethod|Expr\Closure $node */
+	private function resolveSignature($node) {
+		foreach ($node->params as $param) {
+			$param->type = $this->resolveType($param->type);
+			$this->resolveAttrGroups($param);
+		}
+		$node->returnType = $this->resolveType($node->returnType);
+	}
 
-    private function resolveType($node) {
-        if ($node instanceof Name) {
-            return $this->resolveClassName($node);
-        }
-        if ($node instanceof Node\NullableType) {
-            $node->type = $this->resolveType($node->type);
-            return $node;
-        }
-        if ($node instanceof Node\UnionType || $node instanceof Node\IntersectionType) {
-            foreach ($node->types as &$type) {
-                $type = $this->resolveType($type);
-            }
-            return $node;
-        }
-        return $node;
-    }
+	private function resolveType($node) {
+		if ($node instanceof Name) {
+			return $this->resolveClassName($node);
+		}
+		if ($node instanceof Node\NullableType) {
+			$node->type = $this->resolveType($node->type);
+			return $node;
+		}
+		if ($node instanceof Node\UnionType || $node instanceof Node\IntersectionType) {
+			foreach ($node->types as &$type) {
+				$type = $this->resolveType($type);
+			}
+			return $node;
+		}
+		return $node;
+	}
 
-    /**
-     * Resolve name, according to name resolver options.
-     *
-     * @param Name $name Function or constant name to resolve
-     * @param int  $type One of Stmt\Use_::TYPE_*
-     *
-     * @return Name Resolved name, or original name with attribute
-     */
-    protected function resolveName(Name $name, int $type) : Name {
-        if (!$this->replaceNodes) {
-            $resolvedName = $this->nameContext->getResolvedName($name, $type);
-            if (null !== $resolvedName) {
-                $name->setAttribute('resolvedName', $resolvedName);
-            } else {
-                $name->setAttribute('namespacedName', FullyQualified::concat(
-                    $this->nameContext->getNamespace(), $name, $name->getAttributes()));
-            }
-            return $name;
-        }
+	/**
+	 * Resolve name, according to name resolver options.
+	 *
+	 * @param Name $name Function or constant name to resolve
+	 * @param int  $type One of Stmt\Use_::TYPE_*
+	 *
+	 * @return Name Resolved name, or original name with attribute
+	 */
+	protected function resolveName(Name $name, int $type) : Name {
+		if (!$this->replaceNodes) {
+			$resolvedName = $this->nameContext->getResolvedName($name, $type);
+			if (null !== $resolvedName) {
+				$name->setAttribute('resolvedName', $resolvedName);
+			} else {
+				$name->setAttribute('namespacedName', FullyQualified::concat(
+					$this->nameContext->getNamespace(), $name, $name->getAttributes()));
+			}
+			return $name;
+		}
 
-        if ($this->preserveOriginalNames) {
-            // Save the original name
-            $originalName = $name;
-            $name = clone $originalName;
-            $name->setAttribute('originalName', $originalName);
-        }
+		if ($this->preserveOriginalNames) {
+			// Save the original name
+			$originalName = $name;
+			$name = clone $originalName;
+			$name->setAttribute('originalName', $originalName);
+		}
 
-        $resolvedName = $this->nameContext->getResolvedName($name, $type);
-        if (null !== $resolvedName) {
-            return $resolvedName;
-        }
+		$resolvedName = $this->nameContext->getResolvedName($name, $type);
+		if (null !== $resolvedName) {
+			return $resolvedName;
+		}
 
-        // unqualified names inside a namespace cannot be resolved at compile-time
-        // add the namespaced version of the name as an attribute
-        $name->setAttribute('namespacedName', FullyQualified::concat(
-            $this->nameContext->getNamespace(), $name, $name->getAttributes()));
-        return $name;
-    }
+		// unqualified names inside a namespace cannot be resolved at compile-time
+		// add the namespaced version of the name as an attribute
+		$name->setAttribute('namespacedName', FullyQualified::concat(
+			$this->nameContext->getNamespace(), $name, $name->getAttributes()));
+		return $name;
+	}
 
-    protected function resolveClassName(Name $name) {
-        return $this->resolveName($name, Stmt\Use_::TYPE_NORMAL);
-    }
+	protected function resolveClassName(Name $name) {
+		return $this->resolveName($name, Stmt\Use_::TYPE_NORMAL);
+	}
 
-    protected function addNamespacedName(Node $node) {
-        $node->namespacedName = Name::concat(
-            $this->nameContext->getNamespace(), (string) $node->name);
-    }
+	protected function addNamespacedName(Node $node) {
+		$node->namespacedName = Name::concat(
+			$this->nameContext->getNamespace(), (string) $node->name);
+	}
 
-    protected function resolveAttrGroups(Node $node)
-    {
-        foreach ($node->attrGroups as $attrGroup) {
-            foreach ($attrGroup->attrs as $attr) {
-                $attr->name = $this->resolveClassName($attr->name);
-            }
-        }
-    }
+	protected function resolveAttrGroups(Node $node)
+	{
+		foreach ($node->attrGroups as $attrGroup) {
+			foreach ($attrGroup->attrs as $attr) {
+				$attr->name = $this->resolveClassName($attr->name);
+			}
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -171,7 +171,7 @@ 
         $type |= $use->type;
 
         $this->nameContext->addAlias(
-            $name, (string) $use->getAlias(), $type, $use->getAttributes()
+            $name, (string)$use->getAlias(), $type, $use->getAttributes()
         );
     }
 
@@ -246,7 +246,7 @@ 
 
     protected function addNamespacedName(Node $node) {
         $node->namespacedName = Name::concat(
-            $this->nameContext->getNamespace(), (string) $node->name);
+            $this->nameContext->getNamespace(), (string)$node->name);
     }
 
     protected function resolveAttrGroups(Node $node)

Braces +1 added lines, -2 removed lines

@@ -11,8 +11,7 @@
 use PhpParser\Node\Stmt;
 use PhpParser\NodeVisitorAbstract;
 
-class NameResolver extends NodeVisitorAbstract
-{
+class NameResolver extends NodeVisitorAbstract {
     /** @var NameContext Naming context */
     protected $nameContext;