octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 7b2f2e8f866a4f7f32e37e37180d401a4b2cc199 

7b2f2e8f86 Skip traits in CountOnNullRector (#4556)
This commit is contained in:
Tomas Votruba 2023-07-20 19:10:29 +00:00
parent b1bb02fc44
commit 45ea7eeb2a
5 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\Scalar\LNumber;
use PhpParser\NodeTraverser;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Type\ArrayType;
use PHPStan\Type\NullType;
use PHPStan\Type\Type;
@ -95,6 +96,9 @@ CODE_SAMPLE
*/
public function refactorWithScope(Node $node, Scope $scope)
{
if ($this->isInsideTrait($scope)) {
return null;
}
if ($node instanceof Ternary) {
if ($this->shouldSkipTernaryIfElseCountFuncCall($node)) {
return NodeTraverser::DONT_TRAVERSE_CHILDREN;
@ -197,4 +201,12 @@ CODE_SAMPLE
}
return $this->castToArray($countedExpr, $funcCall);
}
private function isInsideTrait(Scope $scope) : bool
{
$classReflection = $scope->getClassReflection();
if (!$classReflection instanceof ClassReflection) {
return \false;
}
return $classReflection->isTrait();
}
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'ebe8c2ef975c2173e21f027486d00f6ec121c264';
public const PACKAGE_VERSION = '7b2f2e8f866a4f7f32e37e37180d401a4b2cc199';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-07-20 16:26:36';
public const RELEASE_DATE = '2023-07-20 19:06:42';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit5562e4a91da355c7d134544ab0ab7829::getLoader();
return ComposerAutoloaderInite8eb1b7c9dec69c434147c35a6fb48b7::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit5562e4a91da355c7d134544ab0ab7829
class ComposerAutoloaderInite8eb1b7c9dec69c434147c35a6fb48b7
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit5562e4a91da355c7d134544ab0ab7829
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit5562e4a91da355c7d134544ab0ab7829', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInite8eb1b7c9dec69c434147c35a6fb48b7', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit5562e4a91da355c7d134544ab0ab7829', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInite8eb1b7c9dec69c434147c35a6fb48b7', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit5562e4a91da355c7d134544ab0ab7829::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInite8eb1b7c9dec69c434147c35a6fb48b7::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit5562e4a91da355c7d134544ab0ab7829::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInite8eb1b7c9dec69c434147c35a6fb48b7::$files;
$requireFile = \Closure::bind(static function ($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 ComposerStaticInit5562e4a91da355c7d134544ab0ab7829
class ComposerStaticInite8eb1b7c9dec69c434147c35a6fb48b7
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3023,9 +3023,9 @@ class ComposerStaticInit5562e4a91da355c7d134544ab0ab7829
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit5562e4a91da355c7d134544ab0ab7829::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit5562e4a91da355c7d134544ab0ab7829::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit5562e4a91da355c7d134544ab0ab7829::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInite8eb1b7c9dec69c434147c35a6fb48b7::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInite8eb1b7c9dec69c434147c35a6fb48b7::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInite8eb1b7c9dec69c434147c35a6fb48b7::$classMap;
}, null, ClassLoader::class);
}