octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-08 12:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 58d862b6f54529f25ecb994ea5e7d2c3eb69f210

Browse Source 
58d862b6f5 [DeadCode] Remove previous and parent attribute usage on RemoveNullPropertyInitializationRector (#3541)
This commit is contained in:
Tomas Votruba 2023-03-30 20:44:38 +00:00
parent 9b6b4fafd3
commit 817a8ccc28
5 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
rules/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector.php
View File

@ -6,11 +6,8 @@ namespace Rector\DeadCode\Rector\PropertyProperty;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ConstFetch;
use PhpParser\Node\NullableType;
use PhpParser\Node\Stmt\Property;
use PhpParser\Node\Stmt\PropertyProperty;
use Rector\Core\Rector\AbstractRector;
use Rector\NodeTypeResolver\Node\AttributeKey;
use function strtolower;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@ -40,33 +37,34 @@ CODE_SAMPLE
*/
public function getNodeTypes() : array
{
return [PropertyProperty::class];
return [Property::class];
}
/**
* @param PropertyProperty $node
* @param Property $node
*/
public function refactor(Node $node) : ?Node
{
$parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
// skip typed properties
if ($parentNode instanceof Property && $parentNode->type !== null) {
if ($node->type instanceof Node) {
return null;
}
$defaultValueNode = $node->default;
if (!$defaultValueNode instanceof Expr) {
return null;
$hasChanged = \false;
foreach ($node->props as $prop) {
$defaultValueNode = $prop->default;
if (!$defaultValueNode instanceof Expr) {
continue;
}
if (!$defaultValueNode instanceof ConstFetch) {
continue;
}
if (strtolower((string) $defaultValueNode->name) !== 'null') {
continue;
}
$prop->default = null;
$hasChanged = \true;
}
if (!$defaultValueNode instanceof ConstFetch) {
return null;
if ($hasChanged) {
return $node;
}
if (strtolower((string) $defaultValueNode->name) !== 'null') {
return null;
}
$nodeNode = $node->getAttribute(AttributeKey::PREVIOUS_NODE);
if ($nodeNode instanceof NullableType) {
return null;
}
$node->default = null;
return $node;
return null;
}
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'fd2e1a181d96cee745529f345d77be55de3f5d17';
public const PACKAGE_VERSION = '58d862b6f54529f25ecb994ea5e7d2c3eb69f210';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-03-30 17:37:47';
public const RELEASE_DATE = '2023-03-31 03:39:54';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

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

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitcaa0b0a4a813af243529f475820be99d
class ComposerStaticInitfbb79adddead867277f9db7383d4e715
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3130,9 +3130,9 @@ class ComposerStaticInitcaa0b0a4a813af243529f475820be99d
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitcaa0b0a4a813af243529f475820be99d::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitcaa0b0a4a813af243529f475820be99d::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitcaa0b0a4a813af243529f475820be99d::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitfbb79adddead867277f9db7383d4e715::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitfbb79adddead867277f9db7383d4e715::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitfbb79adddead867277f9db7383d4e715::$classMap;
}, null, ClassLoader::class);
}