nextcloud / fulltextsearch_elasticsearch

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Error.php

Indentation +173 added lines, -173 removed lines

@@ -4,177 +4,177 @@
 
 class Error extends \RuntimeException
 {
-    protected $rawMessage;
-    protected $attributes;
-
-    /**
-     * Creates an Exception signifying a parse error.
-     *
-     * @param string    $message    Error message
-     * @param array|int $attributes Attributes of node/token where error occurred
-     *                              (or start line of error -- deprecated)
-     */
-    public function __construct(string $message, $attributes = []) {
-        $this->rawMessage = $message;
-        if (is_array($attributes)) {
-            $this->attributes = $attributes;
-        } else {
-            $this->attributes = ['startLine' => $attributes];
-        }
-        $this->updateMessage();
-    }
-
-    /**
-     * Gets the error message
-     *
-     * @return string Error message
-     */
-    public function getRawMessage() : string {
-        return $this->rawMessage;
-    }
-
-    /**
-     * Gets the line the error starts in.
-     *
-     * @return int Error start line
-     */
-    public function getStartLine() : int {
-        return $this->attributes['startLine'] ?? -1;
-    }
-
-    /**
-     * Gets the line the error ends in.
-     *
-     * @return int Error end line
-     */
-    public function getEndLine() : int {
-        return $this->attributes['endLine'] ?? -1;
-    }
-
-    /**
-     * Gets the attributes of the node/token the error occurred at.
-     *
-     * @return array
-     */
-    public function getAttributes() : array {
-        return $this->attributes;
-    }
-
-    /**
-     * Sets the attributes of the node/token the error occurred at.
-     *
-     * @param array $attributes
-     */
-    public function setAttributes(array $attributes) {
-        $this->attributes = $attributes;
-        $this->updateMessage();
-    }
-
-    /**
-     * Sets the line of the PHP file the error occurred in.
-     *
-     * @param string $message Error message
-     */
-    public function setRawMessage(string $message) {
-        $this->rawMessage = $message;
-        $this->updateMessage();
-    }
-
-    /**
-     * Sets the line the error starts in.
-     *
-     * @param int $line Error start line
-     */
-    public function setStartLine(int $line) {
-        $this->attributes['startLine'] = $line;
-        $this->updateMessage();
-    }
-
-    /**
-     * Returns whether the error has start and end column information.
-     *
-     * For column information enable the startFilePos and endFilePos in the lexer options.
-     *
-     * @return bool
-     */
-    public function hasColumnInfo() : bool {
-        return isset($this->attributes['startFilePos'], $this->attributes['endFilePos']);
-    }
-
-    /**
-     * Gets the start column (1-based) into the line where the error started.
-     *
-     * @param string $code Source code of the file
-     * @return int
-     */
-    public function getStartColumn(string $code) : int {
-        if (!$this->hasColumnInfo()) {
-            throw new \RuntimeException('Error does not have column information');
-        }
-
-        return $this->toColumn($code, $this->attributes['startFilePos']);
-    }
-
-    /**
-     * Gets the end column (1-based) into the line where the error ended.
-     *
-     * @param string $code Source code of the file
-     * @return int
-     */
-    public function getEndColumn(string $code) : int {
-        if (!$this->hasColumnInfo()) {
-            throw new \RuntimeException('Error does not have column information');
-        }
-
-        return $this->toColumn($code, $this->attributes['endFilePos']);
-    }
-
-    /**
-     * Formats message including line and column information.
-     *
-     * @param string $code Source code associated with the error, for calculation of the columns
-     *
-     * @return string Formatted message
-     */
-    public function getMessageWithColumnInfo(string $code) : string {
-        return sprintf(
-            '%s from %d:%d to %d:%d', $this->getRawMessage(),
-            $this->getStartLine(), $this->getStartColumn($code),
-            $this->getEndLine(), $this->getEndColumn($code)
-        );
-    }
-
-    /**
-     * Converts a file offset into a column.
-     *
-     * @param string $code Source code that $pos indexes into
-     * @param int    $pos  0-based position in $code
-     *
-     * @return int 1-based column (relative to start of line)
-     */
-    private function toColumn(string $code, int $pos) : int {
-        if ($pos > strlen($code)) {
-            throw new \RuntimeException('Invalid position information');
-        }
-
-        $lineStartPos = strrpos($code, "\n", $pos - strlen($code));
-        if (false === $lineStartPos) {
-            $lineStartPos = -1;
-        }
-
-        return $pos - $lineStartPos;
-    }
-
-    /**
-     * Updates the exception message after a change to rawMessage or rawLine.
-     */
-    protected function updateMessage() {
-        $this->message = $this->rawMessage;
-
-        if (-1 === $this->getStartLine()) {
-            $this->message .= ' on unknown line';
-        } else {
-            $this->message .= ' on line ' . $this->getStartLine();
-        }
-    }
+	protected $rawMessage;
+	protected $attributes;
+
+	/**
+	 * Creates an Exception signifying a parse error.
+	 *
+	 * @param string    $message    Error message
+	 * @param array|int $attributes Attributes of node/token where error occurred
+	 *                              (or start line of error -- deprecated)
+	 */
+	public function __construct(string $message, $attributes = []) {
+		$this->rawMessage = $message;
+		if (is_array($attributes)) {
+			$this->attributes = $attributes;
+		} else {
+			$this->attributes = ['startLine' => $attributes];
+		}
+		$this->updateMessage();
+	}
+
+	/**
+	 * Gets the error message
+	 *
+	 * @return string Error message
+	 */
+	public function getRawMessage() : string {
+		return $this->rawMessage;
+	}
+
+	/**
+	 * Gets the line the error starts in.
+	 *
+	 * @return int Error start line
+	 */
+	public function getStartLine() : int {
+		return $this->attributes['startLine'] ?? -1;
+	}
+
+	/**
+	 * Gets the line the error ends in.
+	 *
+	 * @return int Error end line
+	 */
+	public function getEndLine() : int {
+		return $this->attributes['endLine'] ?? -1;
+	}
+
+	/**
+	 * Gets the attributes of the node/token the error occurred at.
+	 *
+	 * @return array
+	 */
+	public function getAttributes() : array {
+		return $this->attributes;
+	}
+
+	/**
+	 * Sets the attributes of the node/token the error occurred at.
+	 *
+	 * @param array $attributes
+	 */
+	public function setAttributes(array $attributes) {
+		$this->attributes = $attributes;
+		$this->updateMessage();
+	}
+
+	/**
+	 * Sets the line of the PHP file the error occurred in.
+	 *
+	 * @param string $message Error message
+	 */
+	public function setRawMessage(string $message) {
+		$this->rawMessage = $message;
+		$this->updateMessage();
+	}
+
+	/**
+	 * Sets the line the error starts in.
+	 *
+	 * @param int $line Error start line
+	 */
+	public function setStartLine(int $line) {
+		$this->attributes['startLine'] = $line;
+		$this->updateMessage();
+	}
+
+	/**
+	 * Returns whether the error has start and end column information.
+	 *
+	 * For column information enable the startFilePos and endFilePos in the lexer options.
+	 *
+	 * @return bool
+	 */
+	public function hasColumnInfo() : bool {
+		return isset($this->attributes['startFilePos'], $this->attributes['endFilePos']);
+	}
+
+	/**
+	 * Gets the start column (1-based) into the line where the error started.
+	 *
+	 * @param string $code Source code of the file
+	 * @return int
+	 */
+	public function getStartColumn(string $code) : int {
+		if (!$this->hasColumnInfo()) {
+			throw new \RuntimeException('Error does not have column information');
+		}
+
+		return $this->toColumn($code, $this->attributes['startFilePos']);
+	}
+
+	/**
+	 * Gets the end column (1-based) into the line where the error ended.
+	 *
+	 * @param string $code Source code of the file
+	 * @return int
+	 */
+	public function getEndColumn(string $code) : int {
+		if (!$this->hasColumnInfo()) {
+			throw new \RuntimeException('Error does not have column information');
+		}
+
+		return $this->toColumn($code, $this->attributes['endFilePos']);
+	}
+
+	/**
+	 * Formats message including line and column information.
+	 *
+	 * @param string $code Source code associated with the error, for calculation of the columns
+	 *
+	 * @return string Formatted message
+	 */
+	public function getMessageWithColumnInfo(string $code) : string {
+		return sprintf(
+			'%s from %d:%d to %d:%d', $this->getRawMessage(),
+			$this->getStartLine(), $this->getStartColumn($code),
+			$this->getEndLine(), $this->getEndColumn($code)
+		);
+	}
+
+	/**
+	 * Converts a file offset into a column.
+	 *
+	 * @param string $code Source code that $pos indexes into
+	 * @param int    $pos  0-based position in $code
+	 *
+	 * @return int 1-based column (relative to start of line)
+	 */
+	private function toColumn(string $code, int $pos) : int {
+		if ($pos > strlen($code)) {
+			throw new \RuntimeException('Invalid position information');
+		}
+
+		$lineStartPos = strrpos($code, "\n", $pos - strlen($code));
+		if (false === $lineStartPos) {
+			$lineStartPos = -1;
+		}
+
+		return $pos - $lineStartPos;
+	}
+
+	/**
+	 * Updates the exception message after a change to rawMessage or rawLine.
+	 */
+	protected function updateMessage() {
+		$this->message = $this->rawMessage;
+
+		if (-1 === $this->getStartLine()) {
+			$this->message .= ' on unknown line';
+		} else {
+			$this->message .= ' on line ' . $this->getStartLine();
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
         if (-1 === $this->getStartLine()) {
             $this->message .= ' on unknown line';
         } else {
-            $this->message .= ' on line ' . $this->getStartLine();
+            $this->message .= ' on line '.$this->getStartLine();
         }
     }
 }

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Parser.php

Indentation +11 added lines, -11 removed lines

@@ -4,15 +4,15 @@
 
 interface Parser
 {
-    /**
-     * Parses PHP code into a node tree.
-     *
-     * @param string $code The source code to parse
-     * @param ErrorHandler|null $errorHandler Error handler to use for lexer/parser errors, defaults
-     *                                        to ErrorHandler\Throwing.
-     *
-     * @return Node\Stmt[]|null Array of statements (or null non-throwing error handler is used and
-     *                          the parser was unable to recover from an error).
-     */
-    public function parse(string $code, ?ErrorHandler $errorHandler = null);
+	/**
+	 * Parses PHP code into a node tree.
+	 *
+	 * @param string $code The source code to parse
+	 * @param ErrorHandler|null $errorHandler Error handler to use for lexer/parser errors, defaults
+	 *                                        to ErrorHandler\Throwing.
+	 *
+	 * @return Node\Stmt[]|null Array of statements (or null non-throwing error handler is used and
+	 *                          the parser was unable to recover from an error).
+	 */
+	public function parse(string $code, ?ErrorHandler $errorHandler = null);
 }

Braces +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 namespace PhpParser;
 
-interface Parser
-{
+interface Parser {
     /**
      * Parses PHP code into a node tree.
      *

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/NameContext.php

Indentation +274 added lines, -274 removed lines

@@ -8,278 +8,278 @@
 
 class NameContext
 {
-    /** @var null|Name Current namespace */
-    protected $namespace;
-
-    /** @var Name[][] Map of format [aliasType => [aliasName => originalName]] */
-    protected $aliases = [];
-
-    /** @var Name[][] Same as $aliases but preserving original case */
-    protected $origAliases = [];
-
-    /** @var ErrorHandler Error handler */
-    protected $errorHandler;
-
-    /**
-     * Create a name context.
-     *
-     * @param ErrorHandler $errorHandler Error handling used to report errors
-     */
-    public function __construct(ErrorHandler $errorHandler) {
-        $this->errorHandler = $errorHandler;
-    }
-
-    /**
-     * Start a new namespace.
-     *
-     * This also resets the alias table.
-     *
-     * @param Name|null $namespace Null is the global namespace
-     */
-    public function startNamespace(?Name $namespace = null) {
-        $this->namespace = $namespace;
-        $this->origAliases = $this->aliases = [
-            Stmt\Use_::TYPE_NORMAL   => [],
-            Stmt\Use_::TYPE_FUNCTION => [],
-            Stmt\Use_::TYPE_CONSTANT => [],
-        ];
-    }
-
-    /**
-     * Add an alias / import.
-     *
-     * @param Name   $name        Original name
-     * @param string $aliasName   Aliased name
-     * @param int    $type        One of Stmt\Use_::TYPE_*
-     * @param array  $errorAttrs Attributes to use to report an error
-     */
-    public function addAlias(Name $name, string $aliasName, int $type, array $errorAttrs = []) {
-        // Constant names are case sensitive, everything else case insensitive
-        if ($type === Stmt\Use_::TYPE_CONSTANT) {
-            $aliasLookupName = $aliasName;
-        } else {
-            $aliasLookupName = strtolower($aliasName);
-        }
-
-        if (isset($this->aliases[$type][$aliasLookupName])) {
-            $typeStringMap = [
-                Stmt\Use_::TYPE_NORMAL   => '',
-                Stmt\Use_::TYPE_FUNCTION => 'function ',
-                Stmt\Use_::TYPE_CONSTANT => 'const ',
-            ];
-
-            $this->errorHandler->handleError(new Error(
-                sprintf(
-                    'Cannot use %s%s as %s because the name is already in use',
-                    $typeStringMap[$type], $name, $aliasName
-                ),
-                $errorAttrs
-            ));
-            return;
-        }
-
-        $this->aliases[$type][$aliasLookupName] = $name;
-        $this->origAliases[$type][$aliasName] = $name;
-    }
-
-    /**
-     * Get current namespace.
-     *
-     * @return null|Name Namespace (or null if global namespace)
-     */
-    public function getNamespace() {
-        return $this->namespace;
-    }
-
-    /**
-     * Get resolved name.
-     *
-     * @param Name $name Name to resolve
-     * @param int  $type One of Stmt\Use_::TYPE_{FUNCTION|CONSTANT}
-     *
-     * @return null|Name Resolved name, or null if static resolution is not possible
-     */
-    public function getResolvedName(Name $name, int $type) {
-        // don't resolve special class names
-        if ($type === Stmt\Use_::TYPE_NORMAL && $name->isSpecialClassName()) {
-            if (!$name->isUnqualified()) {
-                $this->errorHandler->handleError(new Error(
-                    sprintf("'\\%s' is an invalid class name", $name->toString()),
-                    $name->getAttributes()
-                ));
-            }
-            return $name;
-        }
-
-        // fully qualified names are already resolved
-        if ($name->isFullyQualified()) {
-            return $name;
-        }
-
-        // Try to resolve aliases
-        if (null !== $resolvedName = $this->resolveAlias($name, $type)) {
-            return $resolvedName;
-        }
-
-        if ($type !== Stmt\Use_::TYPE_NORMAL && $name->isUnqualified()) {
-            if (null === $this->namespace) {
-                // outside of a namespace unaliased unqualified is same as fully qualified
-                return new FullyQualified($name, $name->getAttributes());
-            }
-
-            // Cannot resolve statically
-            return null;
-        }
-
-        // if no alias exists prepend current namespace
-        return FullyQualified::concat($this->namespace, $name, $name->getAttributes());
-    }
-
-    /**
-     * Get resolved class name.
-     *
-     * @param Name $name Class ame to resolve
-     *
-     * @return Name Resolved name
-     */
-    public function getResolvedClassName(Name $name) : Name {
-        return $this->getResolvedName($name, Stmt\Use_::TYPE_NORMAL);
-    }
-
-    /**
-     * Get possible ways of writing a fully qualified name (e.g., by making use of aliases).
-     *
-     * @param string $name Fully-qualified name (without leading namespace separator)
-     * @param int    $type One of Stmt\Use_::TYPE_*
-     *
-     * @return Name[] Possible representations of the name
-     */
-    public function getPossibleNames(string $name, int $type) : array {
-        $lcName = strtolower($name);
-
-        if ($type === Stmt\Use_::TYPE_NORMAL) {
-            // self, parent and static must always be unqualified
-            if ($lcName === "self" || $lcName === "parent" || $lcName === "static") {
-                return [new Name($name)];
-            }
-        }
-
-        // Collect possible ways to write this name, starting with the fully-qualified name
-        $possibleNames = [new FullyQualified($name)];
-
-        if (null !== $nsRelativeName = $this->getNamespaceRelativeName($name, $lcName, $type)) {
-            // Make sure there is no alias that makes the normally namespace-relative name
-            // into something else
-            if (null === $this->resolveAlias($nsRelativeName, $type)) {
-                $possibleNames[] = $nsRelativeName;
-            }
-        }
-
-        // Check for relevant namespace use statements
-        foreach ($this->origAliases[Stmt\Use_::TYPE_NORMAL] as $alias => $orig) {
-            $lcOrig = $orig->toLowerString();
-            if (0 === strpos($lcName, $lcOrig . '\\')) {
-                $possibleNames[] = new Name($alias . substr($name, strlen($lcOrig)));
-            }
-        }
-
-        // Check for relevant type-specific use statements
-        foreach ($this->origAliases[$type] as $alias => $orig) {
-            if ($type === Stmt\Use_::TYPE_CONSTANT) {
-                // Constants are are complicated-sensitive
-                $normalizedOrig = $this->normalizeConstName($orig->toString());
-                if ($normalizedOrig === $this->normalizeConstName($name)) {
-                    $possibleNames[] = new Name($alias);
-                }
-            } else {
-                // Everything else is case-insensitive
-                if ($orig->toLowerString() === $lcName) {
-                    $possibleNames[] = new Name($alias);
-                }
-            }
-        }
-
-        return $possibleNames;
-    }
-
-    /**
-     * Get shortest representation of this fully-qualified name.
-     *
-     * @param string $name Fully-qualified name (without leading namespace separator)
-     * @param int    $type One of Stmt\Use_::TYPE_*
-     *
-     * @return Name Shortest representation
-     */
-    public function getShortName(string $name, int $type) : Name {
-        $possibleNames = $this->getPossibleNames($name, $type);
-
-        // Find shortest name
-        $shortestName = null;
-        $shortestLength = \INF;
-        foreach ($possibleNames as $possibleName) {
-            $length = strlen($possibleName->toCodeString());
-            if ($length < $shortestLength) {
-                $shortestName = $possibleName;
-                $shortestLength = $length;
-            }
-        }
-
-       return $shortestName;
-    }
-
-    private function resolveAlias(Name $name, $type) {
-        $firstPart = $name->getFirst();
-
-        if ($name->isQualified()) {
-            // resolve aliases for qualified names, always against class alias table
-            $checkName = strtolower($firstPart);
-            if (isset($this->aliases[Stmt\Use_::TYPE_NORMAL][$checkName])) {
-                $alias = $this->aliases[Stmt\Use_::TYPE_NORMAL][$checkName];
-                return FullyQualified::concat($alias, $name->slice(1), $name->getAttributes());
-            }
-        } elseif ($name->isUnqualified()) {
-            // constant aliases are case-sensitive, function aliases case-insensitive
-            $checkName = $type === Stmt\Use_::TYPE_CONSTANT ? $firstPart : strtolower($firstPart);
-            if (isset($this->aliases[$type][$checkName])) {
-                // resolve unqualified aliases
-                return new FullyQualified($this->aliases[$type][$checkName], $name->getAttributes());
-            }
-        }
-
-        // No applicable aliases
-        return null;
-    }
-
-    private function getNamespaceRelativeName(string $name, string $lcName, int $type) {
-        if (null === $this->namespace) {
-            return new Name($name);
-        }
-
-        if ($type === Stmt\Use_::TYPE_CONSTANT) {
-            // The constants true/false/null always resolve to the global symbols, even inside a
-            // namespace, so they may be used without qualification
-            if ($lcName === "true" || $lcName === "false" || $lcName === "null") {
-                return new Name($name);
-            }
-        }
-
-        $namespacePrefix = strtolower($this->namespace . '\\');
-        if (0 === strpos($lcName, $namespacePrefix)) {
-            return new Name(substr($name, strlen($namespacePrefix)));
-        }
-
-        return null;
-    }
-
-    private function normalizeConstName(string $name) {
-        $nsSep = strrpos($name, '\\');
-        if (false === $nsSep) {
-            return $name;
-        }
-
-        // Constants have case-insensitive namespace and case-sensitive short-name
-        $ns = substr($name, 0, $nsSep);
-        $shortName = substr($name, $nsSep + 1);
-        return strtolower($ns) . '\\' . $shortName;
-    }
+	/** @var null|Name Current namespace */
+	protected $namespace;
+
+	/** @var Name[][] Map of format [aliasType => [aliasName => originalName]] */
+	protected $aliases = [];
+
+	/** @var Name[][] Same as $aliases but preserving original case */
+	protected $origAliases = [];
+
+	/** @var ErrorHandler Error handler */
+	protected $errorHandler;
+
+	/**
+	 * Create a name context.
+	 *
+	 * @param ErrorHandler $errorHandler Error handling used to report errors
+	 */
+	public function __construct(ErrorHandler $errorHandler) {
+		$this->errorHandler = $errorHandler;
+	}
+
+	/**
+	 * Start a new namespace.
+	 *
+	 * This also resets the alias table.
+	 *
+	 * @param Name|null $namespace Null is the global namespace
+	 */
+	public function startNamespace(?Name $namespace = null) {
+		$this->namespace = $namespace;
+		$this->origAliases = $this->aliases = [
+			Stmt\Use_::TYPE_NORMAL   => [],
+			Stmt\Use_::TYPE_FUNCTION => [],
+			Stmt\Use_::TYPE_CONSTANT => [],
+		];
+	}
+
+	/**
+	 * Add an alias / import.
+	 *
+	 * @param Name   $name        Original name
+	 * @param string $aliasName   Aliased name
+	 * @param int    $type        One of Stmt\Use_::TYPE_*
+	 * @param array  $errorAttrs Attributes to use to report an error
+	 */
+	public function addAlias(Name $name, string $aliasName, int $type, array $errorAttrs = []) {
+		// Constant names are case sensitive, everything else case insensitive
+		if ($type === Stmt\Use_::TYPE_CONSTANT) {
+			$aliasLookupName = $aliasName;
+		} else {
+			$aliasLookupName = strtolower($aliasName);
+		}
+
+		if (isset($this->aliases[$type][$aliasLookupName])) {
+			$typeStringMap = [
+				Stmt\Use_::TYPE_NORMAL   => '',
+				Stmt\Use_::TYPE_FUNCTION => 'function ',
+				Stmt\Use_::TYPE_CONSTANT => 'const ',
+			];
+
+			$this->errorHandler->handleError(new Error(
+				sprintf(
+					'Cannot use %s%s as %s because the name is already in use',
+					$typeStringMap[$type], $name, $aliasName
+				),
+				$errorAttrs
+			));
+			return;
+		}
+
+		$this->aliases[$type][$aliasLookupName] = $name;
+		$this->origAliases[$type][$aliasName] = $name;
+	}
+
+	/**
+	 * Get current namespace.
+	 *
+	 * @return null|Name Namespace (or null if global namespace)
+	 */
+	public function getNamespace() {
+		return $this->namespace;
+	}
+
+	/**
+	 * Get resolved name.
+	 *
+	 * @param Name $name Name to resolve
+	 * @param int  $type One of Stmt\Use_::TYPE_{FUNCTION|CONSTANT}
+	 *
+	 * @return null|Name Resolved name, or null if static resolution is not possible
+	 */
+	public function getResolvedName(Name $name, int $type) {
+		// don't resolve special class names
+		if ($type === Stmt\Use_::TYPE_NORMAL && $name->isSpecialClassName()) {
+			if (!$name->isUnqualified()) {
+				$this->errorHandler->handleError(new Error(
+					sprintf("'\\%s' is an invalid class name", $name->toString()),
+					$name->getAttributes()
+				));
+			}
+			return $name;
+		}
+
+		// fully qualified names are already resolved
+		if ($name->isFullyQualified()) {
+			return $name;
+		}
+
+		// Try to resolve aliases
+		if (null !== $resolvedName = $this->resolveAlias($name, $type)) {
+			return $resolvedName;
+		}
+
+		if ($type !== Stmt\Use_::TYPE_NORMAL && $name->isUnqualified()) {
+			if (null === $this->namespace) {
+				// outside of a namespace unaliased unqualified is same as fully qualified
+				return new FullyQualified($name, $name->getAttributes());
+			}
+
+			// Cannot resolve statically
+			return null;
+		}
+
+		// if no alias exists prepend current namespace
+		return FullyQualified::concat($this->namespace, $name, $name->getAttributes());
+	}
+
+	/**
+	 * Get resolved class name.
+	 *
+	 * @param Name $name Class ame to resolve
+	 *
+	 * @return Name Resolved name
+	 */
+	public function getResolvedClassName(Name $name) : Name {
+		return $this->getResolvedName($name, Stmt\Use_::TYPE_NORMAL);
+	}
+
+	/**
+	 * Get possible ways of writing a fully qualified name (e.g., by making use of aliases).
+	 *
+	 * @param string $name Fully-qualified name (without leading namespace separator)
+	 * @param int    $type One of Stmt\Use_::TYPE_*
+	 *
+	 * @return Name[] Possible representations of the name
+	 */
+	public function getPossibleNames(string $name, int $type) : array {
+		$lcName = strtolower($name);
+
+		if ($type === Stmt\Use_::TYPE_NORMAL) {
+			// self, parent and static must always be unqualified
+			if ($lcName === "self" || $lcName === "parent" || $lcName === "static") {
+				return [new Name($name)];
+			}
+		}
+
+		// Collect possible ways to write this name, starting with the fully-qualified name
+		$possibleNames = [new FullyQualified($name)];
+
+		if (null !== $nsRelativeName = $this->getNamespaceRelativeName($name, $lcName, $type)) {
+			// Make sure there is no alias that makes the normally namespace-relative name
+			// into something else
+			if (null === $this->resolveAlias($nsRelativeName, $type)) {
+				$possibleNames[] = $nsRelativeName;
+			}
+		}
+
+		// Check for relevant namespace use statements
+		foreach ($this->origAliases[Stmt\Use_::TYPE_NORMAL] as $alias => $orig) {
+			$lcOrig = $orig->toLowerString();
+			if (0 === strpos($lcName, $lcOrig . '\\')) {
+				$possibleNames[] = new Name($alias . substr($name, strlen($lcOrig)));
+			}
+		}
+
+		// Check for relevant type-specific use statements
+		foreach ($this->origAliases[$type] as $alias => $orig) {
+			if ($type === Stmt\Use_::TYPE_CONSTANT) {
+				// Constants are are complicated-sensitive
+				$normalizedOrig = $this->normalizeConstName($orig->toString());
+				if ($normalizedOrig === $this->normalizeConstName($name)) {
+					$possibleNames[] = new Name($alias);
+				}
+			} else {
+				// Everything else is case-insensitive
+				if ($orig->toLowerString() === $lcName) {
+					$possibleNames[] = new Name($alias);
+				}
+			}
+		}
+
+		return $possibleNames;
+	}
+
+	/**
+	 * Get shortest representation of this fully-qualified name.
+	 *
+	 * @param string $name Fully-qualified name (without leading namespace separator)
+	 * @param int    $type One of Stmt\Use_::TYPE_*
+	 *
+	 * @return Name Shortest representation
+	 */
+	public function getShortName(string $name, int $type) : Name {
+		$possibleNames = $this->getPossibleNames($name, $type);
+
+		// Find shortest name
+		$shortestName = null;
+		$shortestLength = \INF;
+		foreach ($possibleNames as $possibleName) {
+			$length = strlen($possibleName->toCodeString());
+			if ($length < $shortestLength) {
+				$shortestName = $possibleName;
+				$shortestLength = $length;
+			}
+		}
+
+	   return $shortestName;
+	}
+
+	private function resolveAlias(Name $name, $type) {
+		$firstPart = $name->getFirst();
+
+		if ($name->isQualified()) {
+			// resolve aliases for qualified names, always against class alias table
+			$checkName = strtolower($firstPart);
+			if (isset($this->aliases[Stmt\Use_::TYPE_NORMAL][$checkName])) {
+				$alias = $this->aliases[Stmt\Use_::TYPE_NORMAL][$checkName];
+				return FullyQualified::concat($alias, $name->slice(1), $name->getAttributes());
+			}
+		} elseif ($name->isUnqualified()) {
+			// constant aliases are case-sensitive, function aliases case-insensitive
+			$checkName = $type === Stmt\Use_::TYPE_CONSTANT ? $firstPart : strtolower($firstPart);
+			if (isset($this->aliases[$type][$checkName])) {
+				// resolve unqualified aliases
+				return new FullyQualified($this->aliases[$type][$checkName], $name->getAttributes());
+			}
+		}
+
+		// No applicable aliases
+		return null;
+	}
+
+	private function getNamespaceRelativeName(string $name, string $lcName, int $type) {
+		if (null === $this->namespace) {
+			return new Name($name);
+		}
+
+		if ($type === Stmt\Use_::TYPE_CONSTANT) {
+			// The constants true/false/null always resolve to the global symbols, even inside a
+			// namespace, so they may be used without qualification
+			if ($lcName === "true" || $lcName === "false" || $lcName === "null") {
+				return new Name($name);
+			}
+		}
+
+		$namespacePrefix = strtolower($this->namespace . '\\');
+		if (0 === strpos($lcName, $namespacePrefix)) {
+			return new Name(substr($name, strlen($namespacePrefix)));
+		}
+
+		return null;
+	}
+
+	private function normalizeConstName(string $name) {
+		$nsSep = strrpos($name, '\\');
+		if (false === $nsSep) {
+			return $name;
+		}
+
+		// Constants have case-insensitive namespace and case-sensitive short-name
+		$ns = substr($name, 0, $nsSep);
+		$shortName = substr($name, $nsSep + 1);
+		return strtolower($ns) . '\\' . $shortName;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -178,8 +178,8 @@ 
         // Check for relevant namespace use statements
         foreach ($this->origAliases[Stmt\Use_::TYPE_NORMAL] as $alias => $orig) {
             $lcOrig = $orig->toLowerString();
-            if (0 === strpos($lcName, $lcOrig . '\\')) {
-                $possibleNames[] = new Name($alias . substr($name, strlen($lcOrig)));
+            if (0 === strpos($lcName, $lcOrig.'\\')) {
+                $possibleNames[] = new Name($alias.substr($name, strlen($lcOrig)));
             }
         }
 
@@ -263,7 +263,7 @@ 
             }
         }
 
-        $namespacePrefix = strtolower($this->namespace . '\\');
+        $namespacePrefix = strtolower($this->namespace.'\\');
         if (0 === strpos($lcName, $namespacePrefix)) {
             return new Name(substr($name, strlen($namespacePrefix)));
         }
@@ -280,6 +280,6 @@ 
         // Constants have case-insensitive namespace and case-sensitive short-name
         $ns = substr($name, 0, $nsSep);
         $shortName = substr($name, $nsSep + 1);
-        return strtolower($ns) . '\\' . $shortName;
+        return strtolower($ns).'\\'.$shortName;
     }
 }

Braces +1 added lines, -2 removed lines

@@ -6,8 +6,7 @@
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt;
 
-class NameContext
-{
+class NameContext {
     /** @var null|Name Current namespace */
     protected $namespace;
 

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php

Indentation +12 added lines, -12 removed lines

@@ -7,19 +7,19 @@
  */
 class NodeVisitorAbstract implements NodeVisitor
 {
-    public function beforeTraverse(array $nodes) {
-        return null;
-    }
+	public function beforeTraverse(array $nodes) {
+		return null;
+	}
 
-    public function enterNode(Node $node) {
-        return null;
-    }
+	public function enterNode(Node $node) {
+		return null;
+	}
 
-    public function leaveNode(Node $node) {
-        return null;
-    }
+	public function leaveNode(Node $node) {
+		return null;
+	}
 
-    public function afterTraverse(array $nodes) {
-        return null;
-    }
+	public function afterTraverse(array $nodes) {
+		return null;
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -5,8 +5,7 @@
 /**
  * @codeCoverageIgnore
  */
-class NodeVisitorAbstract implements NodeVisitor
-{
+class NodeVisitorAbstract implements NodeVisitor {
     public function beforeTraverse(array $nodes) {
         return null;
     }

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/Comment.php

Indentation +232 added lines, -232 removed lines

@@ -4,236 +4,236 @@
 
 class Comment implements \JsonSerializable
 {
-    protected $text;
-    protected $startLine;
-    protected $startFilePos;
-    protected $startTokenPos;
-    protected $endLine;
-    protected $endFilePos;
-    protected $endTokenPos;
-
-    /**
-     * Constructs a comment node.
-     *
-     * @param string $text          Comment text (including comment delimiters like /*)
-     * @param int    $startLine     Line number the comment started on
-     * @param int    $startFilePos  File offset the comment started on
-     * @param int    $startTokenPos Token offset the comment started on
-     */
-    public function __construct(
-        string $text,
-        int $startLine = -1, int $startFilePos = -1, int $startTokenPos = -1,
-        int $endLine = -1, int $endFilePos = -1, int $endTokenPos = -1
-    ) {
-        $this->text = $text;
-        $this->startLine = $startLine;
-        $this->startFilePos = $startFilePos;
-        $this->startTokenPos = $startTokenPos;
-        $this->endLine = $endLine;
-        $this->endFilePos = $endFilePos;
-        $this->endTokenPos = $endTokenPos;
-    }
-
-    /**
-     * Gets the comment text.
-     *
-     * @return string The comment text (including comment delimiters like /*)
-     */
-    public function getText() : string {
-        return $this->text;
-    }
-
-    /**
-     * Gets the line number the comment started on.
-     *
-     * @return int Line number (or -1 if not available)
-     */
-    public function getStartLine() : int {
-        return $this->startLine;
-    }
-
-    /**
-     * Gets the file offset the comment started on.
-     *
-     * @return int File offset (or -1 if not available)
-     */
-    public function getStartFilePos() : int {
-        return $this->startFilePos;
-    }
-
-    /**
-     * Gets the token offset the comment started on.
-     *
-     * @return int Token offset (or -1 if not available)
-     */
-    public function getStartTokenPos() : int {
-        return $this->startTokenPos;
-    }
-
-    /**
-     * Gets the line number the comment ends on.
-     *
-     * @return int Line number (or -1 if not available)
-     */
-    public function getEndLine() : int {
-        return $this->endLine;
-    }
-
-    /**
-     * Gets the file offset the comment ends on.
-     *
-     * @return int File offset (or -1 if not available)
-     */
-    public function getEndFilePos() : int {
-        return $this->endFilePos;
-    }
-
-    /**
-     * Gets the token offset the comment ends on.
-     *
-     * @return int Token offset (or -1 if not available)
-     */
-    public function getEndTokenPos() : int {
-        return $this->endTokenPos;
-    }
-
-    /**
-     * Gets the line number the comment started on.
-     *
-     * @deprecated Use getStartLine() instead
-     *
-     * @return int Line number
-     */
-    public function getLine() : int {
-        return $this->startLine;
-    }
-
-    /**
-     * Gets the file offset the comment started on.
-     *
-     * @deprecated Use getStartFilePos() instead
-     *
-     * @return int File offset
-     */
-    public function getFilePos() : int {
-        return $this->startFilePos;
-    }
-
-    /**
-     * Gets the token offset the comment started on.
-     *
-     * @deprecated Use getStartTokenPos() instead
-     *
-     * @return int Token offset
-     */
-    public function getTokenPos() : int {
-        return $this->startTokenPos;
-    }
-
-    /**
-     * Gets the comment text.
-     *
-     * @return string The comment text (including comment delimiters like /*)
-     */
-    public function __toString() : string {
-        return $this->text;
-    }
-
-    /**
-     * Gets the reformatted comment text.
-     *
-     * "Reformatted" here means that we try to clean up the whitespace at the
-     * starts of the lines. This is necessary because we receive the comments
-     * without trailing whitespace on the first line, but with trailing whitespace
-     * on all subsequent lines.
-     *
-     * @return mixed|string
-     */
-    public function getReformattedText() {
-        $text = trim($this->text);
-        $newlinePos = strpos($text, "\n");
-        if (false === $newlinePos) {
-            // Single line comments don't need further processing
-            return $text;
-        } elseif (preg_match('((*BSR_ANYCRLF)(*ANYCRLF)^.*(?:\R\s+\*.*)+$)', $text)) {
-            // Multi line comment of the type
-            //
-            //     /*
-            //      * Some text.
-            //      * Some more text.
-            //      */
-            //
-            // is handled by replacing the whitespace sequences before the * by a single space
-            return preg_replace('(^\s+\*)m', ' *', $this->text);
-        } elseif (preg_match('(^/\*\*?\s*[\r\n])', $text) && preg_match('(\n(\s*)\*/$)', $text, $matches)) {
-            // Multi line comment of the type
-            //
-            //    /*
-            //        Some text.
-            //        Some more text.
-            //    */
-            //
-            // is handled by removing the whitespace sequence on the line before the closing
-            // */ on all lines. So if the last line is "    */", then "    " is removed at the
-            // start of all lines.
-            return preg_replace('(^' . preg_quote($matches[1]) . ')m', '', $text);
-        } elseif (preg_match('(^/\*\*?\s*(?!\s))', $text, $matches)) {
-            // Multi line comment of the type
-            //
-            //     /* Some text.
-            //        Some more text.
-            //          Indented text.
-            //        Even more text. */
-            //
-            // is handled by removing the difference between the shortest whitespace prefix on all
-            // lines and the length of the "/* " opening sequence.
-            $prefixLen = $this->getShortestWhitespacePrefixLen(substr($text, $newlinePos + 1));
-            $removeLen = $prefixLen - strlen($matches[0]);
-            return preg_replace('(^\s{' . $removeLen . '})m', '', $text);
-        }
-
-        // No idea how to format this comment, so simply return as is
-        return $text;
-    }
-
-    /**
-     * Get length of shortest whitespace prefix (at the start of a line).
-     *
-     * If there is a line with no prefix whitespace, 0 is a valid return value.
-     *
-     * @param string $str String to check
-     * @return int Length in characters. Tabs count as single characters.
-     */
-    private function getShortestWhitespacePrefixLen(string $str) : int {
-        $lines = explode("\n", $str);
-        $shortestPrefixLen = \INF;
-        foreach ($lines as $line) {
-            preg_match('(^\s*)', $line, $matches);
-            $prefixLen = strlen($matches[0]);
-            if ($prefixLen < $shortestPrefixLen) {
-                $shortestPrefixLen = $prefixLen;
-            }
-        }
-        return $shortestPrefixLen;
-    }
-
-    /**
-     * @return       array
-     * @psalm-return array{nodeType:string, text:mixed, line:mixed, filePos:mixed}
-     */
-    public function jsonSerialize() : array {
-        // Technically not a node, but we make it look like one anyway
-        $type = $this instanceof Comment\Doc ? 'Comment_Doc' : 'Comment';
-        return [
-            'nodeType' => $type,
-            'text' => $this->text,
-            // TODO: Rename these to include "start".
-            'line' => $this->startLine,
-            'filePos' => $this->startFilePos,
-            'tokenPos' => $this->startTokenPos,
-            'endLine' => $this->endLine,
-            'endFilePos' => $this->endFilePos,
-            'endTokenPos' => $this->endTokenPos,
-        ];
-    }
+	protected $text;
+	protected $startLine;
+	protected $startFilePos;
+	protected $startTokenPos;
+	protected $endLine;
+	protected $endFilePos;
+	protected $endTokenPos;
+
+	/**
+	 * Constructs a comment node.
+	 *
+	 * @param string $text          Comment text (including comment delimiters like /*)
+	 * @param int    $startLine     Line number the comment started on
+	 * @param int    $startFilePos  File offset the comment started on
+	 * @param int    $startTokenPos Token offset the comment started on
+	 */
+	public function __construct(
+		string $text,
+		int $startLine = -1, int $startFilePos = -1, int $startTokenPos = -1,
+		int $endLine = -1, int $endFilePos = -1, int $endTokenPos = -1
+	) {
+		$this->text = $text;
+		$this->startLine = $startLine;
+		$this->startFilePos = $startFilePos;
+		$this->startTokenPos = $startTokenPos;
+		$this->endLine = $endLine;
+		$this->endFilePos = $endFilePos;
+		$this->endTokenPos = $endTokenPos;
+	}
+
+	/**
+	 * Gets the comment text.
+	 *
+	 * @return string The comment text (including comment delimiters like /*)
+	 */
+	public function getText() : string {
+		return $this->text;
+	}
+
+	/**
+	 * Gets the line number the comment started on.
+	 *
+	 * @return int Line number (or -1 if not available)
+	 */
+	public function getStartLine() : int {
+		return $this->startLine;
+	}
+
+	/**
+	 * Gets the file offset the comment started on.
+	 *
+	 * @return int File offset (or -1 if not available)
+	 */
+	public function getStartFilePos() : int {
+		return $this->startFilePos;
+	}
+
+	/**
+	 * Gets the token offset the comment started on.
+	 *
+	 * @return int Token offset (or -1 if not available)
+	 */
+	public function getStartTokenPos() : int {
+		return $this->startTokenPos;
+	}
+
+	/**
+	 * Gets the line number the comment ends on.
+	 *
+	 * @return int Line number (or -1 if not available)
+	 */
+	public function getEndLine() : int {
+		return $this->endLine;
+	}
+
+	/**
+	 * Gets the file offset the comment ends on.
+	 *
+	 * @return int File offset (or -1 if not available)
+	 */
+	public function getEndFilePos() : int {
+		return $this->endFilePos;
+	}
+
+	/**
+	 * Gets the token offset the comment ends on.
+	 *
+	 * @return int Token offset (or -1 if not available)
+	 */
+	public function getEndTokenPos() : int {
+		return $this->endTokenPos;
+	}
+
+	/**
+	 * Gets the line number the comment started on.
+	 *
+	 * @deprecated Use getStartLine() instead
+	 *
+	 * @return int Line number
+	 */
+	public function getLine() : int {
+		return $this->startLine;
+	}
+
+	/**
+	 * Gets the file offset the comment started on.
+	 *
+	 * @deprecated Use getStartFilePos() instead
+	 *
+	 * @return int File offset
+	 */
+	public function getFilePos() : int {
+		return $this->startFilePos;
+	}
+
+	/**
+	 * Gets the token offset the comment started on.
+	 *
+	 * @deprecated Use getStartTokenPos() instead
+	 *
+	 * @return int Token offset
+	 */
+	public function getTokenPos() : int {
+		return $this->startTokenPos;
+	}
+
+	/**
+	 * Gets the comment text.
+	 *
+	 * @return string The comment text (including comment delimiters like /*)
+	 */
+	public function __toString() : string {
+		return $this->text;
+	}
+
+	/**
+	 * Gets the reformatted comment text.
+	 *
+	 * "Reformatted" here means that we try to clean up the whitespace at the
+	 * starts of the lines. This is necessary because we receive the comments
+	 * without trailing whitespace on the first line, but with trailing whitespace
+	 * on all subsequent lines.
+	 *
+	 * @return mixed|string
+	 */
+	public function getReformattedText() {
+		$text = trim($this->text);
+		$newlinePos = strpos($text, "\n");
+		if (false === $newlinePos) {
+			// Single line comments don't need further processing
+			return $text;
+		} elseif (preg_match('((*BSR_ANYCRLF)(*ANYCRLF)^.*(?:\R\s+\*.*)+$)', $text)) {
+			// Multi line comment of the type
+			//
+			//     /*
+			//      * Some text.
+			//      * Some more text.
+			//      */
+			//
+			// is handled by replacing the whitespace sequences before the * by a single space
+			return preg_replace('(^\s+\*)m', ' *', $this->text);
+		} elseif (preg_match('(^/\*\*?\s*[\r\n])', $text) && preg_match('(\n(\s*)\*/$)', $text, $matches)) {
+			// Multi line comment of the type
+			//
+			//    /*
+			//        Some text.
+			//        Some more text.
+			//    */
+			//
+			// is handled by removing the whitespace sequence on the line before the closing
+			// */ on all lines. So if the last line is "    */", then "    " is removed at the
+			// start of all lines.
+			return preg_replace('(^' . preg_quote($matches[1]) . ')m', '', $text);
+		} elseif (preg_match('(^/\*\*?\s*(?!\s))', $text, $matches)) {
+			// Multi line comment of the type
+			//
+			//     /* Some text.
+			//        Some more text.
+			//          Indented text.
+			//        Even more text. */
+			//
+			// is handled by removing the difference between the shortest whitespace prefix on all
+			// lines and the length of the "/* " opening sequence.
+			$prefixLen = $this->getShortestWhitespacePrefixLen(substr($text, $newlinePos + 1));
+			$removeLen = $prefixLen - strlen($matches[0]);
+			return preg_replace('(^\s{' . $removeLen . '})m', '', $text);
+		}
+
+		// No idea how to format this comment, so simply return as is
+		return $text;
+	}
+
+	/**
+	 * Get length of shortest whitespace prefix (at the start of a line).
+	 *
+	 * If there is a line with no prefix whitespace, 0 is a valid return value.
+	 *
+	 * @param string $str String to check
+	 * @return int Length in characters. Tabs count as single characters.
+	 */
+	private function getShortestWhitespacePrefixLen(string $str) : int {
+		$lines = explode("\n", $str);
+		$shortestPrefixLen = \INF;
+		foreach ($lines as $line) {
+			preg_match('(^\s*)', $line, $matches);
+			$prefixLen = strlen($matches[0]);
+			if ($prefixLen < $shortestPrefixLen) {
+				$shortestPrefixLen = $prefixLen;
+			}
+		}
+		return $shortestPrefixLen;
+	}
+
+	/**
+	 * @return       array
+	 * @psalm-return array{nodeType:string, text:mixed, line:mixed, filePos:mixed}
+	 */
+	public function jsonSerialize() : array {
+		// Technically not a node, but we make it look like one anyway
+		$type = $this instanceof Comment\Doc ? 'Comment_Doc' : 'Comment';
+		return [
+			'nodeType' => $type,
+			'text' => $this->text,
+			// TODO: Rename these to include "start".
+			'line' => $this->startLine,
+			'filePos' => $this->startFilePos,
+			'tokenPos' => $this->startTokenPos,
+			'endLine' => $this->endLine,
+			'endFilePos' => $this->endFilePos,
+			'endTokenPos' => $this->endTokenPos,
+		];
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -176,7 +176,7 @@ 
             // is handled by removing the whitespace sequence on the line before the closing
             // */ on all lines. So if the last line is "    */", then "    " is removed at the
             // start of all lines.
-            return preg_replace('(^' . preg_quote($matches[1]) . ')m', '', $text);
+            return preg_replace('(^'.preg_quote($matches[1]).')m', '', $text);
         } elseif (preg_match('(^/\*\*?\s*(?!\s))', $text, $matches)) {
             // Multi line comment of the type
             //
@@ -189,7 +189,7 @@ 
             // lines and the length of the "/* " opening sequence.
             $prefixLen = $this->getShortestWhitespacePrefixLen(substr($text, $newlinePos + 1));
             $removeLen = $prefixLen - strlen($matches[0]);
-            return preg_replace('(^\s{' . $removeLen . '})m', '', $text);
+            return preg_replace('(^\s{'.$removeLen.'})m', '', $text);
         }
 
         // No idea how to format this comment, so simply return as is

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/BuilderHelpers.php

Indentation +315 added lines, -315 removed lines

@@ -17,319 +17,319 @@
  */
 final class BuilderHelpers
 {
-    /**
-     * Normalizes a node: Converts builder objects to nodes.
-     *
-     * @param Node|Builder $node The node to normalize
-     *
-     * @return Node The normalized node
-     */
-    public static function normalizeNode($node) : Node {
-        if ($node instanceof Builder) {
-            return $node->getNode();
-        }
-
-        if ($node instanceof Node) {
-            return $node;
-        }
-
-        throw new \LogicException('Expected node or builder object');
-    }
-
-    /**
-     * Normalizes a node to a statement.
-     *
-     * Expressions are wrapped in a Stmt\Expression node.
-     *
-     * @param Node|Builder $node The node to normalize
-     *
-     * @return Stmt The normalized statement node
-     */
-    public static function normalizeStmt($node) : Stmt {
-        $node = self::normalizeNode($node);
-        if ($node instanceof Stmt) {
-            return $node;
-        }
-
-        if ($node instanceof Expr) {
-            return new Stmt\Expression($node);
-        }
-
-        throw new \LogicException('Expected statement or expression node');
-    }
-
-    /**
-     * Normalizes strings to Identifier.
-     *
-     * @param string|Identifier $name The identifier to normalize
-     *
-     * @return Identifier The normalized identifier
-     */
-    public static function normalizeIdentifier($name) : Identifier {
-        if ($name instanceof Identifier) {
-            return $name;
-        }
-
-        if (\is_string($name)) {
-            return new Identifier($name);
-        }
-
-        throw new \LogicException('Expected string or instance of Node\Identifier');
-    }
-
-    /**
-     * Normalizes strings to Identifier, also allowing expressions.
-     *
-     * @param string|Identifier|Expr $name The identifier to normalize
-     *
-     * @return Identifier|Expr The normalized identifier or expression
-     */
-    public static function normalizeIdentifierOrExpr($name) {
-        if ($name instanceof Identifier || $name instanceof Expr) {
-            return $name;
-        }
-
-        if (\is_string($name)) {
-            return new Identifier($name);
-        }
-
-        throw new \LogicException('Expected string or instance of Node\Identifier or Node\Expr');
-    }
-
-    /**
-     * Normalizes a name: Converts string names to Name nodes.
-     *
-     * @param Name|string $name The name to normalize
-     *
-     * @return Name The normalized name
-     */
-    public static function normalizeName($name) : Name {
-        if ($name instanceof Name) {
-            return $name;
-        }
-
-        if (is_string($name)) {
-            if (!$name) {
-                throw new \LogicException('Name cannot be empty');
-            }
-
-            if ($name[0] === '\\') {
-                return new Name\FullyQualified(substr($name, 1));
-            }
-
-            if (0 === strpos($name, 'namespace\\')) {
-                return new Name\Relative(substr($name, strlen('namespace\\')));
-            }
-
-            return new Name($name);
-        }
-
-        throw new \LogicException('Name must be a string or an instance of Node\Name');
-    }
-
-    /**
-     * Normalizes a name: Converts string names to Name nodes, while also allowing expressions.
-     *
-     * @param Expr|Name|string $name The name to normalize
-     *
-     * @return Name|Expr The normalized name or expression
-     */
-    public static function normalizeNameOrExpr($name) {
-        if ($name instanceof Expr) {
-            return $name;
-        }
-
-        if (!is_string($name) && !($name instanceof Name)) {
-            throw new \LogicException(
-                'Name must be a string or an instance of Node\Name or Node\Expr'
-            );
-        }
-
-        return self::normalizeName($name);
-    }
-
-    /**
-     * Normalizes a type: Converts plain-text type names into proper AST representation.
-     *
-     * In particular, builtin types become Identifiers, custom types become Names and nullables
-     * are wrapped in NullableType nodes.
-     *
-     * @param string|Name|Identifier|ComplexType $type The type to normalize
-     *
-     * @return Name|Identifier|ComplexType The normalized type
-     */
-    public static function normalizeType($type) {
-        if (!is_string($type)) {
-            if (
-                !$type instanceof Name && !$type instanceof Identifier &&
-                !$type instanceof ComplexType
-            ) {
-                throw new \LogicException(
-                    'Type must be a string, or an instance of Name, Identifier or ComplexType'
-                );
-            }
-            return $type;
-        }
-
-        $nullable = false;
-        if (strlen($type) > 0 && $type[0] === '?') {
-            $nullable = true;
-            $type = substr($type, 1);
-        }
-
-        $builtinTypes = [
-            'array',
-            'callable',
-            'bool',
-            'int',
-            'float',
-            'string',
-            'iterable',
-            'void',
-            'object',
-            'null',
-            'false',
-            'mixed',
-            'never',
-            'true',
-        ];
-
-        $lowerType = strtolower($type);
-        if (in_array($lowerType, $builtinTypes)) {
-            $type = new Identifier($lowerType);
-        } else {
-            $type = self::normalizeName($type);
-        }
-
-        $notNullableTypes = [
-            'void', 'mixed', 'never',
-        ];
-        if ($nullable && in_array((string) $type, $notNullableTypes)) {
-            throw new \LogicException(sprintf('%s type cannot be nullable', $type));
-        }
-
-        return $nullable ? new NullableType($type) : $type;
-    }
-
-    /**
-     * Normalizes a value: Converts nulls, booleans, integers,
-     * floats, strings and arrays into their respective nodes
-     *
-     * @param Node\Expr|bool|null|int|float|string|array $value The value to normalize
-     *
-     * @return Expr The normalized value
-     */
-    public static function normalizeValue($value) : Expr {
-        if ($value instanceof Node\Expr) {
-            return $value;
-        }
-
-        if (is_null($value)) {
-            return new Expr\ConstFetch(
-                new Name('null')
-            );
-        }
-
-        if (is_bool($value)) {
-            return new Expr\ConstFetch(
-                new Name($value ? 'true' : 'false')
-            );
-        }
-
-        if (is_int($value)) {
-            return new Scalar\LNumber($value);
-        }
-
-        if (is_float($value)) {
-            return new Scalar\DNumber($value);
-        }
-
-        if (is_string($value)) {
-            return new Scalar\String_($value);
-        }
-
-        if (is_array($value)) {
-            $items = [];
-            $lastKey = -1;
-            foreach ($value as $itemKey => $itemValue) {
-                // for consecutive, numeric keys don't generate keys
-                if (null !== $lastKey && ++$lastKey === $itemKey) {
-                    $items[] = new Expr\ArrayItem(
-                        self::normalizeValue($itemValue)
-                    );
-                } else {
-                    $lastKey = null;
-                    $items[] = new Expr\ArrayItem(
-                        self::normalizeValue($itemValue),
-                        self::normalizeValue($itemKey)
-                    );
-                }
-            }
-
-            return new Expr\Array_($items);
-        }
-
-        throw new \LogicException('Invalid value');
-    }
-
-    /**
-     * Normalizes a doc comment: Converts plain strings to PhpParser\Comment\Doc.
-     *
-     * @param Comment\Doc|string $docComment The doc comment to normalize
-     *
-     * @return Comment\Doc The normalized doc comment
-     */
-    public static function normalizeDocComment($docComment) : Comment\Doc {
-        if ($docComment instanceof Comment\Doc) {
-            return $docComment;
-        }
-
-        if (is_string($docComment)) {
-            return new Comment\Doc($docComment);
-        }
-
-        throw new \LogicException('Doc comment must be a string or an instance of PhpParser\Comment\Doc');
-    }
-
-    /**
-     * Normalizes a attribute: Converts attribute to the Attribute Group if needed.
-     *
-     * @param Node\Attribute|Node\AttributeGroup $attribute
-     *
-     * @return Node\AttributeGroup The Attribute Group
-     */
-    public static function normalizeAttribute($attribute) : Node\AttributeGroup
-    {
-        if ($attribute instanceof Node\AttributeGroup) {
-            return $attribute;
-        }
-
-        if (!($attribute instanceof Node\Attribute)) {
-            throw new \LogicException('Attribute must be an instance of PhpParser\Node\Attribute or PhpParser\Node\AttributeGroup');
-        }
-
-        return new Node\AttributeGroup([$attribute]);
-    }
-
-    /**
-     * Adds a modifier and returns new modifier bitmask.
-     *
-     * @param int $modifiers Existing modifiers
-     * @param int $modifier  Modifier to set
-     *
-     * @return int New modifiers
-     */
-    public static function addModifier(int $modifiers, int $modifier) : int {
-        Stmt\Class_::verifyModifier($modifiers, $modifier);
-        return $modifiers | $modifier;
-    }
-
-    /**
-     * Adds a modifier and returns new modifier bitmask.
-     * @return int New modifiers
-     */
-    public static function addClassModifier(int $existingModifiers, int $modifierToSet) : int {
-        Stmt\Class_::verifyClassModifier($existingModifiers, $modifierToSet);
-        return $existingModifiers | $modifierToSet;
-    }
+	/**
+	 * Normalizes a node: Converts builder objects to nodes.
+	 *
+	 * @param Node|Builder $node The node to normalize
+	 *
+	 * @return Node The normalized node
+	 */
+	public static function normalizeNode($node) : Node {
+		if ($node instanceof Builder) {
+			return $node->getNode();
+		}
+
+		if ($node instanceof Node) {
+			return $node;
+		}
+
+		throw new \LogicException('Expected node or builder object');
+	}
+
+	/**
+	 * Normalizes a node to a statement.
+	 *
+	 * Expressions are wrapped in a Stmt\Expression node.
+	 *
+	 * @param Node|Builder $node The node to normalize
+	 *
+	 * @return Stmt The normalized statement node
+	 */
+	public static function normalizeStmt($node) : Stmt {
+		$node = self::normalizeNode($node);
+		if ($node instanceof Stmt) {
+			return $node;
+		}
+
+		if ($node instanceof Expr) {
+			return new Stmt\Expression($node);
+		}
+
+		throw new \LogicException('Expected statement or expression node');
+	}
+
+	/**
+	 * Normalizes strings to Identifier.
+	 *
+	 * @param string|Identifier $name The identifier to normalize
+	 *
+	 * @return Identifier The normalized identifier
+	 */
+	public static function normalizeIdentifier($name) : Identifier {
+		if ($name instanceof Identifier) {
+			return $name;
+		}
+
+		if (\is_string($name)) {
+			return new Identifier($name);
+		}
+
+		throw new \LogicException('Expected string or instance of Node\Identifier');
+	}
+
+	/**
+	 * Normalizes strings to Identifier, also allowing expressions.
+	 *
+	 * @param string|Identifier|Expr $name The identifier to normalize
+	 *
+	 * @return Identifier|Expr The normalized identifier or expression
+	 */
+	public static function normalizeIdentifierOrExpr($name) {
+		if ($name instanceof Identifier || $name instanceof Expr) {
+			return $name;
+		}
+
+		if (\is_string($name)) {
+			return new Identifier($name);
+		}
+
+		throw new \LogicException('Expected string or instance of Node\Identifier or Node\Expr');
+	}
+
+	/**
+	 * Normalizes a name: Converts string names to Name nodes.
+	 *
+	 * @param Name|string $name The name to normalize
+	 *
+	 * @return Name The normalized name
+	 */
+	public static function normalizeName($name) : Name {
+		if ($name instanceof Name) {
+			return $name;
+		}
+
+		if (is_string($name)) {
+			if (!$name) {
+				throw new \LogicException('Name cannot be empty');
+			}
+
+			if ($name[0] === '\\') {
+				return new Name\FullyQualified(substr($name, 1));
+			}
+
+			if (0 === strpos($name, 'namespace\\')) {
+				return new Name\Relative(substr($name, strlen('namespace\\')));
+			}
+
+			return new Name($name);
+		}
+
+		throw new \LogicException('Name must be a string or an instance of Node\Name');
+	}
+
+	/**
+	 * Normalizes a name: Converts string names to Name nodes, while also allowing expressions.
+	 *
+	 * @param Expr|Name|string $name The name to normalize
+	 *
+	 * @return Name|Expr The normalized name or expression
+	 */
+	public static function normalizeNameOrExpr($name) {
+		if ($name instanceof Expr) {
+			return $name;
+		}
+
+		if (!is_string($name) && !($name instanceof Name)) {
+			throw new \LogicException(
+				'Name must be a string or an instance of Node\Name or Node\Expr'
+			);
+		}
+
+		return self::normalizeName($name);
+	}
+
+	/**
+	 * Normalizes a type: Converts plain-text type names into proper AST representation.
+	 *
+	 * In particular, builtin types become Identifiers, custom types become Names and nullables
+	 * are wrapped in NullableType nodes.
+	 *
+	 * @param string|Name|Identifier|ComplexType $type The type to normalize
+	 *
+	 * @return Name|Identifier|ComplexType The normalized type
+	 */
+	public static function normalizeType($type) {
+		if (!is_string($type)) {
+			if (
+				!$type instanceof Name && !$type instanceof Identifier &&
+				!$type instanceof ComplexType
+			) {
+				throw new \LogicException(
+					'Type must be a string, or an instance of Name, Identifier or ComplexType'
+				);
+			}
+			return $type;
+		}
+
+		$nullable = false;
+		if (strlen($type) > 0 && $type[0] === '?') {
+			$nullable = true;
+			$type = substr($type, 1);
+		}
+
+		$builtinTypes = [
+			'array',
+			'callable',
+			'bool',
+			'int',
+			'float',
+			'string',
+			'iterable',
+			'void',
+			'object',
+			'null',
+			'false',
+			'mixed',
+			'never',
+			'true',
+		];
+
+		$lowerType = strtolower($type);
+		if (in_array($lowerType, $builtinTypes)) {
+			$type = new Identifier($lowerType);
+		} else {
+			$type = self::normalizeName($type);
+		}
+
+		$notNullableTypes = [
+			'void', 'mixed', 'never',
+		];
+		if ($nullable && in_array((string) $type, $notNullableTypes)) {
+			throw new \LogicException(sprintf('%s type cannot be nullable', $type));
+		}
+
+		return $nullable ? new NullableType($type) : $type;
+	}
+
+	/**
+	 * Normalizes a value: Converts nulls, booleans, integers,
+	 * floats, strings and arrays into their respective nodes
+	 *
+	 * @param Node\Expr|bool|null|int|float|string|array $value The value to normalize
+	 *
+	 * @return Expr The normalized value
+	 */
+	public static function normalizeValue($value) : Expr {
+		if ($value instanceof Node\Expr) {
+			return $value;
+		}
+
+		if (is_null($value)) {
+			return new Expr\ConstFetch(
+				new Name('null')
+			);
+		}
+
+		if (is_bool($value)) {
+			return new Expr\ConstFetch(
+				new Name($value ? 'true' : 'false')
+			);
+		}
+
+		if (is_int($value)) {
+			return new Scalar\LNumber($value);
+		}
+
+		if (is_float($value)) {
+			return new Scalar\DNumber($value);
+		}
+
+		if (is_string($value)) {
+			return new Scalar\String_($value);
+		}
+
+		if (is_array($value)) {
+			$items = [];
+			$lastKey = -1;
+			foreach ($value as $itemKey => $itemValue) {
+				// for consecutive, numeric keys don't generate keys
+				if (null !== $lastKey && ++$lastKey === $itemKey) {
+					$items[] = new Expr\ArrayItem(
+						self::normalizeValue($itemValue)
+					);
+				} else {
+					$lastKey = null;
+					$items[] = new Expr\ArrayItem(
+						self::normalizeValue($itemValue),
+						self::normalizeValue($itemKey)
+					);
+				}
+			}
+
+			return new Expr\Array_($items);
+		}
+
+		throw new \LogicException('Invalid value');
+	}
+
+	/**
+	 * Normalizes a doc comment: Converts plain strings to PhpParser\Comment\Doc.
+	 *
+	 * @param Comment\Doc|string $docComment The doc comment to normalize
+	 *
+	 * @return Comment\Doc The normalized doc comment
+	 */
+	public static function normalizeDocComment($docComment) : Comment\Doc {
+		if ($docComment instanceof Comment\Doc) {
+			return $docComment;
+		}
+
+		if (is_string($docComment)) {
+			return new Comment\Doc($docComment);
+		}
+
+		throw new \LogicException('Doc comment must be a string or an instance of PhpParser\Comment\Doc');
+	}
+
+	/**
+	 * Normalizes a attribute: Converts attribute to the Attribute Group if needed.
+	 *
+	 * @param Node\Attribute|Node\AttributeGroup $attribute
+	 *
+	 * @return Node\AttributeGroup The Attribute Group
+	 */
+	public static function normalizeAttribute($attribute) : Node\AttributeGroup
+	{
+		if ($attribute instanceof Node\AttributeGroup) {
+			return $attribute;
+		}
+
+		if (!($attribute instanceof Node\Attribute)) {
+			throw new \LogicException('Attribute must be an instance of PhpParser\Node\Attribute or PhpParser\Node\AttributeGroup');
+		}
+
+		return new Node\AttributeGroup([$attribute]);
+	}
+
+	/**
+	 * Adds a modifier and returns new modifier bitmask.
+	 *
+	 * @param int $modifiers Existing modifiers
+	 * @param int $modifier  Modifier to set
+	 *
+	 * @return int New modifiers
+	 */
+	public static function addModifier(int $modifiers, int $modifier) : int {
+		Stmt\Class_::verifyModifier($modifiers, $modifier);
+		return $modifiers | $modifier;
+	}
+
+	/**
+	 * Adds a modifier and returns new modifier bitmask.
+	 * @return int New modifiers
+	 */
+	public static function addClassModifier(int $existingModifiers, int $modifierToSet) : int {
+		Stmt\Class_::verifyClassModifier($existingModifiers, $modifierToSet);
+		return $existingModifiers | $modifierToSet;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
         $notNullableTypes = [
             'void', 'mixed', 'never',
         ];
-        if ($nullable && in_array((string) $type, $notNullableTypes)) {
+        if ($nullable && in_array((string)$type, $notNullableTypes)) {
             throw new \LogicException(sprintf('%s type cannot be nullable', $type));
         }
 

Braces +1 added lines, -2 removed lines

@@ -15,8 +15,7 @@
  *
  * @internal
  */
-final class BuilderHelpers
-{
+final class BuilderHelpers {
     /**
      * Normalizes a node: Converts builder objects to nodes.
      *

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php

Indentation +20 added lines, -20 removed lines

@@ -4,26 +4,26 @@
 
 interface NodeTraverserInterface
 {
-    /**
-     * Adds a visitor.
-     *
-     * @param NodeVisitor $visitor Visitor to add
-     */
-    public function addVisitor(NodeVisitor $visitor);
+	/**
+	 * Adds a visitor.
+	 *
+	 * @param NodeVisitor $visitor Visitor to add
+	 */
+	public function addVisitor(NodeVisitor $visitor);
 
-    /**
-     * Removes an added visitor.
-     *
-     * @param NodeVisitor $visitor
-     */
-    public function removeVisitor(NodeVisitor $visitor);
+	/**
+	 * Removes an added visitor.
+	 *
+	 * @param NodeVisitor $visitor
+	 */
+	public function removeVisitor(NodeVisitor $visitor);
 
-    /**
-     * Traverses an array of nodes using the registered visitors.
-     *
-     * @param Node[] $nodes Array of nodes
-     *
-     * @return Node[] Traversed array of nodes
-     */
-    public function traverse(array $nodes) : array;
+	/**
+	 * Traverses an array of nodes using the registered visitors.
+	 *
+	 * @param Node[] $nodes Array of nodes
+	 *
+	 * @return Node[] Traversed array of nodes
+	 */
+	public function traverse(array $nodes) : array;
 }

Braces +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 namespace PhpParser;
 
-interface NodeTraverserInterface
-{
+interface NodeTraverserInterface {
     /**
      * Adds a visitor.
      *

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/NodeDumper.php

Indentation +193 added lines, -193 removed lines

@@ -10,197 +10,197 @@
 
 class NodeDumper
 {
-    private $dumpComments;
-    private $dumpPositions;
-    private $code;
-
-    /**
-     * Constructs a NodeDumper.
-     *
-     * Supported options:
-     *  * bool dumpComments: Whether comments should be dumped.
-     *  * bool dumpPositions: Whether line/offset information should be dumped. To dump offset
-     *                        information, the code needs to be passed to dump().
-     *
-     * @param array $options Options (see description)
-     */
-    public function __construct(array $options = []) {
-        $this->dumpComments = !empty($options['dumpComments']);
-        $this->dumpPositions = !empty($options['dumpPositions']);
-    }
-
-    /**
-     * Dumps a node or array.
-     *
-     * @param array|Node  $node Node or array to dump
-     * @param string|null $code Code corresponding to dumped AST. This only needs to be passed if
-     *                          the dumpPositions option is enabled and the dumping of node offsets
-     *                          is desired.
-     *
-     * @return string Dumped value
-     */
-    public function dump($node, ?string $code = null) : string {
-        $this->code = $code;
-        return $this->dumpRecursive($node);
-    }
-
-    protected function dumpRecursive($node) {
-        if ($node instanceof Node) {
-            $r = $node->getType();
-            if ($this->dumpPositions && null !== $p = $this->dumpPosition($node)) {
-                $r .= $p;
-            }
-            $r .= '(';
-
-            foreach ($node->getSubNodeNames() as $key) {
-                $r .= "\n    " . $key . ': ';
-
-                $value = $node->$key;
-                if (null === $value) {
-                    $r .= 'null';
-                } elseif (false === $value) {
-                    $r .= 'false';
-                } elseif (true === $value) {
-                    $r .= 'true';
-                } elseif (is_scalar($value)) {
-                    if ('flags' === $key || 'newModifier' === $key) {
-                        $r .= $this->dumpFlags($value);
-                    } elseif ('type' === $key && $node instanceof Include_) {
-                        $r .= $this->dumpIncludeType($value);
-                    } elseif ('type' === $key
-                            && ($node instanceof Use_ || $node instanceof UseUse || $node instanceof GroupUse)) {
-                        $r .= $this->dumpUseType($value);
-                    } else {
-                        $r .= $value;
-                    }
-                } else {
-                    $r .= str_replace("\n", "\n    ", $this->dumpRecursive($value));
-                }
-            }
-
-            if ($this->dumpComments && $comments = $node->getComments()) {
-                $r .= "\n    comments: " . str_replace("\n", "\n    ", $this->dumpRecursive($comments));
-            }
-        } elseif (is_array($node)) {
-            $r = 'array(';
-
-            foreach ($node as $key => $value) {
-                $r .= "\n    " . $key . ': ';
-
-                if (null === $value) {
-                    $r .= 'null';
-                } elseif (false === $value) {
-                    $r .= 'false';
-                } elseif (true === $value) {
-                    $r .= 'true';
-                } elseif (is_scalar($value)) {
-                    $r .= $value;
-                } else {
-                    $r .= str_replace("\n", "\n    ", $this->dumpRecursive($value));
-                }
-            }
-        } elseif ($node instanceof Comment) {
-            return $node->getReformattedText();
-        } else {
-            throw new \InvalidArgumentException('Can only dump nodes and arrays.');
-        }
-
-        return $r . "\n)";
-    }
-
-    protected function dumpFlags($flags) {
-        $strs = [];
-        if ($flags & Class_::MODIFIER_PUBLIC) {
-            $strs[] = 'MODIFIER_PUBLIC';
-        }
-        if ($flags & Class_::MODIFIER_PROTECTED) {
-            $strs[] = 'MODIFIER_PROTECTED';
-        }
-        if ($flags & Class_::MODIFIER_PRIVATE) {
-            $strs[] = 'MODIFIER_PRIVATE';
-        }
-        if ($flags & Class_::MODIFIER_ABSTRACT) {
-            $strs[] = 'MODIFIER_ABSTRACT';
-        }
-        if ($flags & Class_::MODIFIER_STATIC) {
-            $strs[] = 'MODIFIER_STATIC';
-        }
-        if ($flags & Class_::MODIFIER_FINAL) {
-            $strs[] = 'MODIFIER_FINAL';
-        }
-        if ($flags & Class_::MODIFIER_READONLY) {
-            $strs[] = 'MODIFIER_READONLY';
-        }
-
-        if ($strs) {
-            return implode(' | ', $strs) . ' (' . $flags . ')';
-        } else {
-            return $flags;
-        }
-    }
-
-    protected function dumpIncludeType($type) {
-        $map = [
-            Include_::TYPE_INCLUDE      => 'TYPE_INCLUDE',
-            Include_::TYPE_INCLUDE_ONCE => 'TYPE_INCLUDE_ONCE',
-            Include_::TYPE_REQUIRE      => 'TYPE_REQUIRE',
-            Include_::TYPE_REQUIRE_ONCE => 'TYPE_REQUIRE_ONCE',
-        ];
-
-        if (!isset($map[$type])) {
-            return $type;
-        }
-        return $map[$type] . ' (' . $type . ')';
-    }
-
-    protected function dumpUseType($type) {
-        $map = [
-            Use_::TYPE_UNKNOWN  => 'TYPE_UNKNOWN',
-            Use_::TYPE_NORMAL   => 'TYPE_NORMAL',
-            Use_::TYPE_FUNCTION => 'TYPE_FUNCTION',
-            Use_::TYPE_CONSTANT => 'TYPE_CONSTANT',
-        ];
-
-        if (!isset($map[$type])) {
-            return $type;
-        }
-        return $map[$type] . ' (' . $type . ')';
-    }
-
-    /**
-     * Dump node position, if possible.
-     *
-     * @param Node $node Node for which to dump position
-     *
-     * @return string|null Dump of position, or null if position information not available
-     */
-    protected function dumpPosition(Node $node) {
-        if (!$node->hasAttribute('startLine') || !$node->hasAttribute('endLine')) {
-            return null;
-        }
-
-        $start = $node->getStartLine();
-        $end = $node->getEndLine();
-        if ($node->hasAttribute('startFilePos') && $node->hasAttribute('endFilePos')
-            && null !== $this->code
-        ) {
-            $start .= ':' . $this->toColumn($this->code, $node->getStartFilePos());
-            $end .= ':' . $this->toColumn($this->code, $node->getEndFilePos());
-        }
-        return "[$start - $end]";
-    }
-
-    // Copied from Error class
-    private function toColumn($code, $pos) {
-        if ($pos > strlen($code)) {
-            throw new \RuntimeException('Invalid position information');
-        }
-
-        $lineStartPos = strrpos($code, "\n", $pos - strlen($code));
-        if (false === $lineStartPos) {
-            $lineStartPos = -1;
-        }
-
-        return $pos - $lineStartPos;
-    }
+	private $dumpComments;
+	private $dumpPositions;
+	private $code;
+
+	/**
+	 * Constructs a NodeDumper.
+	 *
+	 * Supported options:
+	 *  * bool dumpComments: Whether comments should be dumped.
+	 *  * bool dumpPositions: Whether line/offset information should be dumped. To dump offset
+	 *                        information, the code needs to be passed to dump().
+	 *
+	 * @param array $options Options (see description)
+	 */
+	public function __construct(array $options = []) {
+		$this->dumpComments = !empty($options['dumpComments']);
+		$this->dumpPositions = !empty($options['dumpPositions']);
+	}
+
+	/**
+	 * Dumps a node or array.
+	 *
+	 * @param array|Node  $node Node or array to dump
+	 * @param string|null $code Code corresponding to dumped AST. This only needs to be passed if
+	 *                          the dumpPositions option is enabled and the dumping of node offsets
+	 *                          is desired.
+	 *
+	 * @return string Dumped value
+	 */
+	public function dump($node, ?string $code = null) : string {
+		$this->code = $code;
+		return $this->dumpRecursive($node);
+	}
+
+	protected function dumpRecursive($node) {
+		if ($node instanceof Node) {
+			$r = $node->getType();
+			if ($this->dumpPositions && null !== $p = $this->dumpPosition($node)) {
+				$r .= $p;
+			}
+			$r .= '(';
+
+			foreach ($node->getSubNodeNames() as $key) {
+				$r .= "\n    " . $key . ': ';
+
+				$value = $node->$key;
+				if (null === $value) {
+					$r .= 'null';
+				} elseif (false === $value) {
+					$r .= 'false';
+				} elseif (true === $value) {
+					$r .= 'true';
+				} elseif (is_scalar($value)) {
+					if ('flags' === $key || 'newModifier' === $key) {
+						$r .= $this->dumpFlags($value);
+					} elseif ('type' === $key && $node instanceof Include_) {
+						$r .= $this->dumpIncludeType($value);
+					} elseif ('type' === $key
+							&& ($node instanceof Use_ || $node instanceof UseUse || $node instanceof GroupUse)) {
+						$r .= $this->dumpUseType($value);
+					} else {
+						$r .= $value;
+					}
+				} else {
+					$r .= str_replace("\n", "\n    ", $this->dumpRecursive($value));
+				}
+			}
+
+			if ($this->dumpComments && $comments = $node->getComments()) {
+				$r .= "\n    comments: " . str_replace("\n", "\n    ", $this->dumpRecursive($comments));
+			}
+		} elseif (is_array($node)) {
+			$r = 'array(';
+
+			foreach ($node as $key => $value) {
+				$r .= "\n    " . $key . ': ';
+
+				if (null === $value) {
+					$r .= 'null';
+				} elseif (false === $value) {
+					$r .= 'false';
+				} elseif (true === $value) {
+					$r .= 'true';
+				} elseif (is_scalar($value)) {
+					$r .= $value;
+				} else {
+					$r .= str_replace("\n", "\n    ", $this->dumpRecursive($value));
+				}
+			}
+		} elseif ($node instanceof Comment) {
+			return $node->getReformattedText();
+		} else {
+			throw new \InvalidArgumentException('Can only dump nodes and arrays.');
+		}
+
+		return $r . "\n)";
+	}
+
+	protected function dumpFlags($flags) {
+		$strs = [];
+		if ($flags & Class_::MODIFIER_PUBLIC) {
+			$strs[] = 'MODIFIER_PUBLIC';
+		}
+		if ($flags & Class_::MODIFIER_PROTECTED) {
+			$strs[] = 'MODIFIER_PROTECTED';
+		}
+		if ($flags & Class_::MODIFIER_PRIVATE) {
+			$strs[] = 'MODIFIER_PRIVATE';
+		}
+		if ($flags & Class_::MODIFIER_ABSTRACT) {
+			$strs[] = 'MODIFIER_ABSTRACT';
+		}
+		if ($flags & Class_::MODIFIER_STATIC) {
+			$strs[] = 'MODIFIER_STATIC';
+		}
+		if ($flags & Class_::MODIFIER_FINAL) {
+			$strs[] = 'MODIFIER_FINAL';
+		}
+		if ($flags & Class_::MODIFIER_READONLY) {
+			$strs[] = 'MODIFIER_READONLY';
+		}
+
+		if ($strs) {
+			return implode(' | ', $strs) . ' (' . $flags . ')';
+		} else {
+			return $flags;
+		}
+	}
+
+	protected function dumpIncludeType($type) {
+		$map = [
+			Include_::TYPE_INCLUDE      => 'TYPE_INCLUDE',
+			Include_::TYPE_INCLUDE_ONCE => 'TYPE_INCLUDE_ONCE',
+			Include_::TYPE_REQUIRE      => 'TYPE_REQUIRE',
+			Include_::TYPE_REQUIRE_ONCE => 'TYPE_REQUIRE_ONCE',
+		];
+
+		if (!isset($map[$type])) {
+			return $type;
+		}
+		return $map[$type] . ' (' . $type . ')';
+	}
+
+	protected function dumpUseType($type) {
+		$map = [
+			Use_::TYPE_UNKNOWN  => 'TYPE_UNKNOWN',
+			Use_::TYPE_NORMAL   => 'TYPE_NORMAL',
+			Use_::TYPE_FUNCTION => 'TYPE_FUNCTION',
+			Use_::TYPE_CONSTANT => 'TYPE_CONSTANT',
+		];
+
+		if (!isset($map[$type])) {
+			return $type;
+		}
+		return $map[$type] . ' (' . $type . ')';
+	}
+
+	/**
+	 * Dump node position, if possible.
+	 *
+	 * @param Node $node Node for which to dump position
+	 *
+	 * @return string|null Dump of position, or null if position information not available
+	 */
+	protected function dumpPosition(Node $node) {
+		if (!$node->hasAttribute('startLine') || !$node->hasAttribute('endLine')) {
+			return null;
+		}
+
+		$start = $node->getStartLine();
+		$end = $node->getEndLine();
+		if ($node->hasAttribute('startFilePos') && $node->hasAttribute('endFilePos')
+			&& null !== $this->code
+		) {
+			$start .= ':' . $this->toColumn($this->code, $node->getStartFilePos());
+			$end .= ':' . $this->toColumn($this->code, $node->getEndFilePos());
+		}
+		return "[$start - $end]";
+	}
+
+	// Copied from Error class
+	private function toColumn($code, $pos) {
+		if ($pos > strlen($code)) {
+			throw new \RuntimeException('Invalid position information');
+		}
+
+		$lineStartPos = strrpos($code, "\n", $pos - strlen($code));
+		if (false === $lineStartPos) {
+			$lineStartPos = -1;
+		}
+
+		return $pos - $lineStartPos;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -53,7 +53,7 @@ 
             $r .= '(';
 
             foreach ($node->getSubNodeNames() as $key) {
-                $r .= "\n    " . $key . ': ';
+                $r .= "\n    ".$key.': ';
 
                 $value = $node->$key;
                 if (null === $value) {
@@ -79,13 +79,13 @@ 
             }
 
             if ($this->dumpComments && $comments = $node->getComments()) {
-                $r .= "\n    comments: " . str_replace("\n", "\n    ", $this->dumpRecursive($comments));
+                $r .= "\n    comments: ".str_replace("\n", "\n    ", $this->dumpRecursive($comments));
             }
         } elseif (is_array($node)) {
             $r = 'array(';
 
             foreach ($node as $key => $value) {
-                $r .= "\n    " . $key . ': ';
+                $r .= "\n    ".$key.': ';
 
                 if (null === $value) {
                     $r .= 'null';
@@ -105,7 +105,7 @@ 
             throw new \InvalidArgumentException('Can only dump nodes and arrays.');
         }
 
-        return $r . "\n)";
+        return $r."\n)";
     }
 
     protected function dumpFlags($flags) {
@@ -133,7 +133,7 @@ 
         }
 
         if ($strs) {
-            return implode(' | ', $strs) . ' (' . $flags . ')';
+            return implode(' | ', $strs).' ('.$flags.')';
         } else {
             return $flags;
         }
@@ -150,7 +150,7 @@ 
         if (!isset($map[$type])) {
             return $type;
         }
-        return $map[$type] . ' (' . $type . ')';
+        return $map[$type].' ('.$type.')';
     }
 
     protected function dumpUseType($type) {
@@ -164,7 +164,7 @@ 
         if (!isset($map[$type])) {
             return $type;
         }
-        return $map[$type] . ' (' . $type . ')';
+        return $map[$type].' ('.$type.')';
     }
 
     /**
@@ -184,8 +184,8 @@ 
         if ($node->hasAttribute('startFilePos') && $node->hasAttribute('endFilePos')
             && null !== $this->code
         ) {
-            $start .= ':' . $this->toColumn($this->code, $node->getStartFilePos());
-            $end .= ':' . $this->toColumn($this->code, $node->getEndFilePos());
+            $start .= ':'.$this->toColumn($this->code, $node->getStartFilePos());
+            $end .= ':'.$this->toColumn($this->code, $node->getEndFilePos());
         }
         return "[$start - $end]";
     }

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
 use PhpParser\Node\Stmt\Use_;
 use PhpParser\Node\Stmt\UseUse;
 
-class NodeDumper
-{
+class NodeDumper {
     private $dumpComments;
     private $dumpPositions;
     private $code;

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

Indentation +62 added lines, -62 removed lines

@@ -4,69 +4,69 @@
 
 interface NodeVisitor
 {
-    /**
-     * Called once before traversal.
-     *
-     * Return value semantics:
-     *  * null:      $nodes stays as-is
-     *  * otherwise: $nodes is set to the return value
-     *
-     * @param Node[] $nodes Array of nodes
-     *
-     * @return null|Node[] Array of nodes
-     */
-    public function beforeTraverse(array $nodes);
+	/**
+	 * Called once before traversal.
+	 *
+	 * Return value semantics:
+	 *  * null:      $nodes stays as-is
+	 *  * otherwise: $nodes is set to the return value
+	 *
+	 * @param Node[] $nodes Array of nodes
+	 *
+	 * @return null|Node[] Array of nodes
+	 */
+	public function beforeTraverse(array $nodes);
 
-    /**
-     * Called when entering a node.
-     *
-     * Return value semantics:
-     *  * null
-     *        => $node stays as-is
-     *  * NodeTraverser::DONT_TRAVERSE_CHILDREN
-     *        => Children of $node are not traversed. $node stays as-is
-     *  * NodeTraverser::STOP_TRAVERSAL
-     *        => Traversal is aborted. $node stays as-is
-     *  * otherwise
-     *        => $node is set to the return value
-     *
-     * @param Node $node Node
-     *
-     * @return null|int|Node Replacement node (or special return value)
-     */
-    public function enterNode(Node $node);
+	/**
+	 * Called when entering a node.
+	 *
+	 * Return value semantics:
+	 *  * null
+	 *        => $node stays as-is
+	 *  * NodeTraverser::DONT_TRAVERSE_CHILDREN
+	 *        => Children of $node are not traversed. $node stays as-is
+	 *  * NodeTraverser::STOP_TRAVERSAL
+	 *        => Traversal is aborted. $node stays as-is
+	 *  * otherwise
+	 *        => $node is set to the return value
+	 *
+	 * @param Node $node Node
+	 *
+	 * @return null|int|Node Replacement node (or special return value)
+	 */
+	public function enterNode(Node $node);
 
-    /**
-     * Called when leaving a node.
-     *
-     * Return value semantics:
-     *  * null
-     *        => $node stays as-is
-     *  * NodeTraverser::REMOVE_NODE
-     *        => $node is removed from the parent array
-     *  * NodeTraverser::STOP_TRAVERSAL
-     *        => Traversal is aborted. $node stays as-is
-     *  * array (of Nodes)
-     *        => The return value is merged into the parent array (at the position of the $node)
-     *  * otherwise
-     *        => $node is set to the return value
-     *
-     * @param Node $node Node
-     *
-     * @return null|int|Node|Node[] Replacement node (or special return value)
-     */
-    public function leaveNode(Node $node);
+	/**
+	 * Called when leaving a node.
+	 *
+	 * Return value semantics:
+	 *  * null
+	 *        => $node stays as-is
+	 *  * NodeTraverser::REMOVE_NODE
+	 *        => $node is removed from the parent array
+	 *  * NodeTraverser::STOP_TRAVERSAL
+	 *        => Traversal is aborted. $node stays as-is
+	 *  * array (of Nodes)
+	 *        => The return value is merged into the parent array (at the position of the $node)
+	 *  * otherwise
+	 *        => $node is set to the return value
+	 *
+	 * @param Node $node Node
+	 *
+	 * @return null|int|Node|Node[] Replacement node (or special return value)
+	 */
+	public function leaveNode(Node $node);
 
-    /**
-     * Called once after traversal.
-     *
-     * Return value semantics:
-     *  * null:      $nodes stays as-is
-     *  * otherwise: $nodes is set to the return value
-     *
-     * @param Node[] $nodes Array of nodes
-     *
-     * @return null|Node[] Array of nodes
-     */
-    public function afterTraverse(array $nodes);
+	/**
+	 * Called once after traversal.
+	 *
+	 * Return value semantics:
+	 *  * null:      $nodes stays as-is
+	 *  * otherwise: $nodes is set to the return value
+	 *
+	 * @param Node[] $nodes Array of nodes
+	 *
+	 * @return null|Node[] Array of nodes
+	 */
+	public function afterTraverse(array $nodes);
 }

Braces +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 namespace PhpParser;
 
-interface NodeVisitor
-{
+interface NodeVisitor {
     /**
      * Called once before traversal.
      *