Skip to content

Commit 168d6a7

Browse files
TomasVotrubaTomasVotruba
committed
Updated Rector to commit 120e0ccfc40bc696d23a9e1d93b6662ea7dfa682
rectorphp/rector-src@120e0cc Bump to php parser 4.18 (#5362)
1 parent bd56d13 commit 168d6a7

File tree

6 files changed

+50
-50
lines changed

6 files changed

+50
-50
lines changed

‎rules/DeadCode/Rector/ClassMethod/RemoveNullTagValueNodeRector.php‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,40 @@ public function getNodeTypes() : array
7373
{
7474
return [ClassMethod::class, Function_::class, Expression::class, Property::class];
7575
}
76+
/**
77+
* @param ClassMethod|Function_|Expression|Property $node
78+
*/
79+
public function refactor(Node $node) : ?Node
80+
{
81+
if ($node instanceof Expression || $node instanceof Property) {
82+
return $this->processVarTagNull($node);
83+
}
84+
$phpdocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
85+
$removedParamNames = [];
86+
foreach ($node->params as $param) {
87+
$paramName = $this->getName($param);
88+
$paramTagValueNode = $phpdocInfo->getParamTagValueByName($paramName);
89+
if ($paramTagValueNode instanceof ParamTagValueNode && $this->isNull($paramTagValueNode)) {
90+
$removedParamNames[] = $paramTagValueNode->parameterName;
91+
}
92+
}
93+
$hasRemoved = \false;
94+
if ($removedParamNames !== []) {
95+
$this->removeParamNullTag($phpdocInfo, $removedParamNames);
96+
$this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
97+
$hasRemoved = \true;
98+
}
99+
$returnTagValueNode = $phpdocInfo->getReturnTagValue();
100+
if ($returnTagValueNode instanceof ReturnTagValueNode && $this->isNull($returnTagValueNode)) {
101+
$phpdocInfo->removeByType(ReturnTagValueNode::class);
102+
$this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
103+
$hasRemoved = \true;
104+
}
105+
if (!$hasRemoved) {
106+
return null;
107+
}
108+
return $node;
109+
}
76110
/**
77111
* @param \PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode|\PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode|\PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode $tag
78112
*/
@@ -113,38 +147,4 @@ private function processVarTagNull($node) : ?Node
113147
}
114148
return null;
115149
}
116-
/**
117-
* @param ClassMethod|Function_|Expression|Property $node
118-
*/
119-
public function refactor(Node $node) : ?Node
120-
{
121-
if ($node instanceof Expression || $node instanceof Property) {
122-
return $this->processVarTagNull($node);
123-
}
124-
$phpdocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
125-
$removedParamNames = [];
126-
foreach ($node->params as $param) {
127-
$paramName = $this->getName($param);
128-
$paramTagValueNode = $phpdocInfo->getParamTagValueByName($paramName);
129-
if ($paramTagValueNode instanceof ParamTagValueNode && $this->isNull($paramTagValueNode)) {
130-
$removedParamNames[] = $paramTagValueNode->parameterName;
131-
}
132-
}
133-
$hasRemoved = \false;
134-
if ($removedParamNames !== []) {
135-
$this->removeParamNullTag($phpdocInfo, $removedParamNames);
136-
$this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
137-
$hasRemoved = \true;
138-
}
139-
$returnTagValueNode = $phpdocInfo->getReturnTagValue();
140-
if ($returnTagValueNode instanceof ReturnTagValueNode && $this->isNull($returnTagValueNode)) {
141-
$phpdocInfo->removeByType(ReturnTagValueNode::class);
142-
$this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
143-
$hasRemoved = \true;
144-
}
145-
if (!$hasRemoved) {
146-
return null;
147-
}
148-
return $node;
149-
}
150150
}

‎rules/Php55/Rector/String_/StringClassNameToClassConstantRector.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ final class StringClassNameToClassConstantRector extends AbstractRector implemen
3131
* @var \PHPStan\Reflection\ReflectionProvider
3232
*/
3333
private $reflectionProvider;
34+
/**
35+
* @var string
36+
*/
37+
public const SHOULD_KEEP_PRE_SLASH = 'should_keep_pre_slash';
3438
/**
3539
* @var string
3640
*/
@@ -43,10 +47,6 @@ final class StringClassNameToClassConstantRector extends AbstractRector implemen
4347
* @var bool
4448
*/
4549
private $shouldKeepPreslash = \false;
46-
/**
47-
* @var string
48-
*/
49-
public const SHOULD_KEEP_PRE_SLASH = 'should_keep_pre_slash';
5050
public function __construct(ReflectionProvider $reflectionProvider)
5151
{
5252
$this->reflectionProvider = $reflectionProvider;

‎src/Application/VersionResolver.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ final class VersionResolver
1919
* @api
2020
* @var string
2121
*/
22-
public const PACKAGE_VERSION = '39cce5ccb84ce4ac40eeae113db339a961db9489';
22+
public const PACKAGE_VERSION = '120e0ccfc40bc696d23a9e1d93b6662ea7dfa682';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2023-12-16 16:40:38';
27+
public const RELEASE_DATE = '2023-12-16 15:53:06';
2828
/**
2929
* @var int
3030
*/

‎vendor/autoload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222

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

25-
return ComposerAutoloaderInita55c41c7fa52abd86138c6f32df1d185::getLoader();
25+
return ComposerAutoloaderInit8339caf294dd12447c06647e5d0dc118::getLoader();

‎vendor/composer/autoload_real.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInita55c41c7fa52abd86138c6f32df1d185
5+
class ComposerAutoloaderInit8339caf294dd12447c06647e5d0dc118
66
{
77
private static $loader;
88

@@ -22,17 +22,17 @@ public static function getLoader()
2222
return self::$loader;
2323
}
2424

25-
spl_autoload_register(array('ComposerAutoloaderInita55c41c7fa52abd86138c6f32df1d185', 'loadClassLoader'), true, true);
25+
spl_autoload_register(array('ComposerAutoloaderInit8339caf294dd12447c06647e5d0dc118', 'loadClassLoader'), true, true);
2626
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
27-
spl_autoload_unregister(array('ComposerAutoloaderInita55c41c7fa52abd86138c6f32df1d185', 'loadClassLoader'));
27+
spl_autoload_unregister(array('ComposerAutoloaderInit8339caf294dd12447c06647e5d0dc118', 'loadClassLoader'));
2828

2929
require __DIR__ . '/autoload_static.php';
30-
call_user_func(\Composer\Autoload\ComposerStaticInita55c41c7fa52abd86138c6f32df1d185::getInitializer($loader));
30+
call_user_func(\Composer\Autoload\ComposerStaticInit8339caf294dd12447c06647e5d0dc118::getInitializer($loader));
3131

3232
$loader->setClassMapAuthoritative(true);
3333
$loader->register(true);
3434

35-
$filesToLoad = \Composer\Autoload\ComposerStaticInita55c41c7fa52abd86138c6f32df1d185::$files;
35+
$filesToLoad = \Composer\Autoload\ComposerStaticInit8339caf294dd12447c06647e5d0dc118::$files;
3636
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
3737
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
3838
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

‎vendor/composer/autoload_static.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInita55c41c7fa52abd86138c6f32df1d185
7+
class ComposerStaticInit8339caf294dd12447c06647e5d0dc118
88
{
99
public static $files = array (
1010
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -2619,9 +2619,9 @@ class ComposerStaticInita55c41c7fa52abd86138c6f32df1d185
26192619
public static function getInitializer(ClassLoader $loader)
26202620
{
26212621
return \Closure::bind(function () use ($loader) {
2622-
$loader->prefixLengthsPsr4 = ComposerStaticInita55c41c7fa52abd86138c6f32df1d185::$prefixLengthsPsr4;
2623-
$loader->prefixDirsPsr4 = ComposerStaticInita55c41c7fa52abd86138c6f32df1d185::$prefixDirsPsr4;
2624-
$loader->classMap = ComposerStaticInita55c41c7fa52abd86138c6f32df1d185::$classMap;
2622+
$loader->prefixLengthsPsr4 = ComposerStaticInit8339caf294dd12447c06647e5d0dc118::$prefixLengthsPsr4;
2623+
$loader->prefixDirsPsr4 = ComposerStaticInit8339caf294dd12447c06647e5d0dc118::$prefixDirsPsr4;
2624+
$loader->classMap = ComposerStaticInit8339caf294dd12447c06647e5d0dc118::$classMap;
26252625

26262626
}, null, ClassLoader::class);
26272627
}

0 commit comments

Comments
 (0)