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

fix quoting of value in phpdocp

Browse Source
This commit is contained in:
TomasVotruba 2020-06-16 10:00:57 +02:00
parent 1777d3a444
commit cde3eda53c
1 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
packages/better-php-doc-parser/src/PhpDocNode/AbstractTagValueNode.php
View File

@ -132,40 +132,6 @@ abstract class AbstractTagValueNode implements AttributeAwareNodeInterface, PhpD
return $this->printContentItems($items);
}
/**
* @param mixed[] $item
*/
protected function printArrayItem(array $item, ?string $key = null): string
{
$json = Json::encode($item);
// separate by space only items separated by comma, not in "quotes"
$json = Strings::replace($json, '#,#', ', ');
// @see https://regex101.com/r/C2fDQp/2
$json = Strings::replace($json, '#("[^",]+)(\s+)?,(\s+)?([^"]+")#', '$1,$4');
// change brackets from json to annotations
$json = Strings::replace($json, '#^\[(.*?)\]$#', '{$1}');
// cleanup json encoded extra slashes
$json = Strings::replace($json, '#\\\\\\\\#', '\\');
$json = $this->replaceColonWithEqualInSymfonyAndDoctrine($json);
$keyPart = $this->createKeyPart($key);
// should unquote
if ($this->isValueWithoutQuotes($key)) {
$json = Strings::replace($json, '#"#');
}
if ($this->originalContent !== null && $key !== null) {
$json = $this->quoteKeys($item, $key, $json, $this->originalContent);
}
return $keyPart . $json;
}
/**
* @param string[] $items
*/
@ -276,6 +242,40 @@ abstract class AbstractTagValueNode implements AttributeAwareNodeInterface, PhpD
return ArrayItemStaticHelper::filterAndSortVisibleItems($contentItems, $this->orderedVisibleItems);
}
/**
* @param mixed[] $item
*/
private function printArrayItem(array $item, ?string $key = null): string
{
$json = Json::encode($item);
// separate by space only items separated by comma, not in "quotes"
$json = Strings::replace($json, '#,#', ', ');
// @see https://regex101.com/r/C2fDQp/2
$json = Strings::replace($json, '#("[^",]+)(\s+)?,(\s+)?([^"]+")#', '$1,$4');
// change brackets from json to annotations
$json = Strings::replace($json, '#^\[(.*?)\]$#', '{$1}');
// cleanup json encoded extra slashes
$json = Strings::replace($json, '#\\\\\\\\#', '\\');
$json = $this->replaceColonWithEqualInSymfonyAndDoctrine($json);
$keyPart = $this->createKeyPart($key);
// should unquote
if ($this->isValueWithoutQuotes($key)) {
$json = Strings::replace($json, '#"#');
}
if ($this->originalContent !== null && $key !== null) {
$json = $this->quoteKeys($item, $key, $json, $this->originalContent);
}
return $keyPart . $json;
}
private function createKeyPart(?string $key = null): string
{
if (empty($key)) {
@ -356,7 +356,7 @@ abstract class AbstractTagValueNode implements AttributeAwareNodeInterface, PhpD
{
foreach (array_keys($item) as $itemKey) {
// @see https://regex101.com/r/V7nq5D/1
$quotedKeyPattern = '#' . $key . '={(.*?)?\"' . $itemKey . '\"(.*?)?}#';
$quotedKeyPattern = '#' . $key . '={(.*?)?\"' . $itemKey . '\"(=|:)(.*?)?}#';
$isKeyQuoted = (bool) Strings::match($originalContent, $quotedKeyPattern);
if (! $isKeyQuoted) {
continue;
@ -404,11 +404,13 @@ abstract class AbstractTagValueNode implements AttributeAwareNodeInterface, PhpD
/**
* Before:
* (options={"key": "value"})
* (options={"key":"value"})
*
* After:
* (options={"key"="value"})
*
* @see regex https://regex101.com/r/XfKi4A/1/
*
* @see https://github.com/rectorphp/rector/issues/3225
* @see https://github.com/rectorphp/rector/pull/3241
*/
@ -418,7 +420,6 @@ abstract class AbstractTagValueNode implements AttributeAwareNodeInterface, PhpD
return $json;
}
// @see https://regex101.com/r/XfKi4A/1/
return Strings::replace($json, '#(\"|\w)\:(\"|\w)#', '$1=$2');
}
}