Skip to content

fix var annotations #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2017
Merged

fix var annotations #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Node/CaseStatementNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ class CaseStatementNode extends Node {
public $expression;
/** @var Token */
public $defaultLabelTerminator;
/**@var StatementNode[] */
/** @var StatementNode[] */
public $statementList;
}
4 changes: 2 additions & 2 deletions src/Node/CatchClause.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class CatchClause extends Node {
public $qualifiedName;
/** @var Token */
public $variableName;
/**@var Token */
/** @var Token */
public $closeParen;
/**@var StatementNode */
/** @var StatementNode */
public $compoundStatement;
}
2 changes: 1 addition & 1 deletion src/Node/DefaultStatementNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ class DefaultStatementNode extends Node {
public $defaultKeyword;
/** @var Token */
public $defaultLabelTerminator;
/**@var StatementNode[] */
/** @var StatementNode[] */
public $statementList;
}
2 changes: 1 addition & 1 deletion src/Node/ElseClauseNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ class ElseClauseNode extends Node {
public $elseKeyword;
/** @var Token */
public $colon;
/**@var StatementNode | StatementNode[] */
/** @var StatementNode | StatementNode[] */
Copy link

@felixfbecker felixfbecker Jun 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are spaces between union types allowed? I thought a space separated the type from a description

Copy link
Contributor Author

@jens1o jens1o Jun 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's forbidden, but I don't want to break codestyle to be honest.

Copy link

@felixfbecker felixfbecker Jun 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't break forbidden code style?

Copy link
Contributor Author

@jens1o jens1o Jun 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, you got it. Until I get a message, I won't break that.

Copy link
Member

@roblourens roblourens Jun 12, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does appear to be wrong, at least it isn't parsed by phpDocumentor when it's space-separated. There are a ton of those in the parser, I'll fix them all at once. Also some in the language server.

public $statements;
}
6 changes: 3 additions & 3 deletions src/Node/ElseIfClauseNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ class ElseIfClauseNode extends Node {
public $openParen;
/** @var Expression */
public $expression;
/**@var Token */
/** @var Token */
public $closeParen;
/**@var Token | null */
/** @var Token | null */
public $colon;
/**@var StatementNode | StatementNode[] */
/** @var StatementNode | StatementNode[] */
public $statements;
}
2 changes: 1 addition & 1 deletion src/Node/FinallyClause.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
class FinallyClause extends Node {
/** @var Token */
public $finallyToken;
/**@var StatementNode */
/** @var StatementNode */
public $compoundStatement;
}
4 changes: 2 additions & 2 deletions src/Node/Statement/DoStatement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class DoStatement extends StatementNode {
public $openParen;
/** @var Expression */
public $expression;
/**@var Token */
/** @var Token */
public $closeParen;
/**@var Token | null */
/** @var Token | null */
public $semicolon;
}
8 changes: 4 additions & 4 deletions src/Node/Statement/ForStatement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ class ForStatement extends StatementNode {
public $exprGroupSemicolon2;
/** @var Expression | null */
public $forEndOfLoop;
/**@var Token */
/** @var Token */
public $closeParen;
/** @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;
}
8 changes: 4 additions & 4 deletions src/Node/Statement/ForeachStatement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ class ForeachStatement extends StatementNode {
public $foreachKey;
/** @var ForeachValue */
public $foreachValue;
/**@var Token */
/** @var Token */
public $closeParen;
/** @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;
}
10 changes: 5 additions & 5 deletions src/Node/Statement/IfStatementNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ class IfStatementNode extends StatementNode {
public $openParen;
/** @var Expression */
public $expression;
/**@var Token */
/** @var Token */
public $closeParen;
/** @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;
}
8 changes: 4 additions & 4 deletions src/Node/Statement/SwitchStatementNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ class SwitchStatementNode extends StatementNode {
public $openParen;
/** @var Expression */
public $expression;
/**@var Token */
/** @var Token */
public $closeParen;
/** @var Token | null */
public $colon;
/** @var Token | null */
public $openBrace;
/**@var CaseStatementNode[] */
/** @var CaseStatementNode[] */
public $caseStatements;
/** @var Token | null */
public $closeBrace;
/**@var Token | null */
/** @var Token | null */
public $endswitch;
/**@var Token | null */
/** @var Token | null */
public $semicolon;
}
2 changes: 1 addition & 1 deletion src/Node/Statement/TryStatement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ class TryStatement extends StatementNode {
public $compoundStatement;
/** @var CatchClause[] | null */
public $catchClauses;
/**@var FinallyClause | null */
/** @var FinallyClause | null */
public $finallyClause;
}
8 changes: 4 additions & 4 deletions src/Node/Statement/WhileStatement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ class WhileStatement extends StatementNode {
public $openParen;
/** @var Expression */
public $expression;
/**@var Token */
/** @var Token */
public $closeParen;
/** @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;
}