Updated Rector to commit f8b0ac301f

f8b0ac301f update to new phpstan rules, add static fixes (#18)
This commit is contained in:
Tomas Votruba 2021-05-11 15:54:06 +00:00
parent faffaab0e0
commit 7b29fb0f22
11 changed files with 68 additions and 74 deletions

View File

@ -32,8 +32,6 @@ use Rector\Caching\Cache\NetteCacheFactory;
use Rector\Core\Console\ConsoleApplication;
use Rector\Core\PhpParser\Parser\NikicPhpParserFactory;
use Rector\Core\PhpParser\Parser\PhpParserLexerFactory;
use Rector\FileFormatter\Contract\EditorConfig\EditorConfigParserInterface;
use Rector\FileFormatter\EditorConfig\EditorConfigIdiosyncraticParser;
use Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory;
use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocator\IntermediateSourceLocator;
use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider;
@ -104,5 +102,4 @@ return static function (\RectorPrefix20210511\Symfony\Component\DependencyInject
$services->alias(\RectorPrefix20210511\Ergebnis\Json\Printer\PrinterInterface::class, \RectorPrefix20210511\Ergebnis\Json\Printer\Printer::class);
$services->set(\RectorPrefix20210511\PrettyXml\Formatter::class);
$services->set(\RectorPrefix20210511\Idiosyncratic\EditorConfig\EditorConfig::class);
$services->alias(\Rector\FileFormatter\Contract\EditorConfig\EditorConfigParserInterface::class, \Rector\FileFormatter\EditorConfig\EditorConfigIdiosyncraticParser::class);
};

View File

@ -1,31 +0,0 @@
<?php
namespace Rector\FileFormatter\Contract\EditorConfig;
use Rector\Core\ValueObject\Application\File;
use Rector\FileFormatter\ValueObject\EditorConfigConfiguration;
use Rector\FileFormatter\ValueObjectFactory\EditorConfigConfigurationBuilder;
interface EditorConfigParserInterface
{
/**
* @var string
*/
public const INDENT_STYLE = 'indent_style';
/**
* @var string
*/
public const INDENT_SIZE = 'indent_size';
/**
* @var string
*/
public const END_OF_LINE = 'end_of_line';
/**
* @var string
*/
public const INSERT_FINAL_NEWLINE = 'insert_final_newline';
/**
* @var string
*/
public const TAB_WIDTH = 'tab_width';
public function extractConfigurationForFile(\Rector\Core\ValueObject\Application\File $file, \Rector\FileFormatter\ValueObjectFactory\EditorConfigConfigurationBuilder $editorConfigConfigurationBuilder) : \Rector\FileFormatter\ValueObject\EditorConfigConfiguration;
}

View File

@ -5,13 +5,13 @@ namespace Rector\FileFormatter\EditorConfig;
use RectorPrefix20210511\Idiosyncratic\EditorConfig\EditorConfig;
use Rector\Core\ValueObject\Application\File;
use Rector\FileFormatter\Contract\EditorConfig\EditorConfigParserInterface;
use Rector\FileFormatter\ValueObject\EditorConfigConfiguration;
use Rector\FileFormatter\ValueObject\EditorConfigOption;
use Rector\FileFormatter\ValueObjectFactory\EditorConfigConfigurationBuilder;
/**
* @see \Rector\Tests\FileFormatter\EditorConfig\EditorConfigIdiosyncraticParser\EditorConfigIdiosyncraticParserTest
* @see \Rector\Tests\FileFormatter\EditorConfig\EditorConfigParser\EditorConfigParserTest
*/
final class EditorConfigIdiosyncraticParser implements \Rector\FileFormatter\Contract\EditorConfig\EditorConfigParserInterface
final class EditorConfigParser
{
/**
* @var \Idiosyncratic\EditorConfig\EditorConfig
@ -25,24 +25,24 @@ final class EditorConfigIdiosyncraticParser implements \Rector\FileFormatter\Con
{
$smartFileInfo = $file->getSmartFileInfo();
$configuration = $this->editorConfig->getConfigForPath($smartFileInfo->getRealPath());
if (\array_key_exists(self::INDENT_STYLE, $configuration)) {
$indentStyle = (string) $configuration[self::INDENT_STYLE]->getValue();
if (\array_key_exists(\Rector\FileFormatter\ValueObject\EditorConfigOption::INDENT_STYLE, $configuration)) {
$indentStyle = (string) $configuration[\Rector\FileFormatter\ValueObject\EditorConfigOption::INDENT_STYLE]->getValue();
$editorConfigConfigurationBuilder->withIndentStyle($indentStyle);
}
if (\array_key_exists(self::INDENT_SIZE, $configuration)) {
$indentSize = (int) $configuration[self::INDENT_SIZE]->getValue();
if (\array_key_exists(\Rector\FileFormatter\ValueObject\EditorConfigOption::INDENT_SIZE, $configuration)) {
$indentSize = (int) $configuration[\Rector\FileFormatter\ValueObject\EditorConfigOption::INDENT_SIZE]->getValue();
$editorConfigConfigurationBuilder->withIndentSize($indentSize);
}
if (\array_key_exists(self::END_OF_LINE, $configuration)) {
$endOfLine = (string) $configuration[self::END_OF_LINE]->getValue();
if (\array_key_exists(\Rector\FileFormatter\ValueObject\EditorConfigOption::END_OF_LINE, $configuration)) {
$endOfLine = (string) $configuration[\Rector\FileFormatter\ValueObject\EditorConfigOption::END_OF_LINE]->getValue();
$editorConfigConfigurationBuilder->withEndOfLineFromEditorConfig($endOfLine);
}
if (\array_key_exists(self::INSERT_FINAL_NEWLINE, $configuration)) {
$insertFinalNewline = (bool) $configuration[self::INSERT_FINAL_NEWLINE]->getValue();
if (\array_key_exists(\Rector\FileFormatter\ValueObject\EditorConfigOption::INSERT_FINAL_NEWLINE, $configuration)) {
$insertFinalNewline = (bool) $configuration[\Rector\FileFormatter\ValueObject\EditorConfigOption::INSERT_FINAL_NEWLINE]->getValue();
$editorConfigConfigurationBuilder->withInsertFinalNewline($insertFinalNewline);
}
if (\array_key_exists(self::TAB_WIDTH, $configuration)) {
$editorConfigConfigurationBuilder->withIndentSize($configuration[self::TAB_WIDTH]->getValue());
if (\array_key_exists(\Rector\FileFormatter\ValueObject\EditorConfigOption::TAB_WIDTH, $configuration)) {
$editorConfigConfigurationBuilder->withIndentSize($configuration[\Rector\FileFormatter\ValueObject\EditorConfigOption::TAB_WIDTH]->getValue());
}
return $editorConfigConfigurationBuilder->build();
}

View File

@ -5,8 +5,8 @@ namespace Rector\FileFormatter;
use Rector\Core\Configuration\Option;
use Rector\Core\ValueObject\Application\File;
use Rector\FileFormatter\Contract\EditorConfig\EditorConfigParserInterface;
use Rector\FileFormatter\Contract\Formatter\FileFormatterInterface;
use Rector\FileFormatter\EditorConfig\EditorConfigParser;
use Rector\FileFormatter\Exception\InvalidNewLineStringException;
use Rector\FileFormatter\Exception\ParseIndentException;
use Rector\FileFormatter\ValueObject\EditorConfigConfiguration;
@ -17,7 +17,7 @@ use RectorPrefix20210511\Symplify\PackageBuilder\Parameter\ParameterProvider;
final class FileFormatter
{
/**
* @var \Rector\FileFormatter\Contract\EditorConfig\EditorConfigParserInterface
* @var \Rector\FileFormatter\EditorConfig\EditorConfigParser
*/
private $editorConfigParser;
/**
@ -31,7 +31,7 @@ final class FileFormatter
/**
* @param FileFormatterInterface[] $fileFormatters
*/
public function __construct(\Rector\FileFormatter\Contract\EditorConfig\EditorConfigParserInterface $editorConfigParser, \RectorPrefix20210511\Symplify\PackageBuilder\Parameter\ParameterProvider $parameterProvider, array $fileFormatters = [])
public function __construct(\Rector\FileFormatter\EditorConfig\EditorConfigParser $editorConfigParser, \RectorPrefix20210511\Symplify\PackageBuilder\Parameter\ParameterProvider $parameterProvider, array $fileFormatters = [])
{
$this->editorConfigParser = $editorConfigParser;
$this->parameterProvider = $parameterProvider;
@ -63,12 +63,12 @@ final class FileFormatter
try {
$indent = \Rector\FileFormatter\ValueObject\Indent::fromContent($file->getOriginalFileContent());
$editorConfigConfigurationBuilder->withIndent($indent);
} catch (\Rector\FileFormatter\Exception\ParseIndentException $parseIndentException) {
} catch (\Rector\FileFormatter\Exception\ParseIndentException $exception) {
}
try {
$newLine = \Rector\FileFormatter\ValueObject\NewLine::fromContent($file->getOriginalFileContent());
$editorConfigConfigurationBuilder->withNewLine($newLine);
} catch (\Rector\FileFormatter\Exception\InvalidNewLineStringException $invalidNewLineStringException) {
} catch (\Rector\FileFormatter\Exception\InvalidNewLineStringException $exception) {
}
}
private function createEditorConfiguration(\Rector\Core\ValueObject\Application\File $file, \Rector\FileFormatter\ValueObjectFactory\EditorConfigConfigurationBuilder $editorConfigConfigurationBuilder) : \Rector\FileFormatter\ValueObject\EditorConfigConfiguration

View File

@ -0,0 +1,28 @@
<?php
declare (strict_types=1);
namespace Rector\FileFormatter\ValueObject;
final class EditorConfigOption
{
/**
* @var string
*/
public const INDENT_STYLE = 'indent_style';
/**
* @var string
*/
public const INDENT_SIZE = 'indent_size';
/**
* @var string
*/
public const END_OF_LINE = 'end_of_line';
/**
* @var string
*/
public const INSERT_FINAL_NEWLINE = 'insert_final_newline';
/**
* @var string
*/
public const TAB_WIDTH = 'tab_width';
}

View File

@ -11,7 +11,7 @@ final class SplArrayFixedTypeNarrower
{
public function narrow(\PHPStan\Type\Type $paramType) : \PHPStan\Type\Type
{
if ($paramType->isSuperTypeOf(new \PHPStan\Type\ObjectType('SplArrayFixed'))->no()) {
if ($paramType->isSuperTypeOf(new \PHPStan\Type\ObjectType('SplFixedArray'))->no()) {
return $paramType;
}
if (!$paramType instanceof \PHPStan\Type\TypeWithClassName) {

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit5cda148805866f81bed8349814b39895::getLoader();
return ComposerAutoloaderInitb41cade44363a63377d9458fc5dbad3f::getLoader();

View File

@ -2062,9 +2062,8 @@ return array(
'Rector\\FamilyTree\\NodeAnalyzer\\ClassChildAnalyzer' => $baseDir . '/packages/FamilyTree/NodeAnalyzer/ClassChildAnalyzer.php',
'Rector\\FamilyTree\\NodeAnalyzer\\PropertyUsageAnalyzer' => $baseDir . '/packages/FamilyTree/NodeAnalyzer/PropertyUsageAnalyzer.php',
'Rector\\FamilyTree\\Reflection\\FamilyRelationsAnalyzer' => $baseDir . '/packages/FamilyTree/Reflection/FamilyRelationsAnalyzer.php',
'Rector\\FileFormatter\\Contract\\EditorConfig\\EditorConfigParserInterface' => $baseDir . '/packages/FileFormatter/Contract/EditorConfig/EditorConfigParserInterface.php',
'Rector\\FileFormatter\\Contract\\Formatter\\FileFormatterInterface' => $baseDir . '/packages/FileFormatter/Contract/Formatter/FileFormatterInterface.php',
'Rector\\FileFormatter\\EditorConfig\\EditorConfigIdiosyncraticParser' => $baseDir . '/packages/FileFormatter/EditorConfig/EditorConfigIdiosyncraticParser.php',
'Rector\\FileFormatter\\EditorConfig\\EditorConfigParser' => $baseDir . '/packages/FileFormatter/EditorConfig/EditorConfigParser.php',
'Rector\\FileFormatter\\Exception\\InvalidIndentSizeException' => $baseDir . '/packages/FileFormatter/Exception/InvalidIndentSizeException.php',
'Rector\\FileFormatter\\Exception\\InvalidIndentStringException' => $baseDir . '/packages/FileFormatter/Exception/InvalidIndentStringException.php',
'Rector\\FileFormatter\\Exception\\InvalidIndentStyleException' => $baseDir . '/packages/FileFormatter/Exception/InvalidIndentStyleException.php',
@ -2076,6 +2075,7 @@ return array(
'Rector\\FileFormatter\\Formatter\\YamlFileFormatter' => $baseDir . '/packages/FileFormatter/Formatter/YamlFileFormatter.php',
'Rector\\FileFormatter\\ValueObjectFactory\\EditorConfigConfigurationBuilder' => $baseDir . '/packages/FileFormatter/ValueObjectFactory/EditorConfigConfigurationBuilder.php',
'Rector\\FileFormatter\\ValueObject\\EditorConfigConfiguration' => $baseDir . '/packages/FileFormatter/ValueObject/EditorConfigConfiguration.php',
'Rector\\FileFormatter\\ValueObject\\EditorConfigOption' => $baseDir . '/packages/FileFormatter/ValueObject/EditorConfigOption.php',
'Rector\\FileFormatter\\ValueObject\\Indent' => $baseDir . '/packages/FileFormatter/ValueObject/Indent.php',
'Rector\\FileFormatter\\ValueObject\\NewLine' => $baseDir . '/packages/FileFormatter/ValueObject/NewLine.php',
'Rector\\FileSystemRector\\Contract\\AddedFileInterface' => $baseDir . '/packages/FileSystemRector/Contract/AddedFileInterface.php',

View File

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

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit5cda148805866f81bed8349814b39895
class ComposerStaticInitb41cade44363a63377d9458fc5dbad3f
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -2401,9 +2401,8 @@ class ComposerStaticInit5cda148805866f81bed8349814b39895
'Rector\\FamilyTree\\NodeAnalyzer\\ClassChildAnalyzer' => __DIR__ . '/../..' . '/packages/FamilyTree/NodeAnalyzer/ClassChildAnalyzer.php',
'Rector\\FamilyTree\\NodeAnalyzer\\PropertyUsageAnalyzer' => __DIR__ . '/../..' . '/packages/FamilyTree/NodeAnalyzer/PropertyUsageAnalyzer.php',
'Rector\\FamilyTree\\Reflection\\FamilyRelationsAnalyzer' => __DIR__ . '/../..' . '/packages/FamilyTree/Reflection/FamilyRelationsAnalyzer.php',
'Rector\\FileFormatter\\Contract\\EditorConfig\\EditorConfigParserInterface' => __DIR__ . '/../..' . '/packages/FileFormatter/Contract/EditorConfig/EditorConfigParserInterface.php',
'Rector\\FileFormatter\\Contract\\Formatter\\FileFormatterInterface' => __DIR__ . '/../..' . '/packages/FileFormatter/Contract/Formatter/FileFormatterInterface.php',
'Rector\\FileFormatter\\EditorConfig\\EditorConfigIdiosyncraticParser' => __DIR__ . '/../..' . '/packages/FileFormatter/EditorConfig/EditorConfigIdiosyncraticParser.php',
'Rector\\FileFormatter\\EditorConfig\\EditorConfigParser' => __DIR__ . '/../..' . '/packages/FileFormatter/EditorConfig/EditorConfigParser.php',
'Rector\\FileFormatter\\Exception\\InvalidIndentSizeException' => __DIR__ . '/../..' . '/packages/FileFormatter/Exception/InvalidIndentSizeException.php',
'Rector\\FileFormatter\\Exception\\InvalidIndentStringException' => __DIR__ . '/../..' . '/packages/FileFormatter/Exception/InvalidIndentStringException.php',
'Rector\\FileFormatter\\Exception\\InvalidIndentStyleException' => __DIR__ . '/../..' . '/packages/FileFormatter/Exception/InvalidIndentStyleException.php',
@ -2415,6 +2414,7 @@ class ComposerStaticInit5cda148805866f81bed8349814b39895
'Rector\\FileFormatter\\Formatter\\YamlFileFormatter' => __DIR__ . '/../..' . '/packages/FileFormatter/Formatter/YamlFileFormatter.php',
'Rector\\FileFormatter\\ValueObjectFactory\\EditorConfigConfigurationBuilder' => __DIR__ . '/../..' . '/packages/FileFormatter/ValueObjectFactory/EditorConfigConfigurationBuilder.php',
'Rector\\FileFormatter\\ValueObject\\EditorConfigConfiguration' => __DIR__ . '/../..' . '/packages/FileFormatter/ValueObject/EditorConfigConfiguration.php',
'Rector\\FileFormatter\\ValueObject\\EditorConfigOption' => __DIR__ . '/../..' . '/packages/FileFormatter/ValueObject/EditorConfigOption.php',
'Rector\\FileFormatter\\ValueObject\\Indent' => __DIR__ . '/../..' . '/packages/FileFormatter/ValueObject/Indent.php',
'Rector\\FileFormatter\\ValueObject\\NewLine' => __DIR__ . '/../..' . '/packages/FileFormatter/ValueObject/NewLine.php',
'Rector\\FileSystemRector\\Contract\\AddedFileInterface' => __DIR__ . '/../..' . '/packages/FileSystemRector/Contract/AddedFileInterface.php',
@ -3465,9 +3465,9 @@ class ComposerStaticInit5cda148805866f81bed8349814b39895
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit5cda148805866f81bed8349814b39895::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit5cda148805866f81bed8349814b39895::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit5cda148805866f81bed8349814b39895::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitb41cade44363a63377d9458fc5dbad3f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitb41cade44363a63377d9458fc5dbad3f::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitb41cade44363a63377d9458fc5dbad3f::$classMap;
}, null, ClassLoader::class);
}

View File

@ -21,8 +21,8 @@ if (!class_exists('SomeTestCase', false) && !interface_exists('SomeTestCase', fa
if (!class_exists('CheckoutEntityFactory', false) && !interface_exists('CheckoutEntityFactory', false) && !trait_exists('CheckoutEntityFactory', false)) {
spl_autoload_call('RectorPrefix20210511\CheckoutEntityFactory');
}
if (!class_exists('ComposerAutoloaderInit5cda148805866f81bed8349814b39895', false) && !interface_exists('ComposerAutoloaderInit5cda148805866f81bed8349814b39895', false) && !trait_exists('ComposerAutoloaderInit5cda148805866f81bed8349814b39895', false)) {
spl_autoload_call('RectorPrefix20210511\ComposerAutoloaderInit5cda148805866f81bed8349814b39895');
if (!class_exists('ComposerAutoloaderInitb41cade44363a63377d9458fc5dbad3f', false) && !interface_exists('ComposerAutoloaderInitb41cade44363a63377d9458fc5dbad3f', false) && !trait_exists('ComposerAutoloaderInitb41cade44363a63377d9458fc5dbad3f', false)) {
spl_autoload_call('RectorPrefix20210511\ComposerAutoloaderInitb41cade44363a63377d9458fc5dbad3f');
}
if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) {
spl_autoload_call('RectorPrefix20210511\Doctrine\Inflector\Inflector');
@ -95,9 +95,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210511\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire5cda148805866f81bed8349814b39895')) {
function composerRequire5cda148805866f81bed8349814b39895() {
return \RectorPrefix20210511\composerRequire5cda148805866f81bed8349814b39895(...func_get_args());
if (!function_exists('composerRequireb41cade44363a63377d9458fc5dbad3f')) {
function composerRequireb41cade44363a63377d9458fc5dbad3f() {
return \RectorPrefix20210511\composerRequireb41cade44363a63377d9458fc5dbad3f(...func_get_args());
}
}
if (!function_exists('parseArgs')) {