From f923fd099847909452333d654ffcc7a1a55ce806 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 6 Feb 2023 19:23:07 +0000 Subject: [PATCH] Updated Rector to commit 43dd2efc5d663bc16327911fe31c6f6ecf60e753 https://github.com/rectorphp/rector-src/commit/43dd2efc5d663bc16327911fe31c6f6ecf60e753 Remove deprecated ReturnTypeDeclarationRector, TypedPropertyRector, ParamTypeDeclarationRector rules (#3350) --- docs/rector_rules_overview.md | 175 +----------------- ...litGroupedConstantsAndPropertiesRector.php | 77 -------- .../Rector/Property/TypedPropertyRector.php | 78 -------- .../AddArrayParamDocTypeRector.php | 78 -------- .../AddArrayReturnDocTypeRector.php | 79 -------- .../ParamTypeDeclarationRector.php | 69 ------- .../ReturnTypeDeclarationRector.php | 70 ------- .../PropertyTypeDeclarationRector.php | 74 -------- .../PropertyFetchTypeAnalyzer.php | 2 +- src/Application/VersionResolver.php | 4 +- .../Rector/DeprecatedRectorInterface.php | 3 + vendor/autoload.php | 2 +- vendor/composer/autoload_classmap.php | 7 - vendor/composer/autoload_real.php | 10 +- vendor/composer/autoload_static.php | 15 +- 15 files changed, 20 insertions(+), 723 deletions(-) delete mode 100644 rules/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector.php delete mode 100644 rules/Php74/Rector/Property/TypedPropertyRector.php delete mode 100644 rules/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector.php delete mode 100644 rules/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector.php delete mode 100644 rules/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector.php delete mode 100644 rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php delete mode 100644 rules/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector.php diff --git a/docs/rector_rules_overview.md b/docs/rector_rules_overview.md index 2e309a42f66..360ff6e3b13 100644 --- a/docs/rector_rules_overview.md +++ b/docs/rector_rules_overview.md @@ -1,4 +1,4 @@ -# 422 Rules Overview +# 415 Rules Overview
@@ -8,7 +8,7 @@ - [CodeQuality](#codequality) (79) -- [CodingStyle](#codingstyle) (40) +- [CodingStyle](#codingstyle) (39) - [Compatibility](#compatibility) (1) @@ -42,7 +42,7 @@ - [Php73](#php73) (9) -- [Php74](#php74) (15) +- [Php74](#php74) (14) - [Php80](#php80) (20) @@ -64,7 +64,7 @@ - [Transform](#transform) (34) -- [TypeDeclaration](#typedeclaration) (41) +- [TypeDeclaration](#typedeclaration) (36) - [Visibility](#visibility) (3) @@ -2527,34 +2527,6 @@ Separate class constant to own lines
-### SplitGroupedConstantsAndPropertiesRector - -Separate constant and properties to own lines - -- class: [`Rector\CodingStyle\Rector\ClassConst\SplitGroupedConstantsAndPropertiesRector`](../rules/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector.php) - -```diff - class SomeClass - { -- const HI = true, AHOJ = 'true'; -+ const HI = true; -+ const AHOJ = 'true'; - - /** - * @var string - */ -- public $isIt, $isIsThough; -+ public $isIt; -+ -+ /** -+ * @var string -+ */ -+ public $isIsThough; - } -``` - -
- ### SplitGroupedPropertiesRector Separate grouped properties to own lines @@ -5896,28 +5868,6 @@ Add null default to properties with PHP 7.4 property nullable type
-### TypedPropertyRector - -Changes property type by `@var` annotations or default value. - -- class: [`Rector\Php74\Rector\Property\TypedPropertyRector`](../rules/Php74/Rector/Property/TypedPropertyRector.php) - -```diff - final class SomeClass - { -- /** -- * @var int -- */ -- private $count; -+ private int $count; - -- private $isDone = false; -+ private bool $isDone = false; - } -``` - -
- ## Php80 ### AddParamBasedOnParentClassMethodRector @@ -9193,58 +9143,6 @@ return static function (RectorConfig $rectorConfig): void { ## TypeDeclaration -### AddArrayParamDocTypeRector - -Adds `@param` annotation to array parameters inferred from the rest of the code - -- class: [`Rector\TypeDeclaration\Rector\ClassMethod\AddArrayParamDocTypeRector`](../rules/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector.php) - -```diff - class SomeClass - { - /** - * @var int[] - */ - private $values; - -+ /** -+ * @param int[] $values -+ */ - public function __construct(array $values) - { - $this->values = $values; - } - } -``` - -
- -### AddArrayReturnDocTypeRector - -Adds `@return` annotation to array parameters inferred from the rest of the code - -- class: [`Rector\TypeDeclaration\Rector\ClassMethod\AddArrayReturnDocTypeRector`](../rules/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector.php) - -```diff - class SomeClass - { - /** - * @var int[] - */ - private $values; - -+ /** -+ * @return int[] -+ */ - public function getValues(): array - { - return $this->values; - } - } -``` - -
- ### AddArrowFunctionReturnTypeRector Add known return type to arrow function @@ -9727,27 +9625,6 @@ Change param type based on parent param type
-### ParamTypeDeclarationRector - -Change `@param` types to type declarations if not a BC-break - -- class: [`Rector\TypeDeclaration\Rector\FunctionLike\ParamTypeDeclarationRector`](../rules/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector.php) - -```diff - final class SomeClass - { -- /** -- * @param int $number -- */ -- public function run($number) -+ public function run(int $number) - { - } - } -``` - -
- ### ParamTypeFromStrictTypedPropertyRector Add param type from `$param` set to typed property @@ -9769,29 +9646,6 @@ Add param type from `$param` set to typed property
-### PropertyTypeDeclarationRector - -Add `@var` to properties that are missing it - -- class: [`Rector\TypeDeclaration\Rector\Property\PropertyTypeDeclarationRector`](../rules/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector.php) - -```diff - class SomeClass - { -+ /** -+ * @var int -+ */ - private $value; - - public function run() - { - $this->value = 123; - } - } -``` - -
- ### PropertyTypeFromStrictSetterGetterRector Add property type based on strict setter and getter method @@ -9861,27 +9715,6 @@ Add "never" return-type for methods that never return anything
-### ReturnTypeDeclarationRector - -Change `@return` types and type from static analysis to type declarations if not a BC-break - -- class: [`Rector\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector`](../rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php) - -```diff - class SomeClass - { -- /** -- * @return int -- */ -- public function getCount() -+ public function getCount(): int - { - } - } -``` - -
- ### ReturnTypeFromReturnDirectArrayRector Add return type from return direct array diff --git a/rules/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector.php b/rules/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector.php deleted file mode 100644 index e7c151a1996..00000000000 --- a/rules/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector.php +++ /dev/null @@ -1,77 +0,0 @@ -symfonyStyle = $symfonyStyle; - } - public function getRuleDefinition() : RuleDefinition - { - return new RuleDefinition('Separate constant and properties to own lines', [new CodeSample(<<<'CODE_SAMPLE' -class SomeClass -{ - const HI = true, AHOJ = 'true'; - - /** - * @var string - */ - public $isIt, $isIsThough; -} -CODE_SAMPLE -, <<<'CODE_SAMPLE' -class SomeClass -{ - const HI = true; - const AHOJ = 'true'; - - /** - * @var string - */ - public $isIt; - - /** - * @var string - */ - public $isIsThough; -} -CODE_SAMPLE -)]); - } - /** - * @return array> - */ - public function getNodeTypes() : array - { - return [ClassConst::class, Property::class]; - } - /** - * @param ClassConst|Property $node - * @return Node[]|null - */ - public function refactor(Node $node) : ?array - { - $this->symfonyStyle->error('The "SplitGroupedConstantsAndPropertiesRector" rule is deprecated. Use "SplitGroupedClassConstantsRector" and "SplitGroupedPropertiesRector" instead'); - \sleep(5); - return null; - } -} diff --git a/rules/Php74/Rector/Property/TypedPropertyRector.php b/rules/Php74/Rector/Property/TypedPropertyRector.php deleted file mode 100644 index 74a970dd8a4..00000000000 --- a/rules/Php74/Rector/Property/TypedPropertyRector.php +++ /dev/null @@ -1,78 +0,0 @@ -symfonyStyle = $symfonyStyle; - } - public function getRuleDefinition() : RuleDefinition - { - return new RuleDefinition('Changes property type by `@var` annotations or default value.', [new CodeSample(<<<'CODE_SAMPLE' -final class SomeClass -{ - /** - * @var int - */ - private $count; - - private $isDone = false; -} -CODE_SAMPLE -, <<<'CODE_SAMPLE' -final class SomeClass -{ - private int $count; - - private bool $isDone = false; -} -CODE_SAMPLE -)]); - } - /** - * @return array> - */ - public function getNodeTypes() : array - { - return [Property::class]; - } - /** - * @param Property $node - */ - public function refactorWithScope(Node $node, Scope $scope) : ?Node - { - $this->symfonyStyle->error('The TypedPropertyRector rule is deprecated, as it works with doc block types that are not reliable and adds invalid types'); - \sleep(5); - return null; - } - public function provideMinPhpVersion() : int - { - return PhpVersionFeature::TYPED_PROPERTIES; - } -} diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector.php deleted file mode 100644 index 5b143571371..00000000000 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector.php +++ /dev/null @@ -1,78 +0,0 @@ -symfonyStyle = $symfonyStyle; - } - public function getRuleDefinition() : RuleDefinition - { - return new RuleDefinition('Adds @param annotation to array parameters inferred from the rest of the code', [new CodeSample(<<<'CODE_SAMPLE' -class SomeClass -{ - /** - * @var int[] - */ - private $values; - - public function __construct(array $values) - { - $this->values = $values; - } -} -CODE_SAMPLE -, <<<'CODE_SAMPLE' -class SomeClass -{ - /** - * @var int[] - */ - private $values; - - /** - * @param int[] $values - */ - public function __construct(array $values) - { - $this->values = $values; - } -} -CODE_SAMPLE -)]); - } - /** - * @return array> - */ - public function getNodeTypes() : array - { - return [ClassMethod::class]; - } - /** - * @param ClassMethod $node - */ - public function refactor(Node $node) : ?Node - { - $this->symfonyStyle->error('The AddArrayParamDocTypeRector rule is deprecated, as it works with doc block types that are not reliable and might infer incorrect types'); - \sleep(5); - return null; - } -} diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector.php deleted file mode 100644 index 65d5295affa..00000000000 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector.php +++ /dev/null @@ -1,79 +0,0 @@ -symfonyStyle = $symfonyStyle; - } - public function getRuleDefinition() : RuleDefinition - { - return new RuleDefinition('Adds @return annotation to array parameters inferred from the rest of the code', [new CodeSample(<<<'CODE_SAMPLE' -class SomeClass -{ - /** - * @var int[] - */ - private $values; - - public function getValues(): array - { - return $this->values; - } -} -CODE_SAMPLE -, <<<'CODE_SAMPLE' -class SomeClass -{ - /** - * @var int[] - */ - private $values; - - /** - * @return int[] - */ - public function getValues(): array - { - return $this->values; - } -} -CODE_SAMPLE -)]); - } - /** - * @return array> - */ - public function getNodeTypes() : array - { - return [ClassMethod::class]; - } - /** - * @param ClassMethod $node - */ - public function refactorWithScope(Node $node, Scope $scope) : ?Node - { - $this->symfonyStyle->error('The AddArrayReturnDocTypeRector rule is deprecated, as it works with doc block types that are not reliable and might infer incorrect types'); - \sleep(5); - return null; - } -} diff --git a/rules/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector.php deleted file mode 100644 index 91b65595c29..00000000000 --- a/rules/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector.php +++ /dev/null @@ -1,69 +0,0 @@ -symfonyStyle = $symfonyStyle; - } - /** - * @return array> - */ - public function getNodeTypes() : array - { - // why not on Param node? because class like docblock is edited too for @param tags - return [Function_::class, ClassMethod::class]; - } - public function getRuleDefinition() : RuleDefinition - { - return new RuleDefinition('Change @param types to type declarations if not a BC-break', [new CodeSample(<<<'CODE_SAMPLE' -final class SomeClass -{ - /** - * @param int $number - */ - public function run($number) - { - } -} -CODE_SAMPLE -, <<<'CODE_SAMPLE' -final class SomeClass -{ - public function run(int $number) - { - } -} -CODE_SAMPLE -)]); - } - /** - * @param ClassMethod|Function_ $node - */ - public function refactor(Node $node) : ?Node - { - $this->symfonyStyle->error('Use specific rules to infer params instead. This rule was split into many small ones.'); - \sleep(5); - return null; - } -} diff --git a/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php deleted file mode 100644 index 97d11f89bf7..00000000000 --- a/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php +++ /dev/null @@ -1,70 +0,0 @@ -symfonyStyle = $symfonyStyle; - } - /** - * @return array> - */ - public function getNodeTypes() : array - { - return [Function_::class, ClassMethod::class]; - } - public function getRuleDefinition() : RuleDefinition - { - return new RuleDefinition('Change @return types and type from static analysis to type declarations if not a BC-break', [new CodeSample(<<<'CODE_SAMPLE' -class SomeClass -{ - /** - * @return int - */ - public function getCount() - { - } -} -CODE_SAMPLE -, <<<'CODE_SAMPLE' -class SomeClass -{ - public function getCount(): int - { - } -} -CODE_SAMPLE -)]); - } - /** - * @param ClassMethod|Function_ $node - */ - public function refactor(Node $node) : ?Node - { - $this->symfonyStyle->error('This rule was split info many small ones as breaking types based on falsy docblocks. Use specific rules to infer return instead.'); - \sleep(5); - return null; - } -} diff --git a/rules/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector.php deleted file mode 100644 index 6140a34394a..00000000000 --- a/rules/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector.php +++ /dev/null @@ -1,74 +0,0 @@ -symfonyStyle = $symfonyStyle; - } - public function getRuleDefinition() : RuleDefinition - { - return new RuleDefinition('Add @var to properties that are missing it', [new CodeSample(<<<'CODE_SAMPLE' -class SomeClass -{ - private $value; - - public function run() - { - $this->value = 123; - } -} -CODE_SAMPLE -, <<<'CODE_SAMPLE' -class SomeClass -{ - /** - * @var int - */ - private $value; - - public function run() - { - $this->value = 123; - } -} -CODE_SAMPLE -)]); - } - /** - * @return array> - */ - public function getNodeTypes() : array - { - return [Property::class]; - } - /** - * @param Property $node - */ - public function refactor(Node $node) : ?Node - { - $this->symfonyStyle->error('The PropertyTypeDeclaration rule is deprecated, as it works with doc block types that are not reliable and adds invalid types'); - \sleep(5); - return null; - } -} diff --git a/rules/TypeDeclaration/TypeAnalyzer/PropertyFetchTypeAnalyzer.php b/rules/TypeDeclaration/TypeAnalyzer/PropertyFetchTypeAnalyzer.php index cffeecfc879..54224760532 100644 --- a/rules/TypeDeclaration/TypeAnalyzer/PropertyFetchTypeAnalyzer.php +++ b/rules/TypeDeclaration/TypeAnalyzer/PropertyFetchTypeAnalyzer.php @@ -33,7 +33,7 @@ final class PropertyFetchTypeAnalyzer } $propertyReflection = $propertyHolderType->getProperty($propertyName, $scope); $phpPropertyReflection = $this->getNativeReflectionForProperty($propertyReflection); - if ($phpPropertyReflection === null) { + if (!$phpPropertyReflection instanceof PhpPropertyReflection) { return \false; } return $phpPropertyReflection->getNativeType() instanceof MixedType; diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index b712cfa691d..0b0010b9987 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = '75d1dca2ef328d91cff2b642e79f1c442696d0a1'; + public const PACKAGE_VERSION = '43dd2efc5d663bc16327911fe31c6f6ecf60e753'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-02-06 17:06:42'; + public const RELEASE_DATE = '2023-02-06 19:19:06'; /** * @var int */ diff --git a/src/Contract/Rector/DeprecatedRectorInterface.php b/src/Contract/Rector/DeprecatedRectorInterface.php index 8c194c0755d..dcee85e9986 100644 --- a/src/Contract/Rector/DeprecatedRectorInterface.php +++ b/src/Contract/Rector/DeprecatedRectorInterface.php @@ -3,6 +3,9 @@ declare (strict_types=1); namespace Rector\Core\Contract\Rector; +/** + * @api to mark future Rectors as deprecated + */ interface DeprecatedRectorInterface { } diff --git a/vendor/autoload.php b/vendor/autoload.php index fdac8afba24..7d5a40af6c6 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit8e924aa00232f07a8c77540879f7b1b1::getLoader(); +return ComposerAutoloaderInit0981c60dbbbe9cbbd670a2dacb4bcce4::getLoader(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 91428cda05d..4c4af222469 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -1286,7 +1286,6 @@ return array( 'Rector\\CodingStyle\\Rector\\Catch_\\CatchExceptionNameMatchingTypeRector' => $baseDir . '/rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php', 'Rector\\CodingStyle\\Rector\\ClassConst\\RemoveFinalFromConstRector' => $baseDir . '/rules/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector.php', 'Rector\\CodingStyle\\Rector\\ClassConst\\SplitGroupedClassConstantsRector' => $baseDir . '/rules/CodingStyle/Rector/ClassConst/SplitGroupedClassConstantsRector.php', - 'Rector\\CodingStyle\\Rector\\ClassConst\\SplitGroupedConstantsAndPropertiesRector' => $baseDir . '/rules/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector.php', 'Rector\\CodingStyle\\Rector\\ClassConst\\VarConstantCommentRector' => $baseDir . '/rules/CodingStyle/Rector/ClassConst/VarConstantCommentRector.php', 'Rector\\CodingStyle\\Rector\\ClassMethod\\DataProviderArrayItemsNewlinedRector' => $baseDir . '/rules/CodingStyle/Rector/ClassMethod/DataProviderArrayItemsNewlinedRector.php', 'Rector\\CodingStyle\\Rector\\ClassMethod\\FuncGetArgsToVariadicParamRector' => $baseDir . '/rules/CodingStyle/Rector/ClassMethod/FuncGetArgsToVariadicParamRector.php', @@ -2206,7 +2205,6 @@ return array( 'Rector\\Php74\\Rector\\LNumber\\AddLiteralSeparatorToNumberRector' => $baseDir . '/rules/Php74/Rector/LNumber/AddLiteralSeparatorToNumberRector.php', 'Rector\\Php74\\Rector\\MethodCall\\ChangeReflectionTypeToStringToGetNameRector' => $baseDir . '/rules/Php74/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector.php', 'Rector\\Php74\\Rector\\Property\\RestoreDefaultNullToNullableTypePropertyRector' => $baseDir . '/rules/Php74/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector.php', - 'Rector\\Php74\\Rector\\Property\\TypedPropertyRector' => $baseDir . '/rules/Php74/Rector/Property/TypedPropertyRector.php', 'Rector\\Php74\\Rector\\StaticCall\\ExportToReflectionFunctionRector' => $baseDir . '/rules/Php74/Rector/StaticCall/ExportToReflectionFunctionRector.php', 'Rector\\Php74\\Rector\\Ternary\\ParenthesizeNestedTernaryRector' => $baseDir . '/rules/Php74/Rector/Ternary/ParenthesizeNestedTernaryRector.php', 'Rector\\Php74\\Tokenizer\\FollowedByCurlyBracketAnalyzer' => $baseDir . '/rules/Php74/Tokenizer/FollowedByCurlyBracketAnalyzer.php', @@ -2748,8 +2746,6 @@ return array( 'Rector\\TypeDeclaration\\PHPStan\\TypeSpecifier\\SelfStaticParentTypeSpecifier' => $baseDir . '/rules/TypeDeclaration/PHPStan/TypeSpecifier/SelfStaticParentTypeSpecifier.php', 'Rector\\TypeDeclaration\\PhpDocParser\\ParamPhpDocNodeFactory' => $baseDir . '/rules/TypeDeclaration/PhpDocParser/ParamPhpDocNodeFactory.php', 'Rector\\TypeDeclaration\\Rector\\ArrowFunction\\AddArrowFunctionReturnTypeRector' => $baseDir . '/rules/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector.php', - 'Rector\\TypeDeclaration\\Rector\\ClassMethod\\AddArrayParamDocTypeRector' => $baseDir . '/rules/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector.php', - 'Rector\\TypeDeclaration\\Rector\\ClassMethod\\AddArrayReturnDocTypeRector' => $baseDir . '/rules/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector.php', 'Rector\\TypeDeclaration\\Rector\\ClassMethod\\AddMethodCallBasedStrictParamTypeRector' => $baseDir . '/rules/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector.php', 'Rector\\TypeDeclaration\\Rector\\ClassMethod\\AddParamTypeBasedOnPHPUnitDataProviderRector' => $baseDir . '/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector.php', 'Rector\\TypeDeclaration\\Rector\\ClassMethod\\AddParamTypeDeclarationRector' => $baseDir . '/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector.php', @@ -2778,11 +2774,8 @@ return array( 'Rector\\TypeDeclaration\\Rector\\Empty_\\EmptyOnNullableObjectToInstanceOfRector' => $baseDir . '/rules/TypeDeclaration/Rector/Empty_/EmptyOnNullableObjectToInstanceOfRector.php', 'Rector\\TypeDeclaration\\Rector\\FunctionLike\\AddParamTypeSplFixedArrayRector' => $baseDir . '/rules/TypeDeclaration/Rector/FunctionLike/AddParamTypeSplFixedArrayRector.php', 'Rector\\TypeDeclaration\\Rector\\FunctionLike\\AddReturnTypeDeclarationFromYieldsRector' => $baseDir . '/rules/TypeDeclaration/Rector/FunctionLike/AddReturnTypeDeclarationFromYieldsRector.php', - 'Rector\\TypeDeclaration\\Rector\\FunctionLike\\ParamTypeDeclarationRector' => $baseDir . '/rules/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector.php', - 'Rector\\TypeDeclaration\\Rector\\FunctionLike\\ReturnTypeDeclarationRector' => $baseDir . '/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php', 'Rector\\TypeDeclaration\\Rector\\Param\\ParamTypeFromStrictTypedPropertyRector' => $baseDir . '/rules/TypeDeclaration/Rector/Param/ParamTypeFromStrictTypedPropertyRector.php', 'Rector\\TypeDeclaration\\Rector\\Property\\AddPropertyTypeDeclarationRector' => $baseDir . '/rules/TypeDeclaration/Rector/Property/AddPropertyTypeDeclarationRector.php', - 'Rector\\TypeDeclaration\\Rector\\Property\\PropertyTypeDeclarationRector' => $baseDir . '/rules/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector.php', 'Rector\\TypeDeclaration\\Rector\\Property\\TypedPropertyFromAssignsRector' => $baseDir . '/rules/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector.php', 'Rector\\TypeDeclaration\\Rector\\Property\\TypedPropertyFromStrictConstructorRector' => $baseDir . '/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php', 'Rector\\TypeDeclaration\\Rector\\Property\\TypedPropertyFromStrictGetterMethodReturnTypeRector' => $baseDir . '/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index a679a4e22c8..45f53acd41e 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit8e924aa00232f07a8c77540879f7b1b1 +class ComposerAutoloaderInit0981c60dbbbe9cbbd670a2dacb4bcce4 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInit8e924aa00232f07a8c77540879f7b1b1 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit8e924aa00232f07a8c77540879f7b1b1', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit0981c60dbbbe9cbbd670a2dacb4bcce4', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit8e924aa00232f07a8c77540879f7b1b1', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit0981c60dbbbe9cbbd670a2dacb4bcce4', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit8e924aa00232f07a8c77540879f7b1b1::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit8e924aa00232f07a8c77540879f7b1b1::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4::$files; $requireFile = \Closure::bind(static function ($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 9009b9eb7fe..1344ceaedc4 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit8e924aa00232f07a8c77540879f7b1b1 +class ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -1531,7 +1531,6 @@ class ComposerStaticInit8e924aa00232f07a8c77540879f7b1b1 'Rector\\CodingStyle\\Rector\\Catch_\\CatchExceptionNameMatchingTypeRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php', 'Rector\\CodingStyle\\Rector\\ClassConst\\RemoveFinalFromConstRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector.php', 'Rector\\CodingStyle\\Rector\\ClassConst\\SplitGroupedClassConstantsRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/ClassConst/SplitGroupedClassConstantsRector.php', - 'Rector\\CodingStyle\\Rector\\ClassConst\\SplitGroupedConstantsAndPropertiesRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector.php', 'Rector\\CodingStyle\\Rector\\ClassConst\\VarConstantCommentRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/ClassConst/VarConstantCommentRector.php', 'Rector\\CodingStyle\\Rector\\ClassMethod\\DataProviderArrayItemsNewlinedRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/ClassMethod/DataProviderArrayItemsNewlinedRector.php', 'Rector\\CodingStyle\\Rector\\ClassMethod\\FuncGetArgsToVariadicParamRector' => __DIR__ . '/../..' . '/rules/CodingStyle/Rector/ClassMethod/FuncGetArgsToVariadicParamRector.php', @@ -2451,7 +2450,6 @@ class ComposerStaticInit8e924aa00232f07a8c77540879f7b1b1 'Rector\\Php74\\Rector\\LNumber\\AddLiteralSeparatorToNumberRector' => __DIR__ . '/../..' . '/rules/Php74/Rector/LNumber/AddLiteralSeparatorToNumberRector.php', 'Rector\\Php74\\Rector\\MethodCall\\ChangeReflectionTypeToStringToGetNameRector' => __DIR__ . '/../..' . '/rules/Php74/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector.php', 'Rector\\Php74\\Rector\\Property\\RestoreDefaultNullToNullableTypePropertyRector' => __DIR__ . '/../..' . '/rules/Php74/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector.php', - 'Rector\\Php74\\Rector\\Property\\TypedPropertyRector' => __DIR__ . '/../..' . '/rules/Php74/Rector/Property/TypedPropertyRector.php', 'Rector\\Php74\\Rector\\StaticCall\\ExportToReflectionFunctionRector' => __DIR__ . '/../..' . '/rules/Php74/Rector/StaticCall/ExportToReflectionFunctionRector.php', 'Rector\\Php74\\Rector\\Ternary\\ParenthesizeNestedTernaryRector' => __DIR__ . '/../..' . '/rules/Php74/Rector/Ternary/ParenthesizeNestedTernaryRector.php', 'Rector\\Php74\\Tokenizer\\FollowedByCurlyBracketAnalyzer' => __DIR__ . '/../..' . '/rules/Php74/Tokenizer/FollowedByCurlyBracketAnalyzer.php', @@ -2993,8 +2991,6 @@ class ComposerStaticInit8e924aa00232f07a8c77540879f7b1b1 'Rector\\TypeDeclaration\\PHPStan\\TypeSpecifier\\SelfStaticParentTypeSpecifier' => __DIR__ . '/../..' . '/rules/TypeDeclaration/PHPStan/TypeSpecifier/SelfStaticParentTypeSpecifier.php', 'Rector\\TypeDeclaration\\PhpDocParser\\ParamPhpDocNodeFactory' => __DIR__ . '/../..' . '/rules/TypeDeclaration/PhpDocParser/ParamPhpDocNodeFactory.php', 'Rector\\TypeDeclaration\\Rector\\ArrowFunction\\AddArrowFunctionReturnTypeRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector.php', - 'Rector\\TypeDeclaration\\Rector\\ClassMethod\\AddArrayParamDocTypeRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector.php', - 'Rector\\TypeDeclaration\\Rector\\ClassMethod\\AddArrayReturnDocTypeRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/ClassMethod/AddArrayReturnDocTypeRector.php', 'Rector\\TypeDeclaration\\Rector\\ClassMethod\\AddMethodCallBasedStrictParamTypeRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector.php', 'Rector\\TypeDeclaration\\Rector\\ClassMethod\\AddParamTypeBasedOnPHPUnitDataProviderRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector.php', 'Rector\\TypeDeclaration\\Rector\\ClassMethod\\AddParamTypeDeclarationRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeDeclarationRector.php', @@ -3023,11 +3019,8 @@ class ComposerStaticInit8e924aa00232f07a8c77540879f7b1b1 'Rector\\TypeDeclaration\\Rector\\Empty_\\EmptyOnNullableObjectToInstanceOfRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/Empty_/EmptyOnNullableObjectToInstanceOfRector.php', 'Rector\\TypeDeclaration\\Rector\\FunctionLike\\AddParamTypeSplFixedArrayRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/FunctionLike/AddParamTypeSplFixedArrayRector.php', 'Rector\\TypeDeclaration\\Rector\\FunctionLike\\AddReturnTypeDeclarationFromYieldsRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/FunctionLike/AddReturnTypeDeclarationFromYieldsRector.php', - 'Rector\\TypeDeclaration\\Rector\\FunctionLike\\ParamTypeDeclarationRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector.php', - 'Rector\\TypeDeclaration\\Rector\\FunctionLike\\ReturnTypeDeclarationRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php', 'Rector\\TypeDeclaration\\Rector\\Param\\ParamTypeFromStrictTypedPropertyRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/Param/ParamTypeFromStrictTypedPropertyRector.php', 'Rector\\TypeDeclaration\\Rector\\Property\\AddPropertyTypeDeclarationRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/Property/AddPropertyTypeDeclarationRector.php', - 'Rector\\TypeDeclaration\\Rector\\Property\\PropertyTypeDeclarationRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/Property/PropertyTypeDeclarationRector.php', 'Rector\\TypeDeclaration\\Rector\\Property\\TypedPropertyFromAssignsRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector.php', 'Rector\\TypeDeclaration\\Rector\\Property\\TypedPropertyFromStrictConstructorRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php', 'Rector\\TypeDeclaration\\Rector\\Property\\TypedPropertyFromStrictGetterMethodReturnTypeRector' => __DIR__ . '/../..' . '/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictGetterMethodReturnTypeRector.php', @@ -3088,9 +3081,9 @@ class ComposerStaticInit8e924aa00232f07a8c77540879f7b1b1 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit8e924aa00232f07a8c77540879f7b1b1::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit8e924aa00232f07a8c77540879f7b1b1::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit8e924aa00232f07a8c77540879f7b1b1::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit0981c60dbbbe9cbbd670a2dacb4bcce4::$classMap; }, null, ClassLoader::class); }