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

Updated Rector to commit 5ba1499034

Browse Source 
5ba1499034 [Strict] Skip stripos on BooleanInIfConditionRuleFixerRector (#966)
This commit is contained in:
Tomas Votruba 2021-10-07 17:03:55 +00:00
parent 7d712af5a2
commit 4fa8da0c31
6 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rules/Strict/NodeFactory/ExactCompareFactory.php
View File

@ -89,17 +89,7 @@ final class ExactCompareFactory
$nullConstFetch = $this->nodeFactory->createNull();
$toNullNotIdentical = new \PhpParser\Node\Expr\BinaryOp\NotIdentical($expr, $nullConstFetch);
if ($unionType instanceof \PHPStan\Type\UnionType) {
$compareExprs = [];
foreach ($unionType->getTypes() as $unionedType) {
$compareExprs[] = $this->createNotIdenticalFalsyCompare($unionedType, $expr, $treatAsNotEmpty);
}
/** @var Expr $truthyExpr */
$truthyExpr = \array_shift($compareExprs);
foreach ($compareExprs as $compareExpr) {
/** @var Expr $compareExpr */
$truthyExpr = new \PhpParser\Node\Expr\BinaryOp\BooleanOr($truthyExpr, $compareExpr);
}
return $truthyExpr;
return $this->resolveFromCleanedNullUnionType($unionType, $expr, $treatAsNotEmpty);
}
$compareExpr = $this->createNotIdenticalFalsyCompare($unionType, $expr, $treatAsNotEmpty);
if (!$compareExpr instanceof \PhpParser\Node\Expr) {
@ -107,6 +97,23 @@ final class ExactCompareFactory
}
return new \PhpParser\Node\Expr\BinaryOp\BooleanAnd($toNullNotIdentical, $compareExpr);
}
private function resolveFromCleanedNullUnionType(\PHPStan\Type\UnionType $unionType, \PhpParser\Node\Expr $expr, bool $treatAsNotEmpty) : ?\PhpParser\Node\Expr
{
$compareExprs = [];
foreach ($unionType->getTypes() as $unionedType) {
$compareExprs[] = $this->createNotIdenticalFalsyCompare($unionedType, $expr, $treatAsNotEmpty);
}
/** @var Expr $truthyExpr */
$truthyExpr = \array_shift($compareExprs);
foreach ($compareExprs as $compareExpr) {
if (!$compareExpr instanceof \PhpParser\Node\Expr) {
return null;
}
/** @var Expr $compareExpr */
$truthyExpr = new \PhpParser\Node\Expr\BinaryOp\BooleanOr($truthyExpr, $compareExpr);
}
return $truthyExpr;
}
/**
* @return \PhpParser\Node\Expr|null
*/

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'eb811b13b9197e4e9c3994274ed05c2e47993c5a';
public const PACKAGE_VERSION = '5ba14990349db5141c98b373d3360018f8bd00a0';
/**
* @var string
*/
public const RELEASE_DATE = '2021-10-07 15:59:10';
public const RELEASE_DATE = '2021-10-07 23:52:15';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211007\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 ComposerAutoloaderInita6861995829a1d52e573acaacbb821dd::getLoader();
return ComposerAutoloaderInite2e70f72a121ecdb6eba21005e4b4e55::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInita6861995829a1d52e573acaacbb821dd
class ComposerAutoloaderInite2e70f72a121ecdb6eba21005e4b4e55
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInita6861995829a1d52e573acaacbb821dd
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInita6861995829a1d52e573acaacbb821dd', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInite2e70f72a121ecdb6eba21005e4b4e55', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInita6861995829a1d52e573acaacbb821dd', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInite2e70f72a121ecdb6eba21005e4b4e55', '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\ComposerStaticInita6861995829a1d52e573acaacbb821dd::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInite2e70f72a121ecdb6eba21005e4b4e55::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInita6861995829a1d52e573acaacbb821dd
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInita6861995829a1d52e573acaacbb821dd::$files;
$includeFiles = Composer\Autoload\ComposerStaticInite2e70f72a121ecdb6eba21005e4b4e55::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequirea6861995829a1d52e573acaacbb821dd($fileIdentifier, $file);
composerRequiree2e70f72a121ecdb6eba21005e4b4e55($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequirea6861995829a1d52e573acaacbb821dd($fileIdentifier, $file)
function composerRequiree2e70f72a121ecdb6eba21005e4b4e55($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 ComposerStaticInita6861995829a1d52e573acaacbb821dd
class ComposerStaticInite2e70f72a121ecdb6eba21005e4b4e55
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3894,9 +3894,9 @@ class ComposerStaticInita6861995829a1d52e573acaacbb821dd
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInita6861995829a1d52e573acaacbb821dd::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInita6861995829a1d52e573acaacbb821dd::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInita6861995829a1d52e573acaacbb821dd::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInite2e70f72a121ecdb6eba21005e4b4e55::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInite2e70f72a121ecdb6eba21005e4b4e55::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInite2e70f72a121ecdb6eba21005e4b4e55::$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('RectorPrefix20211007\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInita6861995829a1d52e573acaacbb821dd', false) && !interface_exists('ComposerAutoloaderInita6861995829a1d52e573acaacbb821dd', false) && !trait_exists('ComposerAutoloaderInita6861995829a1d52e573acaacbb821dd', false)) {
spl_autoload_call('RectorPrefix20211007\ComposerAutoloaderInita6861995829a1d52e573acaacbb821dd');
if (!class_exists('ComposerAutoloaderInite2e70f72a121ecdb6eba21005e4b4e55', false) && !interface_exists('ComposerAutoloaderInite2e70f72a121ecdb6eba21005e4b4e55', false) && !trait_exists('ComposerAutoloaderInite2e70f72a121ecdb6eba21005e4b4e55', false)) {
spl_autoload_call('RectorPrefix20211007\ComposerAutoloaderInite2e70f72a121ecdb6eba21005e4b4e55');
}
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('RectorPrefix20211007\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -3306,9 +3306,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211007\print_node(...func_get_args());
}
}
if (!function_exists('composerRequirea6861995829a1d52e573acaacbb821dd')) {
function composerRequirea6861995829a1d52e573acaacbb821dd() {
return \RectorPrefix20211007\composerRequirea6861995829a1d52e573acaacbb821dd(...func_get_args());
if (!function_exists('composerRequiree2e70f72a121ecdb6eba21005e4b4e55')) {
function composerRequiree2e70f72a121ecdb6eba21005e4b4e55() {
return \RectorPrefix20211007\composerRequiree2e70f72a121ecdb6eba21005e4b4e55(...func_get_args());
}
}
if (!function_exists('parseArgs')) {