Skip to content

Commit

Permalink
Updated Rector to commit b67bf64
Browse files Browse the repository at this point in the history
rectorphp/rector-src@b67bf64 move ParamTypeByParentCallTypeRector to type-declaration-strict set
  • Loading branch information
TomasVotruba committed Jul 7, 2022
1 parent 336a52b commit 239f912
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 28 deletions.
3 changes: 2 additions & 1 deletion config/set/type-declaration-strict.php
Expand Up @@ -8,6 +8,7 @@
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ArrayShapeFromConstantArrayReturnRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByParentCallTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictBoolReturnExprRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictNativeFuncCallRector;
Expand All @@ -20,5 +21,5 @@
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictGetterMethodReturnTypeRector;
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictSetUpRector;
return static function (RectorConfig $rectorConfig) : void {
$rectorConfig->rules([AddClosureReturnTypeRector::class, ReturnTypeFromStrictTypedPropertyRector::class, TypedPropertyFromStrictConstructorRector::class, ParamTypeFromStrictTypedPropertyRector::class, ReturnTypeFromStrictTypedCallRector::class, AddVoidReturnTypeWhereNoReturnRector::class, ReturnTypeFromReturnNewRector::class, TypedPropertyFromStrictGetterMethodReturnTypeRector::class, AddMethodCallBasedStrictParamTypeRector::class, ArrayShapeFromConstantArrayReturnRector::class, ReturnTypeFromStrictBoolReturnExprRector::class, ReturnTypeFromStrictNativeFuncCallRector::class, ReturnTypeFromStrictNewArrayRector::class, ReturnTypeFromStrictScalarReturnExprRector::class, TypedPropertyFromStrictSetUpRector::class]);
$rectorConfig->rules([AddClosureReturnTypeRector::class, ReturnTypeFromStrictTypedPropertyRector::class, TypedPropertyFromStrictConstructorRector::class, ParamTypeFromStrictTypedPropertyRector::class, ReturnTypeFromStrictTypedCallRector::class, AddVoidReturnTypeWhereNoReturnRector::class, ReturnTypeFromReturnNewRector::class, TypedPropertyFromStrictGetterMethodReturnTypeRector::class, AddMethodCallBasedStrictParamTypeRector::class, ArrayShapeFromConstantArrayReturnRector::class, ReturnTypeFromStrictBoolReturnExprRector::class, ReturnTypeFromStrictNativeFuncCallRector::class, ReturnTypeFromStrictNewArrayRector::class, ReturnTypeFromStrictScalarReturnExprRector::class, TypedPropertyFromStrictSetUpRector::class, ParamTypeByParentCallTypeRector::class]);
};
14 changes: 1 addition & 13 deletions config/set/type-declaration.php
Expand Up @@ -8,7 +8,6 @@
use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayReturnDocTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ParamAnnotationIncorrectNullableRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByMethodCallTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ParamTypeByParentCallTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnAnnotationIncorrectNullableRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureReturnTypeRector;
use Rector\TypeDeclaration\Rector\FunctionLike\ParamTypeDeclarationRector;
Expand All @@ -17,16 +16,5 @@
use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
use Rector\TypeDeclaration\Rector\Property\VarAnnotationIncorrectNullableRector;
return static function (RectorConfig $rectorConfig) : void {
$rectorConfig->rule(ParamTypeDeclarationRector::class);
$rectorConfig->rule(ReturnTypeDeclarationRector::class);
$rectorConfig->rule(PropertyTypeDeclarationRector::class);
$rectorConfig->rule(AddClosureReturnTypeRector::class);
$rectorConfig->rule(AddArrayParamDocTypeRector::class);
$rectorConfig->rule(AddArrayReturnDocTypeRector::class);
$rectorConfig->rule(ParamTypeByParentCallTypeRector::class);
$rectorConfig->rule(ParamTypeByMethodCallTypeRector::class);
$rectorConfig->rule(TypedPropertyFromAssignsRector::class);
$rectorConfig->rule(ReturnAnnotationIncorrectNullableRector::class);
$rectorConfig->rule(VarAnnotationIncorrectNullableRector::class);
$rectorConfig->rule(ParamAnnotationIncorrectNullableRector::class);
$rectorConfig->rules([ParamTypeDeclarationRector::class, ReturnTypeDeclarationRector::class, PropertyTypeDeclarationRector::class, AddClosureReturnTypeRector::class, AddArrayParamDocTypeRector::class, AddArrayReturnDocTypeRector::class, ParamTypeByMethodCallTypeRector::class, TypedPropertyFromAssignsRector::class, ReturnAnnotationIncorrectNullableRector::class, VarAnnotationIncorrectNullableRector::class, ParamAnnotationIncorrectNullableRector::class]);
};
4 changes: 2 additions & 2 deletions src/Application/VersionResolver.php
Expand Up @@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '22f2acadf73bc00a350b6b457db51eb5e0353d89';
public const PACKAGE_VERSION = 'b67bf649899000a913c4c91ec7ce43b165aa471d';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-07-07 10:54:38';
public const RELEASE_DATE = '2022-07-07 11:17:45';
/**
* @var int
*/
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
Expand Up @@ -9,4 +9,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInit6a7b45bdeda296aaafeb064485efabcd::getLoader();
return ComposerAutoloaderInitab2609172046cee66f6ea03a3c02037e::getLoader();
14 changes: 7 additions & 7 deletions vendor/composer/autoload_real.php
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInit6a7b45bdeda296aaafeb064485efabcd
class ComposerAutoloaderInitab2609172046cee66f6ea03a3c02037e
{
private static $loader;

Expand All @@ -22,19 +22,19 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInit6a7b45bdeda296aaafeb064485efabcd', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitab2609172046cee66f6ea03a3c02037e', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit6a7b45bdeda296aaafeb064485efabcd', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitab2609172046cee66f6ea03a3c02037e', 'loadClassLoader'));

require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitab2609172046cee66f6ea03a3c02037e::getInitializer($loader));

$loader->setClassMapAuthoritative(true);
$loader->register(true);

$includeFiles = \Composer\Autoload\ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitab2609172046cee66f6ea03a3c02037e::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire6a7b45bdeda296aaafeb064485efabcd($fileIdentifier, $file);
composerRequireab2609172046cee66f6ea03a3c02037e($fileIdentifier, $file);
}

return $loader;
Expand All @@ -46,7 +46,7 @@ public static function getLoader()
* @param string $file
* @return void
*/
function composerRequire6a7b45bdeda296aaafeb064485efabcd($fileIdentifier, $file)
function composerRequireab2609172046cee66f6ea03a3c02037e($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
Expand Down
8 changes: 4 additions & 4 deletions vendor/composer/autoload_static.php
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

class ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd
class ComposerStaticInitab2609172046cee66f6ea03a3c02037e
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
Expand Down Expand Up @@ -3412,9 +3412,9 @@ class ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit6a7b45bdeda296aaafeb064485efabcd::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitab2609172046cee66f6ea03a3c02037e::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitab2609172046cee66f6ea03a3c02037e::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitab2609172046cee66f6ea03a3c02037e::$classMap;

}, null, ClassLoader::class);
}
Expand Down

0 comments on commit 239f912

Please sign in to comment.