Updated Rector to commit b56b0c2febafe7ab07b187faa9b315f810cac0ae

b56b0c2feb [TypeDeclaration] Remove findParentType() on SilentVoidResolver (#4203)
This commit is contained in:
Tomas Votruba 2023-06-12 18:32:15 +00:00
parent adf2c53a99
commit 28ddc5c0c4
6 changed files with 24 additions and 18 deletions

View File

@ -9,16 +9,16 @@ use PhpParser\Node\Expr\Closure;
use PhpParser\Node\Expr\Yield_;
use PhpParser\Node\FunctionLike;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\Interface_;
use PhpParser\Node\Stmt\Return_;
use PhpParser\Node\Stmt\Switch_;
use PhpParser\Node\Stmt\Throw_;
use PhpParser\Node\Stmt\TryCatch;
use PHPStan\Reflection\ClassReflection;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\Reflection\ReflectionResolver;
final class SilentVoidResolver
{
/**
@ -26,17 +26,23 @@ final class SilentVoidResolver
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
public function __construct(BetterNodeFinder $betterNodeFinder)
/**
* @readonly
* @var \Rector\Core\Reflection\ReflectionResolver
*/
private $reflectionResolver;
public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver)
{
$this->betterNodeFinder = $betterNodeFinder;
$this->reflectionResolver = $reflectionResolver;
}
/**
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Expr\Closure|\PhpParser\Node\Stmt\Function_ $functionLike
*/
public function hasExclusiveVoid($functionLike) : bool
{
$classLike = $this->betterNodeFinder->findParentType($functionLike, ClassLike::class);
if ($classLike instanceof Interface_) {
$classReflection = $this->reflectionResolver->resolveClassReflection($functionLike);
if ($classReflection instanceof ClassReflection && $classReflection->isInterface()) {
return \false;
}
if ($this->hasNeverType($functionLike)) {

View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'd90d3210e4ccd796347f947ba822705f23457c8c';
public const PACKAGE_VERSION = 'b56b0c2febafe7ab07b187faa9b315f810cac0ae';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-06-13 01:18:18';
public const RELEASE_DATE = '2023-06-13 01:28:21';
/**
* @var int
*/

View File

@ -15,7 +15,7 @@ final class RectorKernel
/**
* @var string
*/
private const CACHE_KEY = 'v113';
private const CACHE_KEY = 'v114';
/**
* @var \Symfony\Component\DependencyInjection\ContainerInterface|null
*/

2
vendor/autoload.php vendored
View File

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

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitc55586c4f9e68dab08e281706d208f9e
class ComposerAutoloaderInit43e879342ee7bc473b8a2479175643e2
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInitc55586c4f9e68dab08e281706d208f9e
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitc55586c4f9e68dab08e281706d208f9e', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit43e879342ee7bc473b8a2479175643e2', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitc55586c4f9e68dab08e281706d208f9e', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit43e879342ee7bc473b8a2479175643e2', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitc55586c4f9e68dab08e281706d208f9e::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit43e879342ee7bc473b8a2479175643e2::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInitc55586c4f9e68dab08e281706d208f9e::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit43e879342ee7bc473b8a2479175643e2::$files;
$requireFile = \Closure::bind(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 ComposerStaticInitc55586c4f9e68dab08e281706d208f9e
class ComposerStaticInit43e879342ee7bc473b8a2479175643e2
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3097,9 +3097,9 @@ class ComposerStaticInitc55586c4f9e68dab08e281706d208f9e
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitc55586c4f9e68dab08e281706d208f9e::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitc55586c4f9e68dab08e281706d208f9e::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitc55586c4f9e68dab08e281706d208f9e::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit43e879342ee7bc473b8a2479175643e2::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit43e879342ee7bc473b8a2479175643e2::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit43e879342ee7bc473b8a2479175643e2::$classMap;
}, null, ClassLoader::class);
}