[ci-review] Rector Rectify

actions-user · actions-user · commit 28ede788b0fa · 2022-10-19T08:10:39.000Z
diff --git a/rules/Arguments/NodeAnalyzer/ChangedArgumentsDetector.php b/rules/Arguments/NodeAnalyzer/ChangedArgumentsDetector.php
@@ -28,7 +28,6 @@ public function isDefaultValueChanged(Param $param, mixed $value): bool
         return ! $this->valueResolver->isValue($param->default, $value);
     }
 
-
     public function isTypeChanged(Param $param, ?Type $newType): bool
     {
         if ($param->type === null) {
diff --git a/rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php b/rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php
@@ -263,7 +263,6 @@ private function shouldSkipParameter(
         return ! $this->argumentAddingScope->isInCorrectScope($node, $argumentAdder);
     }
 
-
     private function addClassMethodParam(
         ClassMethod $classMethod,
         ArgumentAdder $argumentAdder,
diff --git a/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php b/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php
@@ -133,7 +133,6 @@ public function refactor(Node $node): ?Node
         return $node;
     }
 
-
     private function shouldSkip(Type $conditionStaticType, BinaryOp $binaryOp, ?Node $nextNode): bool
     {
         return $conditionStaticType instanceof StringType && $binaryOp instanceof BooleanOr && ! $nextNode instanceof Node;
diff --git a/rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php b/rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php
@@ -168,7 +168,6 @@ private function renameVariableInStmts(Catch_ $catch, string $oldVariableName, s
         $this->replaceNextUsageVariable($tryCatch, $nextNode, $oldVariableName, $newVariableName);
     }
 
-
     private function replaceNextUsageVariable(
         Node $currentNode,
         ?Node $nextNode,
diff --git a/rules/CodingStyle/Rector/Stmt/NewlineAfterStatementRector.php b/rules/CodingStyle/Rector/Stmt/NewlineAfterStatementRector.php
@@ -166,7 +166,6 @@ private function hasNoComment(?array $comments): bool
         return ! isset($comments[0]);
     }
 
-
     private function shouldSkip(?Node $nextNode): bool
     {
         if (! $nextNode instanceof Stmt) {
diff --git a/rules/EarlyReturn/Rector/Return_/PreparedValueToEarlyReturnRector.php b/rules/EarlyReturn/Rector/Return_/PreparedValueToEarlyReturnRector.php
@@ -181,7 +181,6 @@ private function shouldSkip(array $ifsBefore, ?Expr $returnExpr): bool
         return ! (bool) $this->getPreviousIfLinearEquals($ifsBefore[0], $returnExpr);
     }
 
-
     private function getPreviousIfLinearEquals(?Node $node, ?Expr $expr): ?Expression
     {
         if (! $node instanceof Node) {
diff --git a/rules/Naming/Naming/VariableNaming.php b/rules/Naming/Naming/VariableNaming.php
@@ -56,7 +56,6 @@ public function resolveFromNodeWithScopeCountAndFallbackName(
         return lcfirst($countedValueName);
     }
 
-
     public function createCountedValueName(string $valueName, ?Scope $scope): string
     {
         if ($scope === null) {
diff --git a/rules/Privatization/TypeManipulator/NormalizeTypeToRespectArrayScalarType.php b/rules/Privatization/TypeManipulator/NormalizeTypeToRespectArrayScalarType.php
@@ -21,7 +21,6 @@ public function __construct(
     ) {
     }
 
-
     public function normalizeToArray(Type $type, ?Node $returnNode): ArrayType|UnionType|Type
     {
         if ($returnNode === null) {
diff --git a/rules/TypeDeclaration/PHPStan/ObjectTypeSpecifier.php b/rules/TypeDeclaration/PHPStan/ObjectTypeSpecifier.php
@@ -129,7 +129,6 @@ private function matchAliasedObjectType(Node $node, ObjectType $objectType, arra
         return null;
     }
 
-
     private function processAliasedObject(
         string $alias,
         string $className,
diff --git a/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/TrustedClassMethodPropertyTypeInferer.php b/rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/TrustedClassMethodPropertyTypeInferer.php
@@ -105,7 +105,6 @@ public function inferProperty(Property $property, string $methodName): ?Type
         return $this->resolveType($property, $propertyName, $classLike, $resolvedType);
     }
 
-
     private function resolveType(
         Property $property,
         string $propertyName,
diff --git a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php
@@ -256,7 +256,6 @@ private function isAutoImportWithFullyQualifiedReturn(bool $isAutoImport, Functi
         return false;
     }
 
-
     private function isNamespacedFullyQualified(?Node $node): bool
     {
         return $node instanceof FullyQualified && str_contains($node->toString(), '\\');
diff --git a/rules/TypeDeclaration/TypeInferer/VarDocPropertyTypeInferer.php b/rules/TypeDeclaration/TypeInferer/VarDocPropertyTypeInferer.php
@@ -92,7 +92,6 @@ public function inferProperty(Property $property): Type
         return $resolvedType;
     }
 
-
     private function shouldAddNull(Type $resolvedType, ?Type $assignInferredPropertyType): bool
     {
         if (! $assignInferredPropertyType instanceof Type) {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ public function isDefaultValueChanged(Param $param, mixed $value): bool`
`28`	`28`	`return ! $this->valueResolver->isValue($param->default, $value);`
`29`	`29`	`}`
`30`	`30`
`31`		`-`
`32`	`31`	`public function isTypeChanged(Param $param, ?Type $newType): bool`
`33`	`32`	`{`
`34`	`33`	`if ($param->type === null) {`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,6 @@ private function shouldSkipParameter(`
`263`	`263`	`return ! $this->argumentAddingScope->isInCorrectScope($node, $argumentAdder);`
`264`	`264`	`}`
`265`	`265`
`266`		`-`
`267`	`266`	`private function addClassMethodParam(`
`268`	`267`	`ClassMethod $classMethod,`
`269`	`268`	`ArgumentAdder $argumentAdder,`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,6 @@ public function refactor(Node $node): ?Node`
`133`	`133`	`return $node;`
`134`	`134`	`}`
`135`	`135`
`136`		`-`
`137`	`136`	`private function shouldSkip(Type $conditionStaticType, BinaryOp $binaryOp, ?Node $nextNode): bool`
`138`	`137`	`{`
`139`	`138`	`return $conditionStaticType instanceof StringType && $binaryOp instanceof BooleanOr && ! $nextNode instanceof Node;`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,6 @@ private function renameVariableInStmts(Catch_ $catch, string $oldVariableName, s`
`168`	`168`	`$this->replaceNextUsageVariable($tryCatch, $nextNode, $oldVariableName, $newVariableName);`
`169`	`169`	`}`
`170`	`170`
`171`		`-`
`172`	`171`	`private function replaceNextUsageVariable(`
`173`	`172`	`Node $currentNode,`
`174`	`173`	`?Node $nextNode,`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,6 @@ private function hasNoComment(?array $comments): bool`
`166`	`166`	`return ! isset($comments[0]);`
`167`	`167`	`}`
`168`	`168`
`169`		`-`
`170`	`169`	`private function shouldSkip(?Node $nextNode): bool`
`171`	`170`	`{`
`172`	`171`	`if (! $nextNode instanceof Stmt) {`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,6 @@ private function shouldSkip(array $ifsBefore, ?Expr $returnExpr): bool`
`181`	`181`	`return ! (bool) $this->getPreviousIfLinearEquals($ifsBefore[0], $returnExpr);`
`182`	`182`	`}`
`183`	`183`
`184`		`-`
`185`	`184`	`private function getPreviousIfLinearEquals(?Node $node, ?Expr $expr): ?Expression`
`186`	`185`	`{`
`187`	`186`	`if (! $node instanceof Node) {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ public function resolveFromNodeWithScopeCountAndFallbackName(`
`56`	`56`	`return lcfirst($countedValueName);`
`57`	`57`	`}`
`58`	`58`
`59`		`-`
`60`	`59`	`public function createCountedValueName(string $valueName, ?Scope $scope): string`
`61`	`60`	`{`
`62`	`61`	`if ($scope === null) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ public function __construct(`
`21`	`21`	`) {`
`22`	`22`	`}`
`23`	`23`
`24`		`-`
`25`	`24`	`public function normalizeToArray(Type $type, ?Node $returnNode): ArrayType\|UnionType\|Type`
`26`	`25`	`{`
`27`	`26`	`if ($returnNode === null) {`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ private function matchAliasedObjectType(Node $node, ObjectType $objectType, arra`
`129`	`129`	`return null;`
`130`	`130`	`}`
`131`	`131`
`132`		`-`
`133`	`132`	`private function processAliasedObject(`
`134`	`133`	`string $alias,`
`135`	`134`	`string $className,`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,6 @@ public function inferProperty(Property $property, string $methodName): ?Type`
`105`	`105`	`return $this->resolveType($property, $propertyName, $classLike, $resolvedType);`
`106`	`106`	`}`
`107`	`107`
`108`		`-`
`109`	`108`	`private function resolveType(`
`110`	`109`	`Property $property,`
`111`	`110`	`string $propertyName,`