Skip to content

Commit

Permalink
Updated Rector to commit 8320d29
Browse files Browse the repository at this point in the history 
rectorphp/rector-src@8320d29 [Renaming] Fix duplicate namespacing on RenameNamespaceRector (#1759)
  • Loading branch information
@TomasVotruba
TomasVotruba committed Feb 2, 2022
1 parent 1c52903 commit 7764769
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 43 deletions.
32 changes: 8 additions & 24 deletions rules/Renaming/Rector/Namespace_/RenameNamespaceRector.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
declare (strict_types=1);
namespace Rector\Renaming\Rector\Namespace_;

use RectorPrefix20220202\Nette\Utils\Strings;
use PhpParser\Node;
use PhpParser\Node\Expr\New_;
use PhpParser\Node\Name;
Expand Down Expand Up @@ -110,13 +109,16 @@ public function configure(array $configuration) : void
}
private function processFullyQualified(\PhpParser\Node\Name $name, \Rector\Renaming\ValueObject\RenamedNamespace $renamedNamespace) : ?\PhpParser\Node\Name\FullyQualified
{
$newName = $this->isPartialNamespace($name) ? $this->resolvePartialNewName($name, $renamedNamespace) : $renamedNamespace->getNameInNewNamespace();
if (\strncmp($name->toString(), $renamedNamespace->getNewNamespace() . '\\', \strlen($renamedNamespace->getNewNamespace() . '\\')) === 0) {
return null;
}
$nameInNewNamespace = $renamedNamespace->getNameInNewNamespace();
$values = \array_values($this->oldToNewNamespaces);
if (!isset($this->isChangedInNamespaces[$newName])) {
return new \PhpParser\Node\Name\FullyQualified($newName);
if (!isset($this->isChangedInNamespaces[$nameInNewNamespace])) {
return new \PhpParser\Node\Name\FullyQualified($nameInNewNamespace);
}
if (!\in_array($newName, $values, \true)) {
return new \PhpParser\Node\Name\FullyQualified($newName);
if (!\in_array($nameInNewNamespace, $values, \true)) {
return new \PhpParser\Node\Name\FullyQualified($nameInNewNamespace);
}
return null;
}
Expand All @@ -138,22 +140,4 @@ private function isClassFullyQualifiedName(\PhpParser\Node $node) : bool
$newClassName = $fullyQualifiedNode->toString();
return \array_key_exists($newClassName, $this->oldToNewNamespaces);
}
private function isPartialNamespace(\PhpParser\Node\Name $name) : bool
{
$resolvedName = $name->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::RESOLVED_NAME);
if (!$resolvedName instanceof \PhpParser\Node\Name) {
return \false;
}
if ($resolvedName instanceof \PhpParser\Node\Name\FullyQualified) {
return !$this->isName($name, $resolvedName->toString());
}
return \false;
}
private function resolvePartialNewName(\PhpParser\Node\Name $name, \Rector\Renaming\ValueObject\RenamedNamespace $renamedNamespace) : string
{
$nameInNewNamespace = $renamedNamespace->getNameInNewNamespace();
// first dummy implementation - improve
$cutOffFromTheLeft = \RectorPrefix20220202\Nette\Utils\Strings::length($nameInNewNamespace) - \RectorPrefix20220202\Nette\Utils\Strings::length($name->toString());
return \RectorPrefix20220202\Nette\Utils\Strings::substring($nameInNewNamespace, $cutOffFromTheLeft);
}
}
7 changes: 7 additions & 0 deletions rules/Renaming/ValueObject/RenamedNamespace.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ public function __construct(string $currentName, string $oldNamespace, string $n
}
public function getNameInNewNamespace() : string
{
if ($this->newNamespace === $this->currentName) {
return $this->currentName;
}
return \str_replace($this->oldNamespace, $this->newNamespace, $this->currentName);
}
public function getNewNamespace() : string
{
return $this->newNamespace;
}
}
4 changes: 2 additions & 2 deletions src/Application/VersionResolver.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '2468277687fd94c110f824ce27c7850b4b351b33';
public const PACKAGE_VERSION = '8320d290031d91d232e3dd5b1b8779fbcb6e5a07';
/**
* @var string
*/
public const RELEASE_DATE = '2022-02-02 10:03:15';
public const RELEASE_DATE = '2022-02-02 10:05:09';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20220202\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInit4607760fedce846d9d0308df79aa6315::getLoader();
return ComposerAutoloaderInita9432eadaa336def2b08e78cb934fdfe::getLoader();
14 changes: 7 additions & 7 deletions vendor/composer/autoload_real.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInit4607760fedce846d9d0308df79aa6315
class ComposerAutoloaderInita9432eadaa336def2b08e78cb934fdfe
{
private static $loader;

Expand All @@ -22,15 +22,15 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInit4607760fedce846d9d0308df79aa6315', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInita9432eadaa336def2b08e78cb934fdfe', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit4607760fedce846d9d0308df79aa6315', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInita9432eadaa336def2b08e78cb934fdfe', 'loadClassLoader'));

$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';

call_user_func(\Composer\Autoload\ComposerStaticInit4607760fedce846d9d0308df79aa6315::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInita9432eadaa336def2b08e78cb934fdfe::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
Expand All @@ -42,12 +42,12 @@ public static function getLoader()
$loader->register(true);

if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit4607760fedce846d9d0308df79aa6315::$files;
$includeFiles = Composer\Autoload\ComposerStaticInita9432eadaa336def2b08e78cb934fdfe::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire4607760fedce846d9d0308df79aa6315($fileIdentifier, $file);
composerRequirea9432eadaa336def2b08e78cb934fdfe($fileIdentifier, $file);
}

return $loader;
Expand All @@ -59,7 +59,7 @@ public static function getLoader()
* @param string $file
* @return void
*/
function composerRequire4607760fedce846d9d0308df79aa6315($fileIdentifier, $file)
function composerRequirea9432eadaa336def2b08e78cb934fdfe($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
Expand Down
8 changes: 4 additions & 4 deletions vendor/composer/autoload_static.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

class ComposerStaticInit4607760fedce846d9d0308df79aa6315
class ComposerStaticInita9432eadaa336def2b08e78cb934fdfe
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
Expand Down Expand Up @@ -3869,9 +3869,9 @@ class ComposerStaticInit4607760fedce846d9d0308df79aa6315
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit4607760fedce846d9d0308df79aa6315::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit4607760fedce846d9d0308df79aa6315::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit4607760fedce846d9d0308df79aa6315::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInita9432eadaa336def2b08e78cb934fdfe::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInita9432eadaa336def2b08e78cb934fdfe::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInita9432eadaa336def2b08e78cb934fdfe::$classMap;

}, null, ClassLoader::class);
}
Expand Down
10 changes: 5 additions & 5 deletions vendor/scoper-autoload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20220202\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit4607760fedce846d9d0308df79aa6315', false) && !interface_exists('ComposerAutoloaderInit4607760fedce846d9d0308df79aa6315', false) && !trait_exists('ComposerAutoloaderInit4607760fedce846d9d0308df79aa6315', false)) {
spl_autoload_call('RectorPrefix20220202\ComposerAutoloaderInit4607760fedce846d9d0308df79aa6315');
if (!class_exists('ComposerAutoloaderInita9432eadaa336def2b08e78cb934fdfe', false) && !interface_exists('ComposerAutoloaderInita9432eadaa336def2b08e78cb934fdfe', false) && !trait_exists('ComposerAutoloaderInita9432eadaa336def2b08e78cb934fdfe', false)) {
spl_autoload_call('RectorPrefix20220202\ComposerAutoloaderInita9432eadaa336def2b08e78cb934fdfe');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20220202\Helmich\TypoScriptParser\Parser\AST\Statement');
Expand Down Expand Up @@ -71,9 +71,9 @@ function print_node() {
return \RectorPrefix20220202\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire4607760fedce846d9d0308df79aa6315')) {
function composerRequire4607760fedce846d9d0308df79aa6315() {
return \RectorPrefix20220202\composerRequire4607760fedce846d9d0308df79aa6315(...func_get_args());
if (!function_exists('composerRequirea9432eadaa336def2b08e78cb934fdfe')) {
function composerRequirea9432eadaa336def2b08e78cb934fdfe() {
return \RectorPrefix20220202\composerRequirea9432eadaa336def2b08e78cb934fdfe(...func_get_args());
}
}
if (!function_exists('scanPath')) {
Expand Down

0 comments on commit 7764769

Please sign in to comment.