Merge branch '3.x'

This commit is contained in:
Nikita Popov 2017-02-08 23:55:16 +01:00
commit f8a2f6e760
2 changed files with 2 additions and 2 deletions

View File

@ -139,7 +139,7 @@ function parseArgs($args) {
$files = array();
$attributes = array(
'with-column-info' => false,
'with-posititions' => false,
'with-positions' => false,
'with-recovery' => false,
);

View File

@ -623,7 +623,7 @@ class Standard extends PrettyPrinterAbstract
. ($node->name->getLast() !== $node->alias ? ' as ' . $node->alias : '');
}
private function pUseType($type) {
protected function pUseType($type) {
return $type === Stmt\Use_::TYPE_FUNCTION ? 'function '
: ($type === Stmt\Use_::TYPE_CONSTANT ? 'const ' : '');
}