octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-19 17:42:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix PhpDocInfoPrinter slash removal

Browse Source
This commit is contained in:
TomasVotruba 2020-03-02 17:03:26 +01:00
parent 376e2e43ac
commit a8fa941193
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/better-php-doc-parser/src/Printer/PhpDocInfoPrinter.php
View File

@ -11,6 +11,7 @@ use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTextNode;
use PHPStan\PhpDocParser\Lexer\Lexer;
use Rector\AttributeAwarePhpDoc\Ast\PhpDoc\AttributeAwarePhpDocNode;
use Rector\AttributeAwarePhpDoc\Ast\PhpDoc\AttributeAwarePhpDocTagNode;
use Rector\BetterPhpDocParser\Attributes\Attribute\Attribute;
use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
@ -130,7 +131,6 @@ final class PhpDocInfoPrinter
$output = $this->printEnd($output);
// @see
// fix missing start
if (! Strings::match($output, '#^(\/\/|\/\*\*|\/\*|\#)#') && $output) {
$output = '/**' . $output;
@ -264,10 +264,16 @@ final class PhpDocInfoPrinter
$output .= $tagSpaceSeparator;
}
/** @var AttributeAwarePhpDocTagNode $phpDocTagNode */
if ($this->hasDescription($phpDocTagNode)) {
$quotedDescription = preg_quote($phpDocTagNode->value->description, '#');
$pattern = Strings::replace($quotedDescription, '#[\s]+#', '\s+');
$nodeOutput = Strings::replace($nodeOutput, '#' . $pattern . '#', $phpDocTagNode->value->description);
$nodeOutput = Strings::replace($nodeOutput, '#' . $pattern . '#', function (array $matched) use (
$phpDocTagNode
) {
return $phpDocTagNode->value->description;
});
if (substr_count($nodeOutput, "\n") !== 0) {
$nodeOutput = Strings::replace($nodeOutput, "#\n#", PHP_EOL . ' * ');
}
@ -349,11 +355,16 @@ final class PhpDocInfoPrinter
return $matches['space'] ?? '';
}
private function hasDescription(PhpDocTagNode $phpDocTagNode): bool
private function hasDescription(AttributeAwarePhpDocTagNode $attributeAwarePhpDocTagNode): bool
{
return $phpDocTagNode->getAttribute(Attribute::HAS_DESCRIPTION_WITH_ORIGINAL_SPACES) && (property_exists(
$phpDocTagNode->value,
'description'
) && $phpDocTagNode->value->description);
if (! $attributeAwarePhpDocTagNode->getAttribute(Attribute::HAS_DESCRIPTION_WITH_ORIGINAL_SPACES)) {
return false;
}
if (! property_exists($attributeAwarePhpDocTagNode->value, 'description')) {
return false;
}
return (bool) $attributeAwarePhpDocTagNode->value->description;
}
}

3
packages/better-php-doc-parser/tests/PhpDocInfo/PhpDocInfoPrinter/FixtureBasic/return_with_back_and_forth_slashes.txt Normal file
View File

@ -0,0 +1,3 @@
/**
* @return string Set of slashes ("\\" or "/")
*/

10
rules/dead-code/src/Rector/ClassMethod/RemoveUnusedParameterRector.php
View File

@ -283,14 +283,6 @@ PHP
}
// can be opened
if ($classMethod->isProtected()) {
return true;
}
if ($classMethod->isPublic()) {
return true;
}
return false;
return $classMethod->isProtected();
}
}