octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-05-31 00:10:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 75c0b27d37

Browse Source 
75c0b27d37 [types] Add HasPropertyTypeMapepr and HasMethodTypeMapper (#1731)
This commit is contained in:
Tomas Votruba 2022-01-26 11:59:37 +00:00
parent f25b52c226
commit 625848ed0d
9 changed files with 120 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -7,7 +7,7 @@
],
"require": {
"php": "^7.1|^8.0",
"phpstan/phpstan": "^1.4"
"phpstan/phpstan": "^1.4.2"
},
"autoload": {
"files": [

48
packages/PHPStanStaticTypeMapper/TypeMapper/HasMethodTypeMapper.php Normal file
View File

@ -0,0 +1,48 @@
<?php
declare (strict_types=1);
namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
use PhpParser\Node;
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
use PHPStan\Type\Accessory\HasMethodType;
use PHPStan\Type\Type;
use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
/**
* @implements TypeMapperInterface<HasMethodType>
*/
final class HasMethodTypeMapper implements \Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface
{
/**
* @readonly
* @var \Rector\PHPStanStaticTypeMapper\TypeMapper\ObjectWithoutClassTypeMapper
*/
private $objectWithoutClassTypeMapper;
public function __construct(\Rector\PHPStanStaticTypeMapper\TypeMapper\ObjectWithoutClassTypeMapper $objectWithoutClassTypeMapper)
{
$this->objectWithoutClassTypeMapper = $objectWithoutClassTypeMapper;
}
/**
* @return class-string<Type>
*/
public function getNodeClass() : string
{
return \PHPStan\Type\Accessory\HasMethodType::class;
}
/**
* @param HasMethodType $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('object');
}
/**
* @param HasMethodType $type
*/
public function mapToPhpParserNode(\PHPStan\Type\Type $type, \Rector\PHPStanStaticTypeMapper\Enum\TypeKind $typeKind) : ?\PhpParser\Node
{
return $this->objectWithoutClassTypeMapper->mapToPhpParserNode($type, $typeKind);
}
}

48
packages/PHPStanStaticTypeMapper/TypeMapper/HasPropertyTypeMapper.php Normal file
View File

@ -0,0 +1,48 @@
<?php
declare (strict_types=1);
namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
use PhpParser\Node;
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
use PHPStan\Type\Accessory\HasPropertyType;
use PHPStan\Type\Type;
use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
/**
* @implements TypeMapperInterface<HasPropertyType>
*/
final class HasPropertyTypeMapper implements \Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface
{
/**
* @readonly
* @var \Rector\PHPStanStaticTypeMapper\TypeMapper\ObjectWithoutClassTypeMapper
*/
private $objectWithoutClassTypeMapper;
public function __construct(\Rector\PHPStanStaticTypeMapper\TypeMapper\ObjectWithoutClassTypeMapper $objectWithoutClassTypeMapper)
{
$this->objectWithoutClassTypeMapper = $objectWithoutClassTypeMapper;
}
/**
* @return class-string<Type>
*/
public function getNodeClass() : string
{
return \PHPStan\Type\Accessory\HasPropertyType::class;
}
/**
* @param HasPropertyType $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('object');
}
/**
* @param HasPropertyType $type
*/
public function mapToPhpParserNode(\PHPStan\Type\Type $type, \Rector\PHPStanStaticTypeMapper\Enum\TypeKind $typeKind) : ?\PhpParser\Node
{
return $this->objectWithoutClassTypeMapper->mapToPhpParserNode($type, $typeKind);
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'a26c59a7e9c97187db0e6004df3280ca4879bbc4';
public const PACKAGE_VERSION = '75c0b27d37ee34844b0eb5faf35742c6631d5ab2';
/**
* @var string
*/
public const RELEASE_DATE = '2022-01-26 12:11:28';
public const RELEASE_DATE = '2022-01-26 12:52:30';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20220126\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 ComposerAutoloaderInit0a1f5df9c18befc9312934b1e1f5eb8c::getLoader();
return ComposerAutoloaderInit4e65de1314d6f2c0bef87360875202fc::getLoader();

2
vendor/composer/autoload_classmap.php vendored
View File

@ -2436,7 +2436,9 @@ return array(
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\ClassStringTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/ClassStringTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\ClosureTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\FloatTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/FloatTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\HasMethodTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/HasMethodTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\HasOffsetTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/HasOffsetTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\HasPropertyTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/HasPropertyTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\IntegerTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/IntegerTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\IntersectionTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/IntersectionTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\IterableTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/IterableTypeMapper.php',

14
vendor/composer/autoload_real.php vendored
View File

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

10
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit0a1f5df9c18befc9312934b1e1f5eb8c
class ComposerStaticInit4e65de1314d6f2c0bef87360875202fc
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -2826,7 +2826,9 @@ class ComposerStaticInit0a1f5df9c18befc9312934b1e1f5eb8c
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\ClassStringTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/ClassStringTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\ClosureTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\FloatTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/FloatTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\HasMethodTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/HasMethodTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\HasOffsetTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/HasOffsetTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\HasPropertyTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/HasPropertyTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\IntegerTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/IntegerTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\IntersectionTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/IntersectionTypeMapper.php',
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\IterableTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/IterableTypeMapper.php',
@ -3864,9 +3866,9 @@ class ComposerStaticInit0a1f5df9c18befc9312934b1e1f5eb8c
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit0a1f5df9c18befc9312934b1e1f5eb8c::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit0a1f5df9c18befc9312934b1e1f5eb8c::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit0a1f5df9c18befc9312934b1e1f5eb8c::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit4e65de1314d6f2c0bef87360875202fc::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit4e65de1314d6f2c0bef87360875202fc::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit4e65de1314d6f2c0bef87360875202fc::$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('RectorPrefix20220126\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit0a1f5df9c18befc9312934b1e1f5eb8c', false) && !interface_exists('ComposerAutoloaderInit0a1f5df9c18befc9312934b1e1f5eb8c', false) && !trait_exists('ComposerAutoloaderInit0a1f5df9c18befc9312934b1e1f5eb8c', false)) {
spl_autoload_call('RectorPrefix20220126\ComposerAutoloaderInit0a1f5df9c18befc9312934b1e1f5eb8c');
if (!class_exists('ComposerAutoloaderInit4e65de1314d6f2c0bef87360875202fc', false) && !interface_exists('ComposerAutoloaderInit4e65de1314d6f2c0bef87360875202fc', false) && !trait_exists('ComposerAutoloaderInit4e65de1314d6f2c0bef87360875202fc', false)) {
spl_autoload_call('RectorPrefix20220126\ComposerAutoloaderInit4e65de1314d6f2c0bef87360875202fc');
}
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('RectorPrefix20220126\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -71,9 +71,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220126\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire0a1f5df9c18befc9312934b1e1f5eb8c')) {
function composerRequire0a1f5df9c18befc9312934b1e1f5eb8c() {
return \RectorPrefix20220126\composerRequire0a1f5df9c18befc9312934b1e1f5eb8c(...func_get_args());
if (!function_exists('composerRequire4e65de1314d6f2c0bef87360875202fc')) {
function composerRequire4e65de1314d6f2c0bef87360875202fc() {
return \RectorPrefix20220126\composerRequire4e65de1314d6f2c0bef87360875202fc(...func_get_args());
}
}
if (!function_exists('scanPath')) {