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

Updated Rector to commit ae55eac4c9

Browse Source 
ae55eac4c9 [TypeDeclaration] Allow Function_ and ArrowFunction on ReturnTypeFromReturnNewRector (#583)
This commit is contained in:
Tomas Votruba 2021-08-03 12:03:11 +00:00
parent 46cf4c1774
commit f24ba3e919
6 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromReturnNewRector.php
View File

@ -4,9 +4,11 @@ declare (strict_types=1);
namespace Rector\TypeDeclaration\Rector\ClassMethod;
use PhpParser\Node;
use PhpParser\Node\Expr\ArrowFunction;
use PhpParser\Node\Expr\New_;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\Return_;
use PHPStan\Type\ObjectType;
use Rector\Core\Rector\AbstractRector;
@ -56,18 +58,22 @@ CODE_SAMPLE
*/
public function getNodeTypes() : array
{
return [\PhpParser\Node\Stmt\ClassMethod::class];
return [\PhpParser\Node\Stmt\ClassMethod::class, \PhpParser\Node\Stmt\Function_::class, \PhpParser\Node\Expr\ArrowFunction::class];
}
/**
* @param ClassMethod $node
* @param ClassMethod|Function_|ArrowFunction $node
*/
public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node
{
if ($node->returnType !== null) {
return null;
}
/** @var Return_[] $returns */
$returns = $this->betterNodeFinder->findInstanceOf((array) $node->stmts, \PhpParser\Node\Stmt\Return_::class);
if ($node instanceof \PhpParser\Node\Expr\ArrowFunction) {
$returns = [new \PhpParser\Node\Stmt\Return_($node->expr)];
} else {
/** @var Return_[] $returns */
$returns = $this->betterNodeFinder->findInstanceOf((array) $node->stmts, \PhpParser\Node\Stmt\Return_::class);
}
if ($returns === []) {
return null;
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '0888a92985f8018f486798af0f33928f221e7f0f';
public const PACKAGE_VERSION = 'ae55eac4c937caf15d9bb320672f038915bc6f80';
/**
* @var string
*/
public const RELEASE_DATE = '2021-08-03 12:11:45';
public const RELEASE_DATE = '2021-08-03 13:53:45';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210803\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 ComposerAutoloaderInite22b3553076dd3a33ee7ad2b3c8584cf::getLoader();
return ComposerAutoloaderInit46f9ff9f810bf2bc08e6b1e121c5efc0::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInite22b3553076dd3a33ee7ad2b3c8584cf
class ComposerAutoloaderInit46f9ff9f810bf2bc08e6b1e121c5efc0
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInite22b3553076dd3a33ee7ad2b3c8584cf
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInite22b3553076dd3a33ee7ad2b3c8584cf', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit46f9ff9f810bf2bc08e6b1e121c5efc0', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInite22b3553076dd3a33ee7ad2b3c8584cf', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit46f9ff9f810bf2bc08e6b1e121c5efc0', '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\ComposerStaticInite22b3553076dd3a33ee7ad2b3c8584cf::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit46f9ff9f810bf2bc08e6b1e121c5efc0::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInite22b3553076dd3a33ee7ad2b3c8584cf
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInite22b3553076dd3a33ee7ad2b3c8584cf::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit46f9ff9f810bf2bc08e6b1e121c5efc0::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequiree22b3553076dd3a33ee7ad2b3c8584cf($fileIdentifier, $file);
composerRequire46f9ff9f810bf2bc08e6b1e121c5efc0($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequiree22b3553076dd3a33ee7ad2b3c8584cf($fileIdentifier, $file)
function composerRequire46f9ff9f810bf2bc08e6b1e121c5efc0($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInite22b3553076dd3a33ee7ad2b3c8584cf
class ComposerStaticInit46f9ff9f810bf2bc08e6b1e121c5efc0
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3847,9 +3847,9 @@ class ComposerStaticInite22b3553076dd3a33ee7ad2b3c8584cf
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInite22b3553076dd3a33ee7ad2b3c8584cf::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInite22b3553076dd3a33ee7ad2b3c8584cf::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInite22b3553076dd3a33ee7ad2b3c8584cf::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit46f9ff9f810bf2bc08e6b1e121c5efc0::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit46f9ff9f810bf2bc08e6b1e121c5efc0::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit46f9ff9f810bf2bc08e6b1e121c5efc0::$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('RectorPrefix20210803\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInite22b3553076dd3a33ee7ad2b3c8584cf', false) && !interface_exists('ComposerAutoloaderInite22b3553076dd3a33ee7ad2b3c8584cf', false) && !trait_exists('ComposerAutoloaderInite22b3553076dd3a33ee7ad2b3c8584cf', false)) {
spl_autoload_call('RectorPrefix20210803\ComposerAutoloaderInite22b3553076dd3a33ee7ad2b3c8584cf');
if (!class_exists('ComposerAutoloaderInit46f9ff9f810bf2bc08e6b1e121c5efc0', false) && !interface_exists('ComposerAutoloaderInit46f9ff9f810bf2bc08e6b1e121c5efc0', false) && !trait_exists('ComposerAutoloaderInit46f9ff9f810bf2bc08e6b1e121c5efc0', false)) {
spl_autoload_call('RectorPrefix20210803\ComposerAutoloaderInit46f9ff9f810bf2bc08e6b1e121c5efc0');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210803\Doctrine\Inflector\Inflector');
@ -3308,9 +3308,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210803\print_node(...func_get_args());
}
}
if (!function_exists('composerRequiree22b3553076dd3a33ee7ad2b3c8584cf')) {
function composerRequiree22b3553076dd3a33ee7ad2b3c8584cf() {
return \RectorPrefix20210803\composerRequiree22b3553076dd3a33ee7ad2b3c8584cf(...func_get_args());
if (!function_exists('composerRequire46f9ff9f810bf2bc08e6b1e121c5efc0')) {
function composerRequire46f9ff9f810bf2bc08e6b1e121c5efc0() {
return \RectorPrefix20210803\composerRequire46f9ff9f810bf2bc08e6b1e121c5efc0(...func_get_args());
}
}
if (!function_exists('parseArgs')) {