Merge remote-tracking branch 'upstream/master'

Author: TysonAndre

README.md

@@ -13,7 +13,7 @@ with the Abstract Syntax Tree (AST) via a friendly API.
 ```php
 <?php
 // Autoload required classes
-require "vendor/autoload.php";
+require __DIR__ . "/vendor/autoload.php";
 
 use Microsoft\PhpParser\{DiagnosticsProvider, Node, Parser, PositionUtilities};
 

docs/GettingStarted.md

@@ -59,7 +59,8 @@ rather the complete source, which includes tests as well.
 
 ```php
 <?php
-require "vendor/autoload.php"; # autoloads required classes
+// Autoload required classes
+require __DIR__ . "/vendor/autoload.php";
 
 use Microsoft\PhpParser\{DiagnosticsProvider, Parser};
 

src/Node/Statement/BreakOrContinueStatement.php

@@ -6,6 +6,7 @@
 
 namespace Microsoft\PhpParser\Node\Statement;
 
+use Microsoft\PhpParser\Node\Expression;
 use Microsoft\PhpParser\Node\StatementNode;
 use Microsoft\PhpParser\Token;
 

src/Parser.php

@@ -14,6 +14,7 @@
 use Microsoft\PhpParser\Node\ClassInterfaceClause;
 use Microsoft\PhpParser\Node\ClassMembersNode;
 use Microsoft\PhpParser\Node\ConstElement;
+use Microsoft\PhpParser\Node\Expression;
 use Microsoft\PhpParser\Node\Expression\{
     AnonymousFunctionCreationExpression,
     ArgumentExpression,
@@ -1473,6 +1474,11 @@ private function parseWhileStatement($parentNode) {
         return $whileStatement;
     }
 
+    /**
+     * @param Node $parentNode
+     * @param bool $force
+     * @return Node|MissingToken|array - The expression, or a missing token, or (if $force) an array containing a missed and skipped token
+     */
     private function parseExpression($parentNode, $force = false) {
         $token = $this->getCurrentToken();
         if ($token->kind === TokenKind::EndOfFileToken) {
@@ -1494,6 +1500,10 @@ private function parseExpressionFn() {
         };
     }
 
+    /**
+     * @param Node $parentNode
+     * @return Expression
+     */
     private function parseUnaryExpressionOrHigher($parentNode) {
         $token = $this->getCurrentToken();
         switch ($token->kind) {
@@ -1579,6 +1589,11 @@ private function parseUnaryExpressionOrHigher($parentNode) {
         return $this->parsePostfixExpressionRest($expression);
     }
 
+    /**
+     * @param int $precedence
+     * @param Node $parentNode
+     * @return Expression
+     */
     private function parseBinaryExpressionOrHigher($precedence, $parentNode) {
         $leftOperand = $this->parseUnaryExpressionOrHigher($parentNode);
 

src/PhpTokenizer.php

@@ -7,7 +7,7 @@
 namespace Microsoft\PhpParser;
 
 /**
- * Tokenizes content using PHP's built-in `tokens_get_all`, and converts to "lightweight" Token representation.
+ * Tokenizes content using PHP's built-in `token_get_all`, and converts to "lightweight" Token representation.
  *
  * Initially we tried hand-spinning the lexer (see `experiments/Lexer.php`), but we had difficulties optimizing
  * performance (especially when working with Unicode characters.)
@@ -58,7 +58,7 @@ public static function getTokensArrayFromContent(
             $passedPrefix = false;
         }
 
-        $tokens = \token_get_all($content);
+        $tokens = @\token_get_all($content);
 
         $arr = array();
         $fullStart = $start = $pos = $initialPos;