octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-01 08:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 322e5b67b5

Browse Source 
322e5b67b5 [PHPStanStaticTypeMapper] Do not crash on numeric string on ReturnTypeDeclarationRector (#1588)
This commit is contained in:
Tomas Votruba 2021-12-29 23:57:29 +00:00
parent 3e4ee54479
commit ffceafdc35
12 changed files with 73 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/PHPStanStaticTypeMapper/TypeMapper/AccessoryNumericStringTypeMapper.php Normal file
View File

@ -0,0 +1,40 @@
<?php
declare (strict_types=1);
namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
use PhpParser\Node;
use PhpParser\Node\Name;
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
use PHPStan\Type\Accessory\AccessoryNumericStringType;
use PHPStan\Type\Type;
use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
/**
* @implements TypeMapperInterface<AccessoryNumericStringType>
*/
final class AccessoryNumericStringTypeMapper implements \Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface
{
/**
* @return class-string<Type>
*/
public function getNodeClass() : string
{
return \PHPStan\Type\Accessory\AccessoryNumericStringType::class;
}
/**
* @param AccessoryNumericStringType $type
*/
public function mapToPHPStanPhpDocTypeNode(\PHPStan\Type\Type $type, \Rector\PHPStanStaticTypeMapper\Enum\TypeKind $typeKind) : \PHPStan\PhpDocParser\Ast\Type\TypeNode
{
return new \PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode('string');
}
/**
* @param AccessoryNumericStringType $type
*/
public function mapToPhpParserNode(\PHPStan\Type\Type $type, \Rector\PHPStanStaticTypeMapper\Enum\TypeKind $typeKind) : ?\PhpParser\Node
{
return new \PhpParser\Node\Name('string');
}
}

4
packages/PHPStanStaticTypeMapper/TypeMapper/IntersectionTypeMapper.php
View File

@ -77,6 +77,10 @@ final class IntersectionTypeMapper implements \Rector\PHPStanStaticTypeMapper\Co
if (!$resolvedType instanceof \PhpParser\Node\Name) {
throw new \Rector\Core\Exception\ShouldNotHappenException();
}
$resolvedTypeName = (string) $resolvedType;
if ($resolvedTypeName === 'string') {
return $resolvedType;
}
$intersectionedTypeNodes[] = $resolvedType;
}
return new \PhpParser\Node\IntersectionType($intersectionedTypeNodes);

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'be1c7915c3a3dedbd09a47466d03eb03f14d3da8';
public const PACKAGE_VERSION = '322e5b67b5c9dd2e19a3d3e79a8c1fa1523f1dc8';
/**
* @var string
*/
public const RELEASE_DATE = '2021-12-30 00:39:31';
public const RELEASE_DATE = '2021-12-29 23:47:41';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211229\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 ComposerAutoloaderInit684314e606e93eba3503d2cfb295b982::getLoader();
return ComposerAutoloaderInit791cc4bf5f49786cb9b79afdc9dada4d::getLoader();

1
vendor/composer/autoload_classmap.php vendored
View File

@ -2414,6 +2414,7 @@ return array(
'Rector\\PHPStanStaticTypeMapper\\TypeAnalyzer\\UnionTypeAnalyzer' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeAnalyzer.php',
'Rector\\PHPStanStaticTypeMapper\\TypeAnalyzer\\UnionTypeCommonTypeNarrower' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeCommonTypeNarrower.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\AccessoryNonEmptyStringTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/AccessoryNonEmptyStringTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\AccessoryNumericStringTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/AccessoryNumericStringTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\ArrayTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\BooleanTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/BooleanTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\CallableTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/CallableTypeMapper.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit684314e606e93eba3503d2cfb295b982
class ComposerAutoloaderInit791cc4bf5f49786cb9b79afdc9dada4d
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit684314e606e93eba3503d2cfb295b982
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit684314e606e93eba3503d2cfb295b982', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit791cc4bf5f49786cb9b79afdc9dada4d', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit684314e606e93eba3503d2cfb295b982', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit791cc4bf5f49786cb9b79afdc9dada4d', '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\ComposerStaticInit684314e606e93eba3503d2cfb295b982::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit791cc4bf5f49786cb9b79afdc9dada4d::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,12 +42,12 @@ class ComposerAutoloaderInit684314e606e93eba3503d2cfb295b982
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit684314e606e93eba3503d2cfb295b982::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit791cc4bf5f49786cb9b79afdc9dada4d::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire684314e606e93eba3503d2cfb295b982($fileIdentifier, $file);
composerRequire791cc4bf5f49786cb9b79afdc9dada4d($fileIdentifier, $file);
}
return $loader;
@ -59,7 +59,7 @@ class ComposerAutoloaderInit684314e606e93eba3503d2cfb295b982
* @param string $file
* @return void
*/
function composerRequire684314e606e93eba3503d2cfb295b982($fileIdentifier, $file)
function composerRequire791cc4bf5f49786cb9b79afdc9dada4d($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit684314e606e93eba3503d2cfb295b982
class ComposerStaticInit791cc4bf5f49786cb9b79afdc9dada4d
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -2809,6 +2809,7 @@ class ComposerStaticInit684314e606e93eba3503d2cfb295b982
'Rector\\PHPStanStaticTypeMapper\\TypeAnalyzer\\UnionTypeAnalyzer' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeAnalyzer.php',
'Rector\\PHPStanStaticTypeMapper\\TypeAnalyzer\\UnionTypeCommonTypeNarrower' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeCommonTypeNarrower.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\AccessoryNonEmptyStringTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/AccessoryNonEmptyStringTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\AccessoryNumericStringTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/AccessoryNumericStringTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\ArrayTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\BooleanTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/BooleanTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\CallableTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/CallableTypeMapper.php',
@ -3841,9 +3842,9 @@ class ComposerStaticInit684314e606e93eba3503d2cfb295b982
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit684314e606e93eba3503d2cfb295b982::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit684314e606e93eba3503d2cfb295b982::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit684314e606e93eba3503d2cfb295b982::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit791cc4bf5f49786cb9b79afdc9dada4d::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit791cc4bf5f49786cb9b79afdc9dada4d::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit791cc4bf5f49786cb9b79afdc9dada4d::$classMap;
}, null, ClassLoader::class);
}

10
vendor/composer/installed.json vendored
View File

@ -2523,12 +2523,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-phpunit.git",
"reference": "ffcd97189c63cc203a4f25eadde1e23cd90c3a79"
"reference": "1e9f0c38fa225cdc534146d145a7fad61848666f"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/ffcd97189c63cc203a4f25eadde1e23cd90c3a79",
"reference": "ffcd97189c63cc203a4f25eadde1e23cd90c3a79",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/1e9f0c38fa225cdc534146d145a7fad61848666f",
"reference": "1e9f0c38fa225cdc534146d145a7fad61848666f",
"shasum": ""
},
"require": {
@ -2539,7 +2539,7 @@
},
"require-dev": {
"phpstan\/extension-installer": "^1.1",
"phpstan\/phpstan": "^1.0",
"phpstan\/phpstan": "^1.3",
"phpstan\/phpstan-strict-rules": "^1.1",
"phpstan\/phpstan-webmozart-assert": "^1.0",
"phpunit\/phpunit": "^9.5",
@ -2552,7 +2552,7 @@
"symplify\/rule-doc-generator": "^10.0",
"symplify\/vendor-patches": "^10.0"
},
"time": "2021-12-28T13:15:49+00:00",
"time": "2021-12-29T23:41:38+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {

2
vendor/composer/installed.php vendored
View File

File diff suppressed because one or more lines are too long

2
vendor/rector/extension-installer/src/GeneratedConfig.php vendored
View File

@ -9,7 +9,7 @@ namespace Rector\RectorInstaller;
*/
final class GeneratedConfig
{
public const EXTENSIONS = array('rector/rector-cakephp' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-cakephp', 'relative_install_path' => '../../rector-cakephp', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main f601f07'), 'rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main d65a9b0'), 'rector/rector-generator' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-generator', 'relative_install_path' => '../../rector-generator', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 36d651e'), 'rector/rector-laravel' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-laravel', 'relative_install_path' => '../../rector-laravel', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 7bcfd90'), 'rector/rector-nette' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-nette', 'relative_install_path' => '../../rector-nette', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main bb2575d'), 'rector/rector-phpoffice' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpoffice', 'relative_install_path' => '../../rector-phpoffice', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 3f56f3b'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main ffcd971'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main b92de39'), 'ssch/typo3-rector' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/ssch/typo3-rector', 'relative_install_path' => '../../../ssch/typo3-rector', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 5349e2b'));
public const EXTENSIONS = array('rector/rector-cakephp' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-cakephp', 'relative_install_path' => '../../rector-cakephp', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main f601f07'), 'rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main d65a9b0'), 'rector/rector-generator' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-generator', 'relative_install_path' => '../../rector-generator', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 36d651e'), 'rector/rector-laravel' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-laravel', 'relative_install_path' => '../../rector-laravel', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 7bcfd90'), 'rector/rector-nette' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-nette', 'relative_install_path' => '../../rector-nette', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main bb2575d'), 'rector/rector-phpoffice' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpoffice', 'relative_install_path' => '../../rector-phpoffice', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 3f56f3b'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 1e9f0c3'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main b92de39'), 'ssch/typo3-rector' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/ssch/typo3-rector', 'relative_install_path' => '../../../ssch/typo3-rector', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 5349e2b'));
private function __construct()
{
}

2
vendor/rector/rector-phpunit/composer.json vendored
View File

@ -9,7 +9,7 @@
"require-dev": {
"rector\/rector-src": "dev-main",
"phpunit\/phpunit": "^9.5",
"phpstan\/phpstan": "^1.0",
"phpstan\/phpstan": "^1.3",
"symplify\/phpstan-rules": "^10.0",
"symplify\/phpstan-extensions": "^10.0",
"symplify\/easy-coding-standard": "^10.0",

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('RectorPrefix20211229\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit684314e606e93eba3503d2cfb295b982', false) && !interface_exists('ComposerAutoloaderInit684314e606e93eba3503d2cfb295b982', false) && !trait_exists('ComposerAutoloaderInit684314e606e93eba3503d2cfb295b982', false)) {
spl_autoload_call('RectorPrefix20211229\ComposerAutoloaderInit684314e606e93eba3503d2cfb295b982');
if (!class_exists('ComposerAutoloaderInit791cc4bf5f49786cb9b79afdc9dada4d', false) && !interface_exists('ComposerAutoloaderInit791cc4bf5f49786cb9b79afdc9dada4d', false) && !trait_exists('ComposerAutoloaderInit791cc4bf5f49786cb9b79afdc9dada4d', false)) {
spl_autoload_call('RectorPrefix20211229\ComposerAutoloaderInit791cc4bf5f49786cb9b79afdc9dada4d');
}
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('RectorPrefix20211229\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -78,9 +78,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211229\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire684314e606e93eba3503d2cfb295b982')) {
function composerRequire684314e606e93eba3503d2cfb295b982() {
return \RectorPrefix20211229\composerRequire684314e606e93eba3503d2cfb295b982(...func_get_args());
if (!function_exists('composerRequire791cc4bf5f49786cb9b79afdc9dada4d')) {
function composerRequire791cc4bf5f49786cb9b79afdc9dada4d() {
return \RectorPrefix20211229\composerRequire791cc4bf5f49786cb9b79afdc9dada4d(...func_get_args());
}
}
if (!function_exists('scanPath')) {