nikic / PHP-Parser

grammar/analyze.php

Doc Comments +6 added lines

@@ -20,10 +20,16 @@
     'case_separator', 'optional_comma'
 ));
 
+/**
+ * @param string $regex
+ */
 function regex($regex) {
     return '~' . LIB . '(?:' . str_replace('~', '\~', $regex) . ')~';
 }
 
+/**
+ * @param string $regex
+ */
 function magicSplit($regex, $string) {
     $pieces = preg_split(regex('(?:(?&string)|(?&comment)|(?&code))(*SKIP)(*FAIL)|' . $regex), $string);
 

grammar/rebuildParsers.php

Doc Comments +9 added lines

@@ -175,6 +175,9 @@ 
     );
 }
 
+/**
+ * @param integer $num
+ */
 function assertArgs($num, $args, $name) {
     if ($num != count($args)) {
         die('Wrong argument count for ' . $name . '().');
@@ -203,10 +206,16 @@ 
 /// Regex helper functions ///
 //////////////////////////////
 
+/**
+ * @param string $regex
+ */
 function regex($regex) {
     return '~' . LIB . '(?:' . str_replace('~', '\~', $regex) . ')~';
 }
 
+/**
+ * @param string $regex
+ */
 function magicSplit($regex, $string) {
     $pieces = preg_split(regex('(?:(?&string)|(?&comment)|(?&code))(*SKIP)(*FAIL)|' . $regex), $string);
 

Indentation +5 added lines, -5 removed lines

@@ -138,7 +138,7 @@ 
                 assertArgs(2, $args, $name);
 
                 return 'if (is_array(' . $args[1] . ')) { $$ = array_merge(' . $args[0] . ', ' . $args[1] . '); }'
-                     . ' else { ' . $args[0] . '[] = ' . $args[1] . '; $$ = ' . $args[0] . '; }';
+                        . ' else { ' . $args[0] . '[] = ' . $args[1] . '; $$ = ' . $args[0] . '; }';
             }
 
             if ('toArray' == $name) {
@@ -157,16 +157,16 @@ 
                 assertArgs(3, $args, $name);
 
                 return 'foreach (' . $args[0] . ' as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) {'
-                     . ' $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, ' . $args[1] . ', ' . $args[2] . '); } }';
+                        . ' $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, ' . $args[1] . ', ' . $args[2] . '); } }';
             }
 
             if ('parseEncapsedDoc' == $name) {
                 assertArgs(2, $args, $name);
 
                 return 'foreach (' . $args[0] . ' as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) {'
-                     . ' $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, ' . $args[1] . '); } }'
-                     . ' $s->value = preg_replace(\'~(\r\n|\n|\r)\z~\', \'\', $s->value);'
-                     . ' if (\'\' === $s->value) array_pop(' . $args[0] . ');';
+                        . ' $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, ' . $args[1] . '); } }'
+                        . ' $s->value = preg_replace(\'~(\r\n|\n|\r)\z~\', \'\', $s->value);'
+                        . ' if (\'\' === $s->value) array_pop(' . $args[0] . ');';
             }
 
             return $matches[0];

lib/PhpParser/Builder/Class_.php

Doc Comments -2 removed lines

@@ -44,8 +44,6 @@
     /**
      * Implements one or more interfaces.
      *
-     * @param Name|string $interface Name of interface to implement
-     * @param Name|string $...       More interfaces to implement
      *
      * @return $this The builder instance (for fluid interface)
      */

lib/PhpParser/Builder/Interface_.php

Doc Comments -2 removed lines

@@ -25,8 +25,6 @@
     /**
      * Extends one or more interfaces.
      *
-     * @param Name|string $interface Name of interface to extend
-     * @param Name|string $...       More interfaces to extend
      *
      * @return $this The builder instance (for fluid interface)
      */

lib/PhpParser/NodeVisitor/NameResolver.php

Doc Comments +3 added lines

@@ -110,6 +110,9 @@
         );
     }
 
+    /**
+     * @param Name $type
+     */
     protected function addAlias(Stmt\UseUse $use, $type, Name $prefix = null) {
         // Add prefix for group uses
         $name = $prefix ? Name::concat($prefix, $use->name) : $use->name;

lib/PhpParser/Parser/Multiple.php

Doc Comments +3 added lines

@@ -51,6 +51,9 @@
         return $this->errors;
     }
 
+    /**
+     * @param string $code
+     */
     private function tryParse(Parser $parser, $code) {
         $stmts = null;
         $error = null;

lib/PhpParser/PrettyPrinter/Standard.php

Doc Comments +12 added lines

@@ -534,6 +534,9 @@ 
              . ($node->name->getLast() !== $node->alias ? ' as ' . $node->alias : '');
     }
 
+    /**
+     * @param integer $type
+     */
     private function pUseType($type) {
         return $type === Stmt\Use_::TYPE_FUNCTION ? 'function '
             : ($type === Stmt\Use_::TYPE_CONSTANT ? 'const ' : '');
@@ -744,6 +747,9 @@ 
         return is_string($node) ? $node : $this->p($node);
     }
 
+    /**
+     * @param string $afterClassToken
+     */
     protected function pClassCommon(Stmt\Class_ $node, $afterClassToken) {
         return $this->pModifiers($node->type)
         . 'class' . $afterClassToken
@@ -760,6 +766,9 @@ 
         }
     }
 
+    /**
+     * @param integer $modifiers
+     */
     protected function pModifiers($modifiers) {
         return ($modifiers & Stmt\Class_::MODIFIER_PUBLIC    ? 'public '    : '')
              . ($modifiers & Stmt\Class_::MODIFIER_PROTECTED ? 'protected ' : '')
@@ -769,6 +778,9 @@ 
              . ($modifiers & Stmt\Class_::MODIFIER_FINAL     ? 'final '     : '');
     }
 
+    /**
+     * @param string $quote
+     */
     protected function pEncapsList(array $encapsList, $quote) {
         $return = '';
         foreach ($encapsList as $element) {

Spacing +9 added lines, -9 removed lines

@@ -463,7 +463,7 @@ 
         return ($node->static ? 'static ' : '')
              . 'function ' . ($node->byRef ? '&' : '')
              . '(' . $this->pCommaSeparated($node->params) . ')'
-             . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')': '')
+             . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')' : '')
              . (null !== $node->returnType ? ' : ' . $this->pType($node->returnType) : '')
              . ' {' . $this->pStmts($node->stmts) . "\n" . '}';
     }
@@ -570,7 +570,7 @@ 
         return (null !== $node->trait ? $this->p($node->trait) . '::' : '')
              . $node->method . ' as'
              . (null !== $node->newModifier ? ' ' . rtrim($this->pModifiers($node->newModifier), ' ') : '')
-             . (null !== $node->newName     ? ' ' . $node->newName                        : '')
+             . (null !== $node->newName ? ' ' . $node->newName : '')
              . ';';
     }
 
@@ -761,12 +761,12 @@ 
     }
 
     protected function pModifiers($modifiers) {
-        return ($modifiers & Stmt\Class_::MODIFIER_PUBLIC    ? 'public '    : '')
+        return ($modifiers & Stmt\Class_::MODIFIER_PUBLIC ? 'public ' : '')
              . ($modifiers & Stmt\Class_::MODIFIER_PROTECTED ? 'protected ' : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_PRIVATE   ? 'private '   : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_STATIC    ? 'static '    : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_ABSTRACT  ? 'abstract '  : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_FINAL     ? 'final '     : '');
+             . ($modifiers & Stmt\Class_::MODIFIER_PRIVATE ? 'private ' : '')
+             . ($modifiers & Stmt\Class_::MODIFIER_STATIC ? 'static ' : '')
+             . ($modifiers & Stmt\Class_::MODIFIER_ABSTRACT ? 'abstract ' : '')
+             . ($modifiers & Stmt\Class_::MODIFIER_FINAL ? 'final ' : '');
     }
 
     protected function pEncapsList(array $encapsList, $quote) {
@@ -797,7 +797,7 @@ 
             || $node instanceof Expr\ClassConstFetch
         ) {
             return $this->p($node);
-        } else  {
+        } else {
             return '(' . $this->p($node) . ')';
         }
     }
@@ -812,7 +812,7 @@ 
             || $node instanceof Expr\Array_
         ) {
             return $this->p($node);
-        } else  {
+        } else {
             return '(' . $this->p($node) . ')';
         }
     }

Indentation +64 added lines, -64 removed lines

@@ -19,10 +19,10 @@ 
 
     public function pParam(Node\Param $node) {
         return ($node->type ? $this->pType($node->type) . ' ' : '')
-             . ($node->byRef ? '&' : '')
-             . ($node->variadic ? '...' : '')
-             . '$' . $node->name
-             . ($node->default ? ' = ' . $this->p($node->default) : '');
+                . ($node->byRef ? '&' : '')
+                . ($node->variadic ? '...' : '')
+                . '$' . $node->name
+                . ($node->default ? ' = ' . $this->p($node->default) : '');
     }
 
     public function pArg(Node\Arg $node) {
@@ -357,22 +357,22 @@ 
 
     public function pExpr_FuncCall(Expr\FuncCall $node) {
         return $this->pCallLhs($node->name)
-             . '(' . $this->pCommaSeparated($node->args) . ')';
+                . '(' . $this->pCommaSeparated($node->args) . ')';
     }
 
     public function pExpr_MethodCall(Expr\MethodCall $node) {
         return $this->pDereferenceLhs($node->var) . '->' . $this->pObjectProperty($node->name)
-             . '(' . $this->pCommaSeparated($node->args) . ')';
+                . '(' . $this->pCommaSeparated($node->args) . ')';
     }
 
     public function pExpr_StaticCall(Expr\StaticCall $node) {
         return $this->pDereferenceLhs($node->class) . '::'
-             . ($node->name instanceof Expr
+                . ($node->name instanceof Expr
                 ? ($node->name instanceof Expr\Variable
                    ? $this->p($node->name)
                    : '{' . $this->p($node->name) . '}')
                 : $node->name)
-             . '(' . $this->pCommaSeparated($node->args) . ')';
+                . '(' . $this->pCommaSeparated($node->args) . ')';
     }
 
     public function pExpr_Empty(Expr\Empty_ $node) {
@@ -431,12 +431,12 @@ 
 
     public function pExpr_ArrayItem(Expr\ArrayItem $node) {
         return (null !== $node->key ? $this->p($node->key) . ' => ' : '')
-             . ($node->byRef ? '&' : '') . $this->p($node->value);
+                . ($node->byRef ? '&' : '') . $this->p($node->value);
     }
 
     public 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) : '') . ']';
     }
 
     public function pExpr_ConstFetch(Expr\ConstFetch $node) {
@@ -461,11 +461,11 @@ 
 
     public function pExpr_Closure(Expr\Closure $node) {
         return ($node->static ? 'static ' : '')
-             . 'function ' . ($node->byRef ? '&' : '')
-             . '(' . $this->pCommaSeparated($node->params) . ')'
-             . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')': '')
-             . (null !== $node->returnType ? ' : ' . $this->pType($node->returnType) : '')
-             . ' {' . $this->pStmts($node->stmts) . "\n" . '}';
+                . 'function ' . ($node->byRef ? '&' : '')
+                . '(' . $this->pCommaSeparated($node->params) . ')'
+                . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')': '')
+                . (null !== $node->returnType ? ' : ' . $this->pType($node->returnType) : '')
+                . ' {' . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
     public function pExpr_ClosureUse(Expr\ClosureUse $node) {
@@ -502,9 +502,9 @@ 
         } 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)
-                 . ')';
+                    . ($node->key !== null ? $this->p($node->key) . ' => ' : '')
+                    . $this->p($node->value)
+                    . ')';
         }
     }
 
@@ -515,23 +515,23 @@ 
             return 'namespace ' . $this->p($node->name) . ';' . "\n" . $this->pStmts($node->stmts, false);
         } else {
             return 'namespace' . (null !== $node->name ? ' ' . $this->p($node->name) : '')
-                 . ' {' . $this->pStmts($node->stmts) . "\n" . '}';
+                    . ' {' . $this->pStmts($node->stmts) . "\n" . '}';
         }
     }
 
     public function pStmt_Use(Stmt\Use_ $node) {
         return 'use ' . $this->pUseType($node->type)
-             . $this->pCommaSeparated($node->uses) . ';';
+                . $this->pCommaSeparated($node->uses) . ';';
     }
 
     public function pStmt_GroupUse(Stmt\GroupUse $node) {
         return 'use ' . $this->pUseType($node->type) . $this->pName($node->prefix)
-             . '\{' . $this->pCommaSeparated($node->uses) . '};';
+                . '\{' . $this->pCommaSeparated($node->uses) . '};';
     }
 
     public function pStmt_UseUse(Stmt\UseUse $node) {
         return $this->pUseType($node->type) . $this->p($node->name)
-             . ($node->name->getLast() !== $node->alias ? ' as ' . $node->alias : '');
+                . ($node->name->getLast() !== $node->alias ? ' as ' . $node->alias : '');
     }
 
     private function pUseType($type) {
@@ -541,8 +541,8 @@ 
 
     public function pStmt_Interface(Stmt\Interface_ $node) {
         return 'interface ' . $node->name
-             . (!empty($node->extends) ? ' extends ' . $this->pCommaSeparated($node->extends) : '')
-             . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}';
+                . (!empty($node->extends) ? ' extends ' . $this->pCommaSeparated($node->extends) : '')
+                . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
     public function pStmt_Class(Stmt\Class_ $node) {
@@ -551,27 +551,27 @@ 
 
     public function pStmt_Trait(Stmt\Trait_ $node) {
         return 'trait ' . $node->name
-             . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}';
+                . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
     public function pStmt_TraitUse(Stmt\TraitUse $node) {
         return 'use ' . $this->pCommaSeparated($node->traits)
-             . (empty($node->adaptations)
+                . (empty($node->adaptations)
                 ? ';'
                 : ' {' . $this->pStmts($node->adaptations) . "\n" . '}');
     }
 
     public function pStmt_TraitUseAdaptation_Precedence(Stmt\TraitUseAdaptation\Precedence $node) {
         return $this->p($node->trait) . '::' . $node->method
-             . ' insteadof ' . $this->pCommaSeparated($node->insteadof) . ';';
+                . ' insteadof ' . $this->pCommaSeparated($node->insteadof) . ';';
     }
 
     public 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                        : '')
-             . ';';
+                . $node->method . ' as'
+                . (null !== $node->newModifier ? ' ' . rtrim($this->pModifiers($node->newModifier), ' ') : '')
+                . (null !== $node->newName     ? ' ' . $node->newName                        : '')
+                . ';';
     }
 
     public function pStmt_Property(Stmt\Property $node) {
@@ -580,15 +580,15 @@ 
 
     public function pStmt_PropertyProperty(Stmt\PropertyProperty $node) {
         return '$' . $node->name
-             . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
+                . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
     }
 
     public function pStmt_ClassMethod(Stmt\ClassMethod $node) {
         return $this->pModifiers($node->type)
-             . 'function ' . ($node->byRef ? '&' : '') . $node->name
-             . '(' . $this->pCommaSeparated($node->params) . ')'
-             . (null !== $node->returnType ? ' : ' . $this->pType($node->returnType) : '')
-             . (null !== $node->stmts
+                . 'function ' . ($node->byRef ? '&' : '') . $node->name
+                . '(' . $this->pCommaSeparated($node->params) . ')'
+                . (null !== $node->returnType ? ' : ' . $this->pType($node->returnType) : '')
+                . (null !== $node->stmts
                 ? "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}'
                 : ';');
     }
@@ -599,9 +599,9 @@ 
 
     public function pStmt_Function(Stmt\Function_ $node) {
         return 'function ' . ($node->byRef ? '&' : '') . $node->name
-             . '(' . $this->pCommaSeparated($node->params) . ')'
-             . (null !== $node->returnType ? ' : ' . $this->pType($node->returnType) : '')
-             . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}';
+                . '(' . $this->pCommaSeparated($node->params) . ')'
+                . (null !== $node->returnType ? ' : ' . $this->pType($node->returnType) : '')
+                . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
     public function pStmt_Const(Stmt\Const_ $node) {
@@ -610,7 +610,7 @@ 
 
     public function pStmt_Declare(Stmt\Declare_ $node) {
         return 'declare (' . $this->pCommaSeparated($node->declares) . ')'
-             . (null !== $node->stmts ? ' {' . $this->pStmts($node->stmts) . "\n" . '}' : ';');
+                . (null !== $node->stmts ? ' {' . $this->pStmts($node->stmts) . "\n" . '}' : ';');
     }
 
     public function pStmt_DeclareDeclare(Stmt\DeclareDeclare $node) {
@@ -621,14 +621,14 @@ 
 
     public function pStmt_If(Stmt\If_ $node) {
         return 'if (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->stmts) . "\n" . '}'
-             . $this->pImplode($node->elseifs)
-             . (null !== $node->else ? $this->p($node->else) : '');
+                . $this->pStmts($node->stmts) . "\n" . '}'
+                . $this->pImplode($node->elseifs)
+                . (null !== $node->else ? $this->p($node->else) : '');
     }
 
     public function pStmt_ElseIf(Stmt\ElseIf_ $node) {
         return ' elseif (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->stmts) . "\n" . '}';
+                . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
     public function pStmt_Else(Stmt\Else_ $node) {
@@ -637,50 +637,50 @@ 
 
     public 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) . "\n" . '}';
+                . $this->pCommaSeparated($node->init) . ';' . (!empty($node->cond) ? ' ' : '')
+                . $this->pCommaSeparated($node->cond) . ';' . (!empty($node->loop) ? ' ' : '')
+                . $this->pCommaSeparated($node->loop)
+                . ') {' . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
     public 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) . "\n" . '}';
+                . (null !== $node->keyVar ? $this->p($node->keyVar) . ' => ' : '')
+                . ($node->byRef ? '&' : '') . $this->p($node->valueVar) . ') {'
+                . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
     public function pStmt_While(Stmt\While_ $node) {
         return 'while (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->stmts) . "\n" . '}';
+                . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
     public function pStmt_Do(Stmt\Do_ $node) {
         return 'do {' . $this->pStmts($node->stmts) . "\n"
-             . '} while (' . $this->p($node->cond) . ');';
+                . '} while (' . $this->p($node->cond) . ');';
     }
 
     public function pStmt_Switch(Stmt\Switch_ $node) {
         return 'switch (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->cases) . "\n" . '}';
+                . $this->pStmts($node->cases) . "\n" . '}';
     }
 
     public function pStmt_Case(Stmt\Case_ $node) {
         return (null !== $node->cond ? 'case ' . $this->p($node->cond) : 'default') . ':'
-             . $this->pStmts($node->stmts);
+                . $this->pStmts($node->stmts);
     }
 
     public function pStmt_TryCatch(Stmt\TryCatch $node) {
         return 'try {' . $this->pStmts($node->stmts) . "\n" . '}'
-             . $this->pImplode($node->catches)
-             . ($node->finallyStmts !== null
+                . $this->pImplode($node->catches)
+                . ($node->finallyStmts !== null
                 ? ' finally {' . $this->pStmts($node->finallyStmts) . "\n" . '}'
                 : '');
     }
 
     public function pStmt_Catch(Stmt\Catch_ $node) {
         return ' catch (' . $this->p($node->type) . ' $' . $node->var . ') {'
-             . $this->pStmts($node->stmts) . "\n" . '}';
+                . $this->pStmts($node->stmts) . "\n" . '}';
     }
 
     public function pStmt_Break(Stmt\Break_ $node) {
@@ -723,7 +723,7 @@ 
 
     public function pStmt_StaticVar(Stmt\StaticVar $node) {
         return '$' . $node->name
-             . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
+                . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
     }
 
     public function pStmt_Unset(Stmt\Unset_ $node) {
@@ -762,11 +762,11 @@ 
 
     protected function pModifiers($modifiers) {
         return ($modifiers & Stmt\Class_::MODIFIER_PUBLIC    ? 'public '    : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_PROTECTED ? 'protected ' : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_PRIVATE   ? 'private '   : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_STATIC    ? 'static '    : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_ABSTRACT  ? 'abstract '  : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_FINAL     ? 'final '     : '');
+                . ($modifiers & Stmt\Class_::MODIFIER_PROTECTED ? 'protected ' : '')
+                . ($modifiers & Stmt\Class_::MODIFIER_PRIVATE   ? 'private '   : '')
+                . ($modifiers & Stmt\Class_::MODIFIER_STATIC    ? 'static '    : '')
+                . ($modifiers & Stmt\Class_::MODIFIER_ABSTRACT  ? 'abstract '  : '')
+                . ($modifiers & Stmt\Class_::MODIFIER_FINAL     ? 'final '     : '');
     }
 
     protected function pEncapsList(array $encapsList, $quote) {

lib/PhpParser/PrettyPrinterAbstract.php

Doc Comments +13 added lines, -1 removed lines

@@ -187,6 +187,10 @@ 
         return $this->{'p' . $node->getType()}($node);
     }
 
+    /**
+     * @param string $type
+     * @param string $operatorString
+     */
     protected function pInfixOp($type, Node $leftNode, $operatorString, Node $rightNode) {
         list($precedence, $associativity) = $this->precedenceMap[$type];
 
@@ -195,11 +199,19 @@ 
              . $this->pPrec($rightNode, $precedence, $associativity, 1);
     }
 
+    /**
+     * @param string $type
+     * @param string $operatorString
+     */
     protected function pPrefixOp($type, $operatorString, Node $node) {
         list($precedence, $associativity) = $this->precedenceMap[$type];
         return $operatorString . $this->pPrec($node, $precedence, $associativity, 1);
     }
 
+    /**
+     * @param string $type
+     * @param string $operatorString
+     */
     protected function pPostfixOp($type, Node $node, $operatorString) {
         list($precedence, $associativity) = $this->precedenceMap[$type];
         return $this->pPrec($node, $precedence, $associativity, -1) . $operatorString;
@@ -264,7 +276,7 @@ 
      *
      * @param string $string Not to be indented string
      *
-     * @return mixed String marked with $this->noIndentToken's.
+     * @return string String marked with $this->noIndentToken's.
      */
     protected function pNoIndent($string) {
         return str_replace("\n", "\n" . $this->noIndentToken, $string);

Indentation +2 added lines, -2 removed lines

@@ -191,8 +191,8 @@
         list($precedence, $associativity) = $this->precedenceMap[$type];
 
         return $this->pPrec($leftNode, $precedence, $associativity, -1)
-             . $operatorString
-             . $this->pPrec($rightNode, $precedence, $associativity, 1);
+                . $operatorString
+                . $this->pPrec($rightNode, $precedence, $associativity, 1);
     }
 
     protected function pPrefixOp($type, $operatorString, Node $node) {

Spacing +53 added lines, -53 removed lines

@@ -9,65 +9,65 @@
 {
     protected $precedenceMap = array(
         // [precedence, associativity] where for the latter -1 is %left, 0 is %nonassoc and 1 is %right
-        'Expr_BinaryOp_Pow'            => array(  0,  1),
-        'Expr_BitwiseNot'              => array( 10,  1),
-        'Expr_PreInc'                  => array( 10,  1),
-        'Expr_PreDec'                  => array( 10,  1),
-        'Expr_PostInc'                 => array( 10, -1),
-        'Expr_PostDec'                 => array( 10, -1),
-        'Expr_UnaryPlus'               => array( 10,  1),
-        'Expr_UnaryMinus'              => array( 10,  1),
-        'Expr_Cast_Int'                => array( 10,  1),
-        'Expr_Cast_Double'             => array( 10,  1),
-        'Expr_Cast_String'             => array( 10,  1),
-        'Expr_Cast_Array'              => array( 10,  1),
-        'Expr_Cast_Object'             => array( 10,  1),
-        'Expr_Cast_Bool'               => array( 10,  1),
-        'Expr_Cast_Unset'              => array( 10,  1),
-        'Expr_ErrorSuppress'           => array( 10,  1),
-        'Expr_Instanceof'              => array( 20,  0),
-        'Expr_BooleanNot'              => array( 30,  1),
-        'Expr_BinaryOp_Mul'            => array( 40, -1),
-        'Expr_BinaryOp_Div'            => array( 40, -1),
-        'Expr_BinaryOp_Mod'            => array( 40, -1),
-        'Expr_BinaryOp_Plus'           => array( 50, -1),
-        'Expr_BinaryOp_Minus'          => array( 50, -1),
-        'Expr_BinaryOp_Concat'         => array( 50, -1),
-        'Expr_BinaryOp_ShiftLeft'      => array( 60, -1),
-        'Expr_BinaryOp_ShiftRight'     => array( 60, -1),
-        'Expr_BinaryOp_Smaller'        => array( 70,  0),
-        'Expr_BinaryOp_SmallerOrEqual' => array( 70,  0),
-        'Expr_BinaryOp_Greater'        => array( 70,  0),
-        'Expr_BinaryOp_GreaterOrEqual' => array( 70,  0),
-        'Expr_BinaryOp_Equal'          => array( 80,  0),
-        'Expr_BinaryOp_NotEqual'       => array( 80,  0),
-        'Expr_BinaryOp_Identical'      => array( 80,  0),
-        'Expr_BinaryOp_NotIdentical'   => array( 80,  0),
-        'Expr_BinaryOp_Spaceship'      => array( 80,  0),
-        'Expr_BinaryOp_BitwiseAnd'     => array( 90, -1),
+        'Expr_BinaryOp_Pow'            => array(0, 1),
+        'Expr_BitwiseNot'              => array(10, 1),
+        'Expr_PreInc'                  => array(10, 1),
+        'Expr_PreDec'                  => array(10, 1),
+        'Expr_PostInc'                 => array(10, -1),
+        'Expr_PostDec'                 => array(10, -1),
+        'Expr_UnaryPlus'               => array(10, 1),
+        'Expr_UnaryMinus'              => array(10, 1),
+        'Expr_Cast_Int'                => array(10, 1),
+        'Expr_Cast_Double'             => array(10, 1),
+        'Expr_Cast_String'             => array(10, 1),
+        'Expr_Cast_Array'              => array(10, 1),
+        'Expr_Cast_Object'             => array(10, 1),
+        'Expr_Cast_Bool'               => array(10, 1),
+        'Expr_Cast_Unset'              => array(10, 1),
+        'Expr_ErrorSuppress'           => array(10, 1),
+        'Expr_Instanceof'              => array(20, 0),
+        'Expr_BooleanNot'              => array(30, 1),
+        'Expr_BinaryOp_Mul'            => array(40, -1),
+        'Expr_BinaryOp_Div'            => array(40, -1),
+        'Expr_BinaryOp_Mod'            => array(40, -1),
+        'Expr_BinaryOp_Plus'           => array(50, -1),
+        'Expr_BinaryOp_Minus'          => array(50, -1),
+        'Expr_BinaryOp_Concat'         => array(50, -1),
+        'Expr_BinaryOp_ShiftLeft'      => array(60, -1),
+        'Expr_BinaryOp_ShiftRight'     => array(60, -1),
+        'Expr_BinaryOp_Smaller'        => array(70, 0),
+        'Expr_BinaryOp_SmallerOrEqual' => array(70, 0),
+        'Expr_BinaryOp_Greater'        => array(70, 0),
+        'Expr_BinaryOp_GreaterOrEqual' => array(70, 0),
+        'Expr_BinaryOp_Equal'          => array(80, 0),
+        'Expr_BinaryOp_NotEqual'       => array(80, 0),
+        'Expr_BinaryOp_Identical'      => array(80, 0),
+        'Expr_BinaryOp_NotIdentical'   => array(80, 0),
+        'Expr_BinaryOp_Spaceship'      => array(80, 0),
+        'Expr_BinaryOp_BitwiseAnd'     => array(90, -1),
         'Expr_BinaryOp_BitwiseXor'     => array(100, -1),
         'Expr_BinaryOp_BitwiseOr'      => array(110, -1),
         'Expr_BinaryOp_BooleanAnd'     => array(120, -1),
         'Expr_BinaryOp_BooleanOr'      => array(130, -1),
-        'Expr_BinaryOp_Coalesce'       => array(140,  1),
+        'Expr_BinaryOp_Coalesce'       => array(140, 1),
         'Expr_Ternary'                 => array(150, -1),
         // parser uses %left for assignments, but they really behave as %right
-        'Expr_Assign'                  => array(160,  1),
-        'Expr_AssignRef'               => array(160,  1),
-        'Expr_AssignOp_Plus'           => array(160,  1),
-        'Expr_AssignOp_Minus'          => array(160,  1),
-        'Expr_AssignOp_Mul'            => array(160,  1),
-        'Expr_AssignOp_Div'            => array(160,  1),
-        'Expr_AssignOp_Concat'         => array(160,  1),
-        'Expr_AssignOp_Mod'            => array(160,  1),
-        'Expr_AssignOp_BitwiseAnd'     => array(160,  1),
-        'Expr_AssignOp_BitwiseOr'      => array(160,  1),
-        'Expr_AssignOp_BitwiseXor'     => array(160,  1),
-        'Expr_AssignOp_ShiftLeft'      => array(160,  1),
-        'Expr_AssignOp_ShiftRight'     => array(160,  1),
-        'Expr_AssignOp_Pow'            => array(160,  1),
-        'Expr_YieldFrom'               => array(165,  1),
-        'Expr_Print'                   => array(168,  1),
+        'Expr_Assign'                  => array(160, 1),
+        'Expr_AssignRef'               => array(160, 1),
+        'Expr_AssignOp_Plus'           => array(160, 1),
+        'Expr_AssignOp_Minus'          => array(160, 1),
+        'Expr_AssignOp_Mul'            => array(160, 1),
+        'Expr_AssignOp_Div'            => array(160, 1),
+        'Expr_AssignOp_Concat'         => array(160, 1),
+        'Expr_AssignOp_Mod'            => array(160, 1),
+        'Expr_AssignOp_BitwiseAnd'     => array(160, 1),
+        'Expr_AssignOp_BitwiseOr'      => array(160, 1),
+        'Expr_AssignOp_BitwiseXor'     => array(160, 1),
+        'Expr_AssignOp_ShiftLeft'      => array(160, 1),
+        'Expr_AssignOp_ShiftRight'     => array(160, 1),
+        'Expr_AssignOp_Pow'            => array(160, 1),
+        'Expr_YieldFrom'               => array(165, 1),
+        'Expr_Print'                   => array(168, 1),
         'Expr_BinaryOp_LogicalAnd'     => array(170, -1),
         'Expr_BinaryOp_LogicalXor'     => array(180, -1),
         'Expr_BinaryOp_LogicalOr'      => array(190, -1),

lib/PhpParser/Lexer.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
 
         $this->code = $code; // keep the code around for __halt_compiler() handling
         $this->pos  = -1;
-        $this->line =  1;
+        $this->line = 1;
         $this->filePos = 0;
     }
 
@@ -264,10 +264,10 @@ 
             if (T_DOUBLE_COLON === $i) {
                 // T_DOUBLE_COLON is equivalent to T_PAAMAYIM_NEKUDOTAYIM
                 $tokenMap[$i] = Tokens::T_PAAMAYIM_NEKUDOTAYIM;
-            } elseif(T_OPEN_TAG_WITH_ECHO === $i) {
+            } elseif (T_OPEN_TAG_WITH_ECHO === $i) {
                 // T_OPEN_TAG_WITH_ECHO with dropped T_OPEN_TAG results in T_ECHO
                 $tokenMap[$i] = Tokens::T_ECHO;
-            } elseif(T_CLOSE_TAG === $i) {
+            } elseif (T_CLOSE_TAG === $i) {
                 // T_CLOSE_TAG is equivalent to ';'
                 $tokenMap[$i] = ord(';');
             } elseif ('UNKNOWN' !== $name = token_name($i)) {