From 7c445bb60816da94f77fa787d8c2bd9190134904 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sat, 4 Jun 2022 23:23:07 +0200 Subject: [PATCH] Remove space before return type in insertionMap (#841) * remove space before colon in PrettyPrinterAbstract * update tests --- lib/PhpParser/PrettyPrinterAbstract.php | 8 ++++---- test/code/formatPreservation/insertionOfNullable.test | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/PhpParser/PrettyPrinterAbstract.php b/lib/PhpParser/PrettyPrinterAbstract.php index 80172380..669bf447 100644 --- a/lib/PhpParser/PrettyPrinterAbstract.php +++ b/lib/PhpParser/PrettyPrinterAbstract.php @@ -1304,8 +1304,8 @@ abstract class PrettyPrinterAbstract $this->insertionMap = [ 'Expr_ArrayDimFetch->dim' => ['[', false, null, null], 'Expr_ArrayItem->key' => [null, false, null, ' => '], - 'Expr_ArrowFunction->returnType' => [')', false, ' : ', null], - 'Expr_Closure->returnType' => [')', false, ' : ', null], + 'Expr_ArrowFunction->returnType' => [')', false, ': ', null], + 'Expr_Closure->returnType' => [')', false, ': ', null], 'Expr_Ternary->if' => ['?', false, ' ', ' '], 'Expr_Yield->key' => [\T_YIELD, false, null, ' => '], 'Expr_Yield->value' => [\T_YIELD, false, ' ', null], @@ -1313,14 +1313,14 @@ abstract class PrettyPrinterAbstract 'Param->default' => [null, false, ' = ', null], 'Stmt_Break->num' => [\T_BREAK, false, ' ', null], 'Stmt_Catch->var' => [null, false, ' ', null], - 'Stmt_ClassMethod->returnType' => [')', false, ' : ', null], + 'Stmt_ClassMethod->returnType' => [')', false, ': ', null], 'Stmt_Class->extends' => [null, false, ' extends ', null], 'Stmt_Enum->scalarType' => [null, false, ' : ', null], 'Stmt_EnumCase->expr' => [null, false, ' = ', null], 'Expr_PrintableNewAnonClass->extends' => [null, ' extends ', null], 'Stmt_Continue->num' => [\T_CONTINUE, false, ' ', null], 'Stmt_Foreach->keyVar' => [\T_AS, false, null, ' => '], - 'Stmt_Function->returnType' => [')', false, ' : ', null], + 'Stmt_Function->returnType' => [')', false, ': ', null], 'Stmt_If->else' => [null, false, ' ', null], 'Stmt_Namespace->name' => [\T_NAMESPACE, false, ' ', null], 'Stmt_Property->type' => [\T_VARIABLE, true, null, ' '], diff --git a/test/code/formatPreservation/insertionOfNullable.test b/test/code/formatPreservation/insertionOfNullable.test index 8d768a3a..921de02d 100644 --- a/test/code/formatPreservation/insertionOfNullable.test +++ b/test/code/formatPreservation/insertionOfNullable.test @@ -99,7 +99,7 @@ function foo( int $x, array &$y = null -) : Foo +): Foo {} $foo @@ -111,7 +111,7 @@ $foo ]; function -() : Bar +(): Bar {}; $x @@ -134,7 +134,7 @@ class X extends \Bar { public - function y() : Y + function y(): Y {} private