octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-05-31 00:10:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 2c353227e499072689cbb22d83b3483b3015025f

Browse Source 
2c353227e4 [Printer] Handle Add Node after Nop statement inlineHTML (#3303)
This commit is contained in:
Tomas Votruba 2023-01-24 15:30:51 +00:00
parent f904de44f2
commit be2e22ede3
9 changed files with 131 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/PostRector/Rector/NodeAddingPostRector.php
View File

@ -4,8 +4,7 @@ declare (strict_types=1);
namespace Rector\PostRector\Rector;
use PhpParser\Node;
use PhpParser\Node\Stmt\InlineHTML;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\Core\NodeDecorator\MixPhpHtmlDecorator;
use Rector\PostRector\Collector\NodesToAddCollector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@ -27,9 +26,15 @@ final class NodeAddingPostRector extends \Rector\PostRector\Rector\AbstractPostR
* @var \Rector\PostRector\Collector\NodesToAddCollector
*/
private $nodesToAddCollector;
public function __construct(NodesToAddCollector $nodesToAddCollector)
/**
* @readonly
* @var \Rector\Core\NodeDecorator\MixPhpHtmlDecorator
*/
private $mixPhpHtmlDecorator;
public function __construct(NodesToAddCollector $nodesToAddCollector, MixPhpHtmlDecorator $mixPhpHtmlDecorator)
{
$this->nodesToAddCollector = $nodesToAddCollector;
$this->mixPhpHtmlDecorator = $mixPhpHtmlDecorator;
}
public function getPriority() : int
{
@ -45,16 +50,13 @@ final class NodeAddingPostRector extends \Rector\PostRector\Rector\AbstractPostR
if ($nodesToAddAfter !== []) {
$this->nodesToAddCollector->clearNodesToAddAfter($node);
$newNodes = \array_merge($newNodes, $nodesToAddAfter);
$this->mixPhpHtmlDecorator->decorateAfter($node, \array_merge([$node], \is_array($nodesToAddAfter) ? $nodesToAddAfter : \iterator_to_array($nodesToAddAfter)));
}
$nodesToAddBefore = $this->nodesToAddCollector->getNodesToAddBeforeNode($node);
if ($nodesToAddBefore !== []) {
$this->nodesToAddCollector->clearNodesToAddBefore($node);
$newNodes = \array_merge($nodesToAddBefore, $newNodes);
$firstNodePreviousNode = $node->getAttribute(AttributeKey::PREVIOUS_NODE);
if ($firstNodePreviousNode instanceof InlineHTML && !$node instanceof InlineHTML) {
// re-print InlineHTML is safe
$firstNodePreviousNode->setAttribute(AttributeKey::ORIGINAL_NODE, null);
}
$this->mixPhpHtmlDecorator->decorateBefore($node);
}
if ($newNodes === [$node]) {
return $node;

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'bd68c98f0bc5cb8b41a62dd9e7bd94bf82e731a5';
public const PACKAGE_VERSION = '2c353227e499072689cbb22d83b3483b3015025f';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-01-22 12:15:24';
public const RELEASE_DATE = '2023-01-24 22:26:30';
/**
* @var int
*/

91
src/NodeDecorator/MixPhpHtmlDecorator.php Normal file
View File

@ -0,0 +1,91 @@
<?php
declare (strict_types=1);
namespace Rector\Core\NodeDecorator;
use PhpParser\Comment;
use PhpParser\Comment\Doc;
use PhpParser\Node;
use PhpParser\Node\Stmt\InlineHTML;
use PhpParser\Node\Stmt\Nop;
use Rector\Core\PhpParser\Comparing\NodeComparator;
use Rector\NodeRemoval\NodeRemover;
use Rector\NodeTypeResolver\Node\AttributeKey;
final class MixPhpHtmlDecorator
{
/**
* @readonly
* @var \Rector\NodeRemoval\NodeRemover
*/
private $nodeRemover;
/**
* @readonly
* @var \Rector\Core\PhpParser\Comparing\NodeComparator
*/
private $nodeComparator;
public function __construct(NodeRemover $nodeRemover, NodeComparator $nodeComparator)
{
$this->nodeRemover = $nodeRemover;
$this->nodeComparator = $nodeComparator;
}
public function decorateBefore(Node $node) : void
{
$firstNodePreviousNode = $node->getAttribute(AttributeKey::PREVIOUS_NODE);
if ($firstNodePreviousNode instanceof InlineHTML && !$node instanceof InlineHTML) {
// re-print InlineHTML is safe
$firstNodePreviousNode->setAttribute(AttributeKey::ORIGINAL_NODE, null);
}
}
/**
* @param Node[] $nodes
*/
public function decorateAfter(Node $node, array $nodes) : void
{
if (!$node instanceof Nop) {
return;
}
$firstNodeAfterNode = $node->getAttribute(AttributeKey::NEXT_NODE);
if (!$firstNodeAfterNode instanceof Node) {
return;
}
if (!$firstNodeAfterNode instanceof InlineHTML) {
return;
}
$stmt = $this->resolveAppendAfterNode($node, $nodes);
if (!$stmt instanceof Node) {
return;
}
if ($stmt instanceof InlineHTML) {
return;
}
$nodeComments = [];
foreach ($node->getComments() as $comment) {
if ($comment instanceof Doc) {
$nodeComments[] = new Comment($comment->getText(), $comment->getStartLine(), $comment->getStartFilePos(), $comment->getStartTokenPos(), $comment->getEndLine(), $comment->getEndFilePos(), $comment->getEndTokenPos());
continue;
}
$nodeComments[] = $comment;
}
$stmt->setAttribute(AttributeKey::COMMENTS, $nodeComments);
// re-print InlineHTML is safe
$firstNodeAfterNode->setAttribute(AttributeKey::ORIGINAL_NODE, null);
// remove Nop is marked as comment of Next Node
$this->nodeRemover->removeNode($node);
}
/**
* @param Node[] $nodes
*/
private function resolveAppendAfterNode(Nop $nop, array $nodes) : ?Node
{
foreach ($nodes as $key => $subNode) {
if (!$this->nodeComparator->areNodesEqual($subNode, $nop)) {
continue;
}
if (!isset($nodes[$key + 1])) {
continue;
}
return $nodes[$key + 1];
}
return null;
}
}

11
src/PhpParser/Printer/BetterStandardPrinter.php
View File

@ -138,7 +138,7 @@ final class BetterStandardPrinter extends Standard implements NodePrinterInterfa
return $content;
}
if (!$firstStmt instanceof InlineHTML) {
return $content;
return \str_replace('<?php <?php', '<?php', $content);
}
return $this->cleanSurplusTag($content);
}
@ -427,13 +427,16 @@ final class BetterStandardPrinter extends Standard implements NodePrinterInterfa
}
private function cleanEndWithPHPOpenTag(Node $node, string $content) : string
{
if ($node instanceof InlineHTML && \substr_compare($content, '<?php ' . $this->nl, -\strlen('<?php ' . $this->nl)) === 0) {
if (!$node instanceof InlineHTML) {
return $content;
}
if (\substr_compare($content, '<?php ' . $this->nl, -\strlen('<?php ' . $this->nl)) === 0) {
$content = \substr($content, 0, -7);
}
if ($node instanceof InlineHTML && \substr_compare($content, '<?php ', -\strlen('<?php ')) === 0) {
if (\substr_compare($content, '<?php ', -\strlen('<?php ')) === 0) {
return \substr($content, 0, -6);
}
return $content;
return \str_replace('<?php <?php ', '<?php ', $content);
}
private function cleanSurplusTag(string $content) : string
{

15
src/Rector/AbstractRector.php
View File

@ -8,7 +8,6 @@ use PhpParser\Node\Arg;
use PhpParser\Node\Expr;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\InlineHTML;
use PhpParser\Node\Stmt\Nop;
use PhpParser\NodeTraverser;
use PhpParser\NodeVisitor\NodeConnectingVisitor;
@ -28,6 +27,7 @@ use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\FileSystem\FilePathHelper;
use Rector\Core\Logging\CurrentRectorProvider;
use Rector\Core\NodeDecorator\CreatedByRuleDecorator;
use Rector\Core\NodeDecorator\MixPhpHtmlDecorator;
use Rector\Core\PhpParser\Comparing\NodeComparator;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\PhpParser\Node\NodeFactory;
@ -154,10 +154,14 @@ CODE_SAMPLE;
* @var \Rector\Comments\NodeDocBlock\DocBlockUpdater
*/
private $docBlockUpdater;
/**
* @var \Rector\Core\NodeDecorator\MixPhpHtmlDecorator
*/
private $mixPhpHtmlDecorator;
/**
* @required
*/
public function autowire(NodesToRemoveCollector $nodesToRemoveCollector, NodeRemover $nodeRemover, NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeFactory $nodeFactory, PhpDocInfoFactory $phpDocInfoFactory, StaticTypeMapper $staticTypeMapper, CurrentRectorProvider $currentRectorProvider, CurrentNodeProvider $currentNodeProvider, Skipper $skipper, ValueResolver $valueResolver, BetterNodeFinder $betterNodeFinder, NodeComparator $nodeComparator, CurrentFileProvider $currentFileProvider, RectifiedAnalyzer $rectifiedAnalyzer, CreatedByRuleDecorator $createdByRuleDecorator, ChangedNodeScopeRefresher $changedNodeScopeRefresher, RectorOutputStyle $rectorOutputStyle, FilePathHelper $filePathHelper, DocBlockUpdater $docBlockUpdater) : void
public function autowire(NodesToRemoveCollector $nodesToRemoveCollector, NodeRemover $nodeRemover, NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeFactory $nodeFactory, PhpDocInfoFactory $phpDocInfoFactory, StaticTypeMapper $staticTypeMapper, CurrentRectorProvider $currentRectorProvider, CurrentNodeProvider $currentNodeProvider, Skipper $skipper, ValueResolver $valueResolver, BetterNodeFinder $betterNodeFinder, NodeComparator $nodeComparator, CurrentFileProvider $currentFileProvider, RectifiedAnalyzer $rectifiedAnalyzer, CreatedByRuleDecorator $createdByRuleDecorator, ChangedNodeScopeRefresher $changedNodeScopeRefresher, RectorOutputStyle $rectorOutputStyle, FilePathHelper $filePathHelper, DocBlockUpdater $docBlockUpdater, MixPhpHtmlDecorator $mixPhpHtmlDecorator) : void
{
$this->nodesToRemoveCollector = $nodesToRemoveCollector;
$this->nodeRemover = $nodeRemover;
@ -180,6 +184,7 @@ CODE_SAMPLE;
$this->rectorOutputStyle = $rectorOutputStyle;
$this->filePathHelper = $filePathHelper;
$this->docBlockUpdater = $docBlockUpdater;
$this->mixPhpHtmlDecorator = $mixPhpHtmlDecorator;
}
/**
* @return Node[]|null
@ -386,10 +391,7 @@ CODE_SAMPLE;
if (!$firstNodePreviousNode instanceof Node && $node->hasAttribute(AttributeKey::PREVIOUS_NODE)) {
/** @var Node $previousNode */
$previousNode = $node->getAttribute(AttributeKey::PREVIOUS_NODE);
if ($previousNode instanceof InlineHTML && !$firstNode instanceof InlineHTML) {
// re-print InlineHTML is safe
$previousNode->setAttribute(AttributeKey::ORIGINAL_NODE, null);
}
$this->mixPhpHtmlDecorator->decorateBefore($node);
$nodes = \array_merge([$previousNode], \is_array($nodes) ? $nodes : \iterator_to_array($nodes));
}
$lastNode = \end($nodes);
@ -397,6 +399,7 @@ CODE_SAMPLE;
if (!$lastNodeNextNode instanceof Node && $node->hasAttribute(AttributeKey::NEXT_NODE)) {
/** @var Node $nextNode */
$nextNode = $node->getAttribute(AttributeKey::NEXT_NODE);
$this->mixPhpHtmlDecorator->decorateAfter($node, $nodes);
$nodes = \array_merge(\is_array($nodes) ? $nodes : \iterator_to_array($nodes), [$nextNode]);
}
$nodeTraverser = new NodeTraverser();

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit274bd0da1f70b52e1bb33d788f1d209e::getLoader();
return ComposerAutoloaderInit50791387877e964e5b382c4efcb0c02f::getLoader();

1
vendor/composer/autoload_classmap.php vendored
View File

@ -1433,6 +1433,7 @@ return array(
'Rector\\Core\\NodeAnalyzer\\VariableAnalyzer' => $baseDir . '/src/NodeAnalyzer/VariableAnalyzer.php',
'Rector\\Core\\NodeAnalyzer\\VariadicAnalyzer' => $baseDir . '/src/NodeAnalyzer/VariadicAnalyzer.php',
'Rector\\Core\\NodeDecorator\\CreatedByRuleDecorator' => $baseDir . '/src/NodeDecorator/CreatedByRuleDecorator.php',
'Rector\\Core\\NodeDecorator\\MixPhpHtmlDecorator' => $baseDir . '/src/NodeDecorator/MixPhpHtmlDecorator.php',
'Rector\\Core\\NodeDecorator\\PropertyTypeDecorator' => $baseDir . '/src/NodeDecorator/PropertyTypeDecorator.php',
'Rector\\Core\\NodeManipulator\\ArrayDestructVariableFilter' => $baseDir . '/src/NodeManipulator/ArrayDestructVariableFilter.php',
'Rector\\Core\\NodeManipulator\\ArrayManipulator' => $baseDir . '/src/NodeManipulator/ArrayManipulator.php',

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit274bd0da1f70b52e1bb33d788f1d209e
class ComposerAutoloaderInit50791387877e964e5b382c4efcb0c02f
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit274bd0da1f70b52e1bb33d788f1d209e
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit274bd0da1f70b52e1bb33d788f1d209e', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit50791387877e964e5b382c4efcb0c02f', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit274bd0da1f70b52e1bb33d788f1d209e', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit50791387877e964e5b382c4efcb0c02f', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit274bd0da1f70b52e1bb33d788f1d209e::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit50791387877e964e5b382c4efcb0c02f::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit274bd0da1f70b52e1bb33d788f1d209e::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit50791387877e964e5b382c4efcb0c02f::$files;
$requireFile = static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit274bd0da1f70b52e1bb33d788f1d209e
class ComposerStaticInit50791387877e964e5b382c4efcb0c02f
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -1678,6 +1678,7 @@ class ComposerStaticInit274bd0da1f70b52e1bb33d788f1d209e
'Rector\\Core\\NodeAnalyzer\\VariableAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/VariableAnalyzer.php',
'Rector\\Core\\NodeAnalyzer\\VariadicAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/VariadicAnalyzer.php',
'Rector\\Core\\NodeDecorator\\CreatedByRuleDecorator' => __DIR__ . '/../..' . '/src/NodeDecorator/CreatedByRuleDecorator.php',
'Rector\\Core\\NodeDecorator\\MixPhpHtmlDecorator' => __DIR__ . '/../..' . '/src/NodeDecorator/MixPhpHtmlDecorator.php',
'Rector\\Core\\NodeDecorator\\PropertyTypeDecorator' => __DIR__ . '/../..' . '/src/NodeDecorator/PropertyTypeDecorator.php',
'Rector\\Core\\NodeManipulator\\ArrayDestructVariableFilter' => __DIR__ . '/../..' . '/src/NodeManipulator/ArrayDestructVariableFilter.php',
'Rector\\Core\\NodeManipulator\\ArrayManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/ArrayManipulator.php',
@ -3074,9 +3075,9 @@ class ComposerStaticInit274bd0da1f70b52e1bb33d788f1d209e
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit274bd0da1f70b52e1bb33d788f1d209e::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit274bd0da1f70b52e1bb33d788f1d209e::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit274bd0da1f70b52e1bb33d788f1d209e::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit50791387877e964e5b382c4efcb0c02f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit50791387877e964e5b382c4efcb0c02f::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit50791387877e964e5b382c4efcb0c02f::$classMap;
}, null, ClassLoader::class);
}