Skip to content

Commit 651eb35

Browse files
rcalicdanrcalicdan
committed
Refactor Node name usage to use FullyQualified for consistency
1 parent 744bd28 commit 651eb35

4 files changed

Lines changed: 38 additions & 38 deletions

File tree

‎src/Internal/Ast/ContractVisitor.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public function __construct()
2727
*/
2828
public function enterNode(Node $node): ?array
2929
{
30-
if ($node instanceof Node\Stmt\Function_
30+
if (
31+
$node instanceof Node\Stmt\Function_
3132
|| $node instanceof Node\Stmt\ClassMethod
3233
|| $node instanceof Node\Expr\Closure
3334
|| $node instanceof Node\Expr\ArrowFunction
@@ -161,12 +162,12 @@ public function leaveNode(Node $node): Node|null
161162
$node->setAttribute('typephp_wrapped', value: true);
162163

163164
return new Node\Expr\FuncCall(
164-
new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::cloneInstance'),
165+
new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::cloneInstance'),
165166
[
166167
new Node\Arg(
167168
new Node\Expr\Clone_(
168169
new Node\Expr\FuncCall(
169-
new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::prepareClone'),
170+
new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::prepareClone'),
170171
[new Node\Arg($node->expr)]
171172
)
172173
)
@@ -176,7 +177,8 @@ public function leaveNode(Node $node): Node|null
176177
);
177178
}
178179

179-
if ($node instanceof Node\Stmt\Function_
180+
if (
181+
$node instanceof Node\Stmt\Function_
180182
|| $node instanceof Node\Stmt\ClassMethod
181183
|| $node instanceof Node\Expr\Closure
182184
|| $node instanceof Node\Expr\ArrowFunction

‎src/Internal/Ast/FunctionContractInjector.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ private static function buildSetupScopeStmt(array $params, Node\Expr $thisArg):
204204
);
205205

206206
$checkCall = new Node\Expr\FuncCall(
207-
new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::setupScope'),
207+
new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::setupScope'),
208208
[
209209
new Node\Arg(new Node\Scalar\MagicConst\Method()),
210210
new Node\Arg($argsExpr),
@@ -217,7 +217,7 @@ private static function buildSetupScopeStmt(array $params, Node\Expr $thisArg):
217217
$ifStmt = new Node\Stmt\If_(
218218
new Node\Expr\Instanceof_(
219219
new Node\Expr\Assign(new Node\Expr\Variable('__typephpErr'), $checkCall),
220-
new Node\Name('\TypePHP\Internal\Diagnostic\ErrorMessage')
220+
new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
221221
),
222222
['stmts' => [$throwStmt]]
223223
);
@@ -242,7 +242,7 @@ private static function buildCallableParamWrappers(array $params, string $docTex
242242
new Node\Expr\Assign(
243243
new Node\Expr\Variable($paramName),
244244
new Node\Expr\FuncCall(
245-
new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::wrapCallable'),
245+
new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::wrapCallable'),
246246
[
247247
new Node\Arg(new Node\Scalar\MagicConst\Method()),
248248
new Node\Arg(new Node\Scalar\String_($paramName)),
@@ -275,7 +275,7 @@ private static function buildIterableParamWrappers(array $params, string $docTex
275275
new Node\Expr\Assign(
276276
new Node\Expr\Variable($paramName),
277277
new Node\Expr\FuncCall(
278-
new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::wrapIterable'),
278+
new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::wrapIterable'),
279279
[
280280
new Node\Arg(new Node\Scalar\MagicConst\Method()),
281281
new Node\Arg(new Node\Scalar\String_($paramName)),
@@ -373,12 +373,12 @@ public static function buildTypeErrorThrowStmt(Node\Expr $errorVar): Node\Stmt\E
373373
return new Node\Stmt\Expression(
374374
new Node\Expr\Throw_(
375375
new Node\Expr\StaticCall(
376-
new Node\Name('\TypePHP\Internal\Diagnostic\ErrorFactory'),
376+
new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorFactory'),
377377
'prepareException',
378378
[
379379
new Node\Arg(
380380
new Node\Expr\New_(
381-
new Node\Name('\TypePHP\Exception\TypeError'),
381+
new Node\Name\FullyQualified('TypePHP\Exception\TypeError'),
382382
[
383383
new Node\Arg(
384384
new Node\Expr\MethodCall($errorVar, 'getMessage')
@@ -399,7 +399,7 @@ public static function buildReturnCheckCall(Node\Expr $exprToWrap, Node\Expr $th
399399
: new Node\Expr\Array_();
400400

401401
return new Node\Expr\FuncCall(
402-
new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::checkReturn'),
402+
new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::checkReturn'),
403403
[
404404
new Node\Arg(new Node\Scalar\MagicConst\Method()),
405405
new Node\Arg($exprToWrap),
@@ -417,7 +417,7 @@ public static function buildVoidReturnGuard(Node\Expr\FuncCall $checkCall): arra
417417
$ifStmt = new Node\Stmt\If_(
418418
new Node\Expr\Instanceof_(
419419
new Node\Expr\Assign(new Node\Expr\Variable('__typephpRet'), $checkCall),
420-
new Node\Name('\TypePHP\Internal\Diagnostic\ErrorMessage')
420+
new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
421421
),
422422
['stmts' => [self::buildTypeErrorThrowStmt(new Node\Expr\Variable('__typephpRet'))]]
423423
);
@@ -434,16 +434,16 @@ public static function buildTernaryReturnExpr(Node\Expr\FuncCall $checkCall): No
434434
return new Node\Expr\Ternary(
435435
new Node\Expr\Instanceof_(
436436
new Node\Expr\Assign(new Node\Expr\Variable('__typephpRet'), $checkCall),
437-
new Node\Name('\TypePHP\Internal\Diagnostic\ErrorMessage')
437+
new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
438438
),
439439
new Node\Expr\Throw_(
440440
new Node\Expr\StaticCall(
441-
new Node\Name('\TypePHP\Internal\Diagnostic\ErrorFactory'),
441+
new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorFactory'),
442442
'prepareException',
443443
[
444444
new Node\Arg(
445445
new Node\Expr\New_(
446-
new Node\Name('\TypePHP\Exception\TypeError'),
446+
new Node\Name\FullyQualified('TypePHP\Exception\TypeError'),
447447
[
448448
new Node\Arg(
449449
new Node\Expr\MethodCall(new Node\Expr\Variable('__typephpRet'), 'getMessage')
@@ -461,7 +461,7 @@ public static function buildTernaryReturnExpr(Node\Expr\FuncCall $checkCall): No
461461
public static function buildWrappedYieldNode(Node\Expr\Yield_ $n, Node\Expr $thisArg): Node\Expr\Ternary
462462
{
463463
$checkYieldCall = new Node\Expr\FuncCall(
464-
new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::checkYield'),
464+
new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::checkYield'),
465465
[
466466
new Node\Arg(new Node\Scalar\MagicConst\Method()),
467467
new Node\Arg($n->key ?? new Node\Expr\ConstFetch(new Node\Name('null'))),
@@ -473,16 +473,16 @@ public static function buildWrappedYieldNode(Node\Expr\Yield_ $n, Node\Expr $thi
473473
$n->value = new Node\Expr\Ternary(
474474
new Node\Expr\Instanceof_(
475475
new Node\Expr\Assign(new Node\Expr\Variable('__typephpYld'), $checkYieldCall),
476-
new Node\Name('\TypePHP\Internal\Diagnostic\ErrorMessage')
476+
new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
477477
),
478478
new Node\Expr\Throw_(
479479
new Node\Expr\StaticCall(
480-
new Node\Name('\TypePHP\Internal\Diagnostic\ErrorFactory'),
480+
new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorFactory'),
481481
'prepareException',
482482
[
483483
new Node\Arg(
484484
new Node\Expr\New_(
485-
new Node\Name('\TypePHP\Exception\TypeError'),
485+
new Node\Name\FullyQualified('TypePHP\Exception\TypeError'),
486486
[
487487
new Node\Arg(
488488
new Node\Expr\MethodCall(new Node\Expr\Variable('__typephpYld'), 'getMessage')
@@ -498,7 +498,7 @@ public static function buildWrappedYieldNode(Node\Expr\Yield_ $n, Node\Expr $thi
498498
);
499499

500500
$checkSendCall = new Node\Expr\FuncCall(
501-
new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::checkSend'),
501+
new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::checkSend'),
502502
[
503503
new Node\Arg(new Node\Scalar\MagicConst\Method()),
504504
new Node\Arg($n),
@@ -509,16 +509,16 @@ public static function buildWrappedYieldNode(Node\Expr\Yield_ $n, Node\Expr $thi
509509
return new Node\Expr\Ternary(
510510
new Node\Expr\Instanceof_(
511511
new Node\Expr\Assign(new Node\Expr\Variable('__typephpSnd'), $checkSendCall),
512-
new Node\Name('\TypePHP\Internal\Diagnostic\ErrorMessage')
512+
new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
513513
),
514514
new Node\Expr\Throw_(
515515
new Node\Expr\StaticCall(
516-
new Node\Name('\TypePHP\Internal\Diagnostic\ErrorFactory'),
516+
new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorFactory'),
517517
'prepareException',
518518
[
519519
new Node\Arg(
520520
new Node\Expr\New_(
521-
new Node\Name('\TypePHP\Exception\TypeError'),
521+
new Node\Name\FullyQualified('TypePHP\Exception\TypeError'),
522522
[
523523
new Node\Arg(
524524
new Node\Expr\MethodCall(new Node\Expr\Variable('__typephpSnd'), 'getMessage')
@@ -570,7 +570,7 @@ public function enterNode(Node $n): int|Node|null
570570
$n->setAttribute('typephp_wrapped', true);
571571

572572
$n->expr = new Node\Expr\FuncCall(
573-
new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::wrapIterable'),
573+
new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::wrapIterable'),
574574
[
575575
new Node\Arg(new Node\Scalar\MagicConst\Method()),
576576
new Node\Arg(new Node\Scalar\String_('return')),
@@ -649,4 +649,4 @@ public function enterNode(Node $n): int|array|null
649649

650650
return $newStmts;
651651
}
652-
}
652+
}

‎src/Internal/Ast/NodeBuilder.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ final class NodeBuilder
1414
public static function createPropertyCheckCall(Node\Expr $valueExpr, Node\Expr $objectOrClassExpr, string $propertyName): Node\Expr\FuncCall
1515
{
1616
return new Node\Expr\FuncCall(
17-
new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::checkProperty'),
17+
new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::checkProperty'),
1818
[
1919
new Node\Arg($valueExpr),
2020
new Node\Arg($objectOrClassExpr),
@@ -27,7 +27,7 @@ public static function createPropertyCheckCall(Node\Expr $valueExpr, Node\Expr $
2727
public static function createVariableCheckCall(Node\Expr $valueExpr, string $typeString, string $varName): Node\Expr\FuncCall
2828
{
2929
return new Node\Expr\FuncCall(
30-
new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::checkVariable'),
30+
new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::checkVariable'),
3131
[
3232
new Node\Arg($valueExpr),
3333
new Node\Arg(new Node\Scalar\String_($typeString)),
@@ -42,7 +42,7 @@ public static function createTernaryThrowExpr(Node\Expr\FuncCall $checkCall, int
4242
$args = [
4343
new Node\Arg(
4444
new Node\Expr\New_(
45-
new Node\Name('\TypePHP\Exception\TypeError'),
45+
new Node\Name\FullyQualified('TypePHP\Exception\TypeError'),
4646
[
4747
new Node\Arg(
4848
new Node\Expr\MethodCall(
@@ -65,16 +65,16 @@ public static function createTernaryThrowExpr(Node\Expr\FuncCall $checkCall, int
6565
new Node\Expr\Variable('__typephpVal'),
6666
$checkCall
6767
),
68-
new Node\Name('\TypePHP\Internal\Diagnostic\ErrorMessage')
68+
new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
6969
),
7070
new Node\Expr\Throw_(
7171
new Node\Expr\StaticCall(
72-
new Node\Name('\TypePHP\Internal\Diagnostic\ErrorFactory'),
72+
new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorFactory'),
7373
'prepareException',
7474
$args
7575
)
7676
),
7777
new Node\Expr\Variable('__typephpVal')
7878
);
7979
}
80-
}
80+
}

‎src/Internal/Ast/PropertyHookInjector.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,16 @@ private static function buildExpressionSetHookTernary(Node\Expr\FuncCall $checkC
9090
return new Node\Expr\Ternary(
9191
new Node\Expr\Instanceof_(
9292
new Node\Expr\Assign(new Node\Expr\Variable('__typephpVal'), $checkCall),
93-
new Node\Name('\TypePHP\Internal\Diagnostic\ErrorMessage')
93+
new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
9494
),
9595
new Node\Expr\Throw_(
9696
new Node\Expr\StaticCall(
97-
new Node\Name('\TypePHP\Internal\Diagnostic\ErrorFactory'),
97+
new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorFactory'),
9898
'prepareException',
9999
[
100100
new Node\Arg(
101101
new Node\Expr\New_(
102-
new Node\Name('\TypePHP\Exception\TypeError'),
102+
new Node\Name\FullyQualified('TypePHP\Exception\TypeError'),
103103
[
104104
new Node\Arg(
105105
new Node\Expr\MethodCall(new Node\Expr\Variable('__typephpVal'), 'getMessage')
@@ -122,10 +122,8 @@ private static function buildExpressionSetHookTernary(Node\Expr\FuncCall $checkC
122122
private static function wrapHookReturnStatements(array $stmts, string $propertyName): array
123123
{
124124
$traverser = new NodeTraverser();
125-
$traverser->addVisitor(new class ($propertyName) extends NodeVisitorAbstract {
126-
public function __construct(private string $propertyName)
127-
{
128-
}
125+
$traverser->addVisitor(new class($propertyName) extends NodeVisitorAbstract {
126+
public function __construct(private string $propertyName) {}
129127

130128
public function enterNode(Node $node): int|null
131129
{

0 commit comments

Comments
 (0)