From 28583663105fe0b7af51c60f34c8d9fbb06f6fa8 Mon Sep 17 00:00:00 2001 From: Tyson Andre Date: Tue, 12 Sep 2017 23:01:46 -0700 Subject: [PATCH] Normalize spaces in union types in comments ("A | B" -> "A|B") Mentioned in discussion of https://github.com/Microsoft/tolerant-php-parser/pull/136/files Many IDEs and tools don't expect whitespace, and don't handle this. So, they may act as if only the first type. - https://github.com/php-fig/fig-standards/blob/master/proposed/phpdoc.md#appendix-a-types is a proposal, and is vague about how whitespace is handled outside `<>` - https://github.com/phpDocumentor/phpDocumentor2/blob/develop/docs/references/phpdoc/tags/var.rst is vague - https://github.com/phpDocumentor/ReflectionDocBlock/blob/master/src/DocBlock/Tags/Var_.php doesn't expect any whitespace after `@var` Remove extra space between `@param` and `@return` union types Fix DiagnosticsProvider phpdoc --- src/DiagnosticsProvider.php | 15 ++++++++++----- src/Node.php | 14 +++++++------- src/Node/ArrayElement.php | 6 +++--- src/Node/ClassInterfaceClause.php | 2 +- src/Node/ElseClauseNode.php | 2 +- src/Node/ElseIfClauseNode.php | 4 ++-- .../AnonymousFunctionCreationExpression.php | 2 +- src/Node/Expression/ArgumentExpression.php | 4 ++-- src/Node/Expression/ArrayCreationExpression.php | 2 +- src/Node/Expression/CallExpression.php | 2 +- src/Node/Expression/ExitIntrinsicExpression.php | 6 +++--- src/Node/Expression/ObjectCreationExpression.php | 14 +++++++------- .../Expression/ScopedPropertyAccessExpression.php | 4 ++-- src/Node/Expression/UnaryExpression.php | 2 +- src/Node/Expression/Variable.php | 2 +- src/Node/ForeachValue.php | 2 +- src/Node/FunctionBody.php | 2 +- src/Node/FunctionHeader.php | 2 +- src/Node/FunctionReturnType.php | 2 +- src/Node/FunctionUseClause.php | 2 +- src/Node/NamespaceUseClause.php | 6 +++--- src/Node/Parameter.php | 10 +++++----- src/Node/Statement/BreakOrContinueStatement.php | 2 +- src/Node/Statement/CompoundStatementNode.php | 2 +- src/Node/Statement/DeclareStatement.php | 8 ++++---- src/Node/Statement/DoStatement.php | 2 +- src/Node/Statement/ForStatement.php | 14 +++++++------- src/Node/Statement/ForeachStatement.php | 10 +++++----- src/Node/Statement/IfStatementNode.php | 10 +++++----- src/Node/Statement/InlineHtml.php | 4 ++-- src/Node/Statement/InterfaceDeclaration.php | 2 +- src/Node/Statement/NamespaceDefinition.php | 4 ++-- src/Node/Statement/ReturnStatement.php | 2 +- src/Node/Statement/SwitchStatementNode.php | 10 +++++----- src/Node/Statement/TryStatement.php | 4 ++-- src/Node/Statement/WhileStatement.php | 8 ++++---- src/Node/StaticVariableDeclaration.php | 4 ++-- src/Node/TraitSelectOrAliasClause.php | 4 ++-- src/Node/UseVariableName.php | 2 +- src/ResolvedName.php | 2 +- src/TextEdit.php | 2 +- 41 files changed, 104 insertions(+), 99 deletions(-) diff --git a/src/DiagnosticsProvider.php b/src/DiagnosticsProvider.php index 96bd831f..e918fe69 100644 --- a/src/DiagnosticsProvider.php +++ b/src/DiagnosticsProvider.php @@ -9,14 +9,14 @@ use Microsoft\PhpParser\Node; class DiagnosticsProvider { - /** - * Traverses AST to generate diagnostics. - * @param \Microsoft\PhpParser\Node $node - * @return \Generator | Diagnostic[] - */ private static $tokenKindToText; + /** + * Returns the diagnostic for $node, or null. + * @param \Microsoft\PhpParser\Node $node + * @return Diagnostic|null + */ public static function checkDiagnostics($node) { if (!isset(self::$tokenKindToText)) { self::$tokenKindToText = \array_flip(\array_merge( @@ -88,6 +88,11 @@ public static function checkDiagnostics($node) { return null; } + /** + * Traverses AST to generate diagnostics. + * @param \Microsoft\PhpParser\Node $n + * @return Diagnostic[] + */ public static function getDiagnostics(Node $n) : array { $diagnostics = []; diff --git a/src/Node.php b/src/Node.php index d6ddbe66..a01c66d3 100644 --- a/src/Node.php +++ b/src/Node.php @@ -16,7 +16,7 @@ abstract class Node implements \JsonSerializable { /** @var array[] Map from node class to array of child keys */ private static $childNames = []; - /** @var Node | null */ + /** @var Node|null */ public $parent; public function getNodeKindName() : string { @@ -187,7 +187,7 @@ public function getDescendantNodes(callable $shouldDescendIntoChildrenFn = null) /** * Gets generator containing all descendant Tokens. * @param callable|null $shouldDescendIntoChildrenFn - * @return \Generator | Token[] + * @return \Generator|Token[] */ public function getDescendantTokens(callable $shouldDescendIntoChildrenFn = null) { foreach ($this->getChildNodesAndTokens() as $child) { @@ -205,7 +205,7 @@ public function getDescendantTokens(callable $shouldDescendIntoChildrenFn = null * Gets generator containing all child Nodes and Tokens (direct descendants). * Does not return null elements. * - * @return \Generator | Token[] | Node[] + * @return \Generator|Token[]|Node[] */ public function getChildNodesAndTokens() : \Generator { foreach ($this::CHILD_NAMES as $name) { @@ -227,7 +227,7 @@ public function getChildNodesAndTokens() : \Generator { /** * Gets generator containing all child Nodes (direct descendants) - * @return \Generator | Node[] + * @return \Generator|Node[] */ public function getChildNodes() : \Generator { foreach ($this::CHILD_NAMES as $name) { @@ -425,7 +425,7 @@ private function containsPosition(int $pos): bool { * Returns last doc comment in leading comment / whitespace trivia, * and returns null if there is no preceding doc comment. * - * @return string | null + * @return string|null */ public function getDocCommentText() { $leadingTriviaText = $this->getLeadingCommentAndWhitespaceText(); @@ -446,7 +446,7 @@ public function __toString() { } /** - * @return array | ResolvedName[][] + * @return array|ResolvedName[][] * @throws \Exception */ public function getImportTablesForCurrentScope() { @@ -547,7 +547,7 @@ public function getImportTablesForCurrentScope() { /** * Gets corresponding NamespaceDefinition for Node. Returns null if in global namespace. * - * @return NamespaceDefinition | null + * @return NamespaceDefinition|null */ public function getNamespaceDefinition() { $namespaceDefinition = $this instanceof NamespaceDefinition diff --git a/src/Node/ArrayElement.php b/src/Node/ArrayElement.php index 571469bc..84fd15fc 100644 --- a/src/Node/ArrayElement.php +++ b/src/Node/ArrayElement.php @@ -11,13 +11,13 @@ class ArrayElement extends Node { - /** @var Expression | null */ + /** @var Expression|null */ public $elementKey; - /** @var Token | null */ + /** @var Token|null */ public $arrowToken; - /** @var Token | null */ + /** @var Token|null */ public $byRef; /** @var Expression */ diff --git a/src/Node/ClassInterfaceClause.php b/src/Node/ClassInterfaceClause.php index 3f20f874..58490700 100644 --- a/src/Node/ClassInterfaceClause.php +++ b/src/Node/ClassInterfaceClause.php @@ -13,7 +13,7 @@ class ClassInterfaceClause extends Node { /** @var Token */ public $implementsKeyword; - /** @var DelimitedList\QualifiedNameList | null */ + /** @var DelimitedList\QualifiedNameList|null */ public $interfaceNameList; const CHILD_NAMES = [ diff --git a/src/Node/ElseClauseNode.php b/src/Node/ElseClauseNode.php index a9b18e2e..6ac7ce6d 100644 --- a/src/Node/ElseClauseNode.php +++ b/src/Node/ElseClauseNode.php @@ -14,7 +14,7 @@ class ElseClauseNode extends Node { public $elseKeyword; /** @var Token */ public $colon; - /** @var StatementNode | StatementNode[] */ + /** @var StatementNode|StatementNode[] */ public $statements; const CHILD_NAMES = [ diff --git a/src/Node/ElseIfClauseNode.php b/src/Node/ElseIfClauseNode.php index 2280fcfd..f4b8ab42 100644 --- a/src/Node/ElseIfClauseNode.php +++ b/src/Node/ElseIfClauseNode.php @@ -18,9 +18,9 @@ class ElseIfClauseNode extends Node { public $expression; /** @var Token */ public $closeParen; - /** @var Token | null */ + /** @var Token|null */ public $colon; - /** @var StatementNode | StatementNode[] */ + /** @var StatementNode|StatementNode[] */ public $statements; const CHILD_NAMES = [ diff --git a/src/Node/Expression/AnonymousFunctionCreationExpression.php b/src/Node/Expression/AnonymousFunctionCreationExpression.php index 08a16635..7a58acde 100644 --- a/src/Node/Expression/AnonymousFunctionCreationExpression.php +++ b/src/Node/Expression/AnonymousFunctionCreationExpression.php @@ -15,7 +15,7 @@ use Microsoft\PhpParser\Token; class AnonymousFunctionCreationExpression extends Expression implements FunctionLike { - /** @var Token | null */ + /** @var Token|null */ public $staticModifier; use FunctionHeader, FunctionUseClause, FunctionReturnType, FunctionBody; diff --git a/src/Node/Expression/ArgumentExpression.php b/src/Node/Expression/ArgumentExpression.php index f5d0aba4..7059ae88 100644 --- a/src/Node/Expression/ArgumentExpression.php +++ b/src/Node/Expression/ArgumentExpression.php @@ -10,10 +10,10 @@ use Microsoft\PhpParser\Token; class ArgumentExpression extends Expression { - /** @var Token | null */ + /** @var Token|null */ public $byRefToken; // TODO removed in newer versions of PHP. Also only accept variable, not expression if byRef - /** @var Token | null */ + /** @var Token|null */ public $dotDotDotToken; /** @var Expression */ diff --git a/src/Node/Expression/ArrayCreationExpression.php b/src/Node/Expression/ArrayCreationExpression.php index ec228d34..f3fc7f0e 100644 --- a/src/Node/Expression/ArrayCreationExpression.php +++ b/src/Node/Expression/ArrayCreationExpression.php @@ -12,7 +12,7 @@ class ArrayCreationExpression extends Expression { - /** @var Token | null */ + /** @var Token|null */ public $arrayKeyword; /** @var Token */ diff --git a/src/Node/Expression/CallExpression.php b/src/Node/Expression/CallExpression.php index 8ac81bb2..0654fb34 100644 --- a/src/Node/Expression/CallExpression.php +++ b/src/Node/Expression/CallExpression.php @@ -17,7 +17,7 @@ class CallExpression extends Expression { /** @var Token */ public $openParen; - /** @var DelimitedList\ArgumentExpressionList | null */ + /** @var DelimitedList\ArgumentExpressionList|null */ public $argumentExpressionList; /** @var Token */ diff --git a/src/Node/Expression/ExitIntrinsicExpression.php b/src/Node/Expression/ExitIntrinsicExpression.php index 31ed1edd..28503ba7 100644 --- a/src/Node/Expression/ExitIntrinsicExpression.php +++ b/src/Node/Expression/ExitIntrinsicExpression.php @@ -14,13 +14,13 @@ class ExitIntrinsicExpression extends Expression { /** @var Token */ public $exitOrDieKeyword; - /** @var Token | null */ + /** @var Token|null */ public $openParen; - /** @var Expression | null */ + /** @var Expression|null */ public $expression; - /** @var Token | null */ + /** @var Token|null */ public $closeParen; const CHILD_NAMES = [ diff --git a/src/Node/Expression/ObjectCreationExpression.php b/src/Node/Expression/ObjectCreationExpression.php index 025cb892..9d39be57 100644 --- a/src/Node/Expression/ObjectCreationExpression.php +++ b/src/Node/Expression/ObjectCreationExpression.php @@ -19,25 +19,25 @@ class ObjectCreationExpression extends Expression { /** @var Token */ public $newKeword; - /** @var QualifiedName | Variable | Token */ + /** @var QualifiedName|Variable|Token */ public $classTypeDesignator; - /** @var Token | null */ + /** @var Token|null */ public $openParen; - /** @var DelimitedList\ArgumentExpressionList | null */ + /** @var DelimitedList\ArgumentExpressionList|null */ public $argumentExpressionList; - /** @var Token | null */ + /** @var Token|null */ public $closeParen; - /** @var ClassBaseClause | null */ + /** @var ClassBaseClause|null */ public $classBaseClause; - /** @var ClassInterfaceClause | null */ + /** @var ClassInterfaceClause|null */ public $classInterfaceClause; - /** @var ClassMembersNode | null */ + /** @var ClassMembersNode|null */ public $classMembers; const CHILD_NAMES = [ diff --git a/src/Node/Expression/ScopedPropertyAccessExpression.php b/src/Node/Expression/ScopedPropertyAccessExpression.php index a5b4112d..73a85fcf 100644 --- a/src/Node/Expression/ScopedPropertyAccessExpression.php +++ b/src/Node/Expression/ScopedPropertyAccessExpression.php @@ -12,13 +12,13 @@ class ScopedPropertyAccessExpression extends Expression { - /** @var Expression | QualifiedName | Token */ + /** @var Expression|QualifiedName|Token */ public $scopeResolutionQualifier; /** @var Token */ public $doubleColon; - /** @var Token | Variable */ + /** @var Token|Variable */ public $memberName; const CHILD_NAMES = [ diff --git a/src/Node/Expression/UnaryExpression.php b/src/Node/Expression/UnaryExpression.php index 640af09d..6da38cdd 100644 --- a/src/Node/Expression/UnaryExpression.php +++ b/src/Node/Expression/UnaryExpression.php @@ -9,7 +9,7 @@ use Microsoft\PhpParser\Node\Expression; class UnaryExpression extends Expression { - /** @var UnaryExpression | Variable */ + /** @var UnaryExpression|Variable */ public $operand; const CHILD_NAMES = [ diff --git a/src/Node/Expression/Variable.php b/src/Node/Expression/Variable.php index 7dfff695..7a3d3cd8 100644 --- a/src/Node/Expression/Variable.php +++ b/src/Node/Expression/Variable.php @@ -13,7 +13,7 @@ class Variable extends Expression { /** @var Token */ public $dollar; - /** @var Token | Variable | BracedExpression */ + /** @var Token|Variable|BracedExpression */ public $name; const CHILD_NAMES = [ diff --git a/src/Node/ForeachValue.php b/src/Node/ForeachValue.php index 10297509..19c153fb 100644 --- a/src/Node/ForeachValue.php +++ b/src/Node/ForeachValue.php @@ -10,7 +10,7 @@ use Microsoft\PhpParser\Token; class ForeachValue extends Node { - /** @var Token | null */ + /** @var Token|null */ public $ampersand; /** @var Expression */ public $expression; diff --git a/src/Node/FunctionBody.php b/src/Node/FunctionBody.php index 6e5b828f..077eb27e 100644 --- a/src/Node/FunctionBody.php +++ b/src/Node/FunctionBody.php @@ -10,6 +10,6 @@ use Microsoft\PhpParser\Token; trait FunctionBody { - /** @var CompoundStatementNode | Token */ + /** @var CompoundStatementNode|Token */ public $compoundStatementOrSemicolon; } diff --git a/src/Node/FunctionHeader.php b/src/Node/FunctionHeader.php index 2b46532c..47e50977 100644 --- a/src/Node/FunctionHeader.php +++ b/src/Node/FunctionHeader.php @@ -13,7 +13,7 @@ trait FunctionHeader { public $functionKeyword; /** @var Token */ public $byRefToken; - /** @var null | Token */ + /** @var null|Token */ public $name; /** @var Token */ public $openParen; diff --git a/src/Node/FunctionReturnType.php b/src/Node/FunctionReturnType.php index d1b250d5..2c217f6b 100644 --- a/src/Node/FunctionReturnType.php +++ b/src/Node/FunctionReturnType.php @@ -13,6 +13,6 @@ trait FunctionReturnType { public $colonToken; /** @var Token|null */ public $questionToken; - /** @var Token | QualifiedName */ + /** @var Token|QualifiedName */ public $returnType; } diff --git a/src/Node/FunctionUseClause.php b/src/Node/FunctionUseClause.php index ea5d60f6..8f23b0b3 100644 --- a/src/Node/FunctionUseClause.php +++ b/src/Node/FunctionUseClause.php @@ -7,6 +7,6 @@ namespace Microsoft\PhpParser\Node; trait FunctionUseClause { - /** @var AnonymousFunctionUseClause | null */ + /** @var AnonymousFunctionUseClause|null */ public $anonymousFunctionUseClause; } diff --git a/src/Node/NamespaceUseClause.php b/src/Node/NamespaceUseClause.php index b49eb549..ef596280 100644 --- a/src/Node/NamespaceUseClause.php +++ b/src/Node/NamespaceUseClause.php @@ -15,11 +15,11 @@ class NamespaceUseClause extends Node { public $namespaceName; /** @var NamespaceAliasingClause */ public $namespaceAliasingClause; - /** @var Token | null */ + /** @var Token|null */ public $openBrace; - /** @var DelimitedList\NamespaceUseGroupClauseList | null */ + /** @var DelimitedList\NamespaceUseGroupClauseList|null */ public $groupClauses; - /** @var Token | null */ + /** @var Token|null */ public $closeBrace; const CHILD_NAMES = [ diff --git a/src/Node/Parameter.php b/src/Node/Parameter.php index 456bf840..97080b91 100644 --- a/src/Node/Parameter.php +++ b/src/Node/Parameter.php @@ -12,17 +12,17 @@ class Parameter extends Node { /** @var Token|null */ public $questionToken; - /** @var QualifiedName | Token | null */ + /** @var QualifiedName|Token|null */ public $typeDeclaration; - /** @var Token | null */ + /** @var Token|null */ public $byRefToken; - /** @var Token | null */ + /** @var Token|null */ public $dotDotDotToken; /** @var Token */ public $variableName; - /** @var Token | null */ + /** @var Token|null */ public $equalsToken; - /** @var null | Expression */ + /** @var null|Expression */ public $default; const CHILD_NAMES = [ diff --git a/src/Node/Statement/BreakOrContinueStatement.php b/src/Node/Statement/BreakOrContinueStatement.php index e02a555f..bc4a65af 100644 --- a/src/Node/Statement/BreakOrContinueStatement.php +++ b/src/Node/Statement/BreakOrContinueStatement.php @@ -12,7 +12,7 @@ class BreakOrContinueStatement extends StatementNode { /** @var Token */ public $breakOrContinueKeyword; - /** @var Token | null */ + /** @var Token|null */ public $breakoutLevel; /** @var Token */ public $semicolon; diff --git a/src/Node/Statement/CompoundStatementNode.php b/src/Node/Statement/CompoundStatementNode.php index 72b723bd..739e5b38 100644 --- a/src/Node/Statement/CompoundStatementNode.php +++ b/src/Node/Statement/CompoundStatementNode.php @@ -14,7 +14,7 @@ class CompoundStatementNode extends StatementNode { /** @var Token */ public $openBrace; - /** @var array | Node[] */ + /** @var array|Node[] */ public $statements; /** @var Token */ diff --git a/src/Node/Statement/DeclareStatement.php b/src/Node/Statement/DeclareStatement.php index c618c09b..9b2108eb 100644 --- a/src/Node/Statement/DeclareStatement.php +++ b/src/Node/Statement/DeclareStatement.php @@ -19,13 +19,13 @@ class DeclareStatement extends StatementNode { public $declareDirective; /** @var Token */ public $closeParen; - /** @var Token | null */ + /** @var Token|null */ public $colon; - /** @var StatementNode | StatementNode[] */ + /** @var StatementNode|StatementNode[] */ public $statements; - /** @var Token | null */ + /** @var Token|null */ public $enddeclareKeyword; - /** @var Token | null */ + /** @var Token|null */ public $semicolon; const CHILD_NAMES = [ diff --git a/src/Node/Statement/DoStatement.php b/src/Node/Statement/DoStatement.php index aed1ad46..5eada3ea 100644 --- a/src/Node/Statement/DoStatement.php +++ b/src/Node/Statement/DoStatement.php @@ -23,7 +23,7 @@ class DoStatement extends StatementNode { public $expression; /** @var Token */ public $closeParen; - /** @var Token | null */ + /** @var Token|null */ public $semicolon; const CHILD_NAMES = [ diff --git a/src/Node/Statement/ForStatement.php b/src/Node/Statement/ForStatement.php index 853b342a..cdd7dbb4 100644 --- a/src/Node/Statement/ForStatement.php +++ b/src/Node/Statement/ForStatement.php @@ -15,25 +15,25 @@ class ForStatement extends StatementNode { public $for; /** @var Token */ public $openParen; - /** @var Expression | null */ + /** @var Expression|null */ public $forInitializer; /** @var Token */ public $exprGroupSemicolon1; - /** @var Expression | null */ + /** @var Expression|null */ public $forControl; /** @var Token */ public $exprGroupSemicolon2; - /** @var Expression | null */ + /** @var Expression|null */ public $forEndOfLoop; /** @var Token */ public $closeParen; - /** @var Token | null */ + /** @var Token|null */ public $colon; - /** @var StatementNode | StatementNode[] */ + /** @var StatementNode|StatementNode[] */ public $statements; - /** @var Token | null */ + /** @var Token|null */ public $endFor; - /** @var Token | null */ + /** @var Token|null */ public $endForSemicolon; const CHILD_NAMES = [ diff --git a/src/Node/Statement/ForeachStatement.php b/src/Node/Statement/ForeachStatement.php index 1fe733e6..8e0a64e7 100644 --- a/src/Node/Statement/ForeachStatement.php +++ b/src/Node/Statement/ForeachStatement.php @@ -21,19 +21,19 @@ class ForeachStatement extends StatementNode { public $forEachCollectionName; /** @var Token */ public $asKeyword; - /** @var ForeachKey | null */ + /** @var ForeachKey|null */ public $foreachKey; /** @var ForeachValue */ public $foreachValue; /** @var Token */ public $closeParen; - /** @var Token | null */ + /** @var Token|null */ public $colon; - /** @var StatementNode | StatementNode[] */ + /** @var StatementNode|StatementNode[] */ public $statements; - /** @var Token | null */ + /** @var Token|null */ public $endForeach; - /** @var Token | null */ + /** @var Token|null */ public $endForeachSemicolon; const CHILD_NAMES = [ diff --git a/src/Node/Statement/IfStatementNode.php b/src/Node/Statement/IfStatementNode.php index be1aadb1..67d04adc 100644 --- a/src/Node/Statement/IfStatementNode.php +++ b/src/Node/Statement/IfStatementNode.php @@ -21,17 +21,17 @@ class IfStatementNode extends StatementNode { public $expression; /** @var Token */ public $closeParen; - /** @var Token | null */ + /** @var Token|null */ public $colon; - /** @var StatementNode | StatementNode[] */ + /** @var StatementNode|StatementNode[] */ public $statements; /** @var ElseIfClauseNode[] */ public $elseIfClauses; - /** @var ElseClauseNode | null */ + /** @var ElseClauseNode|null */ public $elseClause; - /** @var Token | null */ + /** @var Token|null */ public $endifKeyword; - /** @var Token | null */ + /** @var Token|null */ public $semicolon; const CHILD_NAMES = [ diff --git a/src/Node/Statement/InlineHtml.php b/src/Node/Statement/InlineHtml.php index 25cf2e6e..fdd355b8 100644 --- a/src/Node/Statement/InlineHtml.php +++ b/src/Node/Statement/InlineHtml.php @@ -10,13 +10,13 @@ use Microsoft\PhpParser\Token; class InlineHtml extends StatementNode { - /** @var Token | null */ + /** @var Token|null */ public $scriptSectionEndTag; /** @var Token */ public $text; - /** @var Token | null */ + /** @var Token|null */ public $scriptSectionStartTag; const CHILD_NAMES = [ diff --git a/src/Node/Statement/InterfaceDeclaration.php b/src/Node/Statement/InterfaceDeclaration.php index b9e66521..e11261f5 100644 --- a/src/Node/Statement/InterfaceDeclaration.php +++ b/src/Node/Statement/InterfaceDeclaration.php @@ -23,7 +23,7 @@ class InterfaceDeclaration extends StatementNode implements NamespacedNameInterf /** @var Token */ public $name; - /** @var InterfaceBaseClause | null */ + /** @var InterfaceBaseClause|null */ public $interfaceBaseClause; /** @var InterfaceMembers */ diff --git a/src/Node/Statement/NamespaceDefinition.php b/src/Node/Statement/NamespaceDefinition.php index cd3b83cf..c4ad8af5 100644 --- a/src/Node/Statement/NamespaceDefinition.php +++ b/src/Node/Statement/NamespaceDefinition.php @@ -13,9 +13,9 @@ class NamespaceDefinition extends StatementNode { /** @var Token */ public $namespaceKeyword; - /** @var QualifiedName | null */ + /** @var QualifiedName|null */ public $name; - /** @var CompoundStatementNode | Token */ + /** @var CompoundStatementNode|Token */ public $compoundStatementOrSemicolon; const CHILD_NAMES = [ diff --git a/src/Node/Statement/ReturnStatement.php b/src/Node/Statement/ReturnStatement.php index e6c4dfc9..50353c16 100644 --- a/src/Node/Statement/ReturnStatement.php +++ b/src/Node/Statement/ReturnStatement.php @@ -13,7 +13,7 @@ class ReturnStatement extends StatementNode { /** @var Token */ public $returnKeyword; - /** @var Expression | null */ + /** @var Expression|null */ public $expression; /** @var Token */ public $semicolon; diff --git a/src/Node/Statement/SwitchStatementNode.php b/src/Node/Statement/SwitchStatementNode.php index 23a46f8b..df057393 100644 --- a/src/Node/Statement/SwitchStatementNode.php +++ b/src/Node/Statement/SwitchStatementNode.php @@ -20,17 +20,17 @@ class SwitchStatementNode extends StatementNode { public $expression; /** @var Token */ public $closeParen; - /** @var Token | null */ + /** @var Token|null */ public $colon; - /** @var Token | null */ + /** @var Token|null */ public $openBrace; /** @var CaseStatementNode[] */ public $caseStatements; - /** @var Token | null */ + /** @var Token|null */ public $closeBrace; - /** @var Token | null */ + /** @var Token|null */ public $endswitch; - /** @var Token | null */ + /** @var Token|null */ public $semicolon; const CHILD_NAMES = [ diff --git a/src/Node/Statement/TryStatement.php b/src/Node/Statement/TryStatement.php index 87e2e5e0..b0e503ca 100644 --- a/src/Node/Statement/TryStatement.php +++ b/src/Node/Statement/TryStatement.php @@ -16,9 +16,9 @@ class TryStatement extends StatementNode { public $tryKeyword; /** @var StatementNode */ public $compoundStatement; - /** @var CatchClause[] | null */ + /** @var CatchClause[]|null */ public $catchClauses; - /** @var FinallyClause | null */ + /** @var FinallyClause|null */ public $finallyClause; const CHILD_NAMES = [ diff --git a/src/Node/Statement/WhileStatement.php b/src/Node/Statement/WhileStatement.php index 23056bd0..d79ae713 100644 --- a/src/Node/Statement/WhileStatement.php +++ b/src/Node/Statement/WhileStatement.php @@ -19,13 +19,13 @@ class WhileStatement extends StatementNode { public $expression; /** @var Token */ public $closeParen; - /** @var Token | null */ + /** @var Token|null */ public $colon; - /** @var StatementNode | StatementNode[] */ + /** @var StatementNode|StatementNode[] */ public $statements; - /** @var Token | null */ + /** @var Token|null */ public $endWhile; - /** @var Token | null */ + /** @var Token|null */ public $semicolon; const CHILD_NAMES = [ diff --git a/src/Node/StaticVariableDeclaration.php b/src/Node/StaticVariableDeclaration.php index f5f05004..7c08ec55 100644 --- a/src/Node/StaticVariableDeclaration.php +++ b/src/Node/StaticVariableDeclaration.php @@ -14,10 +14,10 @@ class StaticVariableDeclaration extends Node { /** @var Token */ public $variableName; - /** @var Token | null */ + /** @var Token|null */ public $equalsToken; - /** @var Expression | null */ + /** @var Expression|null */ public $assignment; const CHILD_NAMES = [ diff --git a/src/Node/TraitSelectOrAliasClause.php b/src/Node/TraitSelectOrAliasClause.php index 3d0e719a..711d52c9 100644 --- a/src/Node/TraitSelectOrAliasClause.php +++ b/src/Node/TraitSelectOrAliasClause.php @@ -10,7 +10,7 @@ use Microsoft\PhpParser\Token; class TraitSelectOrAliasClause extends Node { - /** @var QualifiedName | Node\Expression\ScopedPropertyAccessExpression */ + /** @var QualifiedName|Node\Expression\ScopedPropertyAccessExpression */ public $name; /** @var Token */ @@ -19,7 +19,7 @@ class TraitSelectOrAliasClause extends Node { /** @var Token[] */ public $modifiers; - /** @var QualifiedName | Node\Expression\ScopedPropertyAccessExpression */ + /** @var QualifiedName|Node\Expression\ScopedPropertyAccessExpression */ public $targetName; const CHILD_NAMES = [ diff --git a/src/Node/UseVariableName.php b/src/Node/UseVariableName.php index 5e1506bb..21fc0798 100644 --- a/src/Node/UseVariableName.php +++ b/src/Node/UseVariableName.php @@ -12,7 +12,7 @@ class UseVariableName extends Node { const CHILD_NAMES = ['byRef', 'variableName']; - /** @var Token | null */ + /** @var Token|null */ public $byRef; /** @var Token */ diff --git a/src/ResolvedName.php b/src/ResolvedName.php index f97b2614..34acf4ff 100644 --- a/src/ResolvedName.php +++ b/src/ResolvedName.php @@ -10,7 +10,7 @@ class ResolvedName { private $parts = []; /** - * @param array | Token[] $tokens + * @param Token[] $tokens */ public static function buildName(array $tokens, $content) : ResolvedName { $name = new ResolvedName(); diff --git a/src/TextEdit.php b/src/TextEdit.php index 867dd19b..a967b381 100644 --- a/src/TextEdit.php +++ b/src/TextEdit.php @@ -28,7 +28,7 @@ public function __construct(int $start, int $length, string $content) { * * Note that after applying edits, the original AST should be invalidated. * - * @param array | TextEdit[] $edits + * @param TextEdit[] $edits * @param string $text * @return string */