nextcloud / fulltextsearch_elasticsearch

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.
      *

vendor-bin/php-scoper/vendor/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php

Indentation +1088 added lines, -1088 removed lines

@@ -15,1011 +15,1011 @@ 
 
 class Standard extends PrettyPrinterAbstract
 {
-    // Special nodes
-
-    protected function pParam(Node\Param $node) {
-        return $this->pAttrGroups($node->attrGroups, true)
-             . $this->pModifiers($node->flags)
-             . ($node->type ? $this->p($node->type) . ' ' : '')
-             . ($node->byRef ? '&' : '')
-             . ($node->variadic ? '...' : '')
-             . $this->p($node->var)
-             . ($node->default ? ' = ' . $this->p($node->default) : '');
-    }
-
-    protected function pArg(Node\Arg $node) {
-        return ($node->name ? $node->name->toString() . ': ' : '')
-             . ($node->byRef ? '&' : '') . ($node->unpack ? '...' : '')
-             . $this->p($node->value);
-    }
-
-    protected function pVariadicPlaceholder(Node\VariadicPlaceholder $node) {
-        return '...';
-    }
-
-    protected function pConst(Node\Const_ $node) {
-        return $node->name . ' = ' . $this->p($node->value);
-    }
-
-    protected function pNullableType(Node\NullableType $node) {
-        return '?' . $this->p($node->type);
-    }
-
-    protected function pUnionType(Node\UnionType $node) {
-        $types = [];
-        foreach ($node->types as $typeNode) {
-            if ($typeNode instanceof Node\IntersectionType) {
-                $types[] = '('. $this->p($typeNode) . ')';
-                continue;
-            }
-            $types[] = $this->p($typeNode);
-        }
-        return implode('|', $types);
-    }
-
-    protected function pIntersectionType(Node\IntersectionType $node) {
-        return $this->pImplode($node->types, '&');
-    }
-
-    protected function pIdentifier(Node\Identifier $node) {
-        return $node->name;
-    }
-
-    protected function pVarLikeIdentifier(Node\VarLikeIdentifier $node) {
-        return '$' . $node->name;
-    }
-
-    protected function pAttribute(Node\Attribute $node) {
-        return $this->p($node->name)
-             . ($node->args ? '(' . $this->pCommaSeparated($node->args) . ')' : '');
-    }
-
-    protected function pAttributeGroup(Node\AttributeGroup $node) {
-        return '#[' . $this->pCommaSeparated($node->attrs) . ']';
-    }
-
-    // Names
-
-    protected function pName(Name $node) {
-        return implode('\\', $node->parts);
-    }
-
-    protected function pName_FullyQualified(Name\FullyQualified $node) {
-        return '\\' . implode('\\', $node->parts);
-    }
-
-    protected function pName_Relative(Name\Relative $node) {
-        return 'namespace\\' . implode('\\', $node->parts);
-    }
-
-    // Magic Constants
-
-    protected function pScalar_MagicConst_Class(MagicConst\Class_ $node) {
-        return '__CLASS__';
-    }
-
-    protected function pScalar_MagicConst_Dir(MagicConst\Dir $node) {
-        return '__DIR__';
-    }
-
-    protected function pScalar_MagicConst_File(MagicConst\File $node) {
-        return '__FILE__';
-    }
-
-    protected function pScalar_MagicConst_Function(MagicConst\Function_ $node) {
-        return '__FUNCTION__';
-    }
-
-    protected function pScalar_MagicConst_Line(MagicConst\Line $node) {
-        return '__LINE__';
-    }
-
-    protected function pScalar_MagicConst_Method(MagicConst\Method $node) {
-        return '__METHOD__';
-    }
-
-    protected function pScalar_MagicConst_Namespace(MagicConst\Namespace_ $node) {
-        return '__NAMESPACE__';
-    }
-
-    protected function pScalar_MagicConst_Trait(MagicConst\Trait_ $node) {
-        return '__TRAIT__';
-    }
-
-    // Scalars
-
-    protected function pScalar_String(Scalar\String_ $node) {
-        $kind = $node->getAttribute('kind', Scalar\String_::KIND_SINGLE_QUOTED);
-        switch ($kind) {
-            case Scalar\String_::KIND_NOWDOC:
-                $label = $node->getAttribute('docLabel');
-                if ($label && !$this->containsEndLabel($node->value, $label)) {
-                    if ($node->value === '') {
-                        return "<<<'$label'\n$label" . $this->docStringEndToken;
-                    }
-
-                    return "<<<'$label'\n$node->value\n$label"
-                         . $this->docStringEndToken;
-                }
-                /* break missing intentionally */
-            case Scalar\String_::KIND_SINGLE_QUOTED:
-                return $this->pSingleQuotedString($node->value);
-            case Scalar\String_::KIND_HEREDOC:
-                $label = $node->getAttribute('docLabel');
-                if ($label && !$this->containsEndLabel($node->value, $label)) {
-                    if ($node->value === '') {
-                        return "<<<$label\n$label" . $this->docStringEndToken;
-                    }
-
-                    $escaped = $this->escapeString($node->value, null);
-                    return "<<<$label\n" . $escaped . "\n$label"
-                         . $this->docStringEndToken;
-                }
-            /* break missing intentionally */
-            case Scalar\String_::KIND_DOUBLE_QUOTED:
-                return '"' . $this->escapeString($node->value, '"') . '"';
-        }
-        throw new \Exception('Invalid string kind');
-    }
-
-    protected function pScalar_Encapsed(Scalar\Encapsed $node) {
-        if ($node->getAttribute('kind') === Scalar\String_::KIND_HEREDOC) {
-            $label = $node->getAttribute('docLabel');
-            if ($label && !$this->encapsedContainsEndLabel($node->parts, $label)) {
-                if (count($node->parts) === 1
-                    && $node->parts[0] instanceof Scalar\EncapsedStringPart
-                    && $node->parts[0]->value === ''
-                ) {
-                    return "<<<$label\n$label" . $this->docStringEndToken;
-                }
-
-                return "<<<$label\n" . $this->pEncapsList($node->parts, null) . "\n$label"
-                     . $this->docStringEndToken;
-            }
-        }
-        return '"' . $this->pEncapsList($node->parts, '"') . '"';
-    }
-
-    protected function pScalar_LNumber(Scalar\LNumber $node) {
-        if ($node->value === -\PHP_INT_MAX-1) {
-            // PHP_INT_MIN cannot be represented as a literal,
-            // because the sign is not part of the literal
-            return '(-' . \PHP_INT_MAX . '-1)';
-        }
-
-        $kind = $node->getAttribute('kind', Scalar\LNumber::KIND_DEC);
-        if (Scalar\LNumber::KIND_DEC === $kind) {
-            return (string) $node->value;
-        }
-
-        if ($node->value < 0) {
-            $sign = '-';
-            $str = (string) -$node->value;
-        } else {
-            $sign = '';
-            $str = (string) $node->value;
-        }
-        switch ($kind) {
-            case Scalar\LNumber::KIND_BIN:
-                return $sign . '0b' . base_convert($str, 10, 2);
-            case Scalar\LNumber::KIND_OCT:
-                return $sign . '0' . base_convert($str, 10, 8);
-            case Scalar\LNumber::KIND_HEX:
-                return $sign . '0x' . base_convert($str, 10, 16);
-        }
-        throw new \Exception('Invalid number kind');
-    }
-
-    protected function pScalar_DNumber(Scalar\DNumber $node) {
-        if (!is_finite($node->value)) {
-            if ($node->value === \INF) {
-                return '\INF';
-            } elseif ($node->value === -\INF) {
-                return '-\INF';
-            } else {
-                return '\NAN';
-            }
-        }
-
-        // Try to find a short full-precision representation
-        $stringValue = sprintf('%.16G', $node->value);
-        if ($node->value !== (double) $stringValue) {
-            $stringValue = sprintf('%.17G', $node->value);
-        }
-
-        // %G is locale dependent and there exists no locale-independent alternative. We don't want
-        // mess with switching locales here, so let's assume that a comma is the only non-standard
-        // decimal separator we may encounter...
-        $stringValue = str_replace(',', '.', $stringValue);
-
-        // ensure that number is really printed as float
-        return preg_match('/^-?[0-9]+$/', $stringValue) ? $stringValue . '.0' : $stringValue;
-    }
-
-    protected function pScalar_EncapsedStringPart(Scalar\EncapsedStringPart $node) {
-        throw new \LogicException('Cannot directly print EncapsedStringPart');
-    }
-
-    // Assignments
-
-    protected function pExpr_Assign(Expr\Assign $node) {
-        return $this->pInfixOp(Expr\Assign::class, $node->var, ' = ', $node->expr);
-    }
-
-    protected function pExpr_AssignRef(Expr\AssignRef $node) {
-        return $this->pInfixOp(Expr\AssignRef::class, $node->var, ' =& ', $node->expr);
-    }
-
-    protected function pExpr_AssignOp_Plus(AssignOp\Plus $node) {
-        return $this->pInfixOp(AssignOp\Plus::class, $node->var, ' += ', $node->expr);
-    }
-
-    protected function pExpr_AssignOp_Minus(AssignOp\Minus $node) {
-        return $this->pInfixOp(AssignOp\Minus::class, $node->var, ' -= ', $node->expr);
-    }
-
-    protected function pExpr_AssignOp_Mul(AssignOp\Mul $node) {
-        return $this->pInfixOp(AssignOp\Mul::class, $node->var, ' *= ', $node->expr);
-    }
-
-    protected function pExpr_AssignOp_Div(AssignOp\Div $node) {
-        return $this->pInfixOp(AssignOp\Div::class, $node->var, ' /= ', $node->expr);
-    }
-
-    protected function pExpr_AssignOp_Concat(AssignOp\Concat $node) {
-        return $this->pInfixOp(AssignOp\Concat::class, $node->var, ' .= ', $node->expr);
-    }
-
-    protected function pExpr_AssignOp_Mod(AssignOp\Mod $node) {
-        return $this->pInfixOp(AssignOp\Mod::class, $node->var, ' %= ', $node->expr);
-    }
-
-    protected function pExpr_AssignOp_BitwiseAnd(AssignOp\BitwiseAnd $node) {
-        return $this->pInfixOp(AssignOp\BitwiseAnd::class, $node->var, ' &= ', $node->expr);
-    }
-
-    protected function pExpr_AssignOp_BitwiseOr(AssignOp\BitwiseOr $node) {
-        return $this->pInfixOp(AssignOp\BitwiseOr::class, $node->var, ' |= ', $node->expr);
-    }
-
-    protected function pExpr_AssignOp_BitwiseXor(AssignOp\BitwiseXor $node) {
-        return $this->pInfixOp(AssignOp\BitwiseXor::class, $node->var, ' ^= ', $node->expr);
-    }
-
-    protected function pExpr_AssignOp_ShiftLeft(AssignOp\ShiftLeft $node) {
-        return $this->pInfixOp(AssignOp\ShiftLeft::class, $node->var, ' <<= ', $node->expr);
-    }
-
-    protected function pExpr_AssignOp_ShiftRight(AssignOp\ShiftRight $node) {
-        return $this->pInfixOp(AssignOp\ShiftRight::class, $node->var, ' >>= ', $node->expr);
-    }
-
-    protected function pExpr_AssignOp_Pow(AssignOp\Pow $node) {
-        return $this->pInfixOp(AssignOp\Pow::class, $node->var, ' **= ', $node->expr);
-    }
-
-    protected function pExpr_AssignOp_Coalesce(AssignOp\Coalesce $node) {
-        return $this->pInfixOp(AssignOp\Coalesce::class, $node->var, ' ??= ', $node->expr);
-    }
-
-    // Binary expressions
-
-    protected function pExpr_BinaryOp_Plus(BinaryOp\Plus $node) {
-        return $this->pInfixOp(BinaryOp\Plus::class, $node->left, ' + ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_Minus(BinaryOp\Minus $node) {
-        return $this->pInfixOp(BinaryOp\Minus::class, $node->left, ' - ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_Mul(BinaryOp\Mul $node) {
-        return $this->pInfixOp(BinaryOp\Mul::class, $node->left, ' * ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_Div(BinaryOp\Div $node) {
-        return $this->pInfixOp(BinaryOp\Div::class, $node->left, ' / ', $node->right);
-    }
+	// Special nodes
+
+	protected function pParam(Node\Param $node) {
+		return $this->pAttrGroups($node->attrGroups, true)
+			 . $this->pModifiers($node->flags)
+			 . ($node->type ? $this->p($node->type) . ' ' : '')
+			 . ($node->byRef ? '&' : '')
+			 . ($node->variadic ? '...' : '')
+			 . $this->p($node->var)
+			 . ($node->default ? ' = ' . $this->p($node->default) : '');
+	}
+
+	protected function pArg(Node\Arg $node) {
+		return ($node->name ? $node->name->toString() . ': ' : '')
+			 . ($node->byRef ? '&' : '') . ($node->unpack ? '...' : '')
+			 . $this->p($node->value);
+	}
+
+	protected function pVariadicPlaceholder(Node\VariadicPlaceholder $node) {
+		return '...';
+	}
+
+	protected function pConst(Node\Const_ $node) {
+		return $node->name . ' = ' . $this->p($node->value);
+	}
+
+	protected function pNullableType(Node\NullableType $node) {
+		return '?' . $this->p($node->type);
+	}
+
+	protected function pUnionType(Node\UnionType $node) {
+		$types = [];
+		foreach ($node->types as $typeNode) {
+			if ($typeNode instanceof Node\IntersectionType) {
+				$types[] = '('. $this->p($typeNode) . ')';
+				continue;
+			}
+			$types[] = $this->p($typeNode);
+		}
+		return implode('|', $types);
+	}
+
+	protected function pIntersectionType(Node\IntersectionType $node) {
+		return $this->pImplode($node->types, '&');
+	}
+
+	protected function pIdentifier(Node\Identifier $node) {
+		return $node->name;
+	}
+
+	protected function pVarLikeIdentifier(Node\VarLikeIdentifier $node) {
+		return '$' . $node->name;
+	}
+
+	protected function pAttribute(Node\Attribute $node) {
+		return $this->p($node->name)
+			 . ($node->args ? '(' . $this->pCommaSeparated($node->args) . ')' : '');
+	}
+
+	protected function pAttributeGroup(Node\AttributeGroup $node) {
+		return '#[' . $this->pCommaSeparated($node->attrs) . ']';
+	}
+
+	// Names
+
+	protected function pName(Name $node) {
+		return implode('\\', $node->parts);
+	}
+
+	protected function pName_FullyQualified(Name\FullyQualified $node) {
+		return '\\' . implode('\\', $node->parts);
+	}
+
+	protected function pName_Relative(Name\Relative $node) {
+		return 'namespace\\' . implode('\\', $node->parts);
+	}
+
+	// Magic Constants
+
+	protected function pScalar_MagicConst_Class(MagicConst\Class_ $node) {
+		return '__CLASS__';
+	}
+
+	protected function pScalar_MagicConst_Dir(MagicConst\Dir $node) {
+		return '__DIR__';
+	}
+
+	protected function pScalar_MagicConst_File(MagicConst\File $node) {
+		return '__FILE__';
+	}
+
+	protected function pScalar_MagicConst_Function(MagicConst\Function_ $node) {
+		return '__FUNCTION__';
+	}
+
+	protected function pScalar_MagicConst_Line(MagicConst\Line $node) {
+		return '__LINE__';
+	}
+
+	protected function pScalar_MagicConst_Method(MagicConst\Method $node) {
+		return '__METHOD__';
+	}
+
+	protected function pScalar_MagicConst_Namespace(MagicConst\Namespace_ $node) {
+		return '__NAMESPACE__';
+	}
+
+	protected function pScalar_MagicConst_Trait(MagicConst\Trait_ $node) {
+		return '__TRAIT__';
+	}
+
+	// Scalars
+
+	protected function pScalar_String(Scalar\String_ $node) {
+		$kind = $node->getAttribute('kind', Scalar\String_::KIND_SINGLE_QUOTED);
+		switch ($kind) {
+			case Scalar\String_::KIND_NOWDOC:
+				$label = $node->getAttribute('docLabel');
+				if ($label && !$this->containsEndLabel($node->value, $label)) {
+					if ($node->value === '') {
+						return "<<<'$label'\n$label" . $this->docStringEndToken;
+					}
+
+					return "<<<'$label'\n$node->value\n$label"
+						 . $this->docStringEndToken;
+				}
+				/* break missing intentionally */
+			case Scalar\String_::KIND_SINGLE_QUOTED:
+				return $this->pSingleQuotedString($node->value);
+			case Scalar\String_::KIND_HEREDOC:
+				$label = $node->getAttribute('docLabel');
+				if ($label && !$this->containsEndLabel($node->value, $label)) {
+					if ($node->value === '') {
+						return "<<<$label\n$label" . $this->docStringEndToken;
+					}
+
+					$escaped = $this->escapeString($node->value, null);
+					return "<<<$label\n" . $escaped . "\n$label"
+						 . $this->docStringEndToken;
+				}
+			/* break missing intentionally */
+			case Scalar\String_::KIND_DOUBLE_QUOTED:
+				return '"' . $this->escapeString($node->value, '"') . '"';
+		}
+		throw new \Exception('Invalid string kind');
+	}
+
+	protected function pScalar_Encapsed(Scalar\Encapsed $node) {
+		if ($node->getAttribute('kind') === Scalar\String_::KIND_HEREDOC) {
+			$label = $node->getAttribute('docLabel');
+			if ($label && !$this->encapsedContainsEndLabel($node->parts, $label)) {
+				if (count($node->parts) === 1
+					&& $node->parts[0] instanceof Scalar\EncapsedStringPart
+					&& $node->parts[0]->value === ''
+				) {
+					return "<<<$label\n$label" . $this->docStringEndToken;
+				}
+
+				return "<<<$label\n" . $this->pEncapsList($node->parts, null) . "\n$label"
+					 . $this->docStringEndToken;
+			}
+		}
+		return '"' . $this->pEncapsList($node->parts, '"') . '"';
+	}
+
+	protected function pScalar_LNumber(Scalar\LNumber $node) {
+		if ($node->value === -\PHP_INT_MAX-1) {
+			// PHP_INT_MIN cannot be represented as a literal,
+			// because the sign is not part of the literal
+			return '(-' . \PHP_INT_MAX . '-1)';
+		}
+
+		$kind = $node->getAttribute('kind', Scalar\LNumber::KIND_DEC);
+		if (Scalar\LNumber::KIND_DEC === $kind) {
+			return (string) $node->value;
+		}
+
+		if ($node->value < 0) {
+			$sign = '-';
+			$str = (string) -$node->value;
+		} else {
+			$sign = '';
+			$str = (string) $node->value;
+		}
+		switch ($kind) {
+			case Scalar\LNumber::KIND_BIN:
+				return $sign . '0b' . base_convert($str, 10, 2);
+			case Scalar\LNumber::KIND_OCT:
+				return $sign . '0' . base_convert($str, 10, 8);
+			case Scalar\LNumber::KIND_HEX:
+				return $sign . '0x' . base_convert($str, 10, 16);
+		}
+		throw new \Exception('Invalid number kind');
+	}
+
+	protected function pScalar_DNumber(Scalar\DNumber $node) {
+		if (!is_finite($node->value)) {
+			if ($node->value === \INF) {
+				return '\INF';
+			} elseif ($node->value === -\INF) {
+				return '-\INF';
+			} else {
+				return '\NAN';
+			}
+		}
+
+		// Try to find a short full-precision representation
+		$stringValue = sprintf('%.16G', $node->value);
+		if ($node->value !== (double) $stringValue) {
+			$stringValue = sprintf('%.17G', $node->value);
+		}
+
+		// %G is locale dependent and there exists no locale-independent alternative. We don't want
+		// mess with switching locales here, so let's assume that a comma is the only non-standard
+		// decimal separator we may encounter...
+		$stringValue = str_replace(',', '.', $stringValue);
+
+		// ensure that number is really printed as float
+		return preg_match('/^-?[0-9]+$/', $stringValue) ? $stringValue . '.0' : $stringValue;
+	}
+
+	protected function pScalar_EncapsedStringPart(Scalar\EncapsedStringPart $node) {
+		throw new \LogicException('Cannot directly print EncapsedStringPart');
+	}
+
+	// Assignments
+
+	protected function pExpr_Assign(Expr\Assign $node) {
+		return $this->pInfixOp(Expr\Assign::class, $node->var, ' = ', $node->expr);
+	}
+
+	protected function pExpr_AssignRef(Expr\AssignRef $node) {
+		return $this->pInfixOp(Expr\AssignRef::class, $node->var, ' =& ', $node->expr);
+	}
+
+	protected function pExpr_AssignOp_Plus(AssignOp\Plus $node) {
+		return $this->pInfixOp(AssignOp\Plus::class, $node->var, ' += ', $node->expr);
+	}
+
+	protected function pExpr_AssignOp_Minus(AssignOp\Minus $node) {
+		return $this->pInfixOp(AssignOp\Minus::class, $node->var, ' -= ', $node->expr);
+	}
+
+	protected function pExpr_AssignOp_Mul(AssignOp\Mul $node) {
+		return $this->pInfixOp(AssignOp\Mul::class, $node->var, ' *= ', $node->expr);
+	}
+
+	protected function pExpr_AssignOp_Div(AssignOp\Div $node) {
+		return $this->pInfixOp(AssignOp\Div::class, $node->var, ' /= ', $node->expr);
+	}
+
+	protected function pExpr_AssignOp_Concat(AssignOp\Concat $node) {
+		return $this->pInfixOp(AssignOp\Concat::class, $node->var, ' .= ', $node->expr);
+	}
+
+	protected function pExpr_AssignOp_Mod(AssignOp\Mod $node) {
+		return $this->pInfixOp(AssignOp\Mod::class, $node->var, ' %= ', $node->expr);
+	}
+
+	protected function pExpr_AssignOp_BitwiseAnd(AssignOp\BitwiseAnd $node) {
+		return $this->pInfixOp(AssignOp\BitwiseAnd::class, $node->var, ' &= ', $node->expr);
+	}
+
+	protected function pExpr_AssignOp_BitwiseOr(AssignOp\BitwiseOr $node) {
+		return $this->pInfixOp(AssignOp\BitwiseOr::class, $node->var, ' |= ', $node->expr);
+	}
+
+	protected function pExpr_AssignOp_BitwiseXor(AssignOp\BitwiseXor $node) {
+		return $this->pInfixOp(AssignOp\BitwiseXor::class, $node->var, ' ^= ', $node->expr);
+	}
+
+	protected function pExpr_AssignOp_ShiftLeft(AssignOp\ShiftLeft $node) {
+		return $this->pInfixOp(AssignOp\ShiftLeft::class, $node->var, ' <<= ', $node->expr);
+	}
+
+	protected function pExpr_AssignOp_ShiftRight(AssignOp\ShiftRight $node) {
+		return $this->pInfixOp(AssignOp\ShiftRight::class, $node->var, ' >>= ', $node->expr);
+	}
+
+	protected function pExpr_AssignOp_Pow(AssignOp\Pow $node) {
+		return $this->pInfixOp(AssignOp\Pow::class, $node->var, ' **= ', $node->expr);
+	}
+
+	protected function pExpr_AssignOp_Coalesce(AssignOp\Coalesce $node) {
+		return $this->pInfixOp(AssignOp\Coalesce::class, $node->var, ' ??= ', $node->expr);
+	}
+
+	// Binary expressions
+
+	protected function pExpr_BinaryOp_Plus(BinaryOp\Plus $node) {
+		return $this->pInfixOp(BinaryOp\Plus::class, $node->left, ' + ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_Minus(BinaryOp\Minus $node) {
+		return $this->pInfixOp(BinaryOp\Minus::class, $node->left, ' - ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_Mul(BinaryOp\Mul $node) {
+		return $this->pInfixOp(BinaryOp\Mul::class, $node->left, ' * ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_Div(BinaryOp\Div $node) {
+		return $this->pInfixOp(BinaryOp\Div::class, $node->left, ' / ', $node->right);
+	}
 
-    protected function pExpr_BinaryOp_Concat(BinaryOp\Concat $node) {
-        return $this->pInfixOp(BinaryOp\Concat::class, $node->left, ' . ', $node->right);
-    }
+	protected function pExpr_BinaryOp_Concat(BinaryOp\Concat $node) {
+		return $this->pInfixOp(BinaryOp\Concat::class, $node->left, ' . ', $node->right);
+	}
 
-    protected function pExpr_BinaryOp_Mod(BinaryOp\Mod $node) {
-        return $this->pInfixOp(BinaryOp\Mod::class, $node->left, ' % ', $node->right);
-    }
+	protected function pExpr_BinaryOp_Mod(BinaryOp\Mod $node) {
+		return $this->pInfixOp(BinaryOp\Mod::class, $node->left, ' % ', $node->right);
+	}
 
-    protected function pExpr_BinaryOp_BooleanAnd(BinaryOp\BooleanAnd $node) {
-        return $this->pInfixOp(BinaryOp\BooleanAnd::class, $node->left, ' && ', $node->right);
-    }
+	protected function pExpr_BinaryOp_BooleanAnd(BinaryOp\BooleanAnd $node) {
+		return $this->pInfixOp(BinaryOp\BooleanAnd::class, $node->left, ' && ', $node->right);
+	}
 
-    protected function pExpr_BinaryOp_BooleanOr(BinaryOp\BooleanOr $node) {
-        return $this->pInfixOp(BinaryOp\BooleanOr::class, $node->left, ' || ', $node->right);
-    }
+	protected function pExpr_BinaryOp_BooleanOr(BinaryOp\BooleanOr $node) {
+		return $this->pInfixOp(BinaryOp\BooleanOr::class, $node->left, ' || ', $node->right);
+	}
 
-    protected function pExpr_BinaryOp_BitwiseAnd(BinaryOp\BitwiseAnd $node) {
-        return $this->pInfixOp(BinaryOp\BitwiseAnd::class, $node->left, ' & ', $node->right);
-    }
+	protected function pExpr_BinaryOp_BitwiseAnd(BinaryOp\BitwiseAnd $node) {
+		return $this->pInfixOp(BinaryOp\BitwiseAnd::class, $node->left, ' & ', $node->right);
+	}
 
-    protected function pExpr_BinaryOp_BitwiseOr(BinaryOp\BitwiseOr $node) {
-        return $this->pInfixOp(BinaryOp\BitwiseOr::class, $node->left, ' | ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_BitwiseXor(BinaryOp\BitwiseXor $node) {
-        return $this->pInfixOp(BinaryOp\BitwiseXor::class, $node->left, ' ^ ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_ShiftLeft(BinaryOp\ShiftLeft $node) {
-        return $this->pInfixOp(BinaryOp\ShiftLeft::class, $node->left, ' << ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_ShiftRight(BinaryOp\ShiftRight $node) {
-        return $this->pInfixOp(BinaryOp\ShiftRight::class, $node->left, ' >> ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_Pow(BinaryOp\Pow $node) {
-        return $this->pInfixOp(BinaryOp\Pow::class, $node->left, ' ** ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_LogicalAnd(BinaryOp\LogicalAnd $node) {
-        return $this->pInfixOp(BinaryOp\LogicalAnd::class, $node->left, ' and ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_LogicalOr(BinaryOp\LogicalOr $node) {
-        return $this->pInfixOp(BinaryOp\LogicalOr::class, $node->left, ' or ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_LogicalXor(BinaryOp\LogicalXor $node) {
-        return $this->pInfixOp(BinaryOp\LogicalXor::class, $node->left, ' xor ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_Equal(BinaryOp\Equal $node) {
-        return $this->pInfixOp(BinaryOp\Equal::class, $node->left, ' == ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_NotEqual(BinaryOp\NotEqual $node) {
-        return $this->pInfixOp(BinaryOp\NotEqual::class, $node->left, ' != ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_Identical(BinaryOp\Identical $node) {
-        return $this->pInfixOp(BinaryOp\Identical::class, $node->left, ' === ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_NotIdentical(BinaryOp\NotIdentical $node) {
-        return $this->pInfixOp(BinaryOp\NotIdentical::class, $node->left, ' !== ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_Spaceship(BinaryOp\Spaceship $node) {
-        return $this->pInfixOp(BinaryOp\Spaceship::class, $node->left, ' <=> ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_Greater(BinaryOp\Greater $node) {
-        return $this->pInfixOp(BinaryOp\Greater::class, $node->left, ' > ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_GreaterOrEqual(BinaryOp\GreaterOrEqual $node) {
-        return $this->pInfixOp(BinaryOp\GreaterOrEqual::class, $node->left, ' >= ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_Smaller(BinaryOp\Smaller $node) {
-        return $this->pInfixOp(BinaryOp\Smaller::class, $node->left, ' < ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_SmallerOrEqual(BinaryOp\SmallerOrEqual $node) {
-        return $this->pInfixOp(BinaryOp\SmallerOrEqual::class, $node->left, ' <= ', $node->right);
-    }
-
-    protected function pExpr_BinaryOp_Coalesce(BinaryOp\Coalesce $node) {
-        return $this->pInfixOp(BinaryOp\Coalesce::class, $node->left, ' ?? ', $node->right);
-    }
-
-    protected function pExpr_Instanceof(Expr\Instanceof_ $node) {
-        list($precedence, $associativity) = $this->precedenceMap[Expr\Instanceof_::class];
-        return $this->pPrec($node->expr, $precedence, $associativity, -1)
-             . ' instanceof '
-             . $this->pNewVariable($node->class);
-    }
-
-    // Unary expressions
-
-    protected function pExpr_BooleanNot(Expr\BooleanNot $node) {
-        return $this->pPrefixOp(Expr\BooleanNot::class, '!', $node->expr);
-    }
-
-    protected function pExpr_BitwiseNot(Expr\BitwiseNot $node) {
-        return $this->pPrefixOp(Expr\BitwiseNot::class, '~', $node->expr);
-    }
-
-    protected function pExpr_UnaryMinus(Expr\UnaryMinus $node) {
-        if ($node->expr instanceof Expr\UnaryMinus || $node->expr instanceof Expr\PreDec) {
-            // Enforce -(-$expr) instead of --$expr
-            return '-(' . $this->p($node->expr) . ')';
-        }
-        return $this->pPrefixOp(Expr\UnaryMinus::class, '-', $node->expr);
-    }
-
-    protected function pExpr_UnaryPlus(Expr\UnaryPlus $node) {
-        if ($node->expr instanceof Expr\UnaryPlus || $node->expr instanceof Expr\PreInc) {
-            // Enforce +(+$expr) instead of ++$expr
-            return '+(' . $this->p($node->expr) . ')';
-        }
-        return $this->pPrefixOp(Expr\UnaryPlus::class, '+', $node->expr);
-    }
-
-    protected function pExpr_PreInc(Expr\PreInc $node) {
-        return $this->pPrefixOp(Expr\PreInc::class, '++', $node->var);
-    }
-
-    protected function pExpr_PreDec(Expr\PreDec $node) {
-        return $this->pPrefixOp(Expr\PreDec::class, '--', $node->var);
-    }
-
-    protected function pExpr_PostInc(Expr\PostInc $node) {
-        return $this->pPostfixOp(Expr\PostInc::class, $node->var, '++');
-    }
-
-    protected function pExpr_PostDec(Expr\PostDec $node) {
-        return $this->pPostfixOp(Expr\PostDec::class, $node->var, '--');
-    }
-
-    protected function pExpr_ErrorSuppress(Expr\ErrorSuppress $node) {
-        return $this->pPrefixOp(Expr\ErrorSuppress::class, '@', $node->expr);
-    }
-
-    protected function pExpr_YieldFrom(Expr\YieldFrom $node) {
-        return $this->pPrefixOp(Expr\YieldFrom::class, 'yield from ', $node->expr);
-    }
-
-    protected function pExpr_Print(Expr\Print_ $node) {
-        return $this->pPrefixOp(Expr\Print_::class, 'print ', $node->expr);
-    }
-
-    // Casts
-
-    protected function pExpr_Cast_Int(Cast\Int_ $node) {
-        return $this->pPrefixOp(Cast\Int_::class, '(int) ', $node->expr);
-    }
-
-    protected function pExpr_Cast_Double(Cast\Double $node) {
-        $kind = $node->getAttribute('kind', Cast\Double::KIND_DOUBLE);
-        if ($kind === Cast\Double::KIND_DOUBLE) {
-            $cast = '(double)';
-        } elseif ($kind === Cast\Double::KIND_FLOAT) {
-            $cast = '(float)';
-        } elseif ($kind === Cast\Double::KIND_REAL) {
-            $cast = '(real)';
-        }
-        return $this->pPrefixOp(Cast\Double::class, $cast . ' ', $node->expr);
-    }
-
-    protected function pExpr_Cast_String(Cast\String_ $node) {
-        return $this->pPrefixOp(Cast\String_::class, '(string) ', $node->expr);
-    }
-
-    protected function pExpr_Cast_Array(Cast\Array_ $node) {
-        return $this->pPrefixOp(Cast\Array_::class, '(array) ', $node->expr);
-    }
-
-    protected function pExpr_Cast_Object(Cast\Object_ $node) {
-        return $this->pPrefixOp(Cast\Object_::class, '(object) ', $node->expr);
-    }
-
-    protected function pExpr_Cast_Bool(Cast\Bool_ $node) {
-        return $this->pPrefixOp(Cast\Bool_::class, '(bool) ', $node->expr);
-    }
-
-    protected function pExpr_Cast_Unset(Cast\Unset_ $node) {
-        return $this->pPrefixOp(Cast\Unset_::class, '(unset) ', $node->expr);
-    }
-
-    // Function calls and similar constructs
-
-    protected function pExpr_FuncCall(Expr\FuncCall $node) {
-        return $this->pCallLhs($node->name)
-             . '(' . $this->pMaybeMultiline($node->args) . ')';
-    }
-
-    protected function pExpr_MethodCall(Expr\MethodCall $node) {
-        return $this->pDereferenceLhs($node->var) . '->' . $this->pObjectProperty($node->name)
-             . '(' . $this->pMaybeMultiline($node->args) . ')';
-    }
-
-    protected function pExpr_NullsafeMethodCall(Expr\NullsafeMethodCall $node) {
-        return $this->pDereferenceLhs($node->var) . '?->' . $this->pObjectProperty($node->name)
-            . '(' . $this->pMaybeMultiline($node->args) . ')';
-    }
-
-    protected function pExpr_StaticCall(Expr\StaticCall $node) {
-        return $this->pStaticDereferenceLhs($node->class) . '::'
-             . ($node->name instanceof Expr
-                ? ($node->name instanceof Expr\Variable
-                   ? $this->p($node->name)
-                   : '{' . $this->p($node->name) . '}')
-                : $node->name)
-             . '(' . $this->pMaybeMultiline($node->args) . ')';
-    }
-
-    protected function pExpr_Empty(Expr\Empty_ $node) {
-        return 'empty(' . $this->p($node->expr) . ')';
-    }
-
-    protected function pExpr_Isset(Expr\Isset_ $node) {
-        return 'isset(' . $this->pCommaSeparated($node->vars) . ')';
-    }
-
-    protected function pExpr_Eval(Expr\Eval_ $node) {
-        return 'eval(' . $this->p($node->expr) . ')';
-    }
-
-    protected function pExpr_Include(Expr\Include_ $node) {
-        static $map = [
-            Expr\Include_::TYPE_INCLUDE      => 'include',
-            Expr\Include_::TYPE_INCLUDE_ONCE => 'include_once',
-            Expr\Include_::TYPE_REQUIRE      => 'require',
-            Expr\Include_::TYPE_REQUIRE_ONCE => 'require_once',
-        ];
-
-        return $map[$node->type] . ' ' . $this->p($node->expr);
-    }
-
-    protected function pExpr_List(Expr\List_ $node) {
-        return 'list(' . $this->pCommaSeparated($node->items) . ')';
-    }
-
-    // Other
-
-    protected function pExpr_Error(Expr\Error $node) {
-        throw new \LogicException('Cannot pretty-print AST with Error nodes');
-    }
-
-    protected function pExpr_Variable(Expr\Variable $node) {
-        if ($node->name instanceof Expr) {
-            return '${' . $this->p($node->name) . '}';
-        } else {
-            return '$' . $node->name;
-        }
-    }
-
-    protected function pExpr_Array(Expr\Array_ $node) {
-        $syntax = $node->getAttribute('kind',
-            $this->options['shortArraySyntax'] ? Expr\Array_::KIND_SHORT : Expr\Array_::KIND_LONG);
-        if ($syntax === Expr\Array_::KIND_SHORT) {
-            return '[' . $this->pMaybeMultiline($node->items, true) . ']';
-        } else {
-            return 'array(' . $this->pMaybeMultiline($node->items, true) . ')';
-        }
-    }
-
-    protected function pExpr_ArrayItem(Expr\ArrayItem $node) {
-        return (null !== $node->key ? $this->p($node->key) . ' => ' : '')
-             . ($node->byRef ? '&' : '')
-             . ($node->unpack ? '...' : '')
-             . $this->p($node->value);
-    }
-
-    protected function pExpr_ArrayDimFetch(Expr\ArrayDimFetch $node) {
-        return $this->pDereferenceLhs($node->var)
-             . '[' . (null !== $node->dim ? $this->p($node->dim) : '') . ']';
-    }
-
-    protected function pExpr_ConstFetch(Expr\ConstFetch $node) {
-        return $this->p($node->name);
-    }
-
-    protected function pExpr_ClassConstFetch(Expr\ClassConstFetch $node) {
-        return $this->pStaticDereferenceLhs($node->class) . '::' . $this->pObjectProperty($node->name);
-    }
-
-    protected function pExpr_PropertyFetch(Expr\PropertyFetch $node) {
-        return $this->pDereferenceLhs($node->var) . '->' . $this->pObjectProperty($node->name);
-    }
-
-    protected function pExpr_NullsafePropertyFetch(Expr\NullsafePropertyFetch $node) {
-        return $this->pDereferenceLhs($node->var) . '?->' . $this->pObjectProperty($node->name);
-    }
-
-    protected function pExpr_StaticPropertyFetch(Expr\StaticPropertyFetch $node) {
-        return $this->pStaticDereferenceLhs($node->class) . '::$' . $this->pObjectProperty($node->name);
-    }
-
-    protected function pExpr_ShellExec(Expr\ShellExec $node) {
-        return '`' . $this->pEncapsList($node->parts, '`') . '`';
-    }
-
-    protected function pExpr_Closure(Expr\Closure $node) {
-        return $this->pAttrGroups($node->attrGroups, true)
-             . ($node->static ? 'static ' : '')
-             . 'function ' . ($node->byRef ? '&' : '')
-             . '(' . $this->pCommaSeparated($node->params) . ')'
-             . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')' : '')
-             . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '')
-             . ' {' . $this->pStmts($node->stmts) . $this->nl . '}';
-    }
-
-    protected function pExpr_Match(Expr\Match_ $node) {
-        return 'match (' . $this->p($node->cond) . ') {'
-            . $this->pCommaSeparatedMultiline($node->arms, true)
-            . $this->nl
-            . '}';
-    }
-
-    protected function pMatchArm(Node\MatchArm $node) {
-        return ($node->conds ? $this->pCommaSeparated($node->conds) : 'default')
-            . ' => ' . $this->p($node->body);
-    }
-
-    protected function pExpr_ArrowFunction(Expr\ArrowFunction $node) {
-        return $this->pAttrGroups($node->attrGroups, true)
-            . ($node->static ? 'static ' : '')
-            . 'fn' . ($node->byRef ? '&' : '')
-            . '(' . $this->pCommaSeparated($node->params) . ')'
-            . (null !== $node->returnType ? ': ' . $this->p($node->returnType) : '')
-            . ' => '
-            . $this->p($node->expr);
-    }
-
-    protected function pExpr_ClosureUse(Expr\ClosureUse $node) {
-        return ($node->byRef ? '&' : '') . $this->p($node->var);
-    }
-
-    protected function pExpr_New(Expr\New_ $node) {
-        if ($node->class instanceof Stmt\Class_) {
-            $args = $node->args ? '(' . $this->pMaybeMultiline($node->args) . ')' : '';
-            return 'new ' . $this->pClassCommon($node->class, $args);
-        }
-        return 'new ' . $this->pNewVariable($node->class)
-            . '(' . $this->pMaybeMultiline($node->args) . ')';
-    }
-
-    protected function pExpr_Clone(Expr\Clone_ $node) {
-        return 'clone ' . $this->p($node->expr);
-    }
-
-    protected function pExpr_Ternary(Expr\Ternary $node) {
-        // a bit of cheating: we treat the ternary as a binary op where the ?...: part is the operator.
-        // this is okay because the part between ? and : never needs parentheses.
-        return $this->pInfixOp(Expr\Ternary::class,
-            $node->cond, ' ?' . (null !== $node->if ? ' ' . $this->p($node->if) . ' ' : '') . ': ', $node->else
-        );
-    }
-
-    protected function pExpr_Exit(Expr\Exit_ $node) {
-        $kind = $node->getAttribute('kind', Expr\Exit_::KIND_DIE);
-        return ($kind === Expr\Exit_::KIND_EXIT ? 'exit' : 'die')
-             . (null !== $node->expr ? '(' . $this->p($node->expr) . ')' : '');
-    }
-
-    protected function pExpr_Throw(Expr\Throw_ $node) {
-        return 'throw ' . $this->p($node->expr);
-    }
-
-    protected function pExpr_Yield(Expr\Yield_ $node) {
-        if ($node->value === null) {
-            return 'yield';
-        } else {
-            // this is a bit ugly, but currently there is no way to detect whether the parentheses are necessary
-            return '(yield '
-                 . ($node->key !== null ? $this->p($node->key) . ' => ' : '')
-                 . $this->p($node->value)
-                 . ')';
-        }
-    }
-
-    // Declarations
-
-    protected function pStmt_Namespace(Stmt\Namespace_ $node) {
-        if ($this->canUseSemicolonNamespaces) {
-            return 'namespace ' . $this->p($node->name) . ';'
-                 . $this->nl . $this->pStmts($node->stmts, false);
-        } else {
-            return 'namespace' . (null !== $node->name ? ' ' . $this->p($node->name) : '')
-                 . ' {' . $this->pStmts($node->stmts) . $this->nl . '}';
-        }
-    }
-
-    protected function pStmt_Use(Stmt\Use_ $node) {
-        return 'use ' . $this->pUseType($node->type)
-             . $this->pCommaSeparated($node->uses) . ';';
-    }
-
-    protected function pStmt_GroupUse(Stmt\GroupUse $node) {
-        return 'use ' . $this->pUseType($node->type) . $this->pName($node->prefix)
-             . '\{' . $this->pCommaSeparated($node->uses) . '};';
-    }
-
-    protected function pStmt_UseUse(Stmt\UseUse $node) {
-        return $this->pUseType($node->type) . $this->p($node->name)
-             . (null !== $node->alias ? ' as ' . $node->alias : '');
-    }
-
-    protected function pUseType($type) {
-        return $type === Stmt\Use_::TYPE_FUNCTION ? 'function '
-            : ($type === Stmt\Use_::TYPE_CONSTANT ? 'const ' : '');
-    }
-
-    protected function pStmt_Interface(Stmt\Interface_ $node) {
-        return $this->pAttrGroups($node->attrGroups)
-             . 'interface ' . $node->name
-             . (!empty($node->extends) ? ' extends ' . $this->pCommaSeparated($node->extends) : '')
-             . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
-    }
-
-    protected function pStmt_Enum(Stmt\Enum_ $node) {
-        return $this->pAttrGroups($node->attrGroups)
-             . 'enum ' . $node->name
-             . ($node->scalarType ? " : $node->scalarType" : '')
-             . (!empty($node->implements) ? ' implements ' . $this->pCommaSeparated($node->implements) : '')
-             . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
-    }
-
-    protected function pStmt_Class(Stmt\Class_ $node) {
-        return $this->pClassCommon($node, ' ' . $node->name);
-    }
-
-    protected function pStmt_Trait(Stmt\Trait_ $node) {
-        return $this->pAttrGroups($node->attrGroups)
-             . 'trait ' . $node->name
-             . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
-    }
-
-    protected function pStmt_EnumCase(Stmt\EnumCase $node) {
-        return $this->pAttrGroups($node->attrGroups)
-             . 'case ' . $node->name
-             . ($node->expr ? ' = ' . $this->p($node->expr) : '')
-             . ';';
-    }
-
-    protected function pStmt_TraitUse(Stmt\TraitUse $node) {
-        return 'use ' . $this->pCommaSeparated($node->traits)
-             . (empty($node->adaptations)
-                ? ';'
-                : ' {' . $this->pStmts($node->adaptations) . $this->nl . '}');
-    }
-
-    protected function pStmt_TraitUseAdaptation_Precedence(Stmt\TraitUseAdaptation\Precedence $node) {
-        return $this->p($node->trait) . '::' . $node->method
-             . ' insteadof ' . $this->pCommaSeparated($node->insteadof) . ';';
-    }
-
-    protected function pStmt_TraitUseAdaptation_Alias(Stmt\TraitUseAdaptation\Alias $node) {
-        return (null !== $node->trait ? $this->p($node->trait) . '::' : '')
-             . $node->method . ' as'
-             . (null !== $node->newModifier ? ' ' . rtrim($this->pModifiers($node->newModifier), ' ') : '')
-             . (null !== $node->newName     ? ' ' . $node->newName                        : '')
-             . ';';
-    }
-
-    protected function pStmt_Property(Stmt\Property $node) {
-        return $this->pAttrGroups($node->attrGroups)
-            . (0 === $node->flags ? 'var ' : $this->pModifiers($node->flags))
-            . ($node->type ? $this->p($node->type) . ' ' : '')
-            . $this->pCommaSeparated($node->props) . ';';
-    }
-
-    protected function pStmt_PropertyProperty(Stmt\PropertyProperty $node) {
-        return '$' . $node->name
-             . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
-    }
-
-    protected function pStmt_ClassMethod(Stmt\ClassMethod $node) {
-        return $this->pAttrGroups($node->attrGroups)
-             . $this->pModifiers($node->flags)
-             . 'function ' . ($node->byRef ? '&' : '') . $node->name
-             . '(' . $this->pMaybeMultiline($node->params) . ')'
-             . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '')
-             . (null !== $node->stmts
-                ? $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}'
-                : ';');
-    }
-
-    protected function pStmt_ClassConst(Stmt\ClassConst $node) {
-        return $this->pAttrGroups($node->attrGroups)
-             . $this->pModifiers($node->flags)
-             . 'const '
-             . (null !== $node->type ? $this->p($node->type) . ' ' : '')
-             . $this->pCommaSeparated($node->consts) . ';';
-    }
-
-    protected function pStmt_Function(Stmt\Function_ $node) {
-        return $this->pAttrGroups($node->attrGroups)
-             . 'function ' . ($node->byRef ? '&' : '') . $node->name
-             . '(' . $this->pCommaSeparated($node->params) . ')'
-             . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '')
-             . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
-    }
-
-    protected function pStmt_Const(Stmt\Const_ $node) {
-        return 'const ' . $this->pCommaSeparated($node->consts) . ';';
-    }
-
-    protected function pStmt_Declare(Stmt\Declare_ $node) {
-        return 'declare (' . $this->pCommaSeparated($node->declares) . ')'
-             . (null !== $node->stmts ? ' {' . $this->pStmts($node->stmts) . $this->nl . '}' : ';');
-    }
-
-    protected function pStmt_DeclareDeclare(Stmt\DeclareDeclare $node) {
-        return $node->key . '=' . $this->p($node->value);
-    }
-
-    // Control flow
-
-    protected function pStmt_If(Stmt\If_ $node) {
-        return 'if (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->stmts) . $this->nl . '}'
-             . ($node->elseifs ? ' ' . $this->pImplode($node->elseifs, ' ') : '')
-             . (null !== $node->else ? ' ' . $this->p($node->else) : '');
-    }
-
-    protected function pStmt_ElseIf(Stmt\ElseIf_ $node) {
-        return 'elseif (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->stmts) . $this->nl . '}';
-    }
-
-    protected function pStmt_Else(Stmt\Else_ $node) {
-        return 'else {' . $this->pStmts($node->stmts) . $this->nl . '}';
-    }
-
-    protected function pStmt_For(Stmt\For_ $node) {
-        return 'for ('
-             . $this->pCommaSeparated($node->init) . ';' . (!empty($node->cond) ? ' ' : '')
-             . $this->pCommaSeparated($node->cond) . ';' . (!empty($node->loop) ? ' ' : '')
-             . $this->pCommaSeparated($node->loop)
-             . ') {' . $this->pStmts($node->stmts) . $this->nl . '}';
-    }
-
-    protected function pStmt_Foreach(Stmt\Foreach_ $node) {
-        return 'foreach (' . $this->p($node->expr) . ' as '
-             . (null !== $node->keyVar ? $this->p($node->keyVar) . ' => ' : '')
-             . ($node->byRef ? '&' : '') . $this->p($node->valueVar) . ') {'
-             . $this->pStmts($node->stmts) . $this->nl . '}';
-    }
-
-    protected function pStmt_While(Stmt\While_ $node) {
-        return 'while (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->stmts) . $this->nl . '}';
-    }
-
-    protected function pStmt_Do(Stmt\Do_ $node) {
-        return 'do {' . $this->pStmts($node->stmts) . $this->nl
-             . '} while (' . $this->p($node->cond) . ');';
-    }
-
-    protected function pStmt_Switch(Stmt\Switch_ $node) {
-        return 'switch (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->cases) . $this->nl . '}';
-    }
-
-    protected function pStmt_Case(Stmt\Case_ $node) {
-        return (null !== $node->cond ? 'case ' . $this->p($node->cond) : 'default') . ':'
-             . $this->pStmts($node->stmts);
-    }
-
-    protected function pStmt_TryCatch(Stmt\TryCatch $node) {
-        return 'try {' . $this->pStmts($node->stmts) . $this->nl . '}'
-             . ($node->catches ? ' ' . $this->pImplode($node->catches, ' ') : '')
-             . ($node->finally !== null ? ' ' . $this->p($node->finally) : '');
-    }
-
-    protected function pStmt_Catch(Stmt\Catch_ $node) {
-        return 'catch (' . $this->pImplode($node->types, '|')
-             . ($node->var !== null ? ' ' . $this->p($node->var) : '')
-             . ') {' . $this->pStmts($node->stmts) . $this->nl . '}';
-    }
-
-    protected function pStmt_Finally(Stmt\Finally_ $node) {
-        return 'finally {' . $this->pStmts($node->stmts) . $this->nl . '}';
-    }
-
-    protected function pStmt_Break(Stmt\Break_ $node) {
-        return 'break' . ($node->num !== null ? ' ' . $this->p($node->num) : '') . ';';
-    }
-
-    protected function pStmt_Continue(Stmt\Continue_ $node) {
-        return 'continue' . ($node->num !== null ? ' ' . $this->p($node->num) : '') . ';';
-    }
-
-    protected function pStmt_Return(Stmt\Return_ $node) {
-        return 'return' . (null !== $node->expr ? ' ' . $this->p($node->expr) : '') . ';';
-    }
-
-    protected function pStmt_Throw(Stmt\Throw_ $node) {
-        return 'throw ' . $this->p($node->expr) . ';';
-    }
-
-    protected function pStmt_Label(Stmt\Label $node) {
-        return $node->name . ':';
-    }
-
-    protected function pStmt_Goto(Stmt\Goto_ $node) {
-        return 'goto ' . $node->name . ';';
-    }
-
-    // Other
-
-    protected function pStmt_Expression(Stmt\Expression $node) {
-        return $this->p($node->expr) . ';';
-    }
-
-    protected function pStmt_Echo(Stmt\Echo_ $node) {
-        return 'echo ' . $this->pCommaSeparated($node->exprs) . ';';
-    }
-
-    protected function pStmt_Static(Stmt\Static_ $node) {
-        return 'static ' . $this->pCommaSeparated($node->vars) . ';';
-    }
-
-    protected function pStmt_Global(Stmt\Global_ $node) {
-        return 'global ' . $this->pCommaSeparated($node->vars) . ';';
-    }
-
-    protected function pStmt_StaticVar(Stmt\StaticVar $node) {
-        return $this->p($node->var)
-             . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
-    }
-
-    protected function pStmt_Unset(Stmt\Unset_ $node) {
-        return 'unset(' . $this->pCommaSeparated($node->vars) . ');';
-    }
-
-    protected function pStmt_InlineHTML(Stmt\InlineHTML $node) {
-        $newline = $node->getAttribute('hasLeadingNewline', true) ? "\n" : '';
-        return '?>' . $newline . $node->value . '<?php ';
-    }
-
-    protected function pStmt_HaltCompiler(Stmt\HaltCompiler $node) {
-        return '__halt_compiler();' . $node->remaining;
-    }
-
-    protected function pStmt_Nop(Stmt\Nop $node) {
-        return '';
-    }
-
-    // Helpers
-
-    protected function pClassCommon(Stmt\Class_ $node, $afterClassToken) {
-        return $this->pAttrGroups($node->attrGroups, $node->name === null)
-            . $this->pModifiers($node->flags)
-            . 'class' . $afterClassToken
-            . (null !== $node->extends ? ' extends ' . $this->p($node->extends) : '')
-            . (!empty($node->implements) ? ' implements ' . $this->pCommaSeparated($node->implements) : '')
-            . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
-    }
-
-    protected function pObjectProperty($node) {
-        if ($node instanceof Expr) {
-            return '{' . $this->p($node) . '}';
-        } else {
-            return $node;
-        }
-    }
-
-    protected function pEncapsList(array $encapsList, $quote) {
-        $return = '';
-        foreach ($encapsList as $element) {
-            if ($element instanceof Scalar\EncapsedStringPart) {
-                $return .= $this->escapeString($element->value, $quote);
-            } else {
-                $return .= '{' . $this->p($element) . '}';
-            }
-        }
-
-        return $return;
-    }
-
-    protected function pSingleQuotedString(string $string) {
-        return '\'' . addcslashes($string, '\'\\') . '\'';
-    }
-
-    protected function escapeString($string, $quote) {
-        if (null === $quote) {
-            // For doc strings, don't escape newlines
-            $escaped = addcslashes($string, "\t\f\v$\\");
-        } else {
-            $escaped = addcslashes($string, "\n\r\t\f\v$" . $quote . "\\");
-        }
-
-        // Escape control characters and non-UTF-8 characters.
-        // Regex based on https://stackoverflow.com/a/11709412/385378.
-        $regex = '/(
+	protected function pExpr_BinaryOp_BitwiseOr(BinaryOp\BitwiseOr $node) {
+		return $this->pInfixOp(BinaryOp\BitwiseOr::class, $node->left, ' | ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_BitwiseXor(BinaryOp\BitwiseXor $node) {
+		return $this->pInfixOp(BinaryOp\BitwiseXor::class, $node->left, ' ^ ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_ShiftLeft(BinaryOp\ShiftLeft $node) {
+		return $this->pInfixOp(BinaryOp\ShiftLeft::class, $node->left, ' << ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_ShiftRight(BinaryOp\ShiftRight $node) {
+		return $this->pInfixOp(BinaryOp\ShiftRight::class, $node->left, ' >> ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_Pow(BinaryOp\Pow $node) {
+		return $this->pInfixOp(BinaryOp\Pow::class, $node->left, ' ** ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_LogicalAnd(BinaryOp\LogicalAnd $node) {
+		return $this->pInfixOp(BinaryOp\LogicalAnd::class, $node->left, ' and ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_LogicalOr(BinaryOp\LogicalOr $node) {
+		return $this->pInfixOp(BinaryOp\LogicalOr::class, $node->left, ' or ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_LogicalXor(BinaryOp\LogicalXor $node) {
+		return $this->pInfixOp(BinaryOp\LogicalXor::class, $node->left, ' xor ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_Equal(BinaryOp\Equal $node) {
+		return $this->pInfixOp(BinaryOp\Equal::class, $node->left, ' == ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_NotEqual(BinaryOp\NotEqual $node) {
+		return $this->pInfixOp(BinaryOp\NotEqual::class, $node->left, ' != ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_Identical(BinaryOp\Identical $node) {
+		return $this->pInfixOp(BinaryOp\Identical::class, $node->left, ' === ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_NotIdentical(BinaryOp\NotIdentical $node) {
+		return $this->pInfixOp(BinaryOp\NotIdentical::class, $node->left, ' !== ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_Spaceship(BinaryOp\Spaceship $node) {
+		return $this->pInfixOp(BinaryOp\Spaceship::class, $node->left, ' <=> ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_Greater(BinaryOp\Greater $node) {
+		return $this->pInfixOp(BinaryOp\Greater::class, $node->left, ' > ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_GreaterOrEqual(BinaryOp\GreaterOrEqual $node) {
+		return $this->pInfixOp(BinaryOp\GreaterOrEqual::class, $node->left, ' >= ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_Smaller(BinaryOp\Smaller $node) {
+		return $this->pInfixOp(BinaryOp\Smaller::class, $node->left, ' < ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_SmallerOrEqual(BinaryOp\SmallerOrEqual $node) {
+		return $this->pInfixOp(BinaryOp\SmallerOrEqual::class, $node->left, ' <= ', $node->right);
+	}
+
+	protected function pExpr_BinaryOp_Coalesce(BinaryOp\Coalesce $node) {
+		return $this->pInfixOp(BinaryOp\Coalesce::class, $node->left, ' ?? ', $node->right);
+	}
+
+	protected function pExpr_Instanceof(Expr\Instanceof_ $node) {
+		list($precedence, $associativity) = $this->precedenceMap[Expr\Instanceof_::class];
+		return $this->pPrec($node->expr, $precedence, $associativity, -1)
+			 . ' instanceof '
+			 . $this->pNewVariable($node->class);
+	}
+
+	// Unary expressions
+
+	protected function pExpr_BooleanNot(Expr\BooleanNot $node) {
+		return $this->pPrefixOp(Expr\BooleanNot::class, '!', $node->expr);
+	}
+
+	protected function pExpr_BitwiseNot(Expr\BitwiseNot $node) {
+		return $this->pPrefixOp(Expr\BitwiseNot::class, '~', $node->expr);
+	}
+
+	protected function pExpr_UnaryMinus(Expr\UnaryMinus $node) {
+		if ($node->expr instanceof Expr\UnaryMinus || $node->expr instanceof Expr\PreDec) {
+			// Enforce -(-$expr) instead of --$expr
+			return '-(' . $this->p($node->expr) . ')';
+		}
+		return $this->pPrefixOp(Expr\UnaryMinus::class, '-', $node->expr);
+	}
+
+	protected function pExpr_UnaryPlus(Expr\UnaryPlus $node) {
+		if ($node->expr instanceof Expr\UnaryPlus || $node->expr instanceof Expr\PreInc) {
+			// Enforce +(+$expr) instead of ++$expr
+			return '+(' . $this->p($node->expr) . ')';
+		}
+		return $this->pPrefixOp(Expr\UnaryPlus::class, '+', $node->expr);
+	}
+
+	protected function pExpr_PreInc(Expr\PreInc $node) {
+		return $this->pPrefixOp(Expr\PreInc::class, '++', $node->var);
+	}
+
+	protected function pExpr_PreDec(Expr\PreDec $node) {
+		return $this->pPrefixOp(Expr\PreDec::class, '--', $node->var);
+	}
+
+	protected function pExpr_PostInc(Expr\PostInc $node) {
+		return $this->pPostfixOp(Expr\PostInc::class, $node->var, '++');
+	}
+
+	protected function pExpr_PostDec(Expr\PostDec $node) {
+		return $this->pPostfixOp(Expr\PostDec::class, $node->var, '--');
+	}
+
+	protected function pExpr_ErrorSuppress(Expr\ErrorSuppress $node) {
+		return $this->pPrefixOp(Expr\ErrorSuppress::class, '@', $node->expr);
+	}
+
+	protected function pExpr_YieldFrom(Expr\YieldFrom $node) {
+		return $this->pPrefixOp(Expr\YieldFrom::class, 'yield from ', $node->expr);
+	}
+
+	protected function pExpr_Print(Expr\Print_ $node) {
+		return $this->pPrefixOp(Expr\Print_::class, 'print ', $node->expr);
+	}
+
+	// Casts
+
+	protected function pExpr_Cast_Int(Cast\Int_ $node) {
+		return $this->pPrefixOp(Cast\Int_::class, '(int) ', $node->expr);
+	}
+
+	protected function pExpr_Cast_Double(Cast\Double $node) {
+		$kind = $node->getAttribute('kind', Cast\Double::KIND_DOUBLE);
+		if ($kind === Cast\Double::KIND_DOUBLE) {
+			$cast = '(double)';
+		} elseif ($kind === Cast\Double::KIND_FLOAT) {
+			$cast = '(float)';
+		} elseif ($kind === Cast\Double::KIND_REAL) {
+			$cast = '(real)';
+		}
+		return $this->pPrefixOp(Cast\Double::class, $cast . ' ', $node->expr);
+	}
+
+	protected function pExpr_Cast_String(Cast\String_ $node) {
+		return $this->pPrefixOp(Cast\String_::class, '(string) ', $node->expr);
+	}
+
+	protected function pExpr_Cast_Array(Cast\Array_ $node) {
+		return $this->pPrefixOp(Cast\Array_::class, '(array) ', $node->expr);
+	}
+
+	protected function pExpr_Cast_Object(Cast\Object_ $node) {
+		return $this->pPrefixOp(Cast\Object_::class, '(object) ', $node->expr);
+	}
+
+	protected function pExpr_Cast_Bool(Cast\Bool_ $node) {
+		return $this->pPrefixOp(Cast\Bool_::class, '(bool) ', $node->expr);
+	}
+
+	protected function pExpr_Cast_Unset(Cast\Unset_ $node) {
+		return $this->pPrefixOp(Cast\Unset_::class, '(unset) ', $node->expr);
+	}
+
+	// Function calls and similar constructs
+
+	protected function pExpr_FuncCall(Expr\FuncCall $node) {
+		return $this->pCallLhs($node->name)
+			 . '(' . $this->pMaybeMultiline($node->args) . ')';
+	}
+
+	protected function pExpr_MethodCall(Expr\MethodCall $node) {
+		return $this->pDereferenceLhs($node->var) . '->' . $this->pObjectProperty($node->name)
+			 . '(' . $this->pMaybeMultiline($node->args) . ')';
+	}
+
+	protected function pExpr_NullsafeMethodCall(Expr\NullsafeMethodCall $node) {
+		return $this->pDereferenceLhs($node->var) . '?->' . $this->pObjectProperty($node->name)
+			. '(' . $this->pMaybeMultiline($node->args) . ')';
+	}
+
+	protected function pExpr_StaticCall(Expr\StaticCall $node) {
+		return $this->pStaticDereferenceLhs($node->class) . '::'
+			 . ($node->name instanceof Expr
+				? ($node->name instanceof Expr\Variable
+				   ? $this->p($node->name)
+				   : '{' . $this->p($node->name) . '}')
+				: $node->name)
+			 . '(' . $this->pMaybeMultiline($node->args) . ')';
+	}
+
+	protected function pExpr_Empty(Expr\Empty_ $node) {
+		return 'empty(' . $this->p($node->expr) . ')';
+	}
+
+	protected function pExpr_Isset(Expr\Isset_ $node) {
+		return 'isset(' . $this->pCommaSeparated($node->vars) . ')';
+	}
+
+	protected function pExpr_Eval(Expr\Eval_ $node) {
+		return 'eval(' . $this->p($node->expr) . ')';
+	}
+
+	protected function pExpr_Include(Expr\Include_ $node) {
+		static $map = [
+			Expr\Include_::TYPE_INCLUDE      => 'include',
+			Expr\Include_::TYPE_INCLUDE_ONCE => 'include_once',
+			Expr\Include_::TYPE_REQUIRE      => 'require',
+			Expr\Include_::TYPE_REQUIRE_ONCE => 'require_once',
+		];
+
+		return $map[$node->type] . ' ' . $this->p($node->expr);
+	}
+
+	protected function pExpr_List(Expr\List_ $node) {
+		return 'list(' . $this->pCommaSeparated($node->items) . ')';
+	}
+
+	// Other
+
+	protected function pExpr_Error(Expr\Error $node) {
+		throw new \LogicException('Cannot pretty-print AST with Error nodes');
+	}
+
+	protected function pExpr_Variable(Expr\Variable $node) {
+		if ($node->name instanceof Expr) {
+			return '${' . $this->p($node->name) . '}';
+		} else {
+			return '$' . $node->name;
+		}
+	}
+
+	protected function pExpr_Array(Expr\Array_ $node) {
+		$syntax = $node->getAttribute('kind',
+			$this->options['shortArraySyntax'] ? Expr\Array_::KIND_SHORT : Expr\Array_::KIND_LONG);
+		if ($syntax === Expr\Array_::KIND_SHORT) {
+			return '[' . $this->pMaybeMultiline($node->items, true) . ']';
+		} else {
+			return 'array(' . $this->pMaybeMultiline($node->items, true) . ')';
+		}
+	}
+
+	protected function pExpr_ArrayItem(Expr\ArrayItem $node) {
+		return (null !== $node->key ? $this->p($node->key) . ' => ' : '')
+			 . ($node->byRef ? '&' : '')
+			 . ($node->unpack ? '...' : '')
+			 . $this->p($node->value);
+	}
+
+	protected function pExpr_ArrayDimFetch(Expr\ArrayDimFetch $node) {
+		return $this->pDereferenceLhs($node->var)
+			 . '[' . (null !== $node->dim ? $this->p($node->dim) : '') . ']';
+	}
+
+	protected function pExpr_ConstFetch(Expr\ConstFetch $node) {
+		return $this->p($node->name);
+	}
+
+	protected function pExpr_ClassConstFetch(Expr\ClassConstFetch $node) {
+		return $this->pStaticDereferenceLhs($node->class) . '::' . $this->pObjectProperty($node->name);
+	}
+
+	protected function pExpr_PropertyFetch(Expr\PropertyFetch $node) {
+		return $this->pDereferenceLhs($node->var) . '->' . $this->pObjectProperty($node->name);
+	}
+
+	protected function pExpr_NullsafePropertyFetch(Expr\NullsafePropertyFetch $node) {
+		return $this->pDereferenceLhs($node->var) . '?->' . $this->pObjectProperty($node->name);
+	}
+
+	protected function pExpr_StaticPropertyFetch(Expr\StaticPropertyFetch $node) {
+		return $this->pStaticDereferenceLhs($node->class) . '::$' . $this->pObjectProperty($node->name);
+	}
+
+	protected function pExpr_ShellExec(Expr\ShellExec $node) {
+		return '`' . $this->pEncapsList($node->parts, '`') . '`';
+	}
+
+	protected function pExpr_Closure(Expr\Closure $node) {
+		return $this->pAttrGroups($node->attrGroups, true)
+			 . ($node->static ? 'static ' : '')
+			 . 'function ' . ($node->byRef ? '&' : '')
+			 . '(' . $this->pCommaSeparated($node->params) . ')'
+			 . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')' : '')
+			 . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '')
+			 . ' {' . $this->pStmts($node->stmts) . $this->nl . '}';
+	}
+
+	protected function pExpr_Match(Expr\Match_ $node) {
+		return 'match (' . $this->p($node->cond) . ') {'
+			. $this->pCommaSeparatedMultiline($node->arms, true)
+			. $this->nl
+			. '}';
+	}
+
+	protected function pMatchArm(Node\MatchArm $node) {
+		return ($node->conds ? $this->pCommaSeparated($node->conds) : 'default')
+			. ' => ' . $this->p($node->body);
+	}
+
+	protected function pExpr_ArrowFunction(Expr\ArrowFunction $node) {
+		return $this->pAttrGroups($node->attrGroups, true)
+			. ($node->static ? 'static ' : '')
+			. 'fn' . ($node->byRef ? '&' : '')
+			. '(' . $this->pCommaSeparated($node->params) . ')'
+			. (null !== $node->returnType ? ': ' . $this->p($node->returnType) : '')
+			. ' => '
+			. $this->p($node->expr);
+	}
+
+	protected function pExpr_ClosureUse(Expr\ClosureUse $node) {
+		return ($node->byRef ? '&' : '') . $this->p($node->var);
+	}
+
+	protected function pExpr_New(Expr\New_ $node) {
+		if ($node->class instanceof Stmt\Class_) {
+			$args = $node->args ? '(' . $this->pMaybeMultiline($node->args) . ')' : '';
+			return 'new ' . $this->pClassCommon($node->class, $args);
+		}
+		return 'new ' . $this->pNewVariable($node->class)
+			. '(' . $this->pMaybeMultiline($node->args) . ')';
+	}
+
+	protected function pExpr_Clone(Expr\Clone_ $node) {
+		return 'clone ' . $this->p($node->expr);
+	}
+
+	protected function pExpr_Ternary(Expr\Ternary $node) {
+		// a bit of cheating: we treat the ternary as a binary op where the ?...: part is the operator.
+		// this is okay because the part between ? and : never needs parentheses.
+		return $this->pInfixOp(Expr\Ternary::class,
+			$node->cond, ' ?' . (null !== $node->if ? ' ' . $this->p($node->if) . ' ' : '') . ': ', $node->else
+		);
+	}
+
+	protected function pExpr_Exit(Expr\Exit_ $node) {
+		$kind = $node->getAttribute('kind', Expr\Exit_::KIND_DIE);
+		return ($kind === Expr\Exit_::KIND_EXIT ? 'exit' : 'die')
+			 . (null !== $node->expr ? '(' . $this->p($node->expr) . ')' : '');
+	}
+
+	protected function pExpr_Throw(Expr\Throw_ $node) {
+		return 'throw ' . $this->p($node->expr);
+	}
+
+	protected function pExpr_Yield(Expr\Yield_ $node) {
+		if ($node->value === null) {
+			return 'yield';
+		} else {
+			// this is a bit ugly, but currently there is no way to detect whether the parentheses are necessary
+			return '(yield '
+				 . ($node->key !== null ? $this->p($node->key) . ' => ' : '')
+				 . $this->p($node->value)
+				 . ')';
+		}
+	}
+
+	// Declarations
+
+	protected function pStmt_Namespace(Stmt\Namespace_ $node) {
+		if ($this->canUseSemicolonNamespaces) {
+			return 'namespace ' . $this->p($node->name) . ';'
+				 . $this->nl . $this->pStmts($node->stmts, false);
+		} else {
+			return 'namespace' . (null !== $node->name ? ' ' . $this->p($node->name) : '')
+				 . ' {' . $this->pStmts($node->stmts) . $this->nl . '}';
+		}
+	}
+
+	protected function pStmt_Use(Stmt\Use_ $node) {
+		return 'use ' . $this->pUseType($node->type)
+			 . $this->pCommaSeparated($node->uses) . ';';
+	}
+
+	protected function pStmt_GroupUse(Stmt\GroupUse $node) {
+		return 'use ' . $this->pUseType($node->type) . $this->pName($node->prefix)
+			 . '\{' . $this->pCommaSeparated($node->uses) . '};';
+	}
+
+	protected function pStmt_UseUse(Stmt\UseUse $node) {
+		return $this->pUseType($node->type) . $this->p($node->name)
+			 . (null !== $node->alias ? ' as ' . $node->alias : '');
+	}
+
+	protected function pUseType($type) {
+		return $type === Stmt\Use_::TYPE_FUNCTION ? 'function '
+			: ($type === Stmt\Use_::TYPE_CONSTANT ? 'const ' : '');
+	}
+
+	protected function pStmt_Interface(Stmt\Interface_ $node) {
+		return $this->pAttrGroups($node->attrGroups)
+			 . 'interface ' . $node->name
+			 . (!empty($node->extends) ? ' extends ' . $this->pCommaSeparated($node->extends) : '')
+			 . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
+	}
+
+	protected function pStmt_Enum(Stmt\Enum_ $node) {
+		return $this->pAttrGroups($node->attrGroups)
+			 . 'enum ' . $node->name
+			 . ($node->scalarType ? " : $node->scalarType" : '')
+			 . (!empty($node->implements) ? ' implements ' . $this->pCommaSeparated($node->implements) : '')
+			 . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
+	}
+
+	protected function pStmt_Class(Stmt\Class_ $node) {
+		return $this->pClassCommon($node, ' ' . $node->name);
+	}
+
+	protected function pStmt_Trait(Stmt\Trait_ $node) {
+		return $this->pAttrGroups($node->attrGroups)
+			 . 'trait ' . $node->name
+			 . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
+	}
+
+	protected function pStmt_EnumCase(Stmt\EnumCase $node) {
+		return $this->pAttrGroups($node->attrGroups)
+			 . 'case ' . $node->name
+			 . ($node->expr ? ' = ' . $this->p($node->expr) : '')
+			 . ';';
+	}
+
+	protected function pStmt_TraitUse(Stmt\TraitUse $node) {
+		return 'use ' . $this->pCommaSeparated($node->traits)
+			 . (empty($node->adaptations)
+				? ';'
+				: ' {' . $this->pStmts($node->adaptations) . $this->nl . '}');
+	}
+
+	protected function pStmt_TraitUseAdaptation_Precedence(Stmt\TraitUseAdaptation\Precedence $node) {
+		return $this->p($node->trait) . '::' . $node->method
+			 . ' insteadof ' . $this->pCommaSeparated($node->insteadof) . ';';
+	}
+
+	protected function pStmt_TraitUseAdaptation_Alias(Stmt\TraitUseAdaptation\Alias $node) {
+		return (null !== $node->trait ? $this->p($node->trait) . '::' : '')
+			 . $node->method . ' as'
+			 . (null !== $node->newModifier ? ' ' . rtrim($this->pModifiers($node->newModifier), ' ') : '')
+			 . (null !== $node->newName     ? ' ' . $node->newName                        : '')
+			 . ';';
+	}
+
+	protected function pStmt_Property(Stmt\Property $node) {
+		return $this->pAttrGroups($node->attrGroups)
+			. (0 === $node->flags ? 'var ' : $this->pModifiers($node->flags))
+			. ($node->type ? $this->p($node->type) . ' ' : '')
+			. $this->pCommaSeparated($node->props) . ';';
+	}
+
+	protected function pStmt_PropertyProperty(Stmt\PropertyProperty $node) {
+		return '$' . $node->name
+			 . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
+	}
+
+	protected function pStmt_ClassMethod(Stmt\ClassMethod $node) {
+		return $this->pAttrGroups($node->attrGroups)
+			 . $this->pModifiers($node->flags)
+			 . 'function ' . ($node->byRef ? '&' : '') . $node->name
+			 . '(' . $this->pMaybeMultiline($node->params) . ')'
+			 . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '')
+			 . (null !== $node->stmts
+				? $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}'
+				: ';');
+	}
+
+	protected function pStmt_ClassConst(Stmt\ClassConst $node) {
+		return $this->pAttrGroups($node->attrGroups)
+			 . $this->pModifiers($node->flags)
+			 . 'const '
+			 . (null !== $node->type ? $this->p($node->type) . ' ' : '')
+			 . $this->pCommaSeparated($node->consts) . ';';
+	}
+
+	protected function pStmt_Function(Stmt\Function_ $node) {
+		return $this->pAttrGroups($node->attrGroups)
+			 . 'function ' . ($node->byRef ? '&' : '') . $node->name
+			 . '(' . $this->pCommaSeparated($node->params) . ')'
+			 . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '')
+			 . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
+	}
+
+	protected function pStmt_Const(Stmt\Const_ $node) {
+		return 'const ' . $this->pCommaSeparated($node->consts) . ';';
+	}
+
+	protected function pStmt_Declare(Stmt\Declare_ $node) {
+		return 'declare (' . $this->pCommaSeparated($node->declares) . ')'
+			 . (null !== $node->stmts ? ' {' . $this->pStmts($node->stmts) . $this->nl . '}' : ';');
+	}
+
+	protected function pStmt_DeclareDeclare(Stmt\DeclareDeclare $node) {
+		return $node->key . '=' . $this->p($node->value);
+	}
+
+	// Control flow
+
+	protected function pStmt_If(Stmt\If_ $node) {
+		return 'if (' . $this->p($node->cond) . ') {'
+			 . $this->pStmts($node->stmts) . $this->nl . '}'
+			 . ($node->elseifs ? ' ' . $this->pImplode($node->elseifs, ' ') : '')
+			 . (null !== $node->else ? ' ' . $this->p($node->else) : '');
+	}
+
+	protected function pStmt_ElseIf(Stmt\ElseIf_ $node) {
+		return 'elseif (' . $this->p($node->cond) . ') {'
+			 . $this->pStmts($node->stmts) . $this->nl . '}';
+	}
+
+	protected function pStmt_Else(Stmt\Else_ $node) {
+		return 'else {' . $this->pStmts($node->stmts) . $this->nl . '}';
+	}
+
+	protected function pStmt_For(Stmt\For_ $node) {
+		return 'for ('
+			 . $this->pCommaSeparated($node->init) . ';' . (!empty($node->cond) ? ' ' : '')
+			 . $this->pCommaSeparated($node->cond) . ';' . (!empty($node->loop) ? ' ' : '')
+			 . $this->pCommaSeparated($node->loop)
+			 . ') {' . $this->pStmts($node->stmts) . $this->nl . '}';
+	}
+
+	protected function pStmt_Foreach(Stmt\Foreach_ $node) {
+		return 'foreach (' . $this->p($node->expr) . ' as '
+			 . (null !== $node->keyVar ? $this->p($node->keyVar) . ' => ' : '')
+			 . ($node->byRef ? '&' : '') . $this->p($node->valueVar) . ') {'
+			 . $this->pStmts($node->stmts) . $this->nl . '}';
+	}
+
+	protected function pStmt_While(Stmt\While_ $node) {
+		return 'while (' . $this->p($node->cond) . ') {'
+			 . $this->pStmts($node->stmts) . $this->nl . '}';
+	}
+
+	protected function pStmt_Do(Stmt\Do_ $node) {
+		return 'do {' . $this->pStmts($node->stmts) . $this->nl
+			 . '} while (' . $this->p($node->cond) . ');';
+	}
+
+	protected function pStmt_Switch(Stmt\Switch_ $node) {
+		return 'switch (' . $this->p($node->cond) . ') {'
+			 . $this->pStmts($node->cases) . $this->nl . '}';
+	}
+
+	protected function pStmt_Case(Stmt\Case_ $node) {
+		return (null !== $node->cond ? 'case ' . $this->p($node->cond) : 'default') . ':'
+			 . $this->pStmts($node->stmts);
+	}
+
+	protected function pStmt_TryCatch(Stmt\TryCatch $node) {
+		return 'try {' . $this->pStmts($node->stmts) . $this->nl . '}'
+			 . ($node->catches ? ' ' . $this->pImplode($node->catches, ' ') : '')
+			 . ($node->finally !== null ? ' ' . $this->p($node->finally) : '');
+	}
+
+	protected function pStmt_Catch(Stmt\Catch_ $node) {
+		return 'catch (' . $this->pImplode($node->types, '|')
+			 . ($node->var !== null ? ' ' . $this->p($node->var) : '')
+			 . ') {' . $this->pStmts($node->stmts) . $this->nl . '}';
+	}
+
+	protected function pStmt_Finally(Stmt\Finally_ $node) {
+		return 'finally {' . $this->pStmts($node->stmts) . $this->nl . '}';
+	}
+
+	protected function pStmt_Break(Stmt\Break_ $node) {
+		return 'break' . ($node->num !== null ? ' ' . $this->p($node->num) : '') . ';';
+	}
+
+	protected function pStmt_Continue(Stmt\Continue_ $node) {
+		return 'continue' . ($node->num !== null ? ' ' . $this->p($node->num) : '') . ';';
+	}
+
+	protected function pStmt_Return(Stmt\Return_ $node) {
+		return 'return' . (null !== $node->expr ? ' ' . $this->p($node->expr) : '') . ';';
+	}
+
+	protected function pStmt_Throw(Stmt\Throw_ $node) {
+		return 'throw ' . $this->p($node->expr) . ';';
+	}
+
+	protected function pStmt_Label(Stmt\Label $node) {
+		return $node->name . ':';
+	}
+
+	protected function pStmt_Goto(Stmt\Goto_ $node) {
+		return 'goto ' . $node->name . ';';
+	}
+
+	// Other
+
+	protected function pStmt_Expression(Stmt\Expression $node) {
+		return $this->p($node->expr) . ';';
+	}
+
+	protected function pStmt_Echo(Stmt\Echo_ $node) {
+		return 'echo ' . $this->pCommaSeparated($node->exprs) . ';';
+	}
+
+	protected function pStmt_Static(Stmt\Static_ $node) {
+		return 'static ' . $this->pCommaSeparated($node->vars) . ';';
+	}
+
+	protected function pStmt_Global(Stmt\Global_ $node) {
+		return 'global ' . $this->pCommaSeparated($node->vars) . ';';
+	}
+
+	protected function pStmt_StaticVar(Stmt\StaticVar $node) {
+		return $this->p($node->var)
+			 . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
+	}
+
+	protected function pStmt_Unset(Stmt\Unset_ $node) {
+		return 'unset(' . $this->pCommaSeparated($node->vars) . ');';
+	}
+
+	protected function pStmt_InlineHTML(Stmt\InlineHTML $node) {
+		$newline = $node->getAttribute('hasLeadingNewline', true) ? "\n" : '';
+		return '?>' . $newline . $node->value . '<?php ';
+	}
+
+	protected function pStmt_HaltCompiler(Stmt\HaltCompiler $node) {
+		return '__halt_compiler();' . $node->remaining;
+	}
+
+	protected function pStmt_Nop(Stmt\Nop $node) {
+		return '';
+	}
+
+	// Helpers
+
+	protected function pClassCommon(Stmt\Class_ $node, $afterClassToken) {
+		return $this->pAttrGroups($node->attrGroups, $node->name === null)
+			. $this->pModifiers($node->flags)
+			. 'class' . $afterClassToken
+			. (null !== $node->extends ? ' extends ' . $this->p($node->extends) : '')
+			. (!empty($node->implements) ? ' implements ' . $this->pCommaSeparated($node->implements) : '')
+			. $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
+	}
+
+	protected function pObjectProperty($node) {
+		if ($node instanceof Expr) {
+			return '{' . $this->p($node) . '}';
+		} else {
+			return $node;
+		}
+	}
+
+	protected function pEncapsList(array $encapsList, $quote) {
+		$return = '';
+		foreach ($encapsList as $element) {
+			if ($element instanceof Scalar\EncapsedStringPart) {
+				$return .= $this->escapeString($element->value, $quote);
+			} else {
+				$return .= '{' . $this->p($element) . '}';
+			}
+		}
+
+		return $return;
+	}
+
+	protected function pSingleQuotedString(string $string) {
+		return '\'' . addcslashes($string, '\'\\') . '\'';
+	}
+
+	protected function escapeString($string, $quote) {
+		if (null === $quote) {
+			// For doc strings, don't escape newlines
+			$escaped = addcslashes($string, "\t\f\v$\\");
+		} else {
+			$escaped = addcslashes($string, "\n\r\t\f\v$" . $quote . "\\");
+		}
+
+		// Escape control characters and non-UTF-8 characters.
+		// Regex based on https://stackoverflow.com/a/11709412/385378.
+		$regex = '/(
               [\x00-\x08\x0E-\x1F] # Control characters
             | [\xC0-\xC1] # Invalid UTF-8 Bytes
             | [\xF5-\xFF] # Invalid UTF-8 Bytes
@@ -1034,93 +1034,93 @@ 
             | (?<=[\xF0-\xF4])[\x80-\xBF](?![\x80-\xBF]{2}) # Short 4 byte sequence
             | (?<=[\xF0-\xF4][\x80-\xBF])[\x80-\xBF](?![\x80-\xBF]) # Short 4 byte sequence (2)
         )/x';
-        return preg_replace_callback($regex, function ($matches) {
-            assert(strlen($matches[0]) === 1);
-            $hex = dechex(ord($matches[0]));;
-            return '\\x' . str_pad($hex, 2, '0', \STR_PAD_LEFT);
-        }, $escaped);
-    }
-
-    protected function containsEndLabel($string, $label, $atStart = true, $atEnd = true) {
-        $start = $atStart ? '(?:^|[\r\n])' : '[\r\n]';
-        $end = $atEnd ? '(?:$|[;\r\n])' : '[;\r\n]';
-        return false !== strpos($string, $label)
-            && preg_match('/' . $start . $label . $end . '/', $string);
-    }
-
-    protected function encapsedContainsEndLabel(array $parts, $label) {
-        foreach ($parts as $i => $part) {
-            $atStart = $i === 0;
-            $atEnd = $i === count($parts) - 1;
-            if ($part instanceof Scalar\EncapsedStringPart
-                && $this->containsEndLabel($part->value, $label, $atStart, $atEnd)
-            ) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    protected function pDereferenceLhs(Node $node) {
-        if (!$this->dereferenceLhsRequiresParens($node)) {
-            return $this->p($node);
-        } else  {
-            return '(' . $this->p($node) . ')';
-        }
-    }
-
-    protected function pStaticDereferenceLhs(Node $node) {
-        if (!$this->staticDereferenceLhsRequiresParens($node)) {
-            return $this->p($node);
-        } else {
-            return '(' . $this->p($node) . ')';
-        }
-    }
-
-    protected function pCallLhs(Node $node) {
-        if (!$this->callLhsRequiresParens($node)) {
-            return $this->p($node);
-        } else  {
-            return '(' . $this->p($node) . ')';
-        }
-    }
-
-    protected function pNewVariable(Node $node): string {
-        if (!$this->newOperandRequiresParens($node)) {
-            return $this->p($node);
-        } else {
-            return '(' . $this->p($node) . ')';
-        }
-    }
-
-    /**
-     * @param Node[] $nodes
-     * @return bool
-     */
-    protected function hasNodeWithComments(array $nodes) {
-        foreach ($nodes as $node) {
-            if ($node && $node->getComments()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    protected function pMaybeMultiline(array $nodes, bool $trailingComma = false) {
-        if (!$this->hasNodeWithComments($nodes)) {
-            return $this->pCommaSeparated($nodes);
-        } else {
-            return $this->pCommaSeparatedMultiline($nodes, $trailingComma) . $this->nl;
-        }
-    }
-
-    protected function pAttrGroups(array $nodes, bool $inline = false): string {
-        $result = '';
-        $sep = $inline ? ' ' : $this->nl;
-        foreach ($nodes as $node) {
-            $result .= $this->p($node) . $sep;
-        }
-
-        return $result;
-    }
+		return preg_replace_callback($regex, function ($matches) {
+			assert(strlen($matches[0]) === 1);
+			$hex = dechex(ord($matches[0]));;
+			return '\\x' . str_pad($hex, 2, '0', \STR_PAD_LEFT);
+		}, $escaped);
+	}
+
+	protected function containsEndLabel($string, $label, $atStart = true, $atEnd = true) {
+		$start = $atStart ? '(?:^|[\r\n])' : '[\r\n]';
+		$end = $atEnd ? '(?:$|[;\r\n])' : '[;\r\n]';
+		return false !== strpos($string, $label)
+			&& preg_match('/' . $start . $label . $end . '/', $string);
+	}
+
+	protected function encapsedContainsEndLabel(array $parts, $label) {
+		foreach ($parts as $i => $part) {
+			$atStart = $i === 0;
+			$atEnd = $i === count($parts) - 1;
+			if ($part instanceof Scalar\EncapsedStringPart
+				&& $this->containsEndLabel($part->value, $label, $atStart, $atEnd)
+			) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	protected function pDereferenceLhs(Node $node) {
+		if (!$this->dereferenceLhsRequiresParens($node)) {
+			return $this->p($node);
+		} else  {
+			return '(' . $this->p($node) . ')';
+		}
+	}
+
+	protected function pStaticDereferenceLhs(Node $node) {
+		if (!$this->staticDereferenceLhsRequiresParens($node)) {
+			return $this->p($node);
+		} else {
+			return '(' . $this->p($node) . ')';
+		}
+	}
+
+	protected function pCallLhs(Node $node) {
+		if (!$this->callLhsRequiresParens($node)) {
+			return $this->p($node);
+		} else  {
+			return '(' . $this->p($node) . ')';
+		}
+	}
+
+	protected function pNewVariable(Node $node): string {
+		if (!$this->newOperandRequiresParens($node)) {
+			return $this->p($node);
+		} else {
+			return '(' . $this->p($node) . ')';
+		}
+	}
+
+	/**
+	 * @param Node[] $nodes
+	 * @return bool
+	 */
+	protected function hasNodeWithComments(array $nodes) {
+		foreach ($nodes as $node) {
+			if ($node && $node->getComments()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	protected function pMaybeMultiline(array $nodes, bool $trailingComma = false) {
+		if (!$this->hasNodeWithComments($nodes)) {
+			return $this->pCommaSeparated($nodes);
+		} else {
+			return $this->pCommaSeparatedMultiline($nodes, $trailingComma) . $this->nl;
+		}
+	}
+
+	protected function pAttrGroups(array $nodes, bool $inline = false): string {
+		$result = '';
+		$sep = $inline ? ' ' : $this->nl;
+		foreach ($nodes as $node) {
+			$result .= $this->p($node) . $sep;
+		}
+
+		return $result;
+	}
 }

Spacing +183 added lines, -183 removed lines

@@ -20,16 +20,16 @@ 
     protected function pParam(Node\Param $node) {
         return $this->pAttrGroups($node->attrGroups, true)
              . $this->pModifiers($node->flags)
-             . ($node->type ? $this->p($node->type) . ' ' : '')
+             . ($node->type ? $this->p($node->type).' ' : '')
              . ($node->byRef ? '&' : '')
              . ($node->variadic ? '...' : '')
              . $this->p($node->var)
-             . ($node->default ? ' = ' . $this->p($node->default) : '');
+             . ($node->default ? ' = '.$this->p($node->default) : '');
     }
 
     protected function pArg(Node\Arg $node) {
-        return ($node->name ? $node->name->toString() . ': ' : '')
-             . ($node->byRef ? '&' : '') . ($node->unpack ? '...' : '')
+        return ($node->name ? $node->name->toString().': ' : '')
+             . ($node->byRef ? '&' : '').($node->unpack ? '...' : '')
              . $this->p($node->value);
     }
 
@@ -38,18 +38,18 @@ 
     }
 
     protected function pConst(Node\Const_ $node) {
-        return $node->name . ' = ' . $this->p($node->value);
+        return $node->name.' = '.$this->p($node->value);
     }
 
     protected function pNullableType(Node\NullableType $node) {
-        return '?' . $this->p($node->type);
+        return '?'.$this->p($node->type);
     }
 
     protected function pUnionType(Node\UnionType $node) {
         $types = [];
         foreach ($node->types as $typeNode) {
             if ($typeNode instanceof Node\IntersectionType) {
-                $types[] = '('. $this->p($typeNode) . ')';
+                $types[] = '('.$this->p($typeNode).')';
                 continue;
             }
             $types[] = $this->p($typeNode);
@@ -66,16 +66,16 @@ 
     }
 
     protected function pVarLikeIdentifier(Node\VarLikeIdentifier $node) {
-        return '$' . $node->name;
+        return '$'.$node->name;
     }
 
     protected function pAttribute(Node\Attribute $node) {
         return $this->p($node->name)
-             . ($node->args ? '(' . $this->pCommaSeparated($node->args) . ')' : '');
+             . ($node->args ? '('.$this->pCommaSeparated($node->args).')' : '');
     }
 
     protected function pAttributeGroup(Node\AttributeGroup $node) {
-        return '#[' . $this->pCommaSeparated($node->attrs) . ']';
+        return '#['.$this->pCommaSeparated($node->attrs).']';
     }
 
     // Names
@@ -85,11 +85,11 @@ 
     }
 
     protected function pName_FullyQualified(Name\FullyQualified $node) {
-        return '\\' . implode('\\', $node->parts);
+        return '\\'.implode('\\', $node->parts);
     }
 
     protected function pName_Relative(Name\Relative $node) {
-        return 'namespace\\' . implode('\\', $node->parts);
+        return 'namespace\\'.implode('\\', $node->parts);
     }
 
     // Magic Constants
@@ -135,7 +135,7 @@ 
                 $label = $node->getAttribute('docLabel');
                 if ($label && !$this->containsEndLabel($node->value, $label)) {
                     if ($node->value === '') {
-                        return "<<<'$label'\n$label" . $this->docStringEndToken;
+                        return "<<<'$label'\n$label".$this->docStringEndToken;
                     }
 
                     return "<<<'$label'\n$node->value\n$label"
@@ -148,16 +148,16 @@ 
                 $label = $node->getAttribute('docLabel');
                 if ($label && !$this->containsEndLabel($node->value, $label)) {
                     if ($node->value === '') {
-                        return "<<<$label\n$label" . $this->docStringEndToken;
+                        return "<<<$label\n$label".$this->docStringEndToken;
                     }
 
                     $escaped = $this->escapeString($node->value, null);
-                    return "<<<$label\n" . $escaped . "\n$label"
+                    return "<<<$label\n".$escaped."\n$label"
                          . $this->docStringEndToken;
                 }
             /* break missing intentionally */
             case Scalar\String_::KIND_DOUBLE_QUOTED:
-                return '"' . $this->escapeString($node->value, '"') . '"';
+                return '"'.$this->escapeString($node->value, '"').'"';
         }
         throw new \Exception('Invalid string kind');
     }
@@ -170,26 +170,26 @@ 
                     && $node->parts[0] instanceof Scalar\EncapsedStringPart
                     && $node->parts[0]->value === ''
                 ) {
-                    return "<<<$label\n$label" . $this->docStringEndToken;
+                    return "<<<$label\n$label".$this->docStringEndToken;
                 }
 
-                return "<<<$label\n" . $this->pEncapsList($node->parts, null) . "\n$label"
+                return "<<<$label\n".$this->pEncapsList($node->parts, null)."\n$label"
                      . $this->docStringEndToken;
             }
         }
-        return '"' . $this->pEncapsList($node->parts, '"') . '"';
+        return '"'.$this->pEncapsList($node->parts, '"').'"';
     }
 
     protected function pScalar_LNumber(Scalar\LNumber $node) {
         if ($node->value === -\PHP_INT_MAX-1) {
             // PHP_INT_MIN cannot be represented as a literal,
             // because the sign is not part of the literal
-            return '(-' . \PHP_INT_MAX . '-1)';
+            return '(-'.\PHP_INT_MAX.'-1)';
         }
 
         $kind = $node->getAttribute('kind', Scalar\LNumber::KIND_DEC);
         if (Scalar\LNumber::KIND_DEC === $kind) {
-            return (string) $node->value;
+            return (string)$node->value;
         }
 
         if ($node->value < 0) {
@@ -197,15 +197,15 @@ 
             $str = (string) -$node->value;
         } else {
             $sign = '';
-            $str = (string) $node->value;
+            $str = (string)$node->value;
         }
         switch ($kind) {
             case Scalar\LNumber::KIND_BIN:
-                return $sign . '0b' . base_convert($str, 10, 2);
+                return $sign.'0b'.base_convert($str, 10, 2);
             case Scalar\LNumber::KIND_OCT:
-                return $sign . '0' . base_convert($str, 10, 8);
+                return $sign.'0'.base_convert($str, 10, 8);
             case Scalar\LNumber::KIND_HEX:
-                return $sign . '0x' . base_convert($str, 10, 16);
+                return $sign.'0x'.base_convert($str, 10, 16);
         }
         throw new \Exception('Invalid number kind');
     }
@@ -223,7 +223,7 @@ 
 
         // Try to find a short full-precision representation
         $stringValue = sprintf('%.16G', $node->value);
-        if ($node->value !== (double) $stringValue) {
+        if ($node->value !== (double)$stringValue) {
             $stringValue = sprintf('%.17G', $node->value);
         }
 
@@ -233,7 +233,7 @@ 
         $stringValue = str_replace(',', '.', $stringValue);
 
         // ensure that number is really printed as float
-        return preg_match('/^-?[0-9]+$/', $stringValue) ? $stringValue . '.0' : $stringValue;
+        return preg_match('/^-?[0-9]+$/', $stringValue) ? $stringValue.'.0' : $stringValue;
     }
 
     protected function pScalar_EncapsedStringPart(Scalar\EncapsedStringPart $node) {
@@ -432,7 +432,7 @@ 
     protected function pExpr_UnaryMinus(Expr\UnaryMinus $node) {
         if ($node->expr instanceof Expr\UnaryMinus || $node->expr instanceof Expr\PreDec) {
             // Enforce -(-$expr) instead of --$expr
-            return '-(' . $this->p($node->expr) . ')';
+            return '-('.$this->p($node->expr).')';
         }
         return $this->pPrefixOp(Expr\UnaryMinus::class, '-', $node->expr);
     }
@@ -440,7 +440,7 @@ 
     protected function pExpr_UnaryPlus(Expr\UnaryPlus $node) {
         if ($node->expr instanceof Expr\UnaryPlus || $node->expr instanceof Expr\PreInc) {
             // Enforce +(+$expr) instead of ++$expr
-            return '+(' . $this->p($node->expr) . ')';
+            return '+('.$this->p($node->expr).')';
         }
         return $this->pPrefixOp(Expr\UnaryPlus::class, '+', $node->expr);
     }
@@ -488,7 +488,7 @@ 
         } elseif ($kind === Cast\Double::KIND_REAL) {
             $cast = '(real)';
         }
-        return $this->pPrefixOp(Cast\Double::class, $cast . ' ', $node->expr);
+        return $this->pPrefixOp(Cast\Double::class, $cast.' ', $node->expr);
     }
 
     protected function pExpr_Cast_String(Cast\String_ $node) {
@@ -515,39 +515,39 @@ 
 
     protected function pExpr_FuncCall(Expr\FuncCall $node) {
         return $this->pCallLhs($node->name)
-             . '(' . $this->pMaybeMultiline($node->args) . ')';
+             . '('.$this->pMaybeMultiline($node->args).')';
     }
 
     protected function pExpr_MethodCall(Expr\MethodCall $node) {
-        return $this->pDereferenceLhs($node->var) . '->' . $this->pObjectProperty($node->name)
-             . '(' . $this->pMaybeMultiline($node->args) . ')';
+        return $this->pDereferenceLhs($node->var).'->'.$this->pObjectProperty($node->name)
+             . '('.$this->pMaybeMultiline($node->args).')';
     }
 
     protected function pExpr_NullsafeMethodCall(Expr\NullsafeMethodCall $node) {
-        return $this->pDereferenceLhs($node->var) . '?->' . $this->pObjectProperty($node->name)
-            . '(' . $this->pMaybeMultiline($node->args) . ')';
+        return $this->pDereferenceLhs($node->var).'?->'.$this->pObjectProperty($node->name)
+            . '('.$this->pMaybeMultiline($node->args).')';
     }
 
     protected function pExpr_StaticCall(Expr\StaticCall $node) {
-        return $this->pStaticDereferenceLhs($node->class) . '::'
+        return $this->pStaticDereferenceLhs($node->class).'::'
              . ($node->name instanceof Expr
                 ? ($node->name instanceof Expr\Variable
                    ? $this->p($node->name)
-                   : '{' . $this->p($node->name) . '}')
+                   : '{'.$this->p($node->name).'}')
                 : $node->name)
-             . '(' . $this->pMaybeMultiline($node->args) . ')';
+             . '('.$this->pMaybeMultiline($node->args).')';
     }
 
     protected function pExpr_Empty(Expr\Empty_ $node) {
-        return 'empty(' . $this->p($node->expr) . ')';
+        return 'empty('.$this->p($node->expr).')';
     }
 
     protected function pExpr_Isset(Expr\Isset_ $node) {
-        return 'isset(' . $this->pCommaSeparated($node->vars) . ')';
+        return 'isset('.$this->pCommaSeparated($node->vars).')';
     }
 
     protected function pExpr_Eval(Expr\Eval_ $node) {
-        return 'eval(' . $this->p($node->expr) . ')';
+        return 'eval('.$this->p($node->expr).')';
     }
 
     protected function pExpr_Include(Expr\Include_ $node) {
@@ -558,11 +558,11 @@ 
             Expr\Include_::TYPE_REQUIRE_ONCE => 'require_once',
         ];
 
-        return $map[$node->type] . ' ' . $this->p($node->expr);
+        return $map[$node->type].' '.$this->p($node->expr);
     }
 
     protected function pExpr_List(Expr\List_ $node) {
-        return 'list(' . $this->pCommaSeparated($node->items) . ')';
+        return 'list('.$this->pCommaSeparated($node->items).')';
     }
 
     // Other
@@ -573,9 +573,9 @@ 
 
     protected function pExpr_Variable(Expr\Variable $node) {
         if ($node->name instanceof Expr) {
-            return '${' . $this->p($node->name) . '}';
+            return '${'.$this->p($node->name).'}';
         } else {
-            return '$' . $node->name;
+            return '$'.$node->name;
         }
     }
 
@@ -583,14 +583,14 @@ 
         $syntax = $node->getAttribute('kind',
             $this->options['shortArraySyntax'] ? Expr\Array_::KIND_SHORT : Expr\Array_::KIND_LONG);
         if ($syntax === Expr\Array_::KIND_SHORT) {
-            return '[' . $this->pMaybeMultiline($node->items, true) . ']';
+            return '['.$this->pMaybeMultiline($node->items, true).']';
         } else {
-            return 'array(' . $this->pMaybeMultiline($node->items, true) . ')';
+            return 'array('.$this->pMaybeMultiline($node->items, true).')';
         }
     }
 
     protected function pExpr_ArrayItem(Expr\ArrayItem $node) {
-        return (null !== $node->key ? $this->p($node->key) . ' => ' : '')
+        return (null !== $node->key ? $this->p($node->key).' => ' : '')
              . ($node->byRef ? '&' : '')
              . ($node->unpack ? '...' : '')
              . $this->p($node->value);
@@ -598,7 +598,7 @@ 
 
     protected function pExpr_ArrayDimFetch(Expr\ArrayDimFetch $node) {
         return $this->pDereferenceLhs($node->var)
-             . '[' . (null !== $node->dim ? $this->p($node->dim) : '') . ']';
+             . '['.(null !== $node->dim ? $this->p($node->dim) : '').']';
     }
 
     protected function pExpr_ConstFetch(Expr\ConstFetch $node) {
@@ -606,37 +606,37 @@ 
     }
 
     protected function pExpr_ClassConstFetch(Expr\ClassConstFetch $node) {
-        return $this->pStaticDereferenceLhs($node->class) . '::' . $this->pObjectProperty($node->name);
+        return $this->pStaticDereferenceLhs($node->class).'::'.$this->pObjectProperty($node->name);
     }
 
     protected function pExpr_PropertyFetch(Expr\PropertyFetch $node) {
-        return $this->pDereferenceLhs($node->var) . '->' . $this->pObjectProperty($node->name);
+        return $this->pDereferenceLhs($node->var).'->'.$this->pObjectProperty($node->name);
     }
 
     protected function pExpr_NullsafePropertyFetch(Expr\NullsafePropertyFetch $node) {
-        return $this->pDereferenceLhs($node->var) . '?->' . $this->pObjectProperty($node->name);
+        return $this->pDereferenceLhs($node->var).'?->'.$this->pObjectProperty($node->name);
     }
 
     protected function pExpr_StaticPropertyFetch(Expr\StaticPropertyFetch $node) {
-        return $this->pStaticDereferenceLhs($node->class) . '::$' . $this->pObjectProperty($node->name);
+        return $this->pStaticDereferenceLhs($node->class).'::$'.$this->pObjectProperty($node->name);
     }
 
     protected function pExpr_ShellExec(Expr\ShellExec $node) {
-        return '`' . $this->pEncapsList($node->parts, '`') . '`';
+        return '`'.$this->pEncapsList($node->parts, '`').'`';
     }
 
     protected function pExpr_Closure(Expr\Closure $node) {
         return $this->pAttrGroups($node->attrGroups, true)
              . ($node->static ? 'static ' : '')
-             . 'function ' . ($node->byRef ? '&' : '')
-             . '(' . $this->pCommaSeparated($node->params) . ')'
-             . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')' : '')
-             . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '')
-             . ' {' . $this->pStmts($node->stmts) . $this->nl . '}';
+             . 'function '.($node->byRef ? '&' : '')
+             . '('.$this->pCommaSeparated($node->params).')'
+             . (!empty($node->uses) ? ' use('.$this->pCommaSeparated($node->uses).')' : '')
+             . (null !== $node->returnType ? ' : '.$this->p($node->returnType) : '')
+             . ' {'.$this->pStmts($node->stmts).$this->nl.'}';
     }
 
     protected function pExpr_Match(Expr\Match_ $node) {
-        return 'match (' . $this->p($node->cond) . ') {'
+        return 'match ('.$this->p($node->cond).') {'
             . $this->pCommaSeparatedMultiline($node->arms, true)
             . $this->nl
             . '}';
@@ -644,52 +644,52 @@ 
 
     protected function pMatchArm(Node\MatchArm $node) {
         return ($node->conds ? $this->pCommaSeparated($node->conds) : 'default')
-            . ' => ' . $this->p($node->body);
+            . ' => '.$this->p($node->body);
     }
 
     protected function pExpr_ArrowFunction(Expr\ArrowFunction $node) {
         return $this->pAttrGroups($node->attrGroups, true)
             . ($node->static ? 'static ' : '')
-            . 'fn' . ($node->byRef ? '&' : '')
-            . '(' . $this->pCommaSeparated($node->params) . ')'
-            . (null !== $node->returnType ? ': ' . $this->p($node->returnType) : '')
+            . 'fn'.($node->byRef ? '&' : '')
+            . '('.$this->pCommaSeparated($node->params).')'
+            . (null !== $node->returnType ? ': '.$this->p($node->returnType) : '')
             . ' => '
             . $this->p($node->expr);
     }
 
     protected function pExpr_ClosureUse(Expr\ClosureUse $node) {
-        return ($node->byRef ? '&' : '') . $this->p($node->var);
+        return ($node->byRef ? '&' : '').$this->p($node->var);
     }
 
     protected function pExpr_New(Expr\New_ $node) {
         if ($node->class instanceof Stmt\Class_) {
-            $args = $node->args ? '(' . $this->pMaybeMultiline($node->args) . ')' : '';
-            return 'new ' . $this->pClassCommon($node->class, $args);
+            $args = $node->args ? '('.$this->pMaybeMultiline($node->args).')' : '';
+            return 'new '.$this->pClassCommon($node->class, $args);
         }
-        return 'new ' . $this->pNewVariable($node->class)
-            . '(' . $this->pMaybeMultiline($node->args) . ')';
+        return 'new '.$this->pNewVariable($node->class)
+            . '('.$this->pMaybeMultiline($node->args).')';
     }
 
     protected function pExpr_Clone(Expr\Clone_ $node) {
-        return 'clone ' . $this->p($node->expr);
+        return 'clone '.$this->p($node->expr);
     }
 
     protected function pExpr_Ternary(Expr\Ternary $node) {
         // a bit of cheating: we treat the ternary as a binary op where the ?...: part is the operator.
         // this is okay because the part between ? and : never needs parentheses.
         return $this->pInfixOp(Expr\Ternary::class,
-            $node->cond, ' ?' . (null !== $node->if ? ' ' . $this->p($node->if) . ' ' : '') . ': ', $node->else
+            $node->cond, ' ?'.(null !== $node->if ? ' '.$this->p($node->if).' ' : '').': ', $node->else
         );
     }
 
     protected function pExpr_Exit(Expr\Exit_ $node) {
         $kind = $node->getAttribute('kind', Expr\Exit_::KIND_DIE);
         return ($kind === Expr\Exit_::KIND_EXIT ? 'exit' : 'die')
-             . (null !== $node->expr ? '(' . $this->p($node->expr) . ')' : '');
+             . (null !== $node->expr ? '('.$this->p($node->expr).')' : '');
     }
 
     protected function pExpr_Throw(Expr\Throw_ $node) {
-        return 'throw ' . $this->p($node->expr);
+        return 'throw '.$this->p($node->expr);
     }
 
     protected function pExpr_Yield(Expr\Yield_ $node) {
@@ -698,7 +698,7 @@ 
         } else {
             // this is a bit ugly, but currently there is no way to detect whether the parentheses are necessary
             return '(yield '
-                 . ($node->key !== null ? $this->p($node->key) . ' => ' : '')
+                 . ($node->key !== null ? $this->p($node->key).' => ' : '')
                  . $this->p($node->value)
                  . ')';
         }
@@ -708,27 +708,27 @@ 
 
     protected function pStmt_Namespace(Stmt\Namespace_ $node) {
         if ($this->canUseSemicolonNamespaces) {
-            return 'namespace ' . $this->p($node->name) . ';'
-                 . $this->nl . $this->pStmts($node->stmts, false);
+            return 'namespace '.$this->p($node->name).';'
+                 . $this->nl.$this->pStmts($node->stmts, false);
         } else {
-            return 'namespace' . (null !== $node->name ? ' ' . $this->p($node->name) : '')
-                 . ' {' . $this->pStmts($node->stmts) . $this->nl . '}';
+            return 'namespace'.(null !== $node->name ? ' '.$this->p($node->name) : '')
+                 . ' {'.$this->pStmts($node->stmts).$this->nl.'}';
         }
     }
 
     protected function pStmt_Use(Stmt\Use_ $node) {
-        return 'use ' . $this->pUseType($node->type)
-             . $this->pCommaSeparated($node->uses) . ';';
+        return 'use '.$this->pUseType($node->type)
+             . $this->pCommaSeparated($node->uses).';';
     }
 
     protected function pStmt_GroupUse(Stmt\GroupUse $node) {
-        return 'use ' . $this->pUseType($node->type) . $this->pName($node->prefix)
-             . '\{' . $this->pCommaSeparated($node->uses) . '};';
+        return 'use '.$this->pUseType($node->type).$this->pName($node->prefix)
+             . '\{'.$this->pCommaSeparated($node->uses).'};';
     }
 
     protected function pStmt_UseUse(Stmt\UseUse $node) {
-        return $this->pUseType($node->type) . $this->p($node->name)
-             . (null !== $node->alias ? ' as ' . $node->alias : '');
+        return $this->pUseType($node->type).$this->p($node->name)
+             . (null !== $node->alias ? ' as '.$node->alias : '');
     }
 
     protected function pUseType($type) {
@@ -738,76 +738,76 @@ 
 
     protected function pStmt_Interface(Stmt\Interface_ $node) {
         return $this->pAttrGroups($node->attrGroups)
-             . 'interface ' . $node->name
-             . (!empty($node->extends) ? ' extends ' . $this->pCommaSeparated($node->extends) : '')
-             . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
+             . 'interface '.$node->name
+             . (!empty($node->extends) ? ' extends '.$this->pCommaSeparated($node->extends) : '')
+             . $this->nl.'{'.$this->pStmts($node->stmts).$this->nl.'}';
     }
 
     protected function pStmt_Enum(Stmt\Enum_ $node) {
         return $this->pAttrGroups($node->attrGroups)
-             . 'enum ' . $node->name
+             . 'enum '.$node->name
              . ($node->scalarType ? " : $node->scalarType" : '')
-             . (!empty($node->implements) ? ' implements ' . $this->pCommaSeparated($node->implements) : '')
-             . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
+             . (!empty($node->implements) ? ' implements '.$this->pCommaSeparated($node->implements) : '')
+             . $this->nl.'{'.$this->pStmts($node->stmts).$this->nl.'}';
     }
 
     protected function pStmt_Class(Stmt\Class_ $node) {
-        return $this->pClassCommon($node, ' ' . $node->name);
+        return $this->pClassCommon($node, ' '.$node->name);
     }
 
     protected function pStmt_Trait(Stmt\Trait_ $node) {
         return $this->pAttrGroups($node->attrGroups)
-             . 'trait ' . $node->name
-             . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
+             . 'trait '.$node->name
+             . $this->nl.'{'.$this->pStmts($node->stmts).$this->nl.'}';
     }
 
     protected function pStmt_EnumCase(Stmt\EnumCase $node) {
         return $this->pAttrGroups($node->attrGroups)
-             . 'case ' . $node->name
-             . ($node->expr ? ' = ' . $this->p($node->expr) : '')
+             . 'case '.$node->name
+             . ($node->expr ? ' = '.$this->p($node->expr) : '')
              . ';';
     }
 
     protected function pStmt_TraitUse(Stmt\TraitUse $node) {
-        return 'use ' . $this->pCommaSeparated($node->traits)
+        return 'use '.$this->pCommaSeparated($node->traits)
              . (empty($node->adaptations)
                 ? ';'
-                : ' {' . $this->pStmts($node->adaptations) . $this->nl . '}');
+                : ' {'.$this->pStmts($node->adaptations).$this->nl.'}');
     }
 
     protected function pStmt_TraitUseAdaptation_Precedence(Stmt\TraitUseAdaptation\Precedence $node) {
-        return $this->p($node->trait) . '::' . $node->method
-             . ' insteadof ' . $this->pCommaSeparated($node->insteadof) . ';';
+        return $this->p($node->trait).'::'.$node->method
+             . ' insteadof '.$this->pCommaSeparated($node->insteadof).';';
     }
 
     protected function pStmt_TraitUseAdaptation_Alias(Stmt\TraitUseAdaptation\Alias $node) {
-        return (null !== $node->trait ? $this->p($node->trait) . '::' : '')
-             . $node->method . ' as'
-             . (null !== $node->newModifier ? ' ' . rtrim($this->pModifiers($node->newModifier), ' ') : '')
-             . (null !== $node->newName     ? ' ' . $node->newName                        : '')
+        return (null !== $node->trait ? $this->p($node->trait).'::' : '')
+             . $node->method.' as'
+             . (null !== $node->newModifier ? ' '.rtrim($this->pModifiers($node->newModifier), ' ') : '')
+             . (null !== $node->newName ? ' '.$node->newName : '')
              . ';';
     }
 
     protected function pStmt_Property(Stmt\Property $node) {
         return $this->pAttrGroups($node->attrGroups)
             . (0 === $node->flags ? 'var ' : $this->pModifiers($node->flags))
-            . ($node->type ? $this->p($node->type) . ' ' : '')
-            . $this->pCommaSeparated($node->props) . ';';
+            . ($node->type ? $this->p($node->type).' ' : '')
+            . $this->pCommaSeparated($node->props).';';
     }
 
     protected function pStmt_PropertyProperty(Stmt\PropertyProperty $node) {
-        return '$' . $node->name
-             . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
+        return '$'.$node->name
+             . (null !== $node->default ? ' = '.$this->p($node->default) : '');
     }
 
     protected function pStmt_ClassMethod(Stmt\ClassMethod $node) {
         return $this->pAttrGroups($node->attrGroups)
              . $this->pModifiers($node->flags)
-             . 'function ' . ($node->byRef ? '&' : '') . $node->name
-             . '(' . $this->pMaybeMultiline($node->params) . ')'
-             . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '')
+             . 'function '.($node->byRef ? '&' : '').$node->name
+             . '('.$this->pMaybeMultiline($node->params).')'
+             . (null !== $node->returnType ? ' : '.$this->p($node->returnType) : '')
              . (null !== $node->stmts
-                ? $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}'
+                ? $this->nl.'{'.$this->pStmts($node->stmts).$this->nl.'}'
                 : ';');
     }
 
@@ -815,158 +815,158 @@ 
         return $this->pAttrGroups($node->attrGroups)
              . $this->pModifiers($node->flags)
              . 'const '
-             . (null !== $node->type ? $this->p($node->type) . ' ' : '')
-             . $this->pCommaSeparated($node->consts) . ';';
+             . (null !== $node->type ? $this->p($node->type).' ' : '')
+             . $this->pCommaSeparated($node->consts).';';
     }
 
     protected function pStmt_Function(Stmt\Function_ $node) {
         return $this->pAttrGroups($node->attrGroups)
-             . 'function ' . ($node->byRef ? '&' : '') . $node->name
-             . '(' . $this->pCommaSeparated($node->params) . ')'
-             . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '')
-             . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
+             . 'function '.($node->byRef ? '&' : '').$node->name
+             . '('.$this->pCommaSeparated($node->params).')'
+             . (null !== $node->returnType ? ' : '.$this->p($node->returnType) : '')
+             . $this->nl.'{'.$this->pStmts($node->stmts).$this->nl.'}';
     }
 
     protected function pStmt_Const(Stmt\Const_ $node) {
-        return 'const ' . $this->pCommaSeparated($node->consts) . ';';
+        return 'const '.$this->pCommaSeparated($node->consts).';';
     }
 
     protected function pStmt_Declare(Stmt\Declare_ $node) {
-        return 'declare (' . $this->pCommaSeparated($node->declares) . ')'
-             . (null !== $node->stmts ? ' {' . $this->pStmts($node->stmts) . $this->nl . '}' : ';');
+        return 'declare ('.$this->pCommaSeparated($node->declares).')'
+             . (null !== $node->stmts ? ' {'.$this->pStmts($node->stmts).$this->nl.'}' : ';');
     }
 
     protected function pStmt_DeclareDeclare(Stmt\DeclareDeclare $node) {
-        return $node->key . '=' . $this->p($node->value);
+        return $node->key.'='.$this->p($node->value);
     }
 
     // Control flow
 
     protected function pStmt_If(Stmt\If_ $node) {
-        return 'if (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->stmts) . $this->nl . '}'
-             . ($node->elseifs ? ' ' . $this->pImplode($node->elseifs, ' ') : '')
-             . (null !== $node->else ? ' ' . $this->p($node->else) : '');
+        return 'if ('.$this->p($node->cond).') {'
+             . $this->pStmts($node->stmts).$this->nl.'}'
+             . ($node->elseifs ? ' '.$this->pImplode($node->elseifs, ' ') : '')
+             . (null !== $node->else ? ' '.$this->p($node->else) : '');
     }
 
     protected function pStmt_ElseIf(Stmt\ElseIf_ $node) {
-        return 'elseif (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->stmts) . $this->nl . '}';
+        return 'elseif ('.$this->p($node->cond).') {'
+             . $this->pStmts($node->stmts).$this->nl.'}';
     }
 
     protected function pStmt_Else(Stmt\Else_ $node) {
-        return 'else {' . $this->pStmts($node->stmts) . $this->nl . '}';
+        return 'else {'.$this->pStmts($node->stmts).$this->nl.'}';
     }
 
     protected function pStmt_For(Stmt\For_ $node) {
         return 'for ('
-             . $this->pCommaSeparated($node->init) . ';' . (!empty($node->cond) ? ' ' : '')
-             . $this->pCommaSeparated($node->cond) . ';' . (!empty($node->loop) ? ' ' : '')
+             . $this->pCommaSeparated($node->init).';'.(!empty($node->cond) ? ' ' : '')
+             . $this->pCommaSeparated($node->cond).';'.(!empty($node->loop) ? ' ' : '')
              . $this->pCommaSeparated($node->loop)
-             . ') {' . $this->pStmts($node->stmts) . $this->nl . '}';
+             . ') {'.$this->pStmts($node->stmts).$this->nl.'}';
     }
 
     protected function pStmt_Foreach(Stmt\Foreach_ $node) {
-        return 'foreach (' . $this->p($node->expr) . ' as '
-             . (null !== $node->keyVar ? $this->p($node->keyVar) . ' => ' : '')
-             . ($node->byRef ? '&' : '') . $this->p($node->valueVar) . ') {'
-             . $this->pStmts($node->stmts) . $this->nl . '}';
+        return 'foreach ('.$this->p($node->expr).' as '
+             . (null !== $node->keyVar ? $this->p($node->keyVar).' => ' : '')
+             . ($node->byRef ? '&' : '').$this->p($node->valueVar).') {'
+             . $this->pStmts($node->stmts).$this->nl.'}';
     }
 
     protected function pStmt_While(Stmt\While_ $node) {
-        return 'while (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->stmts) . $this->nl . '}';
+        return 'while ('.$this->p($node->cond).') {'
+             . $this->pStmts($node->stmts).$this->nl.'}';
     }
 
     protected function pStmt_Do(Stmt\Do_ $node) {
-        return 'do {' . $this->pStmts($node->stmts) . $this->nl
-             . '} while (' . $this->p($node->cond) . ');';
+        return 'do {'.$this->pStmts($node->stmts).$this->nl
+             . '} while ('.$this->p($node->cond).');';
     }
 
     protected function pStmt_Switch(Stmt\Switch_ $node) {
-        return 'switch (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->cases) . $this->nl . '}';
+        return 'switch ('.$this->p($node->cond).') {'
+             . $this->pStmts($node->cases).$this->nl.'}';
     }
 
     protected function pStmt_Case(Stmt\Case_ $node) {
-        return (null !== $node->cond ? 'case ' . $this->p($node->cond) : 'default') . ':'
+        return (null !== $node->cond ? 'case '.$this->p($node->cond) : 'default').':'
              . $this->pStmts($node->stmts);
     }
 
     protected function pStmt_TryCatch(Stmt\TryCatch $node) {
-        return 'try {' . $this->pStmts($node->stmts) . $this->nl . '}'
-             . ($node->catches ? ' ' . $this->pImplode($node->catches, ' ') : '')
-             . ($node->finally !== null ? ' ' . $this->p($node->finally) : '');
+        return 'try {'.$this->pStmts($node->stmts).$this->nl.'}'
+             . ($node->catches ? ' '.$this->pImplode($node->catches, ' ') : '')
+             . ($node->finally !== null ? ' '.$this->p($node->finally) : '');
     }
 
     protected function pStmt_Catch(Stmt\Catch_ $node) {
-        return 'catch (' . $this->pImplode($node->types, '|')
-             . ($node->var !== null ? ' ' . $this->p($node->var) : '')
-             . ') {' . $this->pStmts($node->stmts) . $this->nl . '}';
+        return 'catch ('.$this->pImplode($node->types, '|')
+             . ($node->var !== null ? ' '.$this->p($node->var) : '')
+             . ') {'.$this->pStmts($node->stmts).$this->nl.'}';
     }
 
     protected function pStmt_Finally(Stmt\Finally_ $node) {
-        return 'finally {' . $this->pStmts($node->stmts) . $this->nl . '}';
+        return 'finally {'.$this->pStmts($node->stmts).$this->nl.'}';
     }
 
     protected function pStmt_Break(Stmt\Break_ $node) {
-        return 'break' . ($node->num !== null ? ' ' . $this->p($node->num) : '') . ';';
+        return 'break'.($node->num !== null ? ' '.$this->p($node->num) : '').';';
     }
 
     protected function pStmt_Continue(Stmt\Continue_ $node) {
-        return 'continue' . ($node->num !== null ? ' ' . $this->p($node->num) : '') . ';';
+        return 'continue'.($node->num !== null ? ' '.$this->p($node->num) : '').';';
     }
 
     protected function pStmt_Return(Stmt\Return_ $node) {
-        return 'return' . (null !== $node->expr ? ' ' . $this->p($node->expr) : '') . ';';
+        return 'return'.(null !== $node->expr ? ' '.$this->p($node->expr) : '').';';
     }
 
     protected function pStmt_Throw(Stmt\Throw_ $node) {
-        return 'throw ' . $this->p($node->expr) . ';';
+        return 'throw '.$this->p($node->expr).';';
     }
 
     protected function pStmt_Label(Stmt\Label $node) {
-        return $node->name . ':';
+        return $node->name.':';
     }
 
     protected function pStmt_Goto(Stmt\Goto_ $node) {
-        return 'goto ' . $node->name . ';';
+        return 'goto '.$node->name.';';
     }
 
     // Other
 
     protected function pStmt_Expression(Stmt\Expression $node) {
-        return $this->p($node->expr) . ';';
+        return $this->p($node->expr).';';
     }
 
     protected function pStmt_Echo(Stmt\Echo_ $node) {
-        return 'echo ' . $this->pCommaSeparated($node->exprs) . ';';
+        return 'echo '.$this->pCommaSeparated($node->exprs).';';
     }
 
     protected function pStmt_Static(Stmt\Static_ $node) {
-        return 'static ' . $this->pCommaSeparated($node->vars) . ';';
+        return 'static '.$this->pCommaSeparated($node->vars).';';
     }
 
     protected function pStmt_Global(Stmt\Global_ $node) {
-        return 'global ' . $this->pCommaSeparated($node->vars) . ';';
+        return 'global '.$this->pCommaSeparated($node->vars).';';
     }
 
     protected function pStmt_StaticVar(Stmt\StaticVar $node) {
         return $this->p($node->var)
-             . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
+             . (null !== $node->default ? ' = '.$this->p($node->default) : '');
     }
 
     protected function pStmt_Unset(Stmt\Unset_ $node) {
-        return 'unset(' . $this->pCommaSeparated($node->vars) . ');';
+        return 'unset('.$this->pCommaSeparated($node->vars).');';
     }
 
     protected function pStmt_InlineHTML(Stmt\InlineHTML $node) {
         $newline = $node->getAttribute('hasLeadingNewline', true) ? "\n" : '';
-        return '?>' . $newline . $node->value . '<?php ';
+        return '?>'.$newline.$node->value.'<?php ';
     }
 
     protected function pStmt_HaltCompiler(Stmt\HaltCompiler $node) {
-        return '__halt_compiler();' . $node->remaining;
+        return '__halt_compiler();'.$node->remaining;
     }
 
     protected function pStmt_Nop(Stmt\Nop $node) {
@@ -978,15 +978,15 @@ 
     protected function pClassCommon(Stmt\Class_ $node, $afterClassToken) {
         return $this->pAttrGroups($node->attrGroups, $node->name === null)
             . $this->pModifiers($node->flags)
-            . 'class' . $afterClassToken
-            . (null !== $node->extends ? ' extends ' . $this->p($node->extends) : '')
-            . (!empty($node->implements) ? ' implements ' . $this->pCommaSeparated($node->implements) : '')
-            . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
+            . 'class'.$afterClassToken
+            . (null !== $node->extends ? ' extends '.$this->p($node->extends) : '')
+            . (!empty($node->implements) ? ' implements '.$this->pCommaSeparated($node->implements) : '')
+            . $this->nl.'{'.$this->pStmts($node->stmts).$this->nl.'}';
     }
 
     protected function pObjectProperty($node) {
         if ($node instanceof Expr) {
-            return '{' . $this->p($node) . '}';
+            return '{'.$this->p($node).'}';
         } else {
             return $node;
         }
@@ -998,7 +998,7 @@ 
             if ($element instanceof Scalar\EncapsedStringPart) {
                 $return .= $this->escapeString($element->value, $quote);
             } else {
-                $return .= '{' . $this->p($element) . '}';
+                $return .= '{'.$this->p($element).'}';
             }
         }
 
@@ -1006,7 +1006,7 @@ 
     }
 
     protected function pSingleQuotedString(string $string) {
-        return '\'' . addcslashes($string, '\'\\') . '\'';
+        return '\''.addcslashes($string, '\'\\').'\'';
     }
 
     protected function escapeString($string, $quote) {
@@ -1014,7 +1014,7 @@ 
             // For doc strings, don't escape newlines
             $escaped = addcslashes($string, "\t\f\v$\\");
         } else {
-            $escaped = addcslashes($string, "\n\r\t\f\v$" . $quote . "\\");
+            $escaped = addcslashes($string, "\n\r\t\f\v$".$quote."\\");
         }
 
         // Escape control characters and non-UTF-8 characters.
@@ -1034,10 +1034,10 @@ 
             | (?<=[\xF0-\xF4])[\x80-\xBF](?![\x80-\xBF]{2}) # Short 4 byte sequence
             | (?<=[\xF0-\xF4][\x80-\xBF])[\x80-\xBF](?![\x80-\xBF]) # Short 4 byte sequence (2)
         )/x';
-        return preg_replace_callback($regex, function ($matches) {
+        return preg_replace_callback($regex, function($matches) {
             assert(strlen($matches[0]) === 1);
-            $hex = dechex(ord($matches[0]));;
-            return '\\x' . str_pad($hex, 2, '0', \STR_PAD_LEFT);
+            $hex = dechex(ord($matches[0])); ;
+            return '\\x'.str_pad($hex, 2, '0', \STR_PAD_LEFT);
         }, $escaped);
     }
 
@@ -1045,7 +1045,7 @@ 
         $start = $atStart ? '(?:^|[\r\n])' : '[\r\n]';
         $end = $atEnd ? '(?:$|[;\r\n])' : '[;\r\n]';
         return false !== strpos($string, $label)
-            && preg_match('/' . $start . $label . $end . '/', $string);
+            && preg_match('/'.$start.$label.$end.'/', $string);
     }
 
     protected function encapsedContainsEndLabel(array $parts, $label) {
@@ -1064,8 +1064,8 @@ 
     protected function pDereferenceLhs(Node $node) {
         if (!$this->dereferenceLhsRequiresParens($node)) {
             return $this->p($node);
-        } else  {
-            return '(' . $this->p($node) . ')';
+        } else {
+            return '('.$this->p($node).')';
         }
     }
 
@@ -1073,15 +1073,15 @@ 
         if (!$this->staticDereferenceLhsRequiresParens($node)) {
             return $this->p($node);
         } else {
-            return '(' . $this->p($node) . ')';
+            return '('.$this->p($node).')';
         }
     }
 
     protected function pCallLhs(Node $node) {
         if (!$this->callLhsRequiresParens($node)) {
             return $this->p($node);
-        } else  {
-            return '(' . $this->p($node) . ')';
+        } else {
+            return '('.$this->p($node).')';
         }
     }
 
@@ -1089,7 +1089,7 @@ 
         if (!$this->newOperandRequiresParens($node)) {
             return $this->p($node);
         } else {
-            return '(' . $this->p($node) . ')';
+            return '('.$this->p($node).')';
         }
     }
 
@@ -1110,7 +1110,7 @@ 
         if (!$this->hasNodeWithComments($nodes)) {
             return $this->pCommaSeparated($nodes);
         } else {
-            return $this->pCommaSeparatedMultiline($nodes, $trailingComma) . $this->nl;
+            return $this->pCommaSeparatedMultiline($nodes, $trailingComma).$this->nl;
         }
     }
 
@@ -1118,7 +1118,7 @@ 
         $result = '';
         $sep = $inline ? ' ' : $this->nl;
         foreach ($nodes as $node) {
-            $result .= $this->p($node) . $sep;
+            $result .= $this->p($node).$sep;
         }
 
         return $result;

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
 use PhpParser\Node\Stmt;
 use PhpParser\PrettyPrinterAbstract;
 
-class Standard extends PrettyPrinterAbstract
-{
+class Standard extends PrettyPrinterAbstract {
     // Special nodes
 
     protected function pParam(Node\Param $node) {