mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-03-14 12:29:43 +01:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit 111bf5d78adbd38f740505bd5a98292834407897

Browse Source 
b1dbbd65c8 Add failing test fixture for TypedPropertyFromStrictGetterMethodReturnTypeRector 8da054709b Prevent existing type override by mixed 111bf5d78a Merge pull request #1642 from zingimmick/patch-1
This commit is contained in:
Tomas Votruba 2022-01-07 06:43:54 +00:00
parent 300503afe6
commit ff1735e468
6 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector.php
View File

@ -8,6 +8,7 @@ use PhpParser\Node\Expr;
use PhpParser\Node\Stmt\Property;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Type\MixedType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
@ -93,6 +94,9 @@ CODE_SAMPLE
if (!$getterReturnType instanceof \PHPStan\Type\Type) {
return null;
}
if ($getterReturnType instanceof \PHPStan\Type\MixedType) {
return null;
}
if (!$this->phpVersionProvider->isAtLeastPhpVersion(\Rector\Core\ValueObject\PhpVersionFeature::TYPED_PROPERTIES)) {
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
$this->phpDocTypeChanger->changeVarType($phpDocInfo, $getterReturnType);

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'f42b3f91e27354411269caf3ce2636d90a2ba3aa';
public const PACKAGE_VERSION = '111bf5d78adbd38f740505bd5a98292834407897';
/**
* @var string
*/
public const RELEASE_DATE = '2022-01-07 07:50:06';
public const RELEASE_DATE = '2022-01-07 13:35:52';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20220107\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit378b85de076e2d0904acc0e2ecb2cb78::getLoader();
return ComposerAutoloaderInit53331b101b45a9a0e15c7c77733ca747::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit378b85de076e2d0904acc0e2ecb2cb78
class ComposerAutoloaderInit53331b101b45a9a0e15c7c77733ca747
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit378b85de076e2d0904acc0e2ecb2cb78
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit378b85de076e2d0904acc0e2ecb2cb78', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit53331b101b45a9a0e15c7c77733ca747', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit378b85de076e2d0904acc0e2ecb2cb78', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit53331b101b45a9a0e15c7c77733ca747', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit378b85de076e2d0904acc0e2ecb2cb78::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit53331b101b45a9a0e15c7c77733ca747::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,12 +42,12 @@ class ComposerAutoloaderInit378b85de076e2d0904acc0e2ecb2cb78
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit378b85de076e2d0904acc0e2ecb2cb78::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit53331b101b45a9a0e15c7c77733ca747::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire378b85de076e2d0904acc0e2ecb2cb78($fileIdentifier, $file);
composerRequire53331b101b45a9a0e15c7c77733ca747($fileIdentifier, $file);
}
return $loader;
@ -59,7 +59,7 @@ class ComposerAutoloaderInit378b85de076e2d0904acc0e2ecb2cb78
* @param string $file
* @return void
*/
function composerRequire378b85de076e2d0904acc0e2ecb2cb78($fileIdentifier, $file)
function composerRequire53331b101b45a9a0e15c7c77733ca747($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit378b85de076e2d0904acc0e2ecb2cb78
class ComposerStaticInit53331b101b45a9a0e15c7c77733ca747
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -3852,9 +3852,9 @@ class ComposerStaticInit378b85de076e2d0904acc0e2ecb2cb78
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit378b85de076e2d0904acc0e2ecb2cb78::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit378b85de076e2d0904acc0e2ecb2cb78::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit378b85de076e2d0904acc0e2ecb2cb78::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit53331b101b45a9a0e15c7c77733ca747::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit53331b101b45a9a0e15c7c77733ca747::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit53331b101b45a9a0e15c7c77733ca747::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20220107\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit378b85de076e2d0904acc0e2ecb2cb78', false) && !interface_exists('ComposerAutoloaderInit378b85de076e2d0904acc0e2ecb2cb78', false) && !trait_exists('ComposerAutoloaderInit378b85de076e2d0904acc0e2ecb2cb78', false)) {
spl_autoload_call('RectorPrefix20220107\ComposerAutoloaderInit378b85de076e2d0904acc0e2ecb2cb78');
if (!class_exists('ComposerAutoloaderInit53331b101b45a9a0e15c7c77733ca747', false) && !interface_exists('ComposerAutoloaderInit53331b101b45a9a0e15c7c77733ca747', false) && !trait_exists('ComposerAutoloaderInit53331b101b45a9a0e15c7c77733ca747', false)) {
spl_autoload_call('RectorPrefix20220107\ComposerAutoloaderInit53331b101b45a9a0e15c7c77733ca747');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20220107\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -71,9 +71,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220107\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire378b85de076e2d0904acc0e2ecb2cb78')) {
function composerRequire378b85de076e2d0904acc0e2ecb2cb78() {
return \RectorPrefix20220107\composerRequire378b85de076e2d0904acc0e2ecb2cb78(...func_get_args());
if (!function_exists('composerRequire53331b101b45a9a0e15c7c77733ca747')) {
function composerRequire53331b101b45a9a0e15c7c77733ca747() {
return \RectorPrefix20220107\composerRequire53331b101b45a9a0e15c7c77733ca747(...func_get_args());
}
}
if (!function_exists('scanPath')) {