mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-03-24 09:19:47 +01:00
Code Issues Projects Releases Wiki Activity

add concat + multiline case to ManualJsonStringToJsonEncodeArra… (#1826)

Browse Source 
add concat + multiline case to ManualJsonStringToJsonEncodeArrayRector
This commit is contained in:
Tomáš Votruba 2019-08-08 10:08:27 +02:00 committed by GitHub
commit 7ae84d1189
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
packages/CodingStyle/src/Rector/String_/ManualJsonStringToJsonEncodeArrayRector.php
View File

@ -11,6 +11,7 @@ use PhpParser\Node\Expr\Array_;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\AssignOp\Concat as ConcatAssign;
use PhpParser\Node\Expr\BinaryOp\Concat;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Scalar\String_;
use PhpParser\Node\Stmt\Expression;
@ -98,13 +99,8 @@ CODE_SAMPLE
return $this->processJsonString($node, $stringValue);
}
// B. just start of a json?
$currentNode = $node;
$concatExpressionJoinData = $this->collectContentAndPlaceholderNodesFromNextExpressions(
$node,
$currentNode
);
// B. just start of a json? join with all the strings that concat so same variable
$concatExpressionJoinData = $this->collectContentAndPlaceholderNodesFromNextExpressions($node);
$stringValue .= $concatExpressionJoinData->getString();
if (! $this->isJsonString($stringValue)) {
@ -126,22 +122,30 @@ CODE_SAMPLE
if ($node->expr instanceof Concat) {
// process only first concat
$concatParentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
if ($concatParentNode instanceof Concat) {
if ($node->getAttribute(AttributeKey::PARENT_NODE) instanceof Concat) {
return null;
}
/** @var Expr[] $placeholderNodes */
[$content, $placeholderNodes] = $this->concatJoiner->joinToStringAndPlaceholderNodes($node->expr);
[$stringValue, $placeholderNodes] = $this->concatJoiner->joinToStringAndPlaceholderNodes($node->expr);
/** @var string $content */
if (! $this->isJsonString($content)) {
// B. just start of a json? join with all the strings that concat so same variable
$concatExpressionJoinData = $this->collectContentAndPlaceholderNodesFromNextExpressions($node);
$placeholderNodes = array_merge($placeholderNodes, $concatExpressionJoinData->getPlaceholdersToNodes());
/** @var string $stringValue */
$stringValue .= $concatExpressionJoinData->getString();
if (! $this->isJsonString($stringValue)) {
return null;
}
$jsonArray = $this->createArrayNodeFromJsonString($content);
$jsonArray = $this->createArrayNodeFromJsonString($stringValue);
$this->replaceNodeObjectHashPlaceholdersWithNodes($jsonArray, $placeholderNodes);
$this->removeNodes($concatExpressionJoinData->getNodesToRemove());
return $this->createAndReturnJsonEncodeFromArray($node, $jsonArray);
}
@ -197,7 +201,7 @@ CODE_SAMPLE
$placeholderNode = $this->matchPlaceholderNode($node->items[0]->value, $placeholderNodes);
if ($placeholderNode && $this->isImplodeToJson($placeholderNode)) {
/** @var Expr\FuncCall $placeholderNode */
/** @var FuncCall $placeholderNode */
return $placeholderNode->args[1]->value;
}
}
@ -263,12 +267,12 @@ CODE_SAMPLE
return $this->createArray($array);
}
private function collectContentAndPlaceholderNodesFromNextExpressions(
Assign $assign,
Node $currentNode
): ConcatExpressionJoinData {
private function collectContentAndPlaceholderNodesFromNextExpressions(Assign $assign): ConcatExpressionJoinData
{
$concatExpressionJoinData = new ConcatExpressionJoinData();
$currentNode = $assign;
while ([$nodeToRemove, $valueNode] = $this->matchNextExpressionAssignConcatToSameVariable(
$assign->var,
$currentNode
@ -308,7 +312,7 @@ CODE_SAMPLE
*/
private function isImplodeToJson(Node $node): bool
{
if (! $node instanceof Expr\FuncCall) {
if (! $node instanceof FuncCall) {
return false;
}

29
packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/Fixture/without_assign.php.inc Normal file
View File

@ -0,0 +1,29 @@
<?php
namespace Rector\CodingStyle\Tests\Rector\String_\ManualJsonStringToJsonEncodeArrayRector\Fixture;
final class WithouAssign
{
public function run()
{
$jsonRequest = '{"service_provider_profile":{"id":"' . 1 .'"},';
$jsonRequest .= '"users":[{"id":"'. 2 .'"},{"id":"'. 3 .'"}]}';
}
}
?>
-----
<?php
namespace Rector\CodingStyle\Tests\Rector\String_\ManualJsonStringToJsonEncodeArrayRector\Fixture;
final class WithouAssign
{
public function run()
{
$jsonData = ['service_provider_profile' => ['id' => 1], 'users' => [['id' => 2], ['id' => 3]]];
$jsonRequest = \Nette\Utils\Json::encode($jsonData);
}
}
?>

1
packages/CodingStyle/tests/Rector/String_/ManualJsonStringToJsonEncodeArrayRector/ManualJsonStringToJsonEncodeArrayRectorTest.php
View File

@ -16,6 +16,7 @@ final class ManualJsonStringToJsonEncodeArrayRectorTest extends AbstractRectorTe
__DIR__ . '/Fixture/tripleline_multiline_concat_json.php.inc',
__DIR__ . '/Fixture/assign_with_concat.php.inc',
__DIR__ . '/Fixture/with_implode.php.inc',
__DIR__ . '/Fixture/without_assign.php.inc',
]);
}