Updated Rector to commit fbf9506c5de7389260e8a842c911b3315b053df3

fbf9506c5d Skip RenamePropertyToMatchTypeRector for promoted property date time (#3275)
This commit is contained in:
Tomas Votruba 2023-01-13 15:15:08 +00:00
parent b27945f635
commit d37a463efc
5 changed files with 27 additions and 13 deletions

View File

@ -4,8 +4,10 @@ declare (strict_types=1);
namespace Rector\Naming\ExpectedNameResolver;
use PhpParser\Node\Param;
use PHPStan\Type\ObjectType;
use Rector\Naming\Naming\PropertyNaming;
use Rector\Naming\ValueObject\ExpectedName;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\StaticTypeMapper\StaticTypeMapper;
final class MatchParamTypeExpectedNameResolver
{
@ -19,10 +21,16 @@ final class MatchParamTypeExpectedNameResolver
* @var \Rector\Naming\Naming\PropertyNaming
*/
private $propertyNaming;
public function __construct(StaticTypeMapper $staticTypeMapper, PropertyNaming $propertyNaming)
/**
* @readonly
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
public function __construct(StaticTypeMapper $staticTypeMapper, PropertyNaming $propertyNaming, NodeNameResolver $nodeNameResolver)
{
$this->staticTypeMapper = $staticTypeMapper;
$this->propertyNaming = $propertyNaming;
$this->nodeNameResolver = $nodeNameResolver;
}
public function resolve(Param $param) : ?string
{
@ -31,6 +39,12 @@ final class MatchParamTypeExpectedNameResolver
return null;
}
$staticType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($param->type);
// skip date time + date time interface, as should be kept
if ($staticType instanceof ObjectType && $staticType->isInstanceOf('DateTimeInterface')->yes()) {
if ($this->nodeNameResolver->isName($param, '*At')) {
return null;
}
}
$expectedName = $this->propertyNaming->getExpectedNameFromType($staticType);
if (!$expectedName instanceof ExpectedName) {
return null;

View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '0.15.5';
public const PACKAGE_VERSION = 'fbf9506c5de7389260e8a842c911b3315b053df3';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-01-12 14:53:20';
public const RELEASE_DATE = '2023-01-13 15:10:38';
/**
* @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 ComposerAutoloaderInitce78928efdb424a5c5bc1ccb81de8041::getLoader();
return ComposerAutoloaderInit3a7cd9c2886ec7ffd966c0c687d33c1c::getLoader();

View File

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

View File

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