From d72ba9e07b6e3974928555da4d8a38319d6d1c6d Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 27 Feb 2023 00:09:29 +0000 Subject: [PATCH] Updated Rector to commit 9cf87f6ac68f0386a27e2892d832ee113ffcc642 https://github.com/rectorphp/rector-src/commit/9cf87f6ac68f0386a27e2892d832ee113ffcc642 Skip nullable DateTimeInterface in RenamePropertyToMatchTypeRector (#3420) --- .../MatchParamTypeExpectedNameResolver.php | 3 ++- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++++----- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/rules/Naming/ExpectedNameResolver/MatchParamTypeExpectedNameResolver.php b/rules/Naming/ExpectedNameResolver/MatchParamTypeExpectedNameResolver.php index 1ba122c113f8..4ad76b9f1c78 100644 --- a/rules/Naming/ExpectedNameResolver/MatchParamTypeExpectedNameResolver.php +++ b/rules/Naming/ExpectedNameResolver/MatchParamTypeExpectedNameResolver.php @@ -32,8 +32,9 @@ public function resolve(Param $param) : ?string return null; } $staticType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($param->type); + // include nullable too // skip date time + date time interface, as should be kept - if ($staticType instanceof ObjectType && $staticType->isInstanceOf('DateTimeInterface')->yes()) { + if ($staticType->isSuperTypeOf(new ObjectType('DateTimeInterface'))->yes()) { return null; } $expectedName = $this->propertyNaming->getExpectedNameFromType($staticType); diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 9283a6717c4e..004c9d0e3ae0 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = 'b7b3a1dc2ea5c141aa1c48e626af10a31f832b77'; + public const PACKAGE_VERSION = '9cf87f6ac68f0386a27e2892d832ee113ffcc642'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-02-26 19:39:41'; + public const RELEASE_DATE = '2023-02-27 00:04:07'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index b60728d5ed64..0e9e745d879a 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitd658c3a965d615efa3975118556723c5::getLoader(); +return ComposerAutoloaderInit2c3dae2e56f4c6f7d9c1ac9aa83f06ff::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index d4b6684eab7d..b27f2db25912 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitd658c3a965d615efa3975118556723c5 +class ComposerAutoloaderInit2c3dae2e56f4c6f7d9c1ac9aa83f06ff { private static $loader; @@ -22,17 +22,17 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitd658c3a965d615efa3975118556723c5', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit2c3dae2e56f4c6f7d9c1ac9aa83f06ff', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInitd658c3a965d615efa3975118556723c5', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit2c3dae2e56f4c6f7d9c1ac9aa83f06ff', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitd658c3a965d615efa3975118556723c5::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit2c3dae2e56f4c6f7d9c1ac9aa83f06ff::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInitd658c3a965d615efa3975118556723c5::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit2c3dae2e56f4c6f7d9c1ac9aa83f06ff::$files; $requireFile = \Closure::bind(static function ($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index ca87aecda02e..08812ab7db05 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitd658c3a965d615efa3975118556723c5 +class ComposerStaticInit2c3dae2e56f4c6f7d9c1ac9aa83f06ff { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3125,9 +3125,9 @@ class ComposerStaticInitd658c3a965d615efa3975118556723c5 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitd658c3a965d615efa3975118556723c5::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitd658c3a965d615efa3975118556723c5::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitd658c3a965d615efa3975118556723c5::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit2c3dae2e56f4c6f7d9c1ac9aa83f06ff::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit2c3dae2e56f4c6f7d9c1ac9aa83f06ff::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit2c3dae2e56f4c6f7d9c1ac9aa83f06ff::$classMap; }, null, ClassLoader::class); }