octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-09-06 15:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extend NodeFactory, beautify code

Browse Source
This commit is contained in:
sashabeton 2019-09-10 11:13:01 +03:00
parent e192c2f284
commit 3f53e60b71
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/Laravel/src/Rector/Class_/InlineValidationRulesToArrayDefinitionRector.php
View File

@ -59,8 +59,7 @@ CODE_SAMPLE
*/
public function refactor(Node $node): ?Node
{
$className = $this->getName($node);
if ($className === null || !is_subclass_of($className, 'Illuminate\Foundation\Http\FormRequest', true)) {
if ($this->isType($node, 'Illuminate\Foundation\Http\FormRequest') === false) {
return null;
}
@ -101,26 +100,25 @@ CODE_SAMPLE
continue;
}
$ruleClass = $matches[1];
$ruleAttribute = $matches[2];
$newRule = new Node\Expr\StaticCall(
new Node\Name('\Illuminate\Validation\Rule'),
'exists',
[
new Node\Arg(
new Node\Expr\ClassConstFetch(
new Node\Name($matches[1]),
new Node\Name($ruleClass),
'class'
)
),
new Node\Arg(new Node\Scalar\String_($matches[2])),
new Node\Arg(new Node\Scalar\String_($ruleAttribute)),
]
);
}
$item->value = new Node\Expr\Array_(
array_map(function (Node\Expr $rule): Node\Expr\ArrayItem {
return new Node\Expr\ArrayItem($rule);
}, $newRules)
);
$item->value = $this->createArray($newRules);
}
}
@ -134,9 +132,9 @@ CODE_SAMPLE
private function transformRulesSet(Node\Expr $expr): array
{
if ($expr instanceof Node\Scalar\String_) {
$parts = preg_split('/\|/', $expr->value);
$parts = explode('|', $expr->value);
if ($parts === false) {
throw new \InvalidArgumentException("Failed to split string {$expr->value} with regex");
throw new \InvalidArgumentException("Failed to explode string {$expr->value} with regex");
}
return array_map(static function (string $value): Node\Scalar\String_ {

7
src/PhpParser/Node/NodeFactory.php
View File

@ -223,7 +223,12 @@ final class NodeFactory
{
$arrayItem = null;
if ($item instanceof Variable) {
if ($item instanceof Variable
|| $item instanceof String_
|| $item instanceof MethodCall
|| $item instanceof StaticCall
|| $item instanceof Expr\FuncCall
) {
$arrayItem = new ArrayItem($item);
} elseif ($item instanceof Identifier) {
$string = new String_($item->toString());