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

Updated Rector to commit 759b5f9fcb

Browse Source 
759b5f9fcb [Php71] Skip with If always array on CountOnNullRector (#1229)
This commit is contained in:
Tomas Votruba 2021-11-14 08:45:23 +00:00
parent a16c61358a
commit 7cca171153
6 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rules/Php71/Rector/FuncCall/CountOnNullRector.php
View File

@ -19,6 +19,8 @@ use PhpParser\Node\Scalar\LNumber;
use PhpParser\Node\Stmt\Trait_;
use PHPStan\Type\ArrayType;
use PHPStan\Type\NullType;
use PHPStan\Type\Type;
use PHPStan\Type\UnionType;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\ValueObject\PhpVersionFeature;
use Rector\NodeTypeResolver\Node\AttributeKey;
@ -100,6 +102,9 @@ CODE_SAMPLE
return $this->castToArray($countedNode, $node);
}
$countedType = $this->getType($countedNode);
if ($this->isAlwaysIterableType($countedType)) {
return null;
}
if ($this->nodeTypeResolver->isNullableType($countedNode) || $countedType instanceof \PHPStan\Type\NullType) {
$identical = new \PhpParser\Node\Expr\BinaryOp\Identical($countedNode, $this->nodeFactory->createNull());
$ternary = new \PhpParser\Node\Expr\Ternary($identical, new \PhpParser\Node\Scalar\LNumber(0), $node);
@ -117,6 +122,19 @@ CODE_SAMPLE
$node->setAttribute(self::ALREADY_CHANGED_ON_COUNT, \true);
return new \PhpParser\Node\Expr\Ternary($conditionNode, $node, new \PhpParser\Node\Scalar\LNumber(0));
}
private function isAlwaysIterableType(\PHPStan\Type\Type $possibleUnionType) : bool
{
if (!$possibleUnionType instanceof \PHPStan\Type\UnionType) {
return \false;
}
$types = $possibleUnionType->getTypes();
foreach ($types as $type) {
if ($type->isIterable()->no()) {
return \false;
}
}
return \true;
}
private function shouldSkip(\PhpParser\Node\Expr\FuncCall $funcCall) : bool
{
if (!$this->isName($funcCall, 'count')) {

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '9c52c9584822c6c4bae5f162a459d79e9f765c91';
public const PACKAGE_VERSION = '759b5f9fcb1ceff7a7c372fa4087d6f7f42ef620';
/**
* @var string
*/
public const RELEASE_DATE = '2021-11-14 00:21:48';
public const RELEASE_DATE = '2021-11-14 11:32:48';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211114\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 ComposerAutoloaderInit390d8a060bc9233339c42c2e82ed759f::getLoader();
return ComposerAutoloaderInitd602c4ff3fb58d37c391d6d4ba7f838e::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit390d8a060bc9233339c42c2e82ed759f
class ComposerAutoloaderInitd602c4ff3fb58d37c391d6d4ba7f838e
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit390d8a060bc9233339c42c2e82ed759f
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit390d8a060bc9233339c42c2e82ed759f', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitd602c4ff3fb58d37c391d6d4ba7f838e', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit390d8a060bc9233339c42c2e82ed759f', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitd602c4ff3fb58d37c391d6d4ba7f838e', '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\ComposerStaticInit390d8a060bc9233339c42c2e82ed759f::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitd602c4ff3fb58d37c391d6d4ba7f838e::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit390d8a060bc9233339c42c2e82ed759f
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit390d8a060bc9233339c42c2e82ed759f::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitd602c4ff3fb58d37c391d6d4ba7f838e::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire390d8a060bc9233339c42c2e82ed759f($fileIdentifier, $file);
composerRequired602c4ff3fb58d37c391d6d4ba7f838e($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire390d8a060bc9233339c42c2e82ed759f($fileIdentifier, $file)
function composerRequired602c4ff3fb58d37c391d6d4ba7f838e($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 ComposerStaticInit390d8a060bc9233339c42c2e82ed759f
class ComposerStaticInitd602c4ff3fb58d37c391d6d4ba7f838e
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3542,9 +3542,9 @@ class ComposerStaticInit390d8a060bc9233339c42c2e82ed759f
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit390d8a060bc9233339c42c2e82ed759f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit390d8a060bc9233339c42c2e82ed759f::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit390d8a060bc9233339c42c2e82ed759f::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitd602c4ff3fb58d37c391d6d4ba7f838e::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd602c4ff3fb58d37c391d6d4ba7f838e::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitd602c4ff3fb58d37c391d6d4ba7f838e::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -12,8 +12,8 @@ if (!class_exists('GenerateChangelogCommand', false) && !interface_exists('Gener
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20211114\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit390d8a060bc9233339c42c2e82ed759f', false) && !interface_exists('ComposerAutoloaderInit390d8a060bc9233339c42c2e82ed759f', false) && !trait_exists('ComposerAutoloaderInit390d8a060bc9233339c42c2e82ed759f', false)) {
spl_autoload_call('RectorPrefix20211114\ComposerAutoloaderInit390d8a060bc9233339c42c2e82ed759f');
if (!class_exists('ComposerAutoloaderInitd602c4ff3fb58d37c391d6d4ba7f838e', false) && !interface_exists('ComposerAutoloaderInitd602c4ff3fb58d37c391d6d4ba7f838e', false) && !trait_exists('ComposerAutoloaderInitd602c4ff3fb58d37c391d6d4ba7f838e', false)) {
spl_autoload_call('RectorPrefix20211114\ComposerAutoloaderInitd602c4ff3fb58d37c391d6d4ba7f838e');
}
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('RectorPrefix20211114\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -3309,9 +3309,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211114\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire390d8a060bc9233339c42c2e82ed759f')) {
function composerRequire390d8a060bc9233339c42c2e82ed759f() {
return \RectorPrefix20211114\composerRequire390d8a060bc9233339c42c2e82ed759f(...func_get_args());
if (!function_exists('composerRequired602c4ff3fb58d37c391d6d4ba7f838e')) {
function composerRequired602c4ff3fb58d37c391d6d4ba7f838e() {
return \RectorPrefix20211114\composerRequired602c4ff3fb58d37c391d6d4ba7f838e(...func_get_args());
}
}
if (!function_exists('parseArgs')) {