Updated Rector to commit 435d125053eed8764652ccf8565bde1660ee08ce

435d125053 Move StrictArrayParamDimFetchRector and StrictStringParamConcatRector to last rules on TypeDeclarationLevel (#5618)
This commit is contained in:
Tomas Votruba 2024-02-14 14:40:00 +00:00
parent 51ddee6f5c
commit a022b931b8
7 changed files with 19 additions and 17 deletions

View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'd62be327173447695dea93ff52d67d087d9fb9d4';
public const PACKAGE_VERSION = '435d125053eed8764652ccf8565bde1660ee08ce';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2024-02-14 09:07:27';
public const RELEASE_DATE = '2024-02-14 15:37:49';
/**
* @var int
*/

View File

@ -87,12 +87,12 @@ final class TypeDeclarationLevel
AddParamTypeFromPropertyTypeRector::class,
MergeDateTimePropertyTypeDeclarationRector::class,
PropertyTypeFromStrictSetterGetterRector::class,
StrictArrayParamDimFetchRector::class,
StrictStringParamConcatRector::class,
ParamTypeByMethodCallTypeRector::class,
TypedPropertyFromAssignsRector::class,
AddReturnTypeDeclarationBasedOnParentClassMethodRector::class,
ReturnTypeFromStrictFluentReturnRector::class,
ReturnNeverTypeRector::class,
StrictArrayParamDimFetchRector::class,
StrictStringParamConcatRector::class,
];
}

View File

@ -1679,12 +1679,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git",
"reference": "e9c0f7e5e05569e7349f7402e4e95a8345de0b8c"
"reference": "68d0f86babbb722037f888a2fba7f53e521b777d"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/e9c0f7e5e05569e7349f7402e4e95a8345de0b8c",
"reference": "e9c0f7e5e05569e7349f7402e4e95a8345de0b8c",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/68d0f86babbb722037f888a2fba7f53e521b777d",
"reference": "68d0f86babbb722037f888a2fba7f53e521b777d",
"shasum": ""
},
"require": {
@ -1692,6 +1692,7 @@
"symfony\/yaml": "^6.4"
},
"require-dev": {
"doctrine\/doctrine-bundle": "^2.11",
"doctrine\/orm": "^2.18",
"phpstan\/extension-installer": "^1.3",
"phpstan\/phpstan": "^1.10.57",
@ -1708,7 +1709,7 @@
"tomasvotruba\/unused-public": "^0.3",
"tracy\/tracy": "^2.10"
},
"time": "2024-02-13T14:46:52+00:00",
"time": "2024-02-14T14:33:16+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {

File diff suppressed because one or more lines are too long

View File

@ -9,7 +9,7 @@ namespace Rector\RectorInstaller;
*/
final class GeneratedConfig
{
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main e9c0f7e'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 8d1aab2'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main cdbe390'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 59edb62'));
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main 68d0f86'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 8d1aab2'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main cdbe390'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 59edb62'));
private function __construct()
{
}

View File

@ -8,20 +8,21 @@
"symfony\/yaml": "^6.4"
},
"require-dev": {
"doctrine\/doctrine-bundle": "^2.11",
"doctrine\/orm": "^2.18",
"phpstan\/extension-installer": "^1.3",
"phpstan\/phpstan-webmozart-assert": "^1.2",
"phpstan\/phpstan": "^1.10.57",
"phpstan\/phpstan-webmozart-assert": "^1.2",
"phpunit\/phpunit": "^10.5",
"rector\/rector-generator": "^0.7.10",
"rector\/rector-src": "dev-main",
"symplify\/phpstan-rules": "^11.4",
"symplify\/phpstan-extensions": "^11.4",
"symplify\/easy-coding-standard": "^12.1",
"symplify\/phpstan-extensions": "^11.4",
"symplify\/phpstan-rules": "^11.4",
"symplify\/rule-doc-generator": "^12.1",
"symplify\/vendor-patches": "^11.3",
"rector\/rector-generator": "^0.7.10",
"tomasvotruba\/unused-public": "^0.3",
"tomasvotruba\/class-leak": "^0.2.8",
"tomasvotruba\/unused-public": "^0.3",
"tracy\/tracy": "^2.10"
},
"autoload": {

View File

@ -100,7 +100,7 @@ CODE_SAMPLE
*/
public function refactor(Node $node) : ?Node
{
if (!$this->hasImplements($node, 'Doctrine\\Common\\EventSubscriber')) {
if (!$this->hasImplements($node, 'Doctrine\\Common\\EventSubscriber') && !$this->hasImplements($node, 'Doctrine\\Bundle\\DoctrineBundle\\EventSubscriber\\EventSubscriberInterface')) {
return null;
}
$this->subscriberClass = $node;
@ -115,7 +115,7 @@ CODE_SAMPLE
if ($stmts[0] instanceof Return_ && $stmts[0]->expr instanceof Array_) {
$this->handleArray($stmts);
}
$this->removeImplements($node, ['Doctrine\\Common\\EventSubscriber']);
$this->removeImplements($node, ['Doctrine\\Common\\EventSubscriber', 'Doctrine\\Bundle\\DoctrineBundle\\EventSubscriber\\EventSubscriberInterface']);
unset($node->stmts[$getSubscribedEventsClassMethod->getAttribute(AttributeKey::STMT_KEY)]);
return $node;
}