From 9c1f1a64bf58e47395899c0963f2f7c4e1d7a756 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Fri, 8 Aug 2025 14:08:23 +0200 Subject: [PATCH] Fix typos --- build/config/phpstan-for-downgrade.neon | 2 +- .../Fixture/skip_multiple_lines.php.inc | 2 +- .../skip_multiple_assign_before_foreach.php.inc | 2 +- .../skip_multiple_assign_before_foreach2.php.inc | 2 +- .../Fixture/with_parentheses.php.inc | 4 ++-- .../Fixture/some_variables_with_braces.php.inc | 4 ++-- .../FixturePhp74/skip_get_iterator.php.inc | 2 +- .../FixturePhp74/skip_spread_array_merge.php.inc | 2 +- .../FixturePhp81/skip_get_iterator.php.inc | 2 +- .../FixturePhp81/skip_spread_array_merge.php.inc | 2 +- .../Fixture/fixture_not_identical.php.inc | 4 ++-- .../{skip_elsefis.php.inc => skip_elseifs.php.inc} | 2 +- .../Fixture/other_comment_before_var.php.inc | 2 +- .../Fixture/skip_other_comment_before_var.php.inc | 2 +- .../Fixture/skip_class_under.php.inc | 2 +- .../Fixture/fixture.php.inc | 8 ++++---- .../Fixture/foreach_not.php.inc | 4 ++-- .../Fixture/return.php.inc | 4 ++-- ..._webmozzart.php.inc => skip_test_webmozart.php.inc} | 2 +- .../Fixture/skip_concatenation_dot.php.inc | 2 +- .../Fixture/property_with_attribute.php.inc | 8 ++++---- ...exception.php.inc => skip_thrown_exception.php.inc} | 2 +- .../Fixture/skip_bare_function.php.inc | 2 +- .../Fixture/skip_void_return.php.inc | 4 ++-- .../skip_void_return_on_callback_docblock.php.inc | 6 +++--- .../BooleanAnd/SimplifyEmptyArrayCheckRector.php | 4 ++-- ...tiveNullCompareReturnsToNullCoalesceQueueRector.php | 4 ++-- .../CodingStyle/NodeAnalyzer/UseImportNameMatcher.php | 4 ++-- rules/DeadCode/ConditionEvaluator.php | 4 ++-- .../Rector/Stmt/RemoveUnreachableStatementRector.php | 4 ++-- .../DeadCode/Rector/TryCatch/RemoveDeadCatchRector.php | 6 +++--- rules/Php70/NodeAnalyzer/BattleshipTernaryAnalyzer.php | 4 ++-- rules/Php80/NodeResolver/SwitchExprsResolver.php | 2 +- .../NumericReturnTypeFromStrictReturnsRector.php | 10 +++++----- .../NumericReturnTypeFromStrictScalarReturnsRector.php | 2 +- src/Config/Level/CodeQualityLevel.php | 4 ++-- .../PHPStan/Scope/PHPStanNodeScopeResolver.php | 6 +++--- src/PhpAttribute/UseAliasNameMatcher.php | 2 +- src/PhpDocParser/PhpDocParser/PhpDocNodeTraverser.php | 2 +- .../wildcard-nested/some_directory/AnotherFile.php | 2 +- .../wildcard-next/some_directory/YetAnotherFile.php | 2 +- .../Fixture/some_fixture.php.inc | 4 ++-- .../IssueDoubleNestedAnnotationDocBlockTest.php} | 4 ++-- .../Source/SomeAnnotation.php | 2 +- .../config/configure_rule.php | 0 .../Fixture/callback_with_curly_braces.php.inc | 4 ++-- .../Fixture/comments_for_typed_property.php.inc | 4 ++-- 47 files changed, 79 insertions(+), 79 deletions(-) rename rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector/Fixture/{skip_elsefis.php.inc => skip_elseifs.php.inc} (95%) rename rules-tests/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/{skip_test_webmozzart.php.inc => skip_test_webmozart.php.inc} (88%) rename rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/Fixture/{skip_throwen_exception.php.inc => skip_thrown_exception.php.inc} (92%) rename tests/Issues/{IssueDoubleNestedAnnotatoinDocBlock => IssueDoubleNestedAnnotationDocBlock}/Fixture/some_fixture.php.inc (51%) rename tests/Issues/{IssueDoubleNestedAnnotatoinDocBlock/IssueDoubleNestedAnnotatoinDocBlockTest.php => IssueDoubleNestedAnnotationDocBlock/IssueDoubleNestedAnnotationDocBlockTest.php} (81%) rename tests/Issues/{IssueDoubleNestedAnnotatoinDocBlock => IssueDoubleNestedAnnotationDocBlock}/Source/SomeAnnotation.php (60%) rename tests/Issues/{IssueDoubleNestedAnnotatoinDocBlock => IssueDoubleNestedAnnotationDocBlock}/config/configure_rule.php (100%) diff --git a/build/config/phpstan-for-downgrade.neon b/build/config/phpstan-for-downgrade.neon index 5868ff3f660..963c89ec1d3 100644 --- a/build/config/phpstan-for-downgrade.neon +++ b/build/config/phpstan-for-downgrade.neon @@ -3,5 +3,5 @@ parameters: inferPrivatePropertyTypeFromConstructor: true scanDirectories: - # this is needed for symfony/dependendency-injection as it has hidden dependency on symfony/expression-language that we don't use here + # this is needed for symfony/dependency-injection as it has hidden dependency on symfony/expression-language that we don't use here - ../../stubs diff --git a/rules-tests/CodeQuality/Rector/Concat/JoinStringConcatRector/Fixture/skip_multiple_lines.php.inc b/rules-tests/CodeQuality/Rector/Concat/JoinStringConcatRector/Fixture/skip_multiple_lines.php.inc index 9540f8287b0..898c0630afc 100644 --- a/rules-tests/CodeQuality/Rector/Concat/JoinStringConcatRector/Fixture/skip_multiple_lines.php.inc +++ b/rules-tests/CodeQuality/Rector/Concat/JoinStringConcatRector/Fixture/skip_multiple_lines.php.inc @@ -2,7 +2,7 @@ namespace Rector\Tests\CodeQuality\Rector\Concat\JoinStringConcatRector\Fixture; -class SkipMultiplelines +class SkipMultipleLines { public function run() { diff --git a/rules-tests/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector/Fixture/skip_multiple_assign_before_foreach.php.inc b/rules-tests/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector/Fixture/skip_multiple_assign_before_foreach.php.inc index 630037c8dee..fffb189d8dd 100644 --- a/rules-tests/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector/Fixture/skip_multiple_assign_before_foreach.php.inc +++ b/rules-tests/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector/Fixture/skip_multiple_assign_before_foreach.php.inc @@ -2,7 +2,7 @@ namespace Rector\Tests\CodeQuality\Rector\Foreach_\ForeachItemsAssignToEmptyArrayToAssignRector\Fixture; -class SkipMultipleAssignbeforeForeach +class SkipMultipleAssignBeforeForeach { public function run(array $items) { diff --git a/rules-tests/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector/Fixture/skip_multiple_assign_before_foreach2.php.inc b/rules-tests/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector/Fixture/skip_multiple_assign_before_foreach2.php.inc index 31fc414b1f6..7333b166c4c 100644 --- a/rules-tests/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector/Fixture/skip_multiple_assign_before_foreach2.php.inc +++ b/rules-tests/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector/Fixture/skip_multiple_assign_before_foreach2.php.inc @@ -2,7 +2,7 @@ namespace Rector\Tests\CodeQuality\Rector\Foreach_\ForeachItemsAssignToEmptyArrayToAssignRector\Fixture; -class SkipMultipleAssignbeforeForeach2 +class SkipMultipleAssignBeforeForeach2 { public function run(array $items) { diff --git a/rules-tests/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector/Fixture/with_parentheses.php.inc b/rules-tests/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector/Fixture/with_parentheses.php.inc index 8eaac9d22c4..d9f7a5ae0ca 100644 --- a/rules-tests/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector/Fixture/with_parentheses.php.inc +++ b/rules-tests/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector/Fixture/with_parentheses.php.inc @@ -4,7 +4,7 @@ namespace Rector\Tests\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector\Fixture final class WithParentheses { - public static function isLeapyear(int $year): bool + public static function isLeapYear(int $year): bool { if (($year % 400) == 0 || (($year & 4) == 0 && ($year % 100) != 0)) { return true; @@ -21,7 +21,7 @@ namespace Rector\Tests\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector\Fixture final class WithParentheses { - public static function isLeapyear(int $year): bool + public static function isLeapYear(int $year): bool { return ($year % 400) == 0 || (($year & 4) == 0 && ($year % 100) != 0); } diff --git a/rules-tests/CodingStyle/Rector/Encapsed/WrapEncapsedVariableInCurlyBracesRector/Fixture/some_variables_with_braces.php.inc b/rules-tests/CodingStyle/Rector/Encapsed/WrapEncapsedVariableInCurlyBracesRector/Fixture/some_variables_with_braces.php.inc index 75861907bef..0efc49728c4 100644 --- a/rules-tests/CodingStyle/Rector/Encapsed/WrapEncapsedVariableInCurlyBracesRector/Fixture/some_variables_with_braces.php.inc +++ b/rules-tests/CodingStyle/Rector/Encapsed/WrapEncapsedVariableInCurlyBracesRector/Fixture/some_variables_with_braces.php.inc @@ -2,7 +2,7 @@ namespace Rector\Tests\CodingStyle\Rector\Encapsed\WrapEncapsedVariableInCurlyBracesRector\Fixture; -function some_variales_with_braces($hello, $world) +function some_variables_with_braces($hello, $world) { return "$hello {$world}!"; } @@ -13,7 +13,7 @@ function some_variales_with_braces($hello, $world) namespace Rector\Tests\CodingStyle\Rector\Encapsed\WrapEncapsedVariableInCurlyBracesRector\Fixture; -function some_variales_with_braces($hello, $world) +function some_variables_with_braces($hello, $world) { return "{$hello} {$world}!"; } diff --git a/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp74/skip_get_iterator.php.inc b/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp74/skip_get_iterator.php.inc index be3043e0fa5..6832db354a1 100644 --- a/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp74/skip_get_iterator.php.inc +++ b/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp74/skip_get_iterator.php.inc @@ -4,7 +4,7 @@ namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMerg use Symfony\Component\Finder\Finder; -class SkipGetIreator +class SkipGetIterator { public function run() { diff --git a/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp74/skip_spread_array_merge.php.inc b/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp74/skip_spread_array_merge.php.inc index 6b8e77e5c56..2912062752f 100644 --- a/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp74/skip_spread_array_merge.php.inc +++ b/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp74/skip_spread_array_merge.php.inc @@ -4,7 +4,7 @@ namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMerg use stdClass; -class SkipSpreadyArrayMerge +class SkipSpreadArrayMerge { public function run() { diff --git a/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp81/skip_get_iterator.php.inc b/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp81/skip_get_iterator.php.inc index d0c0a1d8cf9..ec84e97757a 100644 --- a/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp81/skip_get_iterator.php.inc +++ b/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp81/skip_get_iterator.php.inc @@ -4,7 +4,7 @@ namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMerg use Symfony\Component\Finder\Finder; -class SkipGetIreator +class SkipGetIterator { public function run() { diff --git a/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp81/skip_spread_array_merge.php.inc b/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp81/skip_spread_array_merge.php.inc index b20d507819f..b19b82b23d7 100644 --- a/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp81/skip_spread_array_merge.php.inc +++ b/rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/FixturePhp81/skip_spread_array_merge.php.inc @@ -4,7 +4,7 @@ namespace Rector\Tests\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMerg use stdClass; -class SkipSpreadyArrayMerge +class SkipSpreadArrayMerge { public function run() { diff --git a/rules-tests/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector/Fixture/fixture_not_identical.php.inc b/rules-tests/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector/Fixture/fixture_not_identical.php.inc index aa1e3d8463c..15a75d2c3b0 100644 --- a/rules-tests/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector/Fixture/fixture_not_identical.php.inc +++ b/rules-tests/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector/Fixture/fixture_not_identical.php.inc @@ -2,7 +2,7 @@ namespace Rector\Tests\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector\Fixture; -class FixturNotIdentical +class FixtureNotIdentical { public function run() { @@ -25,7 +25,7 @@ class FixturNotIdentical namespace Rector\Tests\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector\Fixture; -class FixturNotIdentical +class FixtureNotIdentical { public function run() { diff --git a/rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector/Fixture/skip_elsefis.php.inc b/rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector/Fixture/skip_elseifs.php.inc similarity index 95% rename from rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector/Fixture/skip_elsefis.php.inc rename to rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector/Fixture/skip_elseifs.php.inc index 07a6dc234f5..2ea479fa4ac 100644 --- a/rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector/Fixture/skip_elsefis.php.inc +++ b/rules-tests/DeadCode/Rector/If_/UnwrapFutureCompatibleIfPhpVersionRector/Fixture/skip_elseifs.php.inc @@ -2,7 +2,7 @@ namespace Rector\Tests\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector\Fixture; -class SkipElsefis +class SkipElseifs { public function run() { diff --git a/rules-tests/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector/Fixture/other_comment_before_var.php.inc b/rules-tests/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector/Fixture/other_comment_before_var.php.inc index 29d57104f06..ec729a9e51b 100644 --- a/rules-tests/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector/Fixture/other_comment_before_var.php.inc +++ b/rules-tests/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector/Fixture/other_comment_before_var.php.inc @@ -7,7 +7,7 @@ final class SkipOtherCommentBeforeVar public function get() { /** @var \stdClass $nonExisting */ - // Load data also with projekt... + // Load data also with project... $return[] = $this->getReturnData(); } } diff --git a/rules-tests/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector/Fixture/skip_other_comment_before_var.php.inc b/rules-tests/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector/Fixture/skip_other_comment_before_var.php.inc index 29d57104f06..ec729a9e51b 100644 --- a/rules-tests/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector/Fixture/skip_other_comment_before_var.php.inc +++ b/rules-tests/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector/Fixture/skip_other_comment_before_var.php.inc @@ -7,7 +7,7 @@ final class SkipOtherCommentBeforeVar public function get() { /** @var \stdClass $nonExisting */ - // Load data also with projekt... + // Load data also with project... $return[] = $this->getReturnData(); } } diff --git a/rules-tests/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector/Fixture/skip_class_under.php.inc b/rules-tests/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector/Fixture/skip_class_under.php.inc index 25290c62693..87c2381528f 100644 --- a/rules-tests/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector/Fixture/skip_class_under.php.inc +++ b/rules-tests/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector/Fixture/skip_class_under.php.inc @@ -9,7 +9,7 @@ if (mt_rand(0, 1000)) { return 2; -// it can be still autoloaded and used abvoe +// it can be still autoloaded and used above class SkipClassUnder { } diff --git a/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/fixture.php.inc b/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/fixture.php.inc index 23dbcacfdd2..beabce5d763 100644 --- a/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/fixture.php.inc +++ b/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/fixture.php.inc @@ -2,7 +2,7 @@ namespace Rector\Tests\Php70\Rector\Break_\BreakNotInLoopOrSwitchToReturnRector\Fixture; -function break_missplaced_function() +function break_misplaced_function() { $zhrs = abs($gmt)/3600; $hrs = floor($zhrs); @@ -13,7 +13,7 @@ function break_missplaced_function() break; } -function break_missplace_again() +function break_misplace_again() { $errors = []; if (isset($errors)) { @@ -32,7 +32,7 @@ function break_missplace_again() namespace Rector\Tests\Php70\Rector\Break_\BreakNotInLoopOrSwitchToReturnRector\Fixture; -function break_missplaced_function() +function break_misplaced_function() { $zhrs = abs($gmt)/3600; $hrs = floor($zhrs); @@ -42,7 +42,7 @@ function break_missplaced_function() return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); } -function break_missplace_again() +function break_misplace_again() { $errors = []; if (isset($errors)) { diff --git a/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/foreach_not.php.inc b/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/foreach_not.php.inc index 09eceaee15c..74c31989424 100644 --- a/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/foreach_not.php.inc +++ b/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/foreach_not.php.inc @@ -2,7 +2,7 @@ namespace Rector\Tests\Php70\Rector\Break_\BreakNotInLoopOrSwitchToReturnRector\Fixture; -function break_missplaced_function_foreach() +function break_misplaced_function_foreach() { $ip_block = []; @@ -25,7 +25,7 @@ function break_missplaced_function_foreach() namespace Rector\Tests\Php70\Rector\Break_\BreakNotInLoopOrSwitchToReturnRector\Fixture; -function break_missplaced_function_foreach() +function break_misplaced_function_foreach() { $ip_block = []; diff --git a/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/return.php.inc b/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/return.php.inc index 2f87e38c04c..148325049ad 100644 --- a/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/return.php.inc +++ b/rules-tests/Php70/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/return.php.inc @@ -2,7 +2,7 @@ namespace Rector\Tests\Php70\Rector\Break_\BreakNotInLoopOrSwitchToReturnRector\Fixture; -function break_missplaced_return() +function break_misplaced_return() { if (true == $objWebsite ) { $arrobjProperties = (array) $objWebsite->fetchProperties( ); @@ -21,7 +21,7 @@ function break_missplaced_return() namespace Rector\Tests\Php70\Rector\Break_\BreakNotInLoopOrSwitchToReturnRector\Fixture; -function break_missplaced_return() +function break_misplaced_return() { if (true == $objWebsite ) { $arrobjProperties = (array) $objWebsite->fetchProperties( ); diff --git a/rules-tests/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/skip_test_webmozzart.php.inc b/rules-tests/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/skip_test_webmozart.php.inc similarity index 88% rename from rules-tests/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/skip_test_webmozzart.php.inc rename to rules-tests/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/skip_test_webmozart.php.inc index 4440ebecc25..f211e9ab59b 100644 --- a/rules-tests/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/skip_test_webmozzart.php.inc +++ b/rules-tests/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/skip_test_webmozart.php.inc @@ -4,7 +4,7 @@ namespace Rector\Tests\Php70\Rector\StaticCall\StaticCallOnNonStaticToInstanceCa use Webmozart\Assert\Assert; -final class SkipTestWebmozzart +final class SkipTestWebmozart { public function doWork($values) { diff --git a/rules-tests/Php71/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/skip_concatenation_dot.php.inc b/rules-tests/Php71/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/skip_concatenation_dot.php.inc index d6b192fa656..a7951b4b051 100644 --- a/rules-tests/Php71/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/skip_concatenation_dot.php.inc +++ b/rules-tests/Php71/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/skip_concatenation_dot.php.inc @@ -6,7 +6,7 @@ final class SkipConcatenationDot { public function run() { - $string = 'this is a string to cancatenate with the number'; + $string = 'this is a string to concatenate with the number'; $number = 10; $value = $string . ' ' . $number; } diff --git a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/property_with_attribute.php.inc b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/property_with_attribute.php.inc index 0f7c9d30344..9f393115a1d 100644 --- a/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/property_with_attribute.php.inc +++ b/rules-tests/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector/Fixture/property_with_attribute.php.inc @@ -14,12 +14,12 @@ final class PropertyWithAttribute #[Immutable] #[Deprecated] - public float $longiture; + public float $longitude; - public function __construct(float $latitude, float $longiture) + public function __construct(float $latitude, float $longitude) { $this->latitude = $latitude; - $this->longiture = $longiture; + $this->longitude = $longitude; } } @@ -41,7 +41,7 @@ final class PropertyWithAttribute public float $latitude, #[Immutable] #[Deprecated] - public float $longiture + public float $longitude ) { } diff --git a/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/Fixture/skip_throwen_exception.php.inc b/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/Fixture/skip_thrown_exception.php.inc similarity index 92% rename from rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/Fixture/skip_throwen_exception.php.inc rename to rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/Fixture/skip_thrown_exception.php.inc index 4d2e03ba1a0..7c5a8862f05 100644 --- a/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/Fixture/skip_throwen_exception.php.inc +++ b/rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/Fixture/skip_thrown_exception.php.inc @@ -2,7 +2,7 @@ namespace Rector\Tests\Php80\Rector\Switch_\ChangeSwitchToMatchRector\Fixture; -class SkipThrowenException +class SkipThrownException { public function save(): void { diff --git a/rules-tests/Transform/Rector/FuncCall/FuncCallToMethodCallRector/Fixture/skip_bare_function.php.inc b/rules-tests/Transform/Rector/FuncCall/FuncCallToMethodCallRector/Fixture/skip_bare_function.php.inc index 068d9a8f0ff..742aa4cf9da 100644 --- a/rules-tests/Transform/Rector/FuncCall/FuncCallToMethodCallRector/Fixture/skip_bare_function.php.inc +++ b/rules-tests/Transform/Rector/FuncCall/FuncCallToMethodCallRector/Fixture/skip_bare_function.php.inc @@ -4,7 +4,7 @@ namespace Rector\Tests\Transform\Rector\FuncCall\FuncCallToMethodCallRector\Fixt use function Rector\Tests\Transform\Rector\FuncCall\FuncCallToMethodCallRector\Source\some_view_function; -function anothehFunction() +function anotherFunction() { some_view_function('template'); } diff --git a/rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/Fixture/skip_void_return.php.inc b/rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/Fixture/skip_void_return.php.inc index 9dca9f1a4f1..f6ff2d8360c 100644 --- a/rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/Fixture/skip_void_return.php.inc +++ b/rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/Fixture/skip_void_return.php.inc @@ -4,13 +4,13 @@ namespace Rector\Tests\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionRetu final class SkipVoidReturn { - public function doNohing(string $a): void + public function doNothing(string $a): void { echo $a; } public function run() { - fn (string $a) => $this->doNohing($a); + fn (string $a) => $this->doNothing($a); } } diff --git a/rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/Fixture/skip_void_return_on_callback_docblock.php.inc b/rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/Fixture/skip_void_return_on_callback_docblock.php.inc index 28b78862789..32e58b32963 100644 --- a/rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/Fixture/skip_void_return_on_callback_docblock.php.inc +++ b/rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/Fixture/skip_void_return_on_callback_docblock.php.inc @@ -2,16 +2,16 @@ namespace Rector\Tests\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector\Fixture; -final class SkipVoidReturnOnCallbackDockblock +final class SkipVoidReturnOnCallbackDocblock { - public function doNohing(string $a): void + public function doNothing(string $a): void { echo $a; } public function run() { - fn() => $this->executesCallback(fn() => $this->doNohing('a')); + fn() => $this->executesCallback(fn() => $this->doNothing('a')); } /** diff --git a/rules/CodeQuality/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector.php b/rules/CodeQuality/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector.php index 7e755eb689a..373695f6d04 100644 --- a/rules/CodeQuality/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector.php +++ b/rules/CodeQuality/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector.php @@ -47,7 +47,7 @@ public function getNodeTypes(): array */ public function refactor(Node $node): ?Node { - $twoNodeMatch = $this->resolvetwoNodeMatch($node); + $twoNodeMatch = $this->resolveTwoNodeMatch($node); if (! $twoNodeMatch instanceof TwoNodeMatch) { return null; @@ -77,7 +77,7 @@ public function refactor(Node $node): ?Node return new Identical($emptyOrNotIdenticalNode->expr, new Array_()); } - private function resolvetwoNodeMatch(BooleanAnd $booleanAnd): ?TwoNodeMatch + private function resolveTwoNodeMatch(BooleanAnd $booleanAnd): ?TwoNodeMatch { return $this->binaryOpManipulator->matchFirstAndSecondConditionNode( $booleanAnd, diff --git a/rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php b/rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php index 2d0859b9703..a4687e98a3a 100644 --- a/rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php +++ b/rules/CodeQuality/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php @@ -148,7 +148,7 @@ public function refactor(Node $node): ?Node unset($node->stmts[$key]); } - $node->stmts[] = $this->createCealesceReturn($coalescingExprs, $appendExpr); + $node->stmts[] = $this->createCoalesceReturn($coalescingExprs, $appendExpr); return $node; } @@ -174,7 +174,7 @@ private function isReturnNull(Stmt $stmt): bool /** * @param Expr[] $coalescingExprs */ - private function createCealesceReturn(array $coalescingExprs, ?Expr $appendExpr): Return_ + private function createCoalesceReturn(array $coalescingExprs, ?Expr $appendExpr): Return_ { /** @var Expr $leftExpr */ $leftExpr = array_shift($coalescingExprs); diff --git a/rules/CodingStyle/NodeAnalyzer/UseImportNameMatcher.php b/rules/CodingStyle/NodeAnalyzer/UseImportNameMatcher.php index d9a92f04531..b002461f60d 100644 --- a/rules/CodingStyle/NodeAnalyzer/UseImportNameMatcher.php +++ b/rules/CodingStyle/NodeAnalyzer/UseImportNameMatcher.php @@ -67,7 +67,7 @@ public function matchNameWithUses(string $tag, array $uses): ?string */ private function resolveName(string $prefix, string $tag, UseItem $useItem): string { - // useuse can be renamed on the fly, so just in case, use the original one + // UseItem can be renamed on the fly, so just in case, use the original one $originalUseUseNode = $useItem->getAttribute(AttributeKey::ORIGINAL_NODE); if (! $originalUseUseNode instanceof UseItem) { throw new ShouldNotHappenException(); @@ -93,7 +93,7 @@ private function resolveName(string $prefix, string $tag, UseItem $useItem): str private function isUseMatchingName(string $tag, UseItem $useItem): bool { - // useuse can be renamed on the fly, so just in case, use the original one + // UseItem can be renamed on the fly, so just in case, use the original one $originalUseUseNode = $useItem->getAttribute(AttributeKey::ORIGINAL_NODE); if (! $originalUseUseNode instanceof UseItem) { return false; diff --git a/rules/DeadCode/ConditionEvaluator.php b/rules/DeadCode/ConditionEvaluator.php index ec13502318c..49366651d3b 100644 --- a/rules/DeadCode/ConditionEvaluator.php +++ b/rules/DeadCode/ConditionEvaluator.php @@ -28,7 +28,7 @@ public function evaluate(ConditionInterface $condition): bool|int|null } if ($condition instanceof BinaryToVersionCompareCondition) { - return $this->isEvaluedAsTrue($condition); + return $this->isEvaluatedAsTrue($condition); } return null; @@ -56,7 +56,7 @@ private function evaluateVersionCompareCondition( ); } - private function isEvaluedAsTrue(BinaryToVersionCompareCondition $binaryToVersionCompareCondition): bool + private function isEvaluatedAsTrue(BinaryToVersionCompareCondition $binaryToVersionCompareCondition): bool { $versionCompareResult = $this->evaluateVersionCompareCondition( $binaryToVersionCompareCondition->getVersionCompareCondition() diff --git a/rules/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector.php b/rules/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector.php index 2a35074fe85..839c6234047 100644 --- a/rules/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector.php +++ b/rules/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector.php @@ -69,7 +69,7 @@ public function refactor(Node $node): ?Node } $originalStmts = $node->stmts; - $cleanedStmts = $this->processCleanUpUnreachabelStmts($node, $node->stmts); + $cleanedStmts = $this->processCleanUpUnreachableStmts($node, $node->stmts); if ($cleanedStmts === $originalStmts) { return null; @@ -83,7 +83,7 @@ public function refactor(Node $node): ?Node * @param Stmt[] $stmts * @return Stmt[] */ - private function processCleanUpUnreachabelStmts(StmtsAwareInterface $stmtsAware, array $stmts): array + private function processCleanUpUnreachableStmts(StmtsAwareInterface $stmtsAware, array $stmts): array { foreach ($stmts as $key => $stmt) { if (! isset($stmts[$key - 1])) { diff --git a/rules/DeadCode/Rector/TryCatch/RemoveDeadCatchRector.php b/rules/DeadCode/Rector/TryCatch/RemoveDeadCatchRector.php index 067624f6bc5..d8859548602 100644 --- a/rules/DeadCode/Rector/TryCatch/RemoveDeadCatchRector.php +++ b/rules/DeadCode/Rector/TryCatch/RemoveDeadCatchRector.php @@ -80,7 +80,7 @@ public function refactor(Node $node): ?Node $maxIndexCatches = count($catches) - 1; foreach ($catches as $key => $catchItem) { - if (! $this->isJustThrowedSameVariable($catchItem)) { + if (! $this->isJustThrownSameVariable($catchItem)) { continue; } @@ -103,7 +103,7 @@ public function refactor(Node $node): ?Node return $node; } - private function isJustThrowedSameVariable(Catch_ $catch): bool + private function isJustThrownSameVariable(Catch_ $catch): bool { if ($this->isEmpty($catch->stmts)) { return false; @@ -158,7 +158,7 @@ private function shouldSkipNextCatchClassParentWithSpecialTreatment( continue; } - if (! $this->isJustThrowedSameVariable($nextCatch)) { + if (! $this->isJustThrownSameVariable($nextCatch)) { return true; } } diff --git a/rules/Php70/NodeAnalyzer/BattleshipTernaryAnalyzer.php b/rules/Php70/NodeAnalyzer/BattleshipTernaryAnalyzer.php index 9ac3be23e89..1297b6c843b 100644 --- a/rules/Php70/NodeAnalyzer/BattleshipTernaryAnalyzer.php +++ b/rules/Php70/NodeAnalyzer/BattleshipTernaryAnalyzer.php @@ -99,13 +99,13 @@ private function evaluateSmaller(Smaller $smaller, Ternary $ternary, ComparedExp return $this->evaluateTernaryDesc($ternary); } - private function isValueOneAndMinusOne(Expr $firstExpr, Expr $seconcExpr): bool + private function isValueOneAndMinusOne(Expr $firstExpr, Expr $secondExpr): bool { if (! $this->valueResolver->isValue($firstExpr, 1)) { return false; } - return $this->valueResolver->isValue($seconcExpr, -1); + return $this->valueResolver->isValue($secondExpr, -1); } /** diff --git a/rules/Php80/NodeResolver/SwitchExprsResolver.php b/rules/Php80/NodeResolver/SwitchExprsResolver.php index 3f79e4c3546..af6178fb640 100644 --- a/rules/Php80/NodeResolver/SwitchExprsResolver.php +++ b/rules/Php80/NodeResolver/SwitchExprsResolver.php @@ -144,7 +144,7 @@ private function isValidCase(Case_ $case): bool return false; } - // throws expressoin + // throws expression if ($case->stmts[0] instanceof Throw_) { return true; } diff --git a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php index 01c557e56cf..89da603b8d0 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictReturnsRector.php @@ -156,16 +156,16 @@ private function isAlwaysNumeric(array $returns): bool $isAlwaysInt = true; foreach ($returns as $return) { - $epxr = $return->expr; - if ($epxr instanceof UnaryMinus) { - $epxr = $epxr->expr; + $expr = $return->expr; + if ($expr instanceof UnaryMinus) { + $expr = $expr->expr; } - if (! $epxr instanceof Float_) { + if (! $expr instanceof Float_) { $isAlwaysFloat = false; } - if (! $epxr instanceof Int_) { + if (! $expr instanceof Int_) { $isAlwaysInt = false; } } diff --git a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php index a5ac8076dd2..af0bc81aecc 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/NumericReturnTypeFromStrictScalarReturnsRector.php @@ -128,7 +128,7 @@ private function shouldSkip(ClassMethod|Function_ $functionLike, Scope $scope): return true; } - // empty, nothing to ifnd + // empty, nothing to find if ($functionLike->stmts === null || $functionLike->stmts === []) { return true; } diff --git a/src/Config/Level/CodeQualityLevel.php b/src/Config/Level/CodeQualityLevel.php index 4db24e8239a..f47427c7867 100644 --- a/src/Config/Level/CodeQualityLevel.php +++ b/src/Config/Level/CodeQualityLevel.php @@ -90,12 +90,12 @@ * From the safest rules to more changing ones. * * @experimental This list can change in time, based on community feedback, - * what rules are safer than other. The safest rules will be always in the top. + * what rules are safer than others. The safest rules will be always in the top. */ final class CodeQualityLevel { /** - * The rule order matters, as its used in withCodeQualityLevel() method + * The rule order matters, as it's used in the withCodeQualityLevel() method * Place the safest rules first, follow by more complex ones * * @var array> diff --git a/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php b/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php index 852755762cb..5386a323313 100644 --- a/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php +++ b/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php @@ -356,7 +356,7 @@ public function processNodes( } if ($node instanceof CallLike) { - $this->processCallike($node, $mutatingScope); + $this->processCallLike($node, $mutatingScope); return; } @@ -388,7 +388,7 @@ public function processNodes( if ($node instanceof MethodCallableNode || $node instanceof FunctionCallableNode || $node instanceof StaticMethodCallableNode || $node instanceof InstantiationCallableNode) { $node->getOriginalNode() ->setAttribute(AttributeKey::SCOPE, $mutatingScope); - $this->processCallike($node->getOriginalNode(), $mutatingScope); + $this->processCallLike($node->getOriginalNode(), $mutatingScope); return; } @@ -468,7 +468,7 @@ private function nodeScopeResolverProcessNodes( } } - private function processCallike(CallLike $callLike, MutatingScope $mutatingScope): void + private function processCallLike(CallLike $callLike, MutatingScope $mutatingScope): void { if ($callLike instanceof StaticCall) { $callLike->class->setAttribute(AttributeKey::SCOPE, $mutatingScope); diff --git a/src/PhpAttribute/UseAliasNameMatcher.php b/src/PhpAttribute/UseAliasNameMatcher.php index a136a8eac90..2f87ed87197 100644 --- a/src/PhpAttribute/UseAliasNameMatcher.php +++ b/src/PhpAttribute/UseAliasNameMatcher.php @@ -59,7 +59,7 @@ public function match( continue; } - // now we now we are matching correct contanct and old and new have the same number of parts + // now we are matching correct contact and old and new have the same number of parts $useImportPartCount = substr_count($originalUseUseNode->name->toString(), '\\') + 1; $newAttributeImportPart = array_slice($attributeParts, 0, $useImportPartCount); $newAttributeImport = implode('\\', $newAttributeImportPart); diff --git a/src/PhpDocParser/PhpDocParser/PhpDocNodeTraverser.php b/src/PhpDocParser/PhpDocParser/PhpDocNodeTraverser.php index 2556f97b8be..9d1d3df5cc4 100644 --- a/src/PhpDocParser/PhpDocParser/PhpDocNodeTraverser.php +++ b/src/PhpDocParser/PhpDocParser/PhpDocNodeTraverser.php @@ -208,7 +208,7 @@ private function traverseArray(array $nodes): array } } - // should traverse node childrens properties? + // should traverse node children's properties? if ($traverseChildren) { $node = $this->traverseNode($node); if ($this->stopTraversal) { diff --git a/tests-paths/path/wildcard-nested/some_directory/AnotherFile.php b/tests-paths/path/wildcard-nested/some_directory/AnotherFile.php index 57ff0118bb8..b1f674cd784 100644 --- a/tests-paths/path/wildcard-nested/some_directory/AnotherFile.php +++ b/tests-paths/path/wildcard-nested/some_directory/AnotherFile.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\Utils\Path\WhildcardNested; +namespace Rector\Utils\Path\WildcardNested; final class AnotherFile { diff --git a/tests-paths/path/wildcard-next/some_directory/YetAnotherFile.php b/tests-paths/path/wildcard-next/some_directory/YetAnotherFile.php index bd4853b2e7d..78fb20cbd24 100644 --- a/tests-paths/path/wildcard-next/some_directory/YetAnotherFile.php +++ b/tests-paths/path/wildcard-next/some_directory/YetAnotherFile.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\Utils\Path\WhildcardNested; +namespace Rector\Utils\Path\WildcardNested; final class YetAnotherFile { diff --git a/tests/Issues/IssueDoubleNestedAnnotatoinDocBlock/Fixture/some_fixture.php.inc b/tests/Issues/IssueDoubleNestedAnnotationDocBlock/Fixture/some_fixture.php.inc similarity index 51% rename from tests/Issues/IssueDoubleNestedAnnotatoinDocBlock/Fixture/some_fixture.php.inc rename to tests/Issues/IssueDoubleNestedAnnotationDocBlock/Fixture/some_fixture.php.inc index 7eeb5eeeccb..64e18bd0bc0 100644 --- a/tests/Issues/IssueDoubleNestedAnnotatoinDocBlock/Fixture/some_fixture.php.inc +++ b/tests/Issues/IssueDoubleNestedAnnotationDocBlock/Fixture/some_fixture.php.inc @@ -1,8 +1,8 @@