mirror_php/PHP-Parser
1
0
Fork 0
mirror of https://github.com/nikic/PHP-Parser.git synced 2025-01-29 05:07:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch modifierChangeMap to use class name

Browse Source 
For better refactoring support, prefer class name over node type.
This commit is contained in:
Nikita Popov 2022-09-03 19:11:35 +02:00
parent 5f3ad31501
commit 8ed76726aa
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/PhpParser/PrettyPrinterAbstract.php
View File

@ -9,6 +9,7 @@ use PhpParser\Node\Expr;
use PhpParser\Node\Expr\AssignOp;
use PhpParser\Node\Expr\BinaryOp;
use PhpParser\Node\Expr\Cast;
use PhpParser\Node\Param;
use PhpParser\Node\Scalar;
use PhpParser\Node\Stmt;
@ -128,7 +129,7 @@ abstract class PrettyPrinterAbstract {
*/
protected $listInsertionMap;
protected $emptyListInsertionMap;
/** @var int[] Map from "{$node->getType()}->{$subNode}" to token before which the modifiers
/** @var int[] Map from "{$class}->{$subNode}" to token before which the modifiers
* should be reprinted. */
protected $modifierChangeMap;
@ -576,7 +577,7 @@ abstract class PrettyPrinterAbstract {
if (is_int($subNode) && is_int($origSubNode)) {
// Check if this is a modifier change
$key = $type . '->' . $subNodeName;
$key = $class . '->' . $subNodeName;
if (!isset($this->modifierChangeMap[$key])) {
return $this->pFallback($fallbackNode);
}
@ -1495,12 +1496,12 @@ abstract class PrettyPrinterAbstract {
}
$this->modifierChangeMap = [
'Stmt_ClassConst->flags' => \T_CONST,
'Stmt_ClassMethod->flags' => \T_FUNCTION,
'Stmt_Class->flags' => \T_CLASS,
'Stmt_Property->flags' => \T_VARIABLE,
'Param->flags' => \T_VARIABLE,
//'Stmt_TraitUseAdaptation_Alias->newModifier' => 0, // TODO
Stmt\ClassConst::class . '->flags' => \T_CONST,
Stmt\ClassMethod::class . '->flags' => \T_FUNCTION,
Stmt\Class_::class . '->flags' => \T_CLASS,
Stmt\Property::class . '->flags' => \T_VARIABLE,
Param::class . '->flags' => \T_VARIABLE,
//Stmt\TraitUseAdaptation\Alias::class . '->newModifier' => 0, // TODO
];
// List of integer subnodes that are not modifiers: