diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
index 8c06d1c2aa0d..9eedeb500b6a 100644
--- a/.phpstorm.meta.php
+++ b/.phpstorm.meta.php
@@ -68,3 +68,36 @@
     \Rector\NodeTypeResolver\Node\AttributeKey::KIND,
     \Rector\NodeTypeResolver\Node\AttributeKey::CLASS_SHORT_NAME,
 );
+
+expectedArguments(
+    \Rector\Core\Rector\AbstractRector::isAtLeastPhpVersion(),
+    0,
+    \Rector\Core\ValueObject\PhpVersionFeature::DIR_CONSTANT,
+    \Rector\Core\ValueObject\PhpVersionFeature::ELVIS_OPERATOR,
+    \Rector\Core\ValueObject\PhpVersionFeature::CLASSNAME_CONSTANT,
+    \Rector\Core\ValueObject\PhpVersionFeature::EXP_OPERATOR,
+    \Rector\Core\ValueObject\PhpVersionFeature::SCALAR_TYPES,
+    \Rector\Core\ValueObject\PhpVersionFeature::NULL_COALESCE,
+    \Rector\Core\ValueObject\PhpVersionFeature::SPACESHIP,
+    \Rector\Core\ValueObject\PhpVersionFeature::DIRNAME_LEVELS,
+    \Rector\Core\ValueObject\PhpVersionFeature::CSPRNG_FUNCTIONS,
+    \Rector\Core\ValueObject\PhpVersionFeature::THROWABLE_TYPE,
+    \Rector\Core\ValueObject\PhpVersionFeature::ITERABLE_TYPE,
+    \Rector\Core\ValueObject\PhpVersionFeature::VOID_TYPE,
+    \Rector\Core\ValueObject\PhpVersionFeature::CONSTANT_VISIBILITY,
+    \Rector\Core\ValueObject\PhpVersionFeature::ARRAY_DESTRUCT,
+    \Rector\Core\ValueObject\PhpVersionFeature::MULTI_EXCEPTION_CATCH,
+    \Rector\Core\ValueObject\PhpVersionFeature::OBJECT_TYPE,
+    \Rector\Core\ValueObject\PhpVersionFeature::IS_COUNTABLE,
+    \Rector\Core\ValueObject\PhpVersionFeature::ARRAY_KEY_FIRST_LAST,
+    \Rector\Core\ValueObject\PhpVersionFeature::JSON_EXCEPTION,
+    \Rector\Core\ValueObject\PhpVersionFeature::SETCOOKIE_ACCEPT_ARRAY_OPTIONS,
+    \Rector\Core\ValueObject\PhpVersionFeature::ARROW_FUNCTION,
+    \Rector\Core\ValueObject\PhpVersionFeature::LITERAL_SEPARATOR,
+    \Rector\Core\ValueObject\PhpVersionFeature::NULL_COALESCE_ASSIGN,
+    \Rector\Core\ValueObject\PhpVersionFeature::TYPED_PROPERTIES,
+    \Rector\Core\ValueObject\PhpVersionFeature::BEFORE_UNION_TYPES,
+    \Rector\Core\ValueObject\PhpVersionFeature::COVARIANT_RETURN,
+    \Rector\Core\ValueObject\PhpVersionFeature::ARRAY_SPREAD,
+    \Rector\Core\ValueObject\PhpVersionFeature::UNION_TYPES,
+);
diff --git a/composer.json b/composer.json
index 9026b06d8ef9..8f3c979c31d2 100644
--- a/composer.json
+++ b/composer.json
@@ -89,17 +89,17 @@
             "Rector\\PHPUnit\\": "rules/phpunit/src",
             "Rector\\PSR4\\": "rules/psr4/src",
             "Rector\\Phalcon\\": "rules/phalcon/src",
-            "Rector\\Php52\\": "rules/php-52/src",
-            "Rector\\Php53\\": "rules/php-53/src",
-            "Rector\\Php54\\": "rules/php-54/src",
-            "Rector\\Php55\\": "rules/php-55/src",
-            "Rector\\Php56\\": "rules/php-56/src",
-            "Rector\\Php70\\": "rules/php-70/src",
-            "Rector\\Php71\\": "rules/php-71/src",
-            "Rector\\Php72\\": "rules/php-72/src",
-            "Rector\\Php73\\": "rules/php-73/src",
-            "Rector\\Php74\\": "rules/php-74/src",
-            "Rector\\Php80\\": "rules/php-80/src",
+            "Rector\\Php52\\": "rules/php52/src",
+            "Rector\\Php53\\": "rules/php53/src",
+            "Rector\\Php54\\": "rules/php54/src",
+            "Rector\\Php55\\": "rules/php55/src",
+            "Rector\\Php56\\": "rules/php56/src",
+            "Rector\\Php70\\": "rules/php70/src",
+            "Rector\\Php71\\": "rules/php71/src",
+            "Rector\\Php72\\": "rules/php72/src",
+            "Rector\\Php73\\": "rules/php73/src",
+            "Rector\\Php74\\": "rules/php74/src",
+            "Rector\\Php80\\": "rules/php80/src",
             "Rector\\PhpDeglobalize\\": "rules/php-deglobalize/src",
             "Rector\\PhpSpecToPHPUnit\\": "rules/php-spec-to-phpunit/src",
             "Rector\\Polyfill\\": "packages/polyfill/src",
@@ -159,17 +159,17 @@
             "Rector\\PHPUnit\\Tests\\": "rules/phpunit/tests",
             "Rector\\PSR4\\Tests\\": "rules/psr4/tests",
             "Rector\\Phalcon\\Tests\\": "rules/phalcon/tests",
-            "Rector\\Php52\\Tests\\": "rules/php-52/tests",
-            "Rector\\Php53\\Tests\\": "rules/php-53/tests",
-            "Rector\\Php54\\Tests\\": "rules/php-54/tests",
-            "Rector\\Php55\\Tests\\": "rules/php-55/tests",
-            "Rector\\Php56\\Tests\\": "rules/php-56/tests",
-            "Rector\\Php70\\Tests\\": "rules/php-70/tests",
-            "Rector\\Php71\\Tests\\": "rules/php-71/tests",
-            "Rector\\Php72\\Tests\\": "rules/php-72/tests",
-            "Rector\\Php73\\Tests\\": "rules/php-73/tests",
-            "Rector\\Php74\\Tests\\": "rules/php-74/tests",
-            "Rector\\Php80\\Tests\\": "rules/php-80/tests",
+            "Rector\\Php52\\Tests\\": "rules/php52/tests",
+            "Rector\\Php53\\Tests\\": "rules/php53/tests",
+            "Rector\\Php54\\Tests\\": "rules/php54/tests",
+            "Rector\\Php55\\Tests\\": "rules/php55/tests",
+            "Rector\\Php56\\Tests\\": "rules/php56/tests",
+            "Rector\\Php70\\Tests\\": "rules/php70/tests",
+            "Rector\\Php71\\Tests\\": "rules/php71/tests",
+            "Rector\\Php72\\Tests\\": "rules/php72/tests",
+            "Rector\\Php73\\Tests\\": "rules/php73/tests",
+            "Rector\\Php74\\Tests\\": "rules/php74/tests",
+            "Rector\\Php80\\Tests\\": "rules/php80/tests",
             "Rector\\PhpDeglobalize\\Tests\\": "rules/php-deglobalize/tests",
             "Rector\\PhpSpecToPHPUnit\\Tests\\": "rules/php-spec-to-phpunit/tests",
             "Rector\\Polyfill\\Tests\\": "packages/polyfill/tests",
diff --git a/config/set/php/php74.yaml b/config/set/php/php74.yaml
index e035c0c75f34..f67b0366a967 100644
--- a/config/set/php/php74.yaml
+++ b/config/set/php/php74.yaml
@@ -22,3 +22,4 @@ services:
     Rector\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector: null
     Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector: null
     Rector\Php74\Rector\MethodCall\ChangeReflectionTypeToStringToGetNameRector: null
+    Rector\Php74\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector: null
diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md
index 74ac88a4fc09..0370acceff30 100644
--- a/docs/AllRectorsOverview.md
+++ b/docs/AllRectorsOverview.md
@@ -1,4 +1,4 @@
-# All 466 Rectors Overview
+# All 467 Rectors Overview
 
 - [Projects](#projects)
 - [General](#general)
@@ -6028,8 +6028,8 @@ Change new application to default factory with application
 
 ### `ContinueToBreakInSwitchRector`
 
-- class: [`Rector\Php52\Rector\Switch_\ContinueToBreakInSwitchRector`](/../master/rules/php-52/src/Rector/Switch_/ContinueToBreakInSwitchRector.php)
-- [test fixtures](/../master/rules/php-52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture)
+- class: [`Rector\Php52\Rector\Switch_\ContinueToBreakInSwitchRector`](/../master/rules/php52/src/Rector/Switch_/ContinueToBreakInSwitchRector.php)
+- [test fixtures](/../master/rules/php52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture)
 
 Use break instead of continue in switch statements
 
@@ -6052,8 +6052,8 @@ Use break instead of continue in switch statements
 
 ### `VarToPublicPropertyRector`
 
-- class: [`Rector\Php52\Rector\Property\VarToPublicPropertyRector`](/../master/rules/php-52/src/Rector/Property/VarToPublicPropertyRector.php)
-- [test fixtures](/../master/rules/php-52/tests/Rector/Property/VarToPublicPropertyRector/Fixture)
+- class: [`Rector\Php52\Rector\Property\VarToPublicPropertyRector`](/../master/rules/php52/src/Rector/Property/VarToPublicPropertyRector.php)
+- [test fixtures](/../master/rules/php52/tests/Rector/Property/VarToPublicPropertyRector/Fixture)
 
 Remove unused private method
 
@@ -6071,8 +6071,8 @@ Remove unused private method
 
 ### `DirNameFileConstantToDirConstantRector`
 
-- class: [`Rector\Php53\Rector\FuncCall\DirNameFileConstantToDirConstantRector`](/../master/rules/php-53/src/Rector/FuncCall/DirNameFileConstantToDirConstantRector.php)
-- [test fixtures](/../master/rules/php-53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/Fixture)
+- class: [`Rector\Php53\Rector\FuncCall\DirNameFileConstantToDirConstantRector`](/../master/rules/php53/src/Rector/FuncCall/DirNameFileConstantToDirConstantRector.php)
+- [test fixtures](/../master/rules/php53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/Fixture)
 
 Convert dirname(__FILE__) to __DIR__
 
@@ -6091,8 +6091,8 @@ Convert dirname(__FILE__) to __DIR__
 
 ### `TernaryToElvisRector`
 
-- class: [`Rector\Php53\Rector\Ternary\TernaryToElvisRector`](/../master/rules/php-53/src/Rector/Ternary/TernaryToElvisRector.php)
-- [test fixtures](/../master/rules/php-53/tests/Rector/Ternary/TernaryToElvisRector/Fixture)
+- class: [`Rector\Php53\Rector\Ternary\TernaryToElvisRector`](/../master/rules/php53/src/Rector/Ternary/TernaryToElvisRector.php)
+- [test fixtures](/../master/rules/php53/tests/Rector/Ternary/TernaryToElvisRector/Fixture)
 
 Use ?: instead of ?, where useful
 
@@ -6110,8 +6110,8 @@ Use ?: instead of ?, where useful
 
 ### `RemoveReferenceFromCallRector`
 
-- class: [`Rector\Php54\Rector\FuncCall\RemoveReferenceFromCallRector`](/../master/rules/php-54/src/Rector/FuncCall/RemoveReferenceFromCallRector.php)
-- [test fixtures](/../master/rules/php-54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/Fixture)
+- class: [`Rector\Php54\Rector\FuncCall\RemoveReferenceFromCallRector`](/../master/rules/php54/src/Rector/FuncCall/RemoveReferenceFromCallRector.php)
+- [test fixtures](/../master/rules/php54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/Fixture)
 
 Remove & from function and method calls
 
@@ -6130,8 +6130,8 @@ Remove & from function and method calls
 
 ### `RemoveZeroBreakContinueRector`
 
-- class: [`Rector\Php54\Rector\Break_\RemoveZeroBreakContinueRector`](/../master/rules/php-54/src/Rector/Break_/RemoveZeroBreakContinueRector.php)
-- [test fixtures](/../master/rules/php-54/tests/Rector/Break_/RemoveZeroBreakContinueRector/Fixture)
+- class: [`Rector\Php54\Rector\Break_\RemoveZeroBreakContinueRector`](/../master/rules/php54/src/Rector/Break_/RemoveZeroBreakContinueRector.php)
+- [test fixtures](/../master/rules/php54/tests/Rector/Break_/RemoveZeroBreakContinueRector/Fixture)
 
 Remove 0 from break and continue
 
@@ -6161,8 +6161,8 @@ Remove 0 from break and continue
 
 ### `PregReplaceEModifierRector`
 
-- class: [`Rector\Php55\Rector\FuncCall\PregReplaceEModifierRector`](/../master/rules/php-55/src/Rector/FuncCall/PregReplaceEModifierRector.php)
-- [test fixtures](/../master/rules/php-55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture)
+- class: [`Rector\Php55\Rector\FuncCall\PregReplaceEModifierRector`](/../master/rules/php55/src/Rector/FuncCall/PregReplaceEModifierRector.php)
+- [test fixtures](/../master/rules/php55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture)
 
 The /e modifier is no longer supported, use preg_replace_callback instead
 
@@ -6183,8 +6183,8 @@ The /e modifier is no longer supported, use preg_replace_callback instead
 
 ### `StringClassNameToClassConstantRector`
 
-- class: [`Rector\Php55\Rector\String_\StringClassNameToClassConstantRector`](/../master/rules/php-55/src/Rector/String_/StringClassNameToClassConstantRector.php)
-- [test fixtures](/../master/rules/php-55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture)
+- class: [`Rector\Php55\Rector\String_\StringClassNameToClassConstantRector`](/../master/rules/php55/src/Rector/String_/StringClassNameToClassConstantRector.php)
+- [test fixtures](/../master/rules/php55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture)
 
 Replace string class names by <class>::class constant
 
@@ -6209,8 +6209,8 @@ Replace string class names by <class>::class constant
 
 ### `AddDefaultValueForUndefinedVariableRector`
 
-- class: [`Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector`](/../master/rules/php-56/src/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php)
-- [test fixtures](/../master/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture)
+- class: [`Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector`](/../master/rules/php56/src/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php)
+- [test fixtures](/../master/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture)
 
 Adds default value for undefined variable
 
@@ -6232,8 +6232,8 @@ Adds default value for undefined variable
 
 ### `PowToExpRector`
 
-- class: [`Rector\Php56\Rector\FuncCall\PowToExpRector`](/../master/rules/php-56/src/Rector/FuncCall/PowToExpRector.php)
-- [test fixtures](/../master/rules/php-56/tests/Rector/FuncCall/PowToExpRector/Fixture)
+- class: [`Rector\Php56\Rector\FuncCall\PowToExpRector`](/../master/rules/php56/src/Rector/FuncCall/PowToExpRector.php)
+- [test fixtures](/../master/rules/php56/tests/Rector/FuncCall/PowToExpRector/Fixture)
 
 Changes pow(val, val2) to ** (exp) parameter
 
@@ -6248,8 +6248,8 @@ Changes pow(val, val2) to ** (exp) parameter
 
 ### `BreakNotInLoopOrSwitchToReturnRector`
 
-- class: [`Rector\Php70\Rector\Break_\BreakNotInLoopOrSwitchToReturnRector`](/../master/rules/php-70/src/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture)
+- class: [`Rector\Php70\Rector\Break_\BreakNotInLoopOrSwitchToReturnRector`](/../master/rules/php70/src/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture)
 
 Convert break outside for/foreach/switch context to return
 
@@ -6274,8 +6274,8 @@ Convert break outside for/foreach/switch context to return
 
 ### `CallUserMethodRector`
 
-- class: [`Rector\Php70\Rector\FuncCall\CallUserMethodRector`](/../master/rules/php-70/src/Rector/FuncCall/CallUserMethodRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/FuncCall/CallUserMethodRector/Fixture)
+- class: [`Rector\Php70\Rector\FuncCall\CallUserMethodRector`](/../master/rules/php70/src/Rector/FuncCall/CallUserMethodRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/FuncCall/CallUserMethodRector/Fixture)
 
 Changes call_user_method()/call_user_method_array() to call_user_func()/call_user_func_array()
 
@@ -6288,8 +6288,8 @@ Changes call_user_method()/call_user_method_array() to call_user_func()/call_use
 
 ### `EmptyListRector`
 
-- class: [`Rector\Php70\Rector\List_\EmptyListRector`](/../master/rules/php-70/src/Rector/List_/EmptyListRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/List_/EmptyListRector/Fixture)
+- class: [`Rector\Php70\Rector\List_\EmptyListRector`](/../master/rules/php70/src/Rector/List_/EmptyListRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/List_/EmptyListRector/Fixture)
 
 list() cannot be empty
 
@@ -6302,8 +6302,8 @@ list() cannot be empty
 
 ### `EregToPregMatchRector`
 
-- class: [`Rector\Php70\Rector\FuncCall\EregToPregMatchRector`](/../master/rules/php-70/src/Rector/FuncCall/EregToPregMatchRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture)
+- class: [`Rector\Php70\Rector\FuncCall\EregToPregMatchRector`](/../master/rules/php70/src/Rector/FuncCall/EregToPregMatchRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture)
 
 Changes ereg*() to preg*() calls
 
@@ -6316,8 +6316,8 @@ Changes ereg*() to preg*() calls
 
 ### `ExceptionHandlerTypehintRector`
 
-- class: [`Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector`](/../master/rules/php-70/src/Rector/FunctionLike/ExceptionHandlerTypehintRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture)
+- class: [`Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector`](/../master/rules/php70/src/Rector/FunctionLike/ExceptionHandlerTypehintRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture)
 
 Changes property `@var` annotations from annotation to type.
 
@@ -6331,8 +6331,8 @@ Changes property `@var` annotations from annotation to type.
 
 ### `IfToSpaceshipRector`
 
-- class: [`Rector\Php70\Rector\If_\IfToSpaceshipRector`](/../master/rules/php-70/src/Rector/If_/IfToSpaceshipRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/If_/IfToSpaceshipRector/Fixture)
+- class: [`Rector\Php70\Rector\If_\IfToSpaceshipRector`](/../master/rules/php70/src/Rector/If_/IfToSpaceshipRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/If_/IfToSpaceshipRector/Fixture)
 
 Changes if/else to spaceship <=> where useful
 
@@ -6357,8 +6357,8 @@ Changes if/else to spaceship <=> where useful
 
 ### `ListSplitStringRector`
 
-- class: [`Rector\Php70\Rector\List_\ListSplitStringRector`](/../master/rules/php-70/src/Rector/List_/ListSplitStringRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/List_/ListSplitStringRector/Fixture)
+- class: [`Rector\Php70\Rector\List_\ListSplitStringRector`](/../master/rules/php70/src/Rector/List_/ListSplitStringRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/List_/ListSplitStringRector/Fixture)
 
 list() cannot split string directly anymore, use str_split()
 
@@ -6371,8 +6371,8 @@ list() cannot split string directly anymore, use str_split()
 
 ### `ListSwapArrayOrderRector`
 
-- class: [`Rector\Php70\Rector\List_\ListSwapArrayOrderRector`](/../master/rules/php-70/src/Rector/List_/ListSwapArrayOrderRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture)
+- class: [`Rector\Php70\Rector\List_\ListSwapArrayOrderRector`](/../master/rules/php70/src/Rector/List_/ListSwapArrayOrderRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture)
 
 list() assigns variables in reverse order - relevant in array assign
 
@@ -6385,8 +6385,8 @@ list() assigns variables in reverse order - relevant in array assign
 
 ### `MultiDirnameRector`
 
-- class: [`Rector\Php70\Rector\FuncCall\MultiDirnameRector`](/../master/rules/php-70/src/Rector/FuncCall/MultiDirnameRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/FuncCall/MultiDirnameRector/Fixture)
+- class: [`Rector\Php70\Rector\FuncCall\MultiDirnameRector`](/../master/rules/php70/src/Rector/FuncCall/MultiDirnameRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/FuncCall/MultiDirnameRector/Fixture)
 
 Changes multiple dirname() calls to one with nesting level
 
@@ -6399,8 +6399,8 @@ Changes multiple dirname() calls to one with nesting level
 
 ### `NonVariableToVariableOnFunctionCallRector`
 
-- class: [`Rector\Php70\Rector\FuncCall\NonVariableToVariableOnFunctionCallRector`](/../master/rules/php-70/src/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture)
+- class: [`Rector\Php70\Rector\FuncCall\NonVariableToVariableOnFunctionCallRector`](/../master/rules/php70/src/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture)
 
 Transform non variable like arguments to variable where a function or method expects an argument passed by reference
 
@@ -6413,8 +6413,8 @@ Transform non variable like arguments to variable where a function or method exp
 
 ### `Php4ConstructorRector`
 
-- class: [`Rector\Php70\Rector\FunctionLike\Php4ConstructorRector`](/../master/rules/php-70/src/Rector/FunctionLike/Php4ConstructorRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture)
+- class: [`Rector\Php70\Rector\FunctionLike\Php4ConstructorRector`](/../master/rules/php70/src/Rector/FunctionLike/Php4ConstructorRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture)
 
 Changes PHP 4 style constructor to __construct.
 
@@ -6432,8 +6432,8 @@ Changes PHP 4 style constructor to __construct.
 
 ### `RandomFunctionRector`
 
-- class: [`Rector\Php70\Rector\FuncCall\RandomFunctionRector`](/../master/rules/php-70/src/Rector/FuncCall/RandomFunctionRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/FuncCall/RandomFunctionRector/Fixture)
+- class: [`Rector\Php70\Rector\FuncCall\RandomFunctionRector`](/../master/rules/php70/src/Rector/FuncCall/RandomFunctionRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/FuncCall/RandomFunctionRector/Fixture)
 
 Changes rand, srand and getrandmax by new mt_* alternatives.
 
@@ -6446,8 +6446,8 @@ Changes rand, srand and getrandmax by new mt_* alternatives.
 
 ### `ReduceMultipleDefaultSwitchRector`
 
-- class: [`Rector\Php70\Rector\Switch_\ReduceMultipleDefaultSwitchRector`](/../master/rules/php-70/src/Rector/Switch_/ReduceMultipleDefaultSwitchRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/Fixture)
+- class: [`Rector\Php70\Rector\Switch_\ReduceMultipleDefaultSwitchRector`](/../master/rules/php70/src/Rector/Switch_/ReduceMultipleDefaultSwitchRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/Fixture)
 
 Remove first default switch, that is ignored
 
@@ -6466,8 +6466,8 @@ Remove first default switch, that is ignored
 
 ### `RenameMktimeWithoutArgsToTimeRector`
 
-- class: [`Rector\Php70\Rector\FuncCall\RenameMktimeWithoutArgsToTimeRector`](/../master/rules/php-70/src/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/Fixture)
+- class: [`Rector\Php70\Rector\FuncCall\RenameMktimeWithoutArgsToTimeRector`](/../master/rules/php70/src/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/Fixture)
 
 ```diff
  class SomeClass
@@ -6485,8 +6485,8 @@ Remove first default switch, that is ignored
 
 ### `StaticCallOnNonStaticToInstanceCallRector`
 
-- class: [`Rector\Php70\Rector\StaticCall\StaticCallOnNonStaticToInstanceCallRector`](/../master/rules/php-70/src/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture)
+- class: [`Rector\Php70\Rector\StaticCall\StaticCallOnNonStaticToInstanceCallRector`](/../master/rules/php70/src/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture)
 
 Changes static call to instance call, where not useful
 
@@ -6512,8 +6512,8 @@ Changes static call to instance call, where not useful
 
 ### `TernaryToNullCoalescingRector`
 
-- class: [`Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector`](/../master/rules/php-70/src/Rector/Ternary/TernaryToNullCoalescingRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture)
+- class: [`Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector`](/../master/rules/php70/src/Rector/Ternary/TernaryToNullCoalescingRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture)
 
 Changes unneeded null check to ?? operator
 
@@ -6531,8 +6531,8 @@ Changes unneeded null check to ?? operator
 
 ### `TernaryToSpaceshipRector`
 
-- class: [`Rector\Php70\Rector\Ternary\TernaryToSpaceshipRector`](/../master/rules/php-70/src/Rector/Ternary/TernaryToSpaceshipRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/Ternary/TernaryToSpaceshipRector/Fixture)
+- class: [`Rector\Php70\Rector\Ternary\TernaryToSpaceshipRector`](/../master/rules/php70/src/Rector/Ternary/TernaryToSpaceshipRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/Ternary/TernaryToSpaceshipRector/Fixture)
 
 Use <=> spaceship instead of ternary with same effect
 
@@ -6547,8 +6547,8 @@ Use <=> spaceship instead of ternary with same effect
 
 ### `ThisCallOnStaticMethodToStaticCallRector`
 
-- class: [`Rector\Php70\Rector\MethodCall\ThisCallOnStaticMethodToStaticCallRector`](/../master/rules/php-70/src/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php)
-- [test fixtures](/../master/rules/php-70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture)
+- class: [`Rector\Php70\Rector\MethodCall\ThisCallOnStaticMethodToStaticCallRector`](/../master/rules/php70/src/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php)
+- [test fixtures](/../master/rules/php70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture)
 
 Changes $this->call() to static method to static call
 
@@ -6573,8 +6573,8 @@ Changes $this->call() to static method to static call
 
 ### `AssignArrayToStringRector`
 
-- class: [`Rector\Php71\Rector\Assign\AssignArrayToStringRector`](/../master/rules/php-71/src/Rector/Assign/AssignArrayToStringRector.php)
-- [test fixtures](/../master/rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture)
+- class: [`Rector\Php71\Rector\Assign\AssignArrayToStringRector`](/../master/rules/php71/src/Rector/Assign/AssignArrayToStringRector.php)
+- [test fixtures](/../master/rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture)
 
 String cannot be turned into array by assignment anymore
 
@@ -6588,8 +6588,8 @@ String cannot be turned into array by assignment anymore
 
 ### `BinaryOpBetweenNumberAndStringRector`
 
-- class: [`Rector\Php71\Rector\BinaryOp\BinaryOpBetweenNumberAndStringRector`](/../master/rules/php-71/src/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector.php)
-- [test fixtures](/../master/rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture)
+- class: [`Rector\Php71\Rector\BinaryOp\BinaryOpBetweenNumberAndStringRector`](/../master/rules/php71/src/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector.php)
+- [test fixtures](/../master/rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture)
 
 Change binary operation between some number + string to PHP 7.1 compatible version
 
@@ -6610,8 +6610,8 @@ Change binary operation between some number + string to PHP 7.1 compatible versi
 
 ### `CountOnNullRector`
 
-- class: [`Rector\Php71\Rector\FuncCall\CountOnNullRector`](/../master/rules/php-71/src/Rector/FuncCall/CountOnNullRector.php)
-- [test fixtures](/../master/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture)
+- class: [`Rector\Php71\Rector\FuncCall\CountOnNullRector`](/../master/rules/php71/src/Rector/FuncCall/CountOnNullRector.php)
+- [test fixtures](/../master/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture)
 
 Changes count() on null to safe ternary check
 
@@ -6625,8 +6625,8 @@ Changes count() on null to safe ternary check
 
 ### `IsIterableRector`
 
-- class: [`Rector\Php71\Rector\BinaryOp\IsIterableRector`](/../master/rules/php-71/src/Rector/BinaryOp/IsIterableRector.php)
-- [test fixtures](/../master/rules/php-71/tests/Rector/BinaryOp/IsIterableRector/Fixture)
+- class: [`Rector\Php71\Rector\BinaryOp\IsIterableRector`](/../master/rules/php71/src/Rector/BinaryOp/IsIterableRector.php)
+- [test fixtures](/../master/rules/php71/tests/Rector/BinaryOp/IsIterableRector/Fixture)
 
 Changes is_array + Traversable check to is_iterable
 
@@ -6639,8 +6639,8 @@ Changes is_array + Traversable check to is_iterable
 
 ### `ListToArrayDestructRector`
 
-- class: [`Rector\Php71\Rector\List_\ListToArrayDestructRector`](/../master/rules/php-71/src/Rector/List_/ListToArrayDestructRector.php)
-- [test fixtures](/../master/rules/php-71/tests/Rector/List_/ListToArrayDestructRector/Fixture)
+- class: [`Rector\Php71\Rector\List_\ListToArrayDestructRector`](/../master/rules/php71/src/Rector/List_/ListToArrayDestructRector.php)
+- [test fixtures](/../master/rules/php71/tests/Rector/List_/ListToArrayDestructRector/Fixture)
 
 Remove & from new &X
 
@@ -6663,8 +6663,8 @@ Remove & from new &X
 
 ### `MultiExceptionCatchRector`
 
-- class: [`Rector\Php71\Rector\TryCatch\MultiExceptionCatchRector`](/../master/rules/php-71/src/Rector/TryCatch/MultiExceptionCatchRector.php)
-- [test fixtures](/../master/rules/php-71/tests/Rector/TryCatch/MultiExceptionCatchRector/Fixture)
+- class: [`Rector\Php71\Rector\TryCatch\MultiExceptionCatchRector`](/../master/rules/php71/src/Rector/TryCatch/MultiExceptionCatchRector.php)
+- [test fixtures](/../master/rules/php71/tests/Rector/TryCatch/MultiExceptionCatchRector/Fixture)
 
 Changes multi catch of same exception to single one | separated.
 
@@ -6683,8 +6683,8 @@ Changes multi catch of same exception to single one | separated.
 
 ### `PublicConstantVisibilityRector`
 
-- class: [`Rector\Php71\Rector\ClassConst\PublicConstantVisibilityRector`](/../master/rules/php-71/src/Rector/ClassConst/PublicConstantVisibilityRector.php)
-- [test fixtures](/../master/rules/php-71/tests/Rector/ClassConst/PublicConstantVisibilityRector/Fixture)
+- class: [`Rector\Php71\Rector\ClassConst\PublicConstantVisibilityRector`](/../master/rules/php71/src/Rector/ClassConst/PublicConstantVisibilityRector.php)
+- [test fixtures](/../master/rules/php71/tests/Rector/ClassConst/PublicConstantVisibilityRector/Fixture)
 
 Add explicit public constant visibility.
 
@@ -6700,8 +6700,8 @@ Add explicit public constant visibility.
 
 ### `RemoveExtraParametersRector`
 
-- class: [`Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector`](/../master/rules/php-71/src/Rector/FuncCall/RemoveExtraParametersRector.php)
-- [test fixtures](/../master/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture)
+- class: [`Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector`](/../master/rules/php71/src/Rector/FuncCall/RemoveExtraParametersRector.php)
+- [test fixtures](/../master/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture)
 
 Remove extra parameters
 
@@ -6714,8 +6714,8 @@ Remove extra parameters
 
 ### `ReservedObjectRector`
 
-- class: [`Rector\Php71\Rector\Name\ReservedObjectRector`](/../master/rules/php-71/src/Rector/Name/ReservedObjectRector.php)
-- [test fixtures](/../master/rules/php-71/tests/Rector/Name/ReservedObjectRector/Fixture)
+- class: [`Rector\Php71\Rector\Name\ReservedObjectRector`](/../master/rules/php71/src/Rector/Name/ReservedObjectRector.php)
+- [test fixtures](/../master/rules/php71/tests/Rector/Name/ReservedObjectRector/Fixture)
 
 Changes reserved "Object" name to "<Smart>Object" where <Smart> can be configured
 
@@ -6732,8 +6732,8 @@ Changes reserved "Object" name to "<Smart>Object" where <Smart> can be configure
 
 ### `BarewordStringRector`
 
-- class: [`Rector\Php72\Rector\ConstFetch\BarewordStringRector`](/../master/rules/php-72/src/Rector/ConstFetch/BarewordStringRector.php)
-- [test fixtures](/../master/rules/php-72/tests/Rector/ConstFetch/BarewordStringRector/Fixture)
+- class: [`Rector\Php72\Rector\ConstFetch\BarewordStringRector`](/../master/rules/php72/src/Rector/ConstFetch/BarewordStringRector.php)
+- [test fixtures](/../master/rules/php72/tests/Rector/ConstFetch/BarewordStringRector/Fixture)
 
 Changes unquoted non-existing constants to strings
 
@@ -6746,8 +6746,8 @@ Changes unquoted non-existing constants to strings
 
 ### `CreateFunctionToAnonymousFunctionRector`
 
-- class: [`Rector\Php72\Rector\FuncCall\CreateFunctionToAnonymousFunctionRector`](/../master/rules/php-72/src/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php)
-- [test fixtures](/../master/rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture)
+- class: [`Rector\Php72\Rector\FuncCall\CreateFunctionToAnonymousFunctionRector`](/../master/rules/php72/src/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php)
+- [test fixtures](/../master/rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture)
 
 Use anonymous functions instead of deprecated create_function()
 
@@ -6768,8 +6768,8 @@ Use anonymous functions instead of deprecated create_function()
 
 ### `GetClassOnNullRector`
 
-- class: [`Rector\Php72\Rector\FuncCall\GetClassOnNullRector`](/../master/rules/php-72/src/Rector/FuncCall/GetClassOnNullRector.php)
-- [test fixtures](/../master/rules/php-72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture)
+- class: [`Rector\Php72\Rector\FuncCall\GetClassOnNullRector`](/../master/rules/php72/src/Rector/FuncCall/GetClassOnNullRector.php)
+- [test fixtures](/../master/rules/php72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture)
 
 Null is no more allowed in get_class()
 
@@ -6789,8 +6789,8 @@ Null is no more allowed in get_class()
 
 ### `IsObjectOnIncompleteClassRector`
 
-- class: [`Rector\Php72\Rector\FuncCall\IsObjectOnIncompleteClassRector`](/../master/rules/php-72/src/Rector/FuncCall/IsObjectOnIncompleteClassRector.php)
-- [test fixtures](/../master/rules/php-72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/Fixture)
+- class: [`Rector\Php72\Rector\FuncCall\IsObjectOnIncompleteClassRector`](/../master/rules/php72/src/Rector/FuncCall/IsObjectOnIncompleteClassRector.php)
+- [test fixtures](/../master/rules/php72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/Fixture)
 
 Incomplete class returns inverted bool on is_object()
 
@@ -6804,7 +6804,7 @@ Incomplete class returns inverted bool on is_object()
 
 ### `ListEachRector`
 
-- class: [`Rector\Php72\Rector\Each\ListEachRector`](/../master/rules/php-72/src/Rector/Each/ListEachRector.php)
+- class: [`Rector\Php72\Rector\Each\ListEachRector`](/../master/rules/php72/src/Rector/Each/ListEachRector.php)
 
 each() function is deprecated, use key() and current() instead
 
@@ -6818,8 +6818,8 @@ each() function is deprecated, use key() and current() instead
 
 ### `ParseStrWithResultArgumentRector`
 
-- class: [`Rector\Php72\Rector\FuncCall\ParseStrWithResultArgumentRector`](/../master/rules/php-72/src/Rector/FuncCall/ParseStrWithResultArgumentRector.php)
-- [test fixtures](/../master/rules/php-72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/Fixture)
+- class: [`Rector\Php72\Rector\FuncCall\ParseStrWithResultArgumentRector`](/../master/rules/php72/src/Rector/FuncCall/ParseStrWithResultArgumentRector.php)
+- [test fixtures](/../master/rules/php72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/Fixture)
 
 Use $result argument in parse_str() function
 
@@ -6834,8 +6834,8 @@ Use $result argument in parse_str() function
 
 ### `StringifyDefineRector`
 
-- class: [`Rector\Php72\Rector\FuncCall\StringifyDefineRector`](/../master/rules/php-72/src/Rector/FuncCall/StringifyDefineRector.php)
-- [test fixtures](/../master/rules/php-72/tests/Rector/FuncCall/StringifyDefineRector/Fixture)
+- class: [`Rector\Php72\Rector\FuncCall\StringifyDefineRector`](/../master/rules/php72/src/Rector/FuncCall/StringifyDefineRector.php)
+- [test fixtures](/../master/rules/php72/tests/Rector/FuncCall/StringifyDefineRector/Fixture)
 
 Make first argument of define() string
 
@@ -6855,8 +6855,8 @@ Make first argument of define() string
 
 ### `StringsAssertNakedRector`
 
-- class: [`Rector\Php72\Rector\FuncCall\StringsAssertNakedRector`](/../master/rules/php-72/src/Rector/FuncCall/StringsAssertNakedRector.php)
-- [test fixtures](/../master/rules/php-72/tests/Rector/FuncCall/StringsAssertNakedRector/Fixture)
+- class: [`Rector\Php72\Rector\FuncCall\StringsAssertNakedRector`](/../master/rules/php72/src/Rector/FuncCall/StringsAssertNakedRector.php)
+- [test fixtures](/../master/rules/php72/tests/Rector/FuncCall/StringsAssertNakedRector/Fixture)
 
 String asserts must be passed directly to assert()
 
@@ -6874,8 +6874,8 @@ String asserts must be passed directly to assert()
 
 ### `UnsetCastRector`
 
-- class: [`Rector\Php72\Rector\Unset_\UnsetCastRector`](/../master/rules/php-72/src/Rector/Unset_/UnsetCastRector.php)
-- [test fixtures](/../master/rules/php-72/tests/Rector/Unset_/UnsetCastRector/Fixture)
+- class: [`Rector\Php72\Rector\Unset_\UnsetCastRector`](/../master/rules/php72/src/Rector/Unset_/UnsetCastRector.php)
+- [test fixtures](/../master/rules/php72/tests/Rector/Unset_/UnsetCastRector/Fixture)
 
 Removes (unset) cast
 
@@ -6891,7 +6891,7 @@ Removes (unset) cast
 
 ### `WhileEachToForeachRector`
 
-- class: [`Rector\Php72\Rector\Each\WhileEachToForeachRector`](/../master/rules/php-72/src/Rector/Each/WhileEachToForeachRector.php)
+- class: [`Rector\Php72\Rector\Each\WhileEachToForeachRector`](/../master/rules/php72/src/Rector/Each/WhileEachToForeachRector.php)
 
 each() function is deprecated, use foreach() instead.
 
@@ -6915,8 +6915,8 @@ each() function is deprecated, use foreach() instead.
 
 ### `ArrayKeyFirstLastRector`
 
-- class: [`Rector\Php73\Rector\FuncCall\ArrayKeyFirstLastRector`](/../master/rules/php-73/src/Rector/FuncCall/ArrayKeyFirstLastRector.php)
-- [test fixtures](/../master/rules/php-73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture)
+- class: [`Rector\Php73\Rector\FuncCall\ArrayKeyFirstLastRector`](/../master/rules/php73/src/Rector/FuncCall/ArrayKeyFirstLastRector.php)
+- [test fixtures](/../master/rules/php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture)
 
 Make use of array_key_first() and array_key_last()
 
@@ -6936,8 +6936,8 @@ Make use of array_key_first() and array_key_last()
 
 ### `IsCountableRector`
 
-- class: [`Rector\Php73\Rector\BinaryOp\IsCountableRector`](/../master/rules/php-73/src/Rector/BinaryOp/IsCountableRector.php)
-- [test fixtures](/../master/rules/php-73/tests/Rector/BinaryOp/IsCountableRector/Fixture)
+- class: [`Rector\Php73\Rector\BinaryOp\IsCountableRector`](/../master/rules/php73/src/Rector/BinaryOp/IsCountableRector.php)
+- [test fixtures](/../master/rules/php73/tests/Rector/BinaryOp/IsCountableRector/Fixture)
 
 Changes is_array + Countable check to is_countable
 
@@ -6950,8 +6950,8 @@ Changes is_array + Countable check to is_countable
 
 ### `JsonThrowOnErrorRector`
 
-- class: [`Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector`](/../master/rules/php-73/src/Rector/FuncCall/JsonThrowOnErrorRector.php)
-- [test fixtures](/../master/rules/php-73/tests/Rector/FuncCall/JsonThrowOnErrorRector/Fixture)
+- class: [`Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector`](/../master/rules/php73/src/Rector/FuncCall/JsonThrowOnErrorRector.php)
+- [test fixtures](/../master/rules/php73/tests/Rector/FuncCall/JsonThrowOnErrorRector/Fixture)
 
 Adds JSON_THROW_ON_ERROR to json_encode() and json_decode() to throw JsonException on error
 
@@ -6966,8 +6966,8 @@ Adds JSON_THROW_ON_ERROR to json_encode() and json_decode() to throw JsonExcepti
 
 ### `RegexDashEscapeRector`
 
-- class: [`Rector\Php73\Rector\FuncCall\RegexDashEscapeRector`](/../master/rules/php-73/src/Rector/FuncCall/RegexDashEscapeRector.php)
-- [test fixtures](/../master/rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture)
+- class: [`Rector\Php73\Rector\FuncCall\RegexDashEscapeRector`](/../master/rules/php73/src/Rector/FuncCall/RegexDashEscapeRector.php)
+- [test fixtures](/../master/rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture)
 
 Escape - in some cases
 
@@ -6980,8 +6980,8 @@ Escape - in some cases
 
 ### `RemoveMissingCompactVariableRector`
 
-- class: [`Rector\Php73\Rector\FuncCall\RemoveMissingCompactVariableRector`](/../master/rules/php-73/src/Rector/FuncCall/RemoveMissingCompactVariableRector.php)
-- [test fixtures](/../master/rules/php-73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture)
+- class: [`Rector\Php73\Rector\FuncCall\RemoveMissingCompactVariableRector`](/../master/rules/php73/src/Rector/FuncCall/RemoveMissingCompactVariableRector.php)
+- [test fixtures](/../master/rules/php73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture)
 
 Remove non-existing vars from compact()
 
@@ -7002,8 +7002,8 @@ Remove non-existing vars from compact()
 
 ### `SensitiveConstantNameRector`
 
-- class: [`Rector\Php73\Rector\ConstFetch\SensitiveConstantNameRector`](/../master/rules/php-73/src/Rector/ConstFetch/SensitiveConstantNameRector.php)
-- [test fixtures](/../master/rules/php-73/tests/Rector/ConstFetch/SensitiveConstantNameRector/Fixture)
+- class: [`Rector\Php73\Rector\ConstFetch\SensitiveConstantNameRector`](/../master/rules/php73/src/Rector/ConstFetch/SensitiveConstantNameRector.php)
+- [test fixtures](/../master/rules/php73/tests/Rector/ConstFetch/SensitiveConstantNameRector/Fixture)
 
 Changes case insensitive constants to sensitive ones.
 
@@ -7018,8 +7018,8 @@ Changes case insensitive constants to sensitive ones.
 
 ### `SensitiveDefineRector`
 
-- class: [`Rector\Php73\Rector\FuncCall\SensitiveDefineRector`](/../master/rules/php-73/src/Rector/FuncCall/SensitiveDefineRector.php)
-- [test fixtures](/../master/rules/php-73/tests/Rector/FuncCall/SensitiveDefineRector/Fixture)
+- class: [`Rector\Php73\Rector\FuncCall\SensitiveDefineRector`](/../master/rules/php73/src/Rector/FuncCall/SensitiveDefineRector.php)
+- [test fixtures](/../master/rules/php73/tests/Rector/FuncCall/SensitiveDefineRector/Fixture)
 
 Changes case insensitive constants to sensitive ones.
 
@@ -7032,8 +7032,8 @@ Changes case insensitive constants to sensitive ones.
 
 ### `SensitiveHereNowDocRector`
 
-- class: [`Rector\Php73\Rector\String_\SensitiveHereNowDocRector`](/../master/rules/php-73/src/Rector/String_/SensitiveHereNowDocRector.php)
-- [test fixtures](/../master/rules/php-73/tests/Rector/String_/SensitiveHereNowDocRector/Fixture)
+- class: [`Rector\Php73\Rector\String_\SensitiveHereNowDocRector`](/../master/rules/php73/src/Rector/String_/SensitiveHereNowDocRector.php)
+- [test fixtures](/../master/rules/php73/tests/Rector/String_/SensitiveHereNowDocRector/Fixture)
 
 Changes heredoc/nowdoc that contains closing word to safe wrapper name
 
@@ -7049,8 +7049,8 @@ Changes heredoc/nowdoc that contains closing word to safe wrapper name
 
 ### `SetCookieRector`
 
-- class: [`Rector\Php73\Rector\FuncCall\SetCookieRector`](/../master/rules/php-73/src/Rector/FuncCall/SetCookieRector.php)
-- [test fixtures](/../master/rules/php-73/tests/Rector/FuncCall/SetcookieRector/Fixture)
+- class: [`Rector\Php73\Rector\FuncCall\SetCookieRector`](/../master/rules/php73/src/Rector/FuncCall/SetCookieRector.php)
+- [test fixtures](/../master/rules/php73/tests/Rector/FuncCall/SetcookieRector/Fixture)
 
 Convert setcookie argument to PHP7.3 option array
 
@@ -7068,8 +7068,8 @@ Convert setcookie argument to PHP7.3 option array
 
 ### `StringifyStrNeedlesRector`
 
-- class: [`Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector`](/../master/rules/php-73/src/Rector/FuncCall/StringifyStrNeedlesRector.php)
-- [test fixtures](/../master/rules/php-73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture)
+- class: [`Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector`](/../master/rules/php73/src/Rector/FuncCall/StringifyStrNeedlesRector.php)
+- [test fixtures](/../master/rules/php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture)
 
 Makes needles explicit strings
 
@@ -7085,8 +7085,8 @@ Makes needles explicit strings
 
 ### `AddLiteralSeparatorToNumberRector`
 
-- class: [`Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector`](/../master/rules/php-74/src/Rector/LNumber/AddLiteralSeparatorToNumberRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture)
+- class: [`Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector`](/../master/rules/php74/src/Rector/LNumber/AddLiteralSeparatorToNumberRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture)
 
 Add "_" as thousands separator in numbers
 
@@ -7107,8 +7107,8 @@ Add "_" as thousands separator in numbers
 
 ### `ArrayKeyExistsOnPropertyRector`
 
-- class: [`Rector\Php74\Rector\FuncCall\ArrayKeyExistsOnPropertyRector`](/../master/rules/php-74/src/Rector/FuncCall/ArrayKeyExistsOnPropertyRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/Fixture)
+- class: [`Rector\Php74\Rector\FuncCall\ArrayKeyExistsOnPropertyRector`](/../master/rules/php74/src/Rector/FuncCall/ArrayKeyExistsOnPropertyRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/Fixture)
 
 Change array_key_exists() on property to property_exists()
 
@@ -7126,8 +7126,8 @@ Change array_key_exists() on property to property_exists()
 
 ### `ArraySpreadInsteadOfArrayMergeRector`
 
-- class: [`Rector\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector`](/../master/rules/php-74/src/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture)
+- class: [`Rector\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector`](/../master/rules/php74/src/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture)
 
 Change array_merge() to spread operator, except values with possible string key values
 
@@ -7153,8 +7153,8 @@ Change array_merge() to spread operator, except values with possible string key
 
 ### `ChangeReflectionTypeToStringToGetNameRector`
 
-- class: [`Rector\Php74\Rector\MethodCall\ChangeReflectionTypeToStringToGetNameRector`](/../master/rules/php-74/src/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture)
+- class: [`Rector\Php74\Rector\MethodCall\ChangeReflectionTypeToStringToGetNameRector`](/../master/rules/php74/src/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture)
 
 Change string calls on ReflectionType
 
@@ -7181,8 +7181,8 @@ Change string calls on ReflectionType
 
 ### `ClassConstantToSelfClassRector`
 
-- class: [`Rector\Php74\Rector\MagicConstClass\ClassConstantToSelfClassRector`](/../master/rules/php-74/src/Rector/MagicConstClass/ClassConstantToSelfClassRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/Fixture)
+- class: [`Rector\Php74\Rector\MagicConstClass\ClassConstantToSelfClassRector`](/../master/rules/php74/src/Rector/MagicConstClass/ClassConstantToSelfClassRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/Fixture)
 
 Change __CLASS__ to self::class
 
@@ -7201,8 +7201,8 @@ Change __CLASS__ to self::class
 
 ### `ClosureToArrowFunctionRector`
 
-- class: [`Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector`](/../master/rules/php-74/src/Rector/Closure/ClosureToArrowFunctionRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture)
+- class: [`Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector`](/../master/rules/php74/src/Rector/Closure/ClosureToArrowFunctionRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture)
 
 Change closure to arrow function
 
@@ -7223,8 +7223,8 @@ Change closure to arrow function
 
 ### `ExportToReflectionFunctionRector`
 
-- class: [`Rector\Php74\Rector\StaticCall\ExportToReflectionFunctionRector`](/../master/rules/php-74/src/Rector/StaticCall/ExportToReflectionFunctionRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/Fixture)
+- class: [`Rector\Php74\Rector\StaticCall\ExportToReflectionFunctionRector`](/../master/rules/php74/src/Rector/StaticCall/ExportToReflectionFunctionRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/Fixture)
 
 Change export() to ReflectionFunction alternatives
 
@@ -7239,8 +7239,8 @@ Change export() to ReflectionFunction alternatives
 
 ### `FilterVarToAddSlashesRector`
 
-- class: [`Rector\Php74\Rector\FuncCall\FilterVarToAddSlashesRector`](/../master/rules/php-74/src/Rector/FuncCall/FilterVarToAddSlashesRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/Fixture)
+- class: [`Rector\Php74\Rector\FuncCall\FilterVarToAddSlashesRector`](/../master/rules/php74/src/Rector/FuncCall/FilterVarToAddSlashesRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/Fixture)
 
 Change filter_var() with slash escaping to addslashes()
 
@@ -7254,8 +7254,8 @@ Change filter_var() with slash escaping to addslashes()
 
 ### `GetCalledClassToStaticClassRector`
 
-- class: [`Rector\Php74\Rector\FuncCall\GetCalledClassToStaticClassRector`](/../master/rules/php-74/src/Rector/FuncCall/GetCalledClassToStaticClassRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/Fixture)
+- class: [`Rector\Php74\Rector\FuncCall\GetCalledClassToStaticClassRector`](/../master/rules/php74/src/Rector/FuncCall/GetCalledClassToStaticClassRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/Fixture)
 
 Change __CLASS__ to self::class
 
@@ -7274,8 +7274,8 @@ Change __CLASS__ to self::class
 
 ### `MbStrrposEncodingArgumentPositionRector`
 
-- class: [`Rector\Php74\Rector\FuncCall\MbStrrposEncodingArgumentPositionRector`](/../master/rules/php-74/src/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/Fixture)
+- class: [`Rector\Php74\Rector\FuncCall\MbStrrposEncodingArgumentPositionRector`](/../master/rules/php74/src/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/Fixture)
 
 Change mb_strrpos() encoding argument position
 
@@ -7288,8 +7288,8 @@ Change mb_strrpos() encoding argument position
 
 ### `NullCoalescingOperatorRector`
 
-- class: [`Rector\Php74\Rector\Assign\NullCoalescingOperatorRector`](/../master/rules/php-74/src/Rector/Assign/NullCoalescingOperatorRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/Assign/NullCoalescingOperatorRector/Fixture)
+- class: [`Rector\Php74\Rector\Assign\NullCoalescingOperatorRector`](/../master/rules/php74/src/Rector/Assign/NullCoalescingOperatorRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/Assign/NullCoalescingOperatorRector/Fixture)
 
 Use null coalescing operator ??=
 
@@ -7303,8 +7303,8 @@ Use null coalescing operator ??=
 
 ### `RealToFloatTypeCastRector`
 
-- class: [`Rector\Php74\Rector\Double\RealToFloatTypeCastRector`](/../master/rules/php-74/src/Rector/Double/RealToFloatTypeCastRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/Double/RealToFloatTypeCastRector/Fixture)
+- class: [`Rector\Php74\Rector\Double\RealToFloatTypeCastRector`](/../master/rules/php74/src/Rector/Double/RealToFloatTypeCastRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/Double/RealToFloatTypeCastRector/Fixture)
 
 Change deprecated (real) to (float)
 
@@ -7325,8 +7325,8 @@ Change deprecated (real) to (float)
 
 ### `ReservedFnFunctionRector`
 
-- class: [`Rector\Php74\Rector\Function_\ReservedFnFunctionRector`](/../master/rules/php-74/src/Rector/Function_/ReservedFnFunctionRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/Function_/ReservedFnFunctionRector/Fixture)
+- class: [`Rector\Php74\Rector\Function_\ReservedFnFunctionRector`](/../master/rules/php74/src/Rector/Function_/ReservedFnFunctionRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/Function_/ReservedFnFunctionRector/Fixture)
 
 Change fn() function name, since it will be reserved keyword
 
@@ -7349,10 +7349,27 @@ Change fn() function name, since it will be reserved keyword
 
 <br>
 
+### `RestoreDefaultNullToNullableTypePropertyRector`
+
+- class: [`Rector\Php74\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector`](/../master/rules/php74/src/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector/Fixture)
+
+Add null default to properties with PHP 7.4 property nullable type
+
+```diff
+ class SomeClass
+ {
+-    public ?string $name;
++    public ?string $name = null;
+ }
+```
+
+<br>
+
 ### `TypedPropertyRector`
 
-- class: [`Rector\Php74\Rector\Property\TypedPropertyRector`](/../master/rules/php-74/src/Rector/Property/TypedPropertyRector.php)
-- [test fixtures](/../master/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture)
+- class: [`Rector\Php74\Rector\Property\TypedPropertyRector`](/../master/rules/php74/src/Rector/Property/TypedPropertyRector.php)
+- [test fixtures](/../master/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture)
 
 Changes property `@var` annotations from annotation to type.
 
@@ -7373,8 +7390,8 @@ Changes property `@var` annotations from annotation to type.
 
 ### `UnionTypesRector`
 
-- class: [`Rector\Php80\Rector\FunctionLike\UnionTypesRector`](/../master/rules/php-80/src/Rector/FunctionLike/UnionTypesRector.php)
-- [test fixtures](/../master/rules/php-80/tests/Rector/FunctionLike/UnionTypesRector/Fixture)
+- class: [`Rector\Php80\Rector\FunctionLike\UnionTypesRector`](/../master/rules/php80/src/Rector/FunctionLike/UnionTypesRector.php)
+- [test fixtures](/../master/rules/php80/tests/Rector/FunctionLike/UnionTypesRector/Fixture)
 
 Change docs types to union types, where possible (properties are covered by TypedPropertiesRector)
 
diff --git a/ecs.yaml b/ecs.yaml
index 9f6341fcae7a..076fd6b6327b 100644
--- a/ecs.yaml
+++ b/ecs.yaml
@@ -65,7 +65,7 @@ parameters:
         Symplify\CodingStandard\Fixer\Order\PrivateMethodOrderByUseFixer: null
 
         PhpCsFixer\Fixer\Phpdoc\PhpdocTypesFixer:
-            - 'rules/php-74/src/Rector/Double/RealToFloatTypeCastRector.php'
+            - 'rules/php74/src/Rector/Double/RealToFloatTypeCastRector.php'
 
         Symplify\CodingStandard\Sniffs\CleanCode\ForbiddenReferenceSniff: null
 
@@ -88,7 +88,7 @@ parameters:
             # node printing
             - 'utils/documentation-generator/src/Command/DumpNodesCommand.php'
             # 3rd party code
-            - 'rules/php-70/src/EregToPcreTransformer.php'
+            - 'rules/php70/src/EregToPcreTransformer.php'
 
         Symplify\CodingStandard\Sniffs\CleanCode\CognitiveComplexitySniff:
             # todo
@@ -105,10 +105,10 @@ parameters:
             # per node logic
             - 'utils/documentation-generator/src/Command/DumpNodesCommand.php'
             # copied 3rd party logic
-            - 'rules/php-70/src/EregToPcreTransformer.php'
+            - 'rules/php70/src/EregToPcreTransformer.php'
             # dev
             - 'packages/type-declaration/src/Rector/FunctionLike/*TypeDeclarationRector.php'
-            - 'rules/php-70/src/Rector/If_/IfToSpaceshipRector.php'
+            - 'rules/php70/src/Rector/If_/IfToSpaceshipRector.php'
 
         Symplify\CodingStandard\Sniffs\ControlStructure\SprintfOverContactSniff:
             # respects inherited pattern for better comparing
@@ -129,7 +129,7 @@ parameters:
 
         Symplify\CodingStandard\Sniffs\Debug\CommentedOutCodeSniff.Found:
             # notes
-            - 'rules/php-72/src/Rector/Each/ListEachRector.php'
+            - 'rules/php72/src/Rector/Each/ListEachRector.php'
             - 'rules/dead-code/src/Rector/ClassMethod/RemoveOverriddenValuesRector.php'
             - 'rules/php-spec-to-phpunit/src/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php'
             - 'rules/cakephp-to-symfony/tests/Rector/Class_/CakePHPModelToDoctrineRepositoryRector/CakePHPModelToDoctrineRepositoryRectorTest.php'
@@ -154,6 +154,6 @@ parameters:
 
         SlevomatCodingStandard\Sniffs\Namespaces\ReferenceUsedNamesOnlySniff.PartialUse:
             - "rules/dead-code/src/Rector/Plus/RemoveDeadZeroAndOneOperationRector.php"
-            - "rules/php-56/src/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php"
+            - "rules/php56/src/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php"
 
     line_ending: "\n"
diff --git a/rules/php-52/src/Rector/Property/VarToPublicPropertyRector.php b/rules/php52/src/Rector/Property/VarToPublicPropertyRector.php
similarity index 100%
rename from rules/php-52/src/Rector/Property/VarToPublicPropertyRector.php
rename to rules/php52/src/Rector/Property/VarToPublicPropertyRector.php
diff --git a/rules/php-52/src/Rector/Switch_/ContinueToBreakInSwitchRector.php b/rules/php52/src/Rector/Switch_/ContinueToBreakInSwitchRector.php
similarity index 100%
rename from rules/php-52/src/Rector/Switch_/ContinueToBreakInSwitchRector.php
rename to rules/php52/src/Rector/Switch_/ContinueToBreakInSwitchRector.php
diff --git a/rules/php-52/tests/Rector/Property/VarToPublicPropertyRector/Fixture/fixture.php.inc b/rules/php52/tests/Rector/Property/VarToPublicPropertyRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-52/tests/Rector/Property/VarToPublicPropertyRector/Fixture/fixture.php.inc
rename to rules/php52/tests/Rector/Property/VarToPublicPropertyRector/Fixture/fixture.php.inc
diff --git a/rules/php-52/tests/Rector/Property/VarToPublicPropertyRector/VarToPublicPropertyRectorTest.php b/rules/php52/tests/Rector/Property/VarToPublicPropertyRector/VarToPublicPropertyRectorTest.php
similarity index 100%
rename from rules/php-52/tests/Rector/Property/VarToPublicPropertyRector/VarToPublicPropertyRectorTest.php
rename to rules/php52/tests/Rector/Property/VarToPublicPropertyRector/VarToPublicPropertyRectorTest.php
diff --git a/rules/php-52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/ContinueToBreakInSwitchRectorTest.php b/rules/php52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/ContinueToBreakInSwitchRectorTest.php
similarity index 100%
rename from rules/php-52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/ContinueToBreakInSwitchRectorTest.php
rename to rules/php52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/ContinueToBreakInSwitchRectorTest.php
diff --git a/rules/php-52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture/fixture.php.inc b/rules/php52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture/fixture.php.inc
rename to rules/php52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture/fixture.php.inc
diff --git a/rules/php-52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture/skip_continue_with_argument.php.inc b/rules/php52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture/skip_continue_with_argument.php.inc
similarity index 100%
rename from rules/php-52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture/skip_continue_with_argument.php.inc
rename to rules/php52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture/skip_continue_with_argument.php.inc
diff --git a/rules/php-52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture/skip_nested.php.inc b/rules/php52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture/skip_nested.php.inc
similarity index 100%
rename from rules/php-52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture/skip_nested.php.inc
rename to rules/php52/tests/Rector/Switch_/ContinueToBreakInSwitchRector/Fixture/skip_nested.php.inc
diff --git a/rules/php-53/src/Rector/FuncCall/DirNameFileConstantToDirConstantRector.php b/rules/php53/src/Rector/FuncCall/DirNameFileConstantToDirConstantRector.php
similarity index 100%
rename from rules/php-53/src/Rector/FuncCall/DirNameFileConstantToDirConstantRector.php
rename to rules/php53/src/Rector/FuncCall/DirNameFileConstantToDirConstantRector.php
diff --git a/rules/php-53/src/Rector/Ternary/TernaryToElvisRector.php b/rules/php53/src/Rector/Ternary/TernaryToElvisRector.php
similarity index 100%
rename from rules/php-53/src/Rector/Ternary/TernaryToElvisRector.php
rename to rules/php53/src/Rector/Ternary/TernaryToElvisRector.php
diff --git a/rules/php-53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/DirNameFileConstantToDirConstantRectorTest.php b/rules/php53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/DirNameFileConstantToDirConstantRectorTest.php
similarity index 100%
rename from rules/php-53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/DirNameFileConstantToDirConstantRectorTest.php
rename to rules/php53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/DirNameFileConstantToDirConstantRectorTest.php
diff --git a/rules/php-53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/Fixture/fixture.php.inc b/rules/php53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/Fixture/fixture.php.inc
rename to rules/php53/tests/Rector/FuncCall/DirNameFileConstantToDirConstantRector/Fixture/fixture.php.inc
diff --git a/rules/php-53/tests/Rector/Ternary/TernaryToElvisRector/Fixture/fixture.php.inc b/rules/php53/tests/Rector/Ternary/TernaryToElvisRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-53/tests/Rector/Ternary/TernaryToElvisRector/Fixture/fixture.php.inc
rename to rules/php53/tests/Rector/Ternary/TernaryToElvisRector/Fixture/fixture.php.inc
diff --git a/rules/php-53/tests/Rector/Ternary/TernaryToElvisRector/Fixture/parenthesis.php.inc b/rules/php53/tests/Rector/Ternary/TernaryToElvisRector/Fixture/parenthesis.php.inc
similarity index 100%
rename from rules/php-53/tests/Rector/Ternary/TernaryToElvisRector/Fixture/parenthesis.php.inc
rename to rules/php53/tests/Rector/Ternary/TernaryToElvisRector/Fixture/parenthesis.php.inc
diff --git a/rules/php-53/tests/Rector/Ternary/TernaryToElvisRector/Fixture/yolo.php.inc b/rules/php53/tests/Rector/Ternary/TernaryToElvisRector/Fixture/yolo.php.inc
similarity index 100%
rename from rules/php-53/tests/Rector/Ternary/TernaryToElvisRector/Fixture/yolo.php.inc
rename to rules/php53/tests/Rector/Ternary/TernaryToElvisRector/Fixture/yolo.php.inc
diff --git a/rules/php-53/tests/Rector/Ternary/TernaryToElvisRector/TernaryToElvisRectorTest.php b/rules/php53/tests/Rector/Ternary/TernaryToElvisRector/TernaryToElvisRectorTest.php
similarity index 100%
rename from rules/php-53/tests/Rector/Ternary/TernaryToElvisRector/TernaryToElvisRectorTest.php
rename to rules/php53/tests/Rector/Ternary/TernaryToElvisRector/TernaryToElvisRectorTest.php
diff --git a/rules/php-54/src/Rector/Break_/RemoveZeroBreakContinueRector.php b/rules/php54/src/Rector/Break_/RemoveZeroBreakContinueRector.php
similarity index 100%
rename from rules/php-54/src/Rector/Break_/RemoveZeroBreakContinueRector.php
rename to rules/php54/src/Rector/Break_/RemoveZeroBreakContinueRector.php
diff --git a/rules/php-54/src/Rector/FuncCall/RemoveReferenceFromCallRector.php b/rules/php54/src/Rector/FuncCall/RemoveReferenceFromCallRector.php
similarity index 100%
rename from rules/php-54/src/Rector/FuncCall/RemoveReferenceFromCallRector.php
rename to rules/php54/src/Rector/FuncCall/RemoveReferenceFromCallRector.php
diff --git a/rules/php-54/tests/Rector/Break_/RemoveZeroBreakContinueRector/Fixture/fixture.php.inc b/rules/php54/tests/Rector/Break_/RemoveZeroBreakContinueRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-54/tests/Rector/Break_/RemoveZeroBreakContinueRector/Fixture/fixture.php.inc
rename to rules/php54/tests/Rector/Break_/RemoveZeroBreakContinueRector/Fixture/fixture.php.inc
diff --git a/rules/php-54/tests/Rector/Break_/RemoveZeroBreakContinueRector/RemoveZeroBreakContinueRectorTest.php b/rules/php54/tests/Rector/Break_/RemoveZeroBreakContinueRector/RemoveZeroBreakContinueRectorTest.php
similarity index 100%
rename from rules/php-54/tests/Rector/Break_/RemoveZeroBreakContinueRector/RemoveZeroBreakContinueRectorTest.php
rename to rules/php54/tests/Rector/Break_/RemoveZeroBreakContinueRector/RemoveZeroBreakContinueRectorTest.php
diff --git a/rules/php-54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/Fixture/fixture.php.inc b/rules/php54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/Fixture/fixture.php.inc
rename to rules/php54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/Fixture/fixture.php.inc
diff --git a/rules/php-54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/RemoveReferenceFromCallRectorTest.php b/rules/php54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/RemoveReferenceFromCallRectorTest.php
similarity index 100%
rename from rules/php-54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/RemoveReferenceFromCallRectorTest.php
rename to rules/php54/tests/Rector/FuncCall/RemoveReferenceFromCallRector/RemoveReferenceFromCallRectorTest.php
diff --git a/rules/php-55/src/Rector/FuncCall/PregReplaceEModifierRector.php b/rules/php55/src/Rector/FuncCall/PregReplaceEModifierRector.php
similarity index 100%
rename from rules/php-55/src/Rector/FuncCall/PregReplaceEModifierRector.php
rename to rules/php55/src/Rector/FuncCall/PregReplaceEModifierRector.php
diff --git a/rules/php-55/src/Rector/String_/StringClassNameToClassConstantRector.php b/rules/php55/src/Rector/String_/StringClassNameToClassConstantRector.php
similarity index 100%
rename from rules/php-55/src/Rector/String_/StringClassNameToClassConstantRector.php
rename to rules/php55/src/Rector/String_/StringClassNameToClassConstantRector.php
diff --git a/rules/php-55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/call_function.php.inc b/rules/php55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/call_function.php.inc
similarity index 100%
rename from rules/php-55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/call_function.php.inc
rename to rules/php55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/call_function.php.inc
diff --git a/rules/php-55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/fixture.php.inc b/rules/php55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/fixture.php.inc
rename to rules/php55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/fixture.php.inc
diff --git a/rules/php-55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/slashes.php.inc b/rules/php55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/slashes.php.inc
similarity index 100%
rename from rules/php-55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/slashes.php.inc
rename to rules/php55/tests/Rector/FuncCall/PregReplaceEModifierRector/Fixture/slashes.php.inc
diff --git a/rules/php-55/tests/Rector/FuncCall/PregReplaceEModifierRector/PregReplaceEModifierRectorTest.php b/rules/php55/tests/Rector/FuncCall/PregReplaceEModifierRector/PregReplaceEModifierRectorTest.php
similarity index 100%
rename from rules/php-55/tests/Rector/FuncCall/PregReplaceEModifierRector/PregReplaceEModifierRectorTest.php
rename to rules/php55/tests/Rector/FuncCall/PregReplaceEModifierRector/PregReplaceEModifierRectorTest.php
diff --git a/rules/php-55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture/fixture.php.inc b/rules/php55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture/fixture.php.inc
rename to rules/php55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture/fixture.php.inc
diff --git a/rules/php-55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture/skip_error.php.inc b/rules/php55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture/skip_error.php.inc
similarity index 100%
rename from rules/php-55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture/skip_error.php.inc
rename to rules/php55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture/skip_error.php.inc
diff --git a/rules/php-55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture/skip_sensitive.php.inc b/rules/php55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture/skip_sensitive.php.inc
similarity index 100%
rename from rules/php-55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture/skip_sensitive.php.inc
rename to rules/php55/tests/Rector/String_/StringClassNameToClassConstantRector/Fixture/skip_sensitive.php.inc
diff --git a/rules/php-55/tests/Rector/String_/StringClassNameToClassConstantRector/Source/AnotherClass.php b/rules/php55/tests/Rector/String_/StringClassNameToClassConstantRector/Source/AnotherClass.php
similarity index 100%
rename from rules/php-55/tests/Rector/String_/StringClassNameToClassConstantRector/Source/AnotherClass.php
rename to rules/php55/tests/Rector/String_/StringClassNameToClassConstantRector/Source/AnotherClass.php
diff --git a/rules/php-55/tests/Rector/String_/StringClassNameToClassConstantRector/StringClassNameToClassConstantRectorTest.php b/rules/php55/tests/Rector/String_/StringClassNameToClassConstantRector/StringClassNameToClassConstantRectorTest.php
similarity index 100%
rename from rules/php-55/tests/Rector/String_/StringClassNameToClassConstantRector/StringClassNameToClassConstantRectorTest.php
rename to rules/php55/tests/Rector/String_/StringClassNameToClassConstantRector/StringClassNameToClassConstantRectorTest.php
diff --git a/rules/php-56/src/Rector/FuncCall/PowToExpRector.php b/rules/php56/src/Rector/FuncCall/PowToExpRector.php
similarity index 100%
rename from rules/php-56/src/Rector/FuncCall/PowToExpRector.php
rename to rules/php56/src/Rector/FuncCall/PowToExpRector.php
diff --git a/rules/php-56/src/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php b/rules/php56/src/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php
similarity index 100%
rename from rules/php-56/src/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php
rename to rules/php56/src/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php
diff --git a/rules/php-56/tests/Rector/FuncCall/PowToExpRector/Fixture/fixture.php.inc b/rules/php56/tests/Rector/FuncCall/PowToExpRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FuncCall/PowToExpRector/Fixture/fixture.php.inc
rename to rules/php56/tests/Rector/FuncCall/PowToExpRector/Fixture/fixture.php.inc
diff --git a/rules/php-56/tests/Rector/FuncCall/PowToExpRector/PowToExpRectorTest.php b/rules/php56/tests/Rector/FuncCall/PowToExpRector/PowToExpRectorTest.php
similarity index 100%
rename from rules/php-56/tests/Rector/FuncCall/PowToExpRector/PowToExpRectorTest.php
rename to rules/php56/tests/Rector/FuncCall/PowToExpRector/PowToExpRectorTest.php
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/AddDefaultValueForUndefinedVariableRectorTest.php b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/AddDefaultValueForUndefinedVariableRectorTest.php
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/AddDefaultValueForUndefinedVariableRectorTest.php
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/AddDefaultValueForUndefinedVariableRectorTest.php
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/anonymous_function.php.inc b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/anonymous_function.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/anonymous_function.php.inc
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/anonymous_function.php.inc
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/fixture.php.inc b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/fixture.php.inc
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/fixture.php.inc
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/in_foreach.php.inc b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/in_foreach.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/in_foreach.php.inc
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/in_foreach.php.inc
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/keep_vimeo_unset.php.inc b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/keep_vimeo_unset.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/keep_vimeo_unset.php.inc
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/keep_vimeo_unset.php.inc
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_foreach_assign.php.inc b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_foreach_assign.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_foreach_assign.php.inc
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_foreach_assign.php.inc
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_global_variables.php.inc b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_global_variables.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_global_variables.php.inc
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_global_variables.php.inc
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_list.php.inc b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_list.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_list.php.inc
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_list.php.inc
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_reference_assign.php.inc b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_reference_assign.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_reference_assign.php.inc
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_reference_assign.php.inc
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_this_assign.php.inc b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_this_assign.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_this_assign.php.inc
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/skip_this_assign.php.inc
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/take_static_into_account.php.inc b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/take_static_into_account.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/take_static_into_account.php.inc
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/take_static_into_account.php.inc
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/vimeo_else.php.inc b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/vimeo_else.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/vimeo_else.php.inc
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/vimeo_else.php.inc
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/vimeo_one.php.inc b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/vimeo_one.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/vimeo_one.php.inc
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/vimeo_one.php.inc
diff --git a/rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/vimeo_two.php.inc b/rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/vimeo_two.php.inc
similarity index 100%
rename from rules/php-56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/vimeo_two.php.inc
rename to rules/php56/tests/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/vimeo_two.php.inc
diff --git a/rules/php-70/config/config.yaml b/rules/php70/config/config.yaml
similarity index 100%
rename from rules/php-70/config/config.yaml
rename to rules/php70/config/config.yaml
diff --git a/rules/php-70/src/EregToPcreTransformer.php b/rules/php70/src/EregToPcreTransformer.php
similarity index 100%
rename from rules/php-70/src/EregToPcreTransformer.php
rename to rules/php70/src/EregToPcreTransformer.php
diff --git a/rules/php-70/src/Exception/InvalidEregException.php b/rules/php70/src/Exception/InvalidEregException.php
similarity index 100%
rename from rules/php-70/src/Exception/InvalidEregException.php
rename to rules/php70/src/Exception/InvalidEregException.php
diff --git a/rules/php-70/src/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php b/rules/php70/src/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php
similarity index 100%
rename from rules/php-70/src/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php
rename to rules/php70/src/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector.php
diff --git a/rules/php-70/src/Rector/FuncCall/CallUserMethodRector.php b/rules/php70/src/Rector/FuncCall/CallUserMethodRector.php
similarity index 100%
rename from rules/php-70/src/Rector/FuncCall/CallUserMethodRector.php
rename to rules/php70/src/Rector/FuncCall/CallUserMethodRector.php
diff --git a/rules/php-70/src/Rector/FuncCall/EregToPregMatchRector.php b/rules/php70/src/Rector/FuncCall/EregToPregMatchRector.php
similarity index 100%
rename from rules/php-70/src/Rector/FuncCall/EregToPregMatchRector.php
rename to rules/php70/src/Rector/FuncCall/EregToPregMatchRector.php
diff --git a/rules/php-70/src/Rector/FuncCall/MultiDirnameRector.php b/rules/php70/src/Rector/FuncCall/MultiDirnameRector.php
similarity index 100%
rename from rules/php-70/src/Rector/FuncCall/MultiDirnameRector.php
rename to rules/php70/src/Rector/FuncCall/MultiDirnameRector.php
diff --git a/rules/php-70/src/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector.php b/rules/php70/src/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector.php
similarity index 100%
rename from rules/php-70/src/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector.php
rename to rules/php70/src/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector.php
diff --git a/rules/php-70/src/Rector/FuncCall/RandomFunctionRector.php b/rules/php70/src/Rector/FuncCall/RandomFunctionRector.php
similarity index 100%
rename from rules/php-70/src/Rector/FuncCall/RandomFunctionRector.php
rename to rules/php70/src/Rector/FuncCall/RandomFunctionRector.php
diff --git a/rules/php-70/src/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php b/rules/php70/src/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php
similarity index 100%
rename from rules/php-70/src/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php
rename to rules/php70/src/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector.php
diff --git a/rules/php-70/src/Rector/FunctionLike/ExceptionHandlerTypehintRector.php b/rules/php70/src/Rector/FunctionLike/ExceptionHandlerTypehintRector.php
similarity index 100%
rename from rules/php-70/src/Rector/FunctionLike/ExceptionHandlerTypehintRector.php
rename to rules/php70/src/Rector/FunctionLike/ExceptionHandlerTypehintRector.php
diff --git a/rules/php-70/src/Rector/FunctionLike/Php4ConstructorRector.php b/rules/php70/src/Rector/FunctionLike/Php4ConstructorRector.php
similarity index 100%
rename from rules/php-70/src/Rector/FunctionLike/Php4ConstructorRector.php
rename to rules/php70/src/Rector/FunctionLike/Php4ConstructorRector.php
diff --git a/rules/php-70/src/Rector/If_/IfToSpaceshipRector.php b/rules/php70/src/Rector/If_/IfToSpaceshipRector.php
similarity index 100%
rename from rules/php-70/src/Rector/If_/IfToSpaceshipRector.php
rename to rules/php70/src/Rector/If_/IfToSpaceshipRector.php
diff --git a/rules/php-70/src/Rector/List_/EmptyListRector.php b/rules/php70/src/Rector/List_/EmptyListRector.php
similarity index 100%
rename from rules/php-70/src/Rector/List_/EmptyListRector.php
rename to rules/php70/src/Rector/List_/EmptyListRector.php
diff --git a/rules/php-70/src/Rector/List_/ListSplitStringRector.php b/rules/php70/src/Rector/List_/ListSplitStringRector.php
similarity index 100%
rename from rules/php-70/src/Rector/List_/ListSplitStringRector.php
rename to rules/php70/src/Rector/List_/ListSplitStringRector.php
diff --git a/rules/php-70/src/Rector/List_/ListSwapArrayOrderRector.php b/rules/php70/src/Rector/List_/ListSwapArrayOrderRector.php
similarity index 100%
rename from rules/php-70/src/Rector/List_/ListSwapArrayOrderRector.php
rename to rules/php70/src/Rector/List_/ListSwapArrayOrderRector.php
diff --git a/rules/php-70/src/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php b/rules/php70/src/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php
similarity index 100%
rename from rules/php-70/src/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php
rename to rules/php70/src/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php
diff --git a/rules/php-70/src/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php b/rules/php70/src/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php
similarity index 100%
rename from rules/php-70/src/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php
rename to rules/php70/src/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php
diff --git a/rules/php-70/src/Rector/Switch_/ReduceMultipleDefaultSwitchRector.php b/rules/php70/src/Rector/Switch_/ReduceMultipleDefaultSwitchRector.php
similarity index 100%
rename from rules/php-70/src/Rector/Switch_/ReduceMultipleDefaultSwitchRector.php
rename to rules/php70/src/Rector/Switch_/ReduceMultipleDefaultSwitchRector.php
diff --git a/rules/php-70/src/Rector/Ternary/TernaryToNullCoalescingRector.php b/rules/php70/src/Rector/Ternary/TernaryToNullCoalescingRector.php
similarity index 100%
rename from rules/php-70/src/Rector/Ternary/TernaryToNullCoalescingRector.php
rename to rules/php70/src/Rector/Ternary/TernaryToNullCoalescingRector.php
diff --git a/rules/php-70/src/Rector/Ternary/TernaryToSpaceshipRector.php b/rules/php70/src/Rector/Ternary/TernaryToSpaceshipRector.php
similarity index 100%
rename from rules/php-70/src/Rector/Ternary/TernaryToSpaceshipRector.php
rename to rules/php70/src/Rector/Ternary/TernaryToSpaceshipRector.php
diff --git a/rules/php-70/src/ValueObject/VariableAssignPair.php b/rules/php70/src/ValueObject/VariableAssignPair.php
similarity index 100%
rename from rules/php-70/src/ValueObject/VariableAssignPair.php
rename to rules/php70/src/ValueObject/VariableAssignPair.php
diff --git a/rules/php-70/tests/EregToPcreTransformerTest.php b/rules/php70/tests/EregToPcreTransformerTest.php
similarity index 100%
rename from rules/php-70/tests/EregToPcreTransformerTest.php
rename to rules/php70/tests/EregToPcreTransformerTest.php
diff --git a/rules/php-70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/BreakNotInLoopOrSwitchToReturnRectorTest.php b/rules/php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/BreakNotInLoopOrSwitchToReturnRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/BreakNotInLoopOrSwitchToReturnRectorTest.php
rename to rules/php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/BreakNotInLoopOrSwitchToReturnRectorTest.php
diff --git a/rules/php-70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/Keep.php b/rules/php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/Keep.php
similarity index 100%
rename from rules/php-70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/Keep.php
rename to rules/php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/Keep.php
diff --git a/rules/php-70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/foreach_not.php.inc b/rules/php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/foreach_not.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/foreach_not.php.inc
rename to rules/php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/foreach_not.php.inc
diff --git a/rules/php-70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/return.php.inc b/rules/php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/return.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/return.php.inc
rename to rules/php70/tests/Rector/Break_/BreakNotInLoopOrSwitchToReturnRector/Fixture/return.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/CallUserMethodRector/CallUserMethodRectorTest.php b/rules/php70/tests/Rector/FuncCall/CallUserMethodRector/CallUserMethodRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/CallUserMethodRector/CallUserMethodRectorTest.php
rename to rules/php70/tests/Rector/FuncCall/CallUserMethodRector/CallUserMethodRectorTest.php
diff --git a/rules/php-70/tests/Rector/FuncCall/CallUserMethodRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/FuncCall/CallUserMethodRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/CallUserMethodRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/FuncCall/CallUserMethodRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/EregToPregMatchRector/EregToPregMatchRectorTest.php b/rules/php70/tests/Rector/FuncCall/EregToPregMatchRector/EregToPregMatchRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/EregToPregMatchRector/EregToPregMatchRectorTest.php
rename to rules/php70/tests/Rector/FuncCall/EregToPregMatchRector/EregToPregMatchRectorTest.php
diff --git a/rules/php-70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture2.php.inc b/rules/php70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture2.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture2.php.inc
rename to rules/php70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture2.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture3.php.inc b/rules/php70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture3.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture3.php.inc
rename to rules/php70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture3.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture4.php.inc b/rules/php70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture4.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture4.php.inc
rename to rules/php70/tests/Rector/FuncCall/EregToPregMatchRector/Fixture/fixture4.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/MultiDirnameRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/FuncCall/MultiDirnameRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/MultiDirnameRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/FuncCall/MultiDirnameRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/MultiDirnameRector/Fixture/fixture2.php.inc b/rules/php70/tests/Rector/FuncCall/MultiDirnameRector/Fixture/fixture2.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/MultiDirnameRector/Fixture/fixture2.php.inc
rename to rules/php70/tests/Rector/FuncCall/MultiDirnameRector/Fixture/fixture2.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/MultiDirnameRector/Fixture/fixture3.php.inc b/rules/php70/tests/Rector/FuncCall/MultiDirnameRector/Fixture/fixture3.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/MultiDirnameRector/Fixture/fixture3.php.inc
rename to rules/php70/tests/Rector/FuncCall/MultiDirnameRector/Fixture/fixture3.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/MultiDirnameRector/MultiDirnameRectorTest.php b/rules/php70/tests/Rector/FuncCall/MultiDirnameRector/MultiDirnameRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/MultiDirnameRector/MultiDirnameRectorTest.php
rename to rules/php70/tests/Rector/FuncCall/MultiDirnameRector/MultiDirnameRectorTest.php
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/anonymous_class.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/anonymous_class.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/anonymous_class.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/anonymous_class.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/anonymous_function.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/anonymous_function.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/anonymous_function.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/anonymous_function.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/array_callable.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/array_callable.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/array_callable.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/array_callable.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/assignment.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/assignment.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/assignment.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/assignment.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/binary_op.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/binary_op.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/binary_op.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/binary_op.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/func_calls.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/func_calls.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/func_calls.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/func_calls.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/invokable.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/invokable.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/invokable.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/invokable.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_array_dim_fetch.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_array_dim_fetch.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_array_dim_fetch.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_array_dim_fetch.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_property_fetch.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_property_fetch.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_property_fetch.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_property_fetch.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_static_property_fetch.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_static_property_fetch.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_static_property_fetch.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_static_property_fetch.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_variable.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_variable.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_variable.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/keep_variable.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/method_call_as_argument.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/method_call_as_argument.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/method_call_as_argument.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/method_call_as_argument.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/method_calls.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/method_calls.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/method_calls.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/method_calls.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/new.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/new.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/new.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/new.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/skip_optional_parameter.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/skip_optional_parameter.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/skip_optional_parameter.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/skip_optional_parameter.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/stringy_calls.php.inc b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/stringy_calls.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/stringy_calls.php.inc
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/Fixture/stringy_calls.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/NonVariableToVariableOnFunctionCallRectorTest.php b/rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/NonVariableToVariableOnFunctionCallRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/NonVariableToVariableOnFunctionCallRectorTest.php
rename to rules/php70/tests/Rector/FuncCall/NonVariableToVariableOnFunctionCallRector/NonVariableToVariableOnFunctionCallRectorTest.php
diff --git a/rules/php-70/tests/Rector/FuncCall/RandomFunctionRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/FuncCall/RandomFunctionRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/RandomFunctionRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/FuncCall/RandomFunctionRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/RandomFunctionRector/RandomFunctionRectorTest.php b/rules/php70/tests/Rector/FuncCall/RandomFunctionRector/RandomFunctionRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/RandomFunctionRector/RandomFunctionRectorTest.php
rename to rules/php70/tests/Rector/FuncCall/RandomFunctionRector/RandomFunctionRectorTest.php
diff --git a/rules/php-70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/RenameMktimeWithoutArgsToTimeRectorTest.php b/rules/php70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/RenameMktimeWithoutArgsToTimeRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/RenameMktimeWithoutArgsToTimeRectorTest.php
rename to rules/php70/tests/Rector/FuncCall/RenameMktimeWithoutArgsToTimeRector/RenameMktimeWithoutArgsToTimeRectorTest.php
diff --git a/rules/php-70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/ExceptionHandlerTypehintRectorTest.php b/rules/php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/ExceptionHandlerTypehintRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/ExceptionHandlerTypehintRectorTest.php
rename to rules/php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/ExceptionHandlerTypehintRectorTest.php
diff --git a/rules/php-70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture/fixture_nullable.php.inc b/rules/php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture/fixture_nullable.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture/fixture_nullable.php.inc
rename to rules/php70/tests/Rector/FunctionLike/ExceptionHandlerTypehintRector/Fixture/fixture_nullable.php.inc
diff --git a/rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/delegating.php.inc b/rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/delegating.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/delegating.php.inc
rename to rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/delegating.php.inc
diff --git a/rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/delegating_2.php.inc b/rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/delegating_2.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/delegating_2.php.inc
rename to rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/delegating_2.php.inc
diff --git a/rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/fixture5.php.inc b/rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/fixture5.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/fixture5.php.inc
rename to rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/fixture5.php.inc
diff --git a/rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/in_namespace.php.inc b/rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/in_namespace.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/in_namespace.php.inc
rename to rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/in_namespace.php.inc
diff --git a/rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/non_expression.php.inc b/rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/non_expression.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/non_expression.php.inc
rename to rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Fixture/non_expression.php.inc
diff --git a/rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Php4ConstructorRectorTest.php b/rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Php4ConstructorRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/FunctionLike/Php4ConstructorRector/Php4ConstructorRectorTest.php
rename to rules/php70/tests/Rector/FunctionLike/Php4ConstructorRector/Php4ConstructorRectorTest.php
diff --git a/rules/php-70/tests/Rector/If_/IfToSpaceshipRector/Fixture/complex.php.inc b/rules/php70/tests/Rector/If_/IfToSpaceshipRector/Fixture/complex.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/If_/IfToSpaceshipRector/Fixture/complex.php.inc
rename to rules/php70/tests/Rector/If_/IfToSpaceshipRector/Fixture/complex.php.inc
diff --git a/rules/php-70/tests/Rector/If_/IfToSpaceshipRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/If_/IfToSpaceshipRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/If_/IfToSpaceshipRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/If_/IfToSpaceshipRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/If_/IfToSpaceshipRector/Fixture/skip.php.inc b/rules/php70/tests/Rector/If_/IfToSpaceshipRector/Fixture/skip.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/If_/IfToSpaceshipRector/Fixture/skip.php.inc
rename to rules/php70/tests/Rector/If_/IfToSpaceshipRector/Fixture/skip.php.inc
diff --git a/rules/php-70/tests/Rector/If_/IfToSpaceshipRector/IfToSpaceshipRectorTest.php b/rules/php70/tests/Rector/If_/IfToSpaceshipRector/IfToSpaceshipRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/If_/IfToSpaceshipRector/IfToSpaceshipRectorTest.php
rename to rules/php70/tests/Rector/If_/IfToSpaceshipRector/IfToSpaceshipRectorTest.php
diff --git a/rules/php-70/tests/Rector/List_/EmptyListRector/EmptyListRectorTest.php b/rules/php70/tests/Rector/List_/EmptyListRector/EmptyListRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/List_/EmptyListRector/EmptyListRectorTest.php
rename to rules/php70/tests/Rector/List_/EmptyListRector/EmptyListRectorTest.php
diff --git a/rules/php-70/tests/Rector/List_/EmptyListRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/List_/EmptyListRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/List_/EmptyListRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/List_/EmptyListRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/List_/ListSplitStringRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/List_/ListSplitStringRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/List_/ListSplitStringRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/List_/ListSplitStringRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/List_/ListSplitStringRector/ListSplitStringRectorTest.php b/rules/php70/tests/Rector/List_/ListSplitStringRector/ListSplitStringRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/List_/ListSplitStringRector/ListSplitStringRectorTest.php
rename to rules/php70/tests/Rector/List_/ListSplitStringRector/ListSplitStringRectorTest.php
diff --git a/rules/php-70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/skip-array-dim.php b/rules/php70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/skip-array-dim.php
similarity index 100%
rename from rules/php-70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/skip-array-dim.php
rename to rules/php70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/skip-array-dim.php
diff --git a/rules/php-70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/skip.php.inc b/rules/php70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/skip.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/skip.php.inc
rename to rules/php70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/skip.php.inc
diff --git a/rules/php-70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/skip_empty.php.inc b/rules/php70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/skip_empty.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/skip_empty.php.inc
rename to rules/php70/tests/Rector/List_/ListSwapArrayOrderRector/Fixture/skip_empty.php.inc
diff --git a/rules/php-70/tests/Rector/List_/ListSwapArrayOrderRector/ListSwapArrayOrderRectorTest.php b/rules/php70/tests/Rector/List_/ListSwapArrayOrderRector/ListSwapArrayOrderRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/List_/ListSwapArrayOrderRector/ListSwapArrayOrderRectorTest.php
rename to rules/php70/tests/Rector/List_/ListSwapArrayOrderRector/ListSwapArrayOrderRectorTest.php
diff --git a/rules/php-70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture/another_call.php.inc b/rules/php70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture/another_call.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture/another_call.php.inc
rename to rules/php70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture/another_call.php.inc
diff --git a/rules/php-70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture/skip_phpunit.php.inc b/rules/php70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture/skip_phpunit.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture/skip_phpunit.php.inc
rename to rules/php70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/Fixture/skip_phpunit.php.inc
diff --git a/rules/php-70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/ThisCallOnStaticMethodToStaticCallRectorTest.php b/rules/php70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/ThisCallOnStaticMethodToStaticCallRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/ThisCallOnStaticMethodToStaticCallRectorTest.php
rename to rules/php70/tests/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector/ThisCallOnStaticMethodToStaticCallRectorTest.php
diff --git a/rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/add_static_to_method.php.inc b/rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/add_static_to_method.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/add_static_to_method.php.inc
rename to rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/add_static_to_method.php.inc
diff --git a/rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep.php.inc b/rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep.php.inc
rename to rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep.php.inc
diff --git a/rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep_annotated.php.inc b/rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep_annotated.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep_annotated.php.inc
rename to rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep_annotated.php.inc
diff --git a/rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep_parent_static.php.inc b/rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep_parent_static.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep_parent_static.php.inc
rename to rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/keep_parent_static.php.inc
diff --git a/rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/static_call_on_property.php.inc b/rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/static_call_on_property.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/static_call_on_property.php.inc
rename to rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/static_call_on_property.php.inc
diff --git a/rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/with_constructor.php.inc b/rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/with_constructor.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/with_constructor.php.inc
rename to rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/with_constructor.php.inc
diff --git a/rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/with_only_static_methods.php.inc b/rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/with_only_static_methods.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/with_only_static_methods.php.inc
rename to rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/with_only_static_methods.php.inc
diff --git a/rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Source/WithOnlyStaticMethods.php b/rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Source/WithOnlyStaticMethods.php
similarity index 100%
rename from rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Source/WithOnlyStaticMethods.php
rename to rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/Source/WithOnlyStaticMethods.php
diff --git a/rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/StaticCallOnNonStaticToInstanceCallRectorTest.php b/rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/StaticCallOnNonStaticToInstanceCallRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/StaticCallOnNonStaticToInstanceCallRectorTest.php
rename to rules/php70/tests/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector/StaticCallOnNonStaticToInstanceCallRectorTest.php
diff --git a/rules/php-70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/Fixture/hidden_in_middle.php.inc b/rules/php70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/Fixture/hidden_in_middle.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/Fixture/hidden_in_middle.php.inc
rename to rules/php70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/Fixture/hidden_in_middle.php.inc
diff --git a/rules/php-70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/ReduceMultipleDefaultSwitchRectorTest.php b/rules/php70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/ReduceMultipleDefaultSwitchRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/ReduceMultipleDefaultSwitchRectorTest.php
rename to rules/php70/tests/Rector/Switch_/ReduceMultipleDefaultSwitchRector/ReduceMultipleDefaultSwitchRectorTest.php
diff --git a/rules/php-70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture2.php.inc b/rules/php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture2.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture2.php.inc
rename to rules/php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture2.php.inc
diff --git a/rules/php-70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture3.php.inc b/rules/php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture3.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture3.php.inc
rename to rules/php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture3.php.inc
diff --git a/rules/php-70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture4.php.inc b/rules/php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture4.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture4.php.inc
rename to rules/php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/Fixture/fixture4.php.inc
diff --git a/rules/php-70/tests/Rector/Ternary/TernaryToNullCoalescingRector/TernaryToNullCoalescingRectorTest.php b/rules/php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/TernaryToNullCoalescingRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/Ternary/TernaryToNullCoalescingRector/TernaryToNullCoalescingRectorTest.php
rename to rules/php70/tests/Rector/Ternary/TernaryToNullCoalescingRector/TernaryToNullCoalescingRectorTest.php
diff --git a/rules/php-70/tests/Rector/Ternary/TernaryToSpaceshipRector/Fixture/fixture.php.inc b/rules/php70/tests/Rector/Ternary/TernaryToSpaceshipRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/Ternary/TernaryToSpaceshipRector/Fixture/fixture.php.inc
rename to rules/php70/tests/Rector/Ternary/TernaryToSpaceshipRector/Fixture/fixture.php.inc
diff --git a/rules/php-70/tests/Rector/Ternary/TernaryToSpaceshipRector/Fixture/skip_non_binary_op_in_nested_ternary.php.inc b/rules/php70/tests/Rector/Ternary/TernaryToSpaceshipRector/Fixture/skip_non_binary_op_in_nested_ternary.php.inc
similarity index 100%
rename from rules/php-70/tests/Rector/Ternary/TernaryToSpaceshipRector/Fixture/skip_non_binary_op_in_nested_ternary.php.inc
rename to rules/php70/tests/Rector/Ternary/TernaryToSpaceshipRector/Fixture/skip_non_binary_op_in_nested_ternary.php.inc
diff --git a/rules/php-70/tests/Rector/Ternary/TernaryToSpaceshipRector/TernaryToSpaceshipRectorTest.php b/rules/php70/tests/Rector/Ternary/TernaryToSpaceshipRector/TernaryToSpaceshipRectorTest.php
similarity index 100%
rename from rules/php-70/tests/Rector/Ternary/TernaryToSpaceshipRector/TernaryToSpaceshipRectorTest.php
rename to rules/php70/tests/Rector/Ternary/TernaryToSpaceshipRector/TernaryToSpaceshipRectorTest.php
diff --git a/rules/php-71/config/config.yaml b/rules/php71/config/config.yaml
similarity index 100%
rename from rules/php-71/config/config.yaml
rename to rules/php71/config/config.yaml
diff --git a/rules/php-71/src/IsArrayAndDualCheckToAble.php b/rules/php71/src/IsArrayAndDualCheckToAble.php
similarity index 100%
rename from rules/php-71/src/IsArrayAndDualCheckToAble.php
rename to rules/php71/src/IsArrayAndDualCheckToAble.php
diff --git a/rules/php-71/src/Rector/Assign/AssignArrayToStringRector.php b/rules/php71/src/Rector/Assign/AssignArrayToStringRector.php
similarity index 100%
rename from rules/php-71/src/Rector/Assign/AssignArrayToStringRector.php
rename to rules/php71/src/Rector/Assign/AssignArrayToStringRector.php
diff --git a/rules/php-71/src/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector.php b/rules/php71/src/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector.php
similarity index 100%
rename from rules/php-71/src/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector.php
rename to rules/php71/src/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector.php
diff --git a/rules/php-71/src/Rector/BinaryOp/IsIterableRector.php b/rules/php71/src/Rector/BinaryOp/IsIterableRector.php
similarity index 100%
rename from rules/php-71/src/Rector/BinaryOp/IsIterableRector.php
rename to rules/php71/src/Rector/BinaryOp/IsIterableRector.php
diff --git a/rules/php-71/src/Rector/ClassConst/PublicConstantVisibilityRector.php b/rules/php71/src/Rector/ClassConst/PublicConstantVisibilityRector.php
similarity index 100%
rename from rules/php-71/src/Rector/ClassConst/PublicConstantVisibilityRector.php
rename to rules/php71/src/Rector/ClassConst/PublicConstantVisibilityRector.php
diff --git a/rules/php-71/src/Rector/FuncCall/CountOnNullRector.php b/rules/php71/src/Rector/FuncCall/CountOnNullRector.php
similarity index 100%
rename from rules/php-71/src/Rector/FuncCall/CountOnNullRector.php
rename to rules/php71/src/Rector/FuncCall/CountOnNullRector.php
diff --git a/rules/php-71/src/Rector/FuncCall/RemoveExtraParametersRector.php b/rules/php71/src/Rector/FuncCall/RemoveExtraParametersRector.php
similarity index 100%
rename from rules/php-71/src/Rector/FuncCall/RemoveExtraParametersRector.php
rename to rules/php71/src/Rector/FuncCall/RemoveExtraParametersRector.php
diff --git a/rules/php-71/src/Rector/List_/ListToArrayDestructRector.php b/rules/php71/src/Rector/List_/ListToArrayDestructRector.php
similarity index 100%
rename from rules/php-71/src/Rector/List_/ListToArrayDestructRector.php
rename to rules/php71/src/Rector/List_/ListToArrayDestructRector.php
diff --git a/rules/php-71/src/Rector/Name/ReservedObjectRector.php b/rules/php71/src/Rector/Name/ReservedObjectRector.php
similarity index 100%
rename from rules/php-71/src/Rector/Name/ReservedObjectRector.php
rename to rules/php71/src/Rector/Name/ReservedObjectRector.php
diff --git a/rules/php-71/src/Rector/TryCatch/MultiExceptionCatchRector.php b/rules/php71/src/Rector/TryCatch/MultiExceptionCatchRector.php
similarity index 100%
rename from rules/php-71/src/Rector/TryCatch/MultiExceptionCatchRector.php
rename to rules/php71/src/Rector/TryCatch/MultiExceptionCatchRector.php
diff --git a/rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/AssignArrayToStringRectorTest.php b/rules/php71/tests/Rector/Assign/AssignArrayToStringRector/AssignArrayToStringRectorTest.php
similarity index 100%
rename from rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/AssignArrayToStringRectorTest.php
rename to rules/php71/tests/Rector/Assign/AssignArrayToStringRector/AssignArrayToStringRectorTest.php
diff --git a/rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture.php.inc b/rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture.php.inc
rename to rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture.php.inc
diff --git a/rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture2.php.inc b/rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture2.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture2.php.inc
rename to rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture2.php.inc
diff --git a/rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture3.php.inc b/rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture3.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture3.php.inc
rename to rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture3.php.inc
diff --git a/rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture4.php.inc b/rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture4.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture4.php.inc
rename to rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture4.php.inc
diff --git a/rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture5.php.inc b/rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture5.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture5.php.inc
rename to rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture5.php.inc
diff --git a/rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture6.php.inc b/rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture6.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture6.php.inc
rename to rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture6.php.inc
diff --git a/rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture7.php.inc b/rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture7.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture7.php.inc
rename to rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture7.php.inc
diff --git a/rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture8.php.inc b/rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture8.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture8.php.inc
rename to rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/fixture8.php.inc
diff --git a/rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/skip.php.inc b/rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/skip.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/skip.php.inc
rename to rules/php71/tests/Rector/Assign/AssignArrayToStringRector/Fixture/skip.php.inc
diff --git a/rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/BinaryOpBetweenNumberAndStringRectorTest.php b/rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/BinaryOpBetweenNumberAndStringRectorTest.php
similarity index 100%
rename from rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/BinaryOpBetweenNumberAndStringRectorTest.php
rename to rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/BinaryOpBetweenNumberAndStringRectorTest.php
diff --git a/rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/edge_case.php.inc b/rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/edge_case.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/edge_case.php.inc
rename to rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/edge_case.php.inc
diff --git a/rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/fixture.php.inc b/rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/fixture.php.inc
rename to rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/fixture.php.inc
diff --git a/rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/ignore_concatenation_dot.php.inc b/rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/ignore_concatenation_dot.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/ignore_concatenation_dot.php.inc
rename to rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/ignore_concatenation_dot.php.inc
diff --git a/rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/known_static_string.php.inc b/rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/known_static_string.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/known_static_string.php.inc
rename to rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/known_static_string.php.inc
diff --git a/rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/skip_constant_value.php.inc b/rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/skip_constant_value.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/skip_constant_value.php.inc
rename to rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/skip_constant_value.php.inc
diff --git a/rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/skip_enscaped.php.inc b/rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/skip_enscaped.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/skip_enscaped.php.inc
rename to rules/php71/tests/Rector/BinaryOp/BinaryOpBetweenNumberAndStringRector/Fixture/skip_enscaped.php.inc
diff --git a/rules/php-71/tests/Rector/BinaryOp/IsIterableRector/Fixture/fixture.php.inc b/rules/php71/tests/Rector/BinaryOp/IsIterableRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/BinaryOp/IsIterableRector/Fixture/fixture.php.inc
rename to rules/php71/tests/Rector/BinaryOp/IsIterableRector/Fixture/fixture.php.inc
diff --git a/rules/php-71/tests/Rector/BinaryOp/IsIterableRector/Fixture/polyfill_function.php.inc b/rules/php71/tests/Rector/BinaryOp/IsIterableRector/Fixture/polyfill_function.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/BinaryOp/IsIterableRector/Fixture/polyfill_function.php.inc
rename to rules/php71/tests/Rector/BinaryOp/IsIterableRector/Fixture/polyfill_function.php.inc
diff --git a/rules/php-71/tests/Rector/BinaryOp/IsIterableRector/IsIterableRectorTest.php b/rules/php71/tests/Rector/BinaryOp/IsIterableRector/IsIterableRectorTest.php
similarity index 100%
rename from rules/php-71/tests/Rector/BinaryOp/IsIterableRector/IsIterableRectorTest.php
rename to rules/php71/tests/Rector/BinaryOp/IsIterableRector/IsIterableRectorTest.php
diff --git a/rules/php-71/tests/Rector/BinaryOp/IsIterableRector/PolyfillRectorTest.php b/rules/php71/tests/Rector/BinaryOp/IsIterableRector/PolyfillRectorTest.php
similarity index 100%
rename from rules/php-71/tests/Rector/BinaryOp/IsIterableRector/PolyfillRectorTest.php
rename to rules/php71/tests/Rector/BinaryOp/IsIterableRector/PolyfillRectorTest.php
diff --git a/rules/php-71/tests/Rector/ClassConst/PublicConstantVisibilityRector/Fixture/SomeClass.php.inc b/rules/php71/tests/Rector/ClassConst/PublicConstantVisibilityRector/Fixture/SomeClass.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/ClassConst/PublicConstantVisibilityRector/Fixture/SomeClass.php.inc
rename to rules/php71/tests/Rector/ClassConst/PublicConstantVisibilityRector/Fixture/SomeClass.php.inc
diff --git a/rules/php-71/tests/Rector/ClassConst/PublicConstantVisibilityRector/PublicConstantVisibilityRectorTest.php b/rules/php71/tests/Rector/ClassConst/PublicConstantVisibilityRector/PublicConstantVisibilityRectorTest.php
similarity index 100%
rename from rules/php-71/tests/Rector/ClassConst/PublicConstantVisibilityRector/PublicConstantVisibilityRectorTest.php
rename to rules/php71/tests/Rector/ClassConst/PublicConstantVisibilityRector/PublicConstantVisibilityRectorTest.php
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorTest.php b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorTest.php
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorTest.php
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorTest.php
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorWithPHP73Test.php b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorWithPHP73Test.php
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorWithPHP73Test.php
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/CountOnNullRectorWithPHP73Test.php
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/array_countable_class.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/array_countable_class.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/array_countable_class.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/array_countable_class.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/countable_annotated_params.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/countable_annotated_params.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/countable_annotated_params.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/countable_annotated_params.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/double_same_variable.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/double_same_variable.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/double_same_variable.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/double_same_variable.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/external_property.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/external_property.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/external_property.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/external_property.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/false_true_class.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/false_true_class.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/false_true_class.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/false_true_class.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/local_property.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/local_property.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/local_property.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/local_property.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/nullable_array.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/nullable_array.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/nullable_array.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/nullable_array.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/on_null.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/on_null.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/on_null.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/on_null.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/preg_match_array.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/preg_match_array.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/preg_match_array.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/preg_match_array.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/property_with_doc.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/property_with_doc.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/property_with_doc.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/property_with_doc.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/property_within_trait_method.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/property_within_trait_method.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/property_within_trait_method.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/property_within_trait_method.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_array_merge.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_array_merge.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_array_merge.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_array_merge.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_countable_local_property.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_countable_local_property.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_countable_local_property.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_countable_local_property.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_countable_remote_property.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_countable_remote_property.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_countable_remote_property.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_countable_remote_property.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_simple_xml_element.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_simple_xml_element.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_simple_xml_element.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/skip_simple_xml_element.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/variable_within_trait_method.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/variable_within_trait_method.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Fixture/variable_within_trait_method.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Fixture/variable_within_trait_method.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/FixtureForPhp73/is_countable.php.inc b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/FixtureForPhp73/is_countable.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/FixtureForPhp73/is_countable.php.inc
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/FixtureForPhp73/is_countable.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Source/ClassWithCountableProperty.php b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Source/ClassWithCountableProperty.php
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Source/ClassWithCountableProperty.php
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Source/ClassWithCountableProperty.php
diff --git a/rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Source/CountableClass.php b/rules/php71/tests/Rector/FuncCall/CountOnNullRector/Source/CountableClass.php
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/CountOnNullRector/Source/CountableClass.php
rename to rules/php71/tests/Rector/FuncCall/CountOnNullRector/Source/CountableClass.php
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/better_func_get_all.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/better_func_get_all.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/better_func_get_all.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/better_func_get_all.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/external_scope.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/external_scope.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/external_scope.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/external_scope.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/fixture.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/fixture.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/fixture.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/func_get_all.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/func_get_all.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/func_get_all.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/func_get_all.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/function_with_one_required_and_one_optional_parameter.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/function_with_one_required_and_one_optional_parameter.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/function_with_one_required_and_one_optional_parameter.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/function_with_one_required_and_one_optional_parameter.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/methods.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/methods.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/methods.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/methods.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/redeclare_function.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/redeclare_function.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/redeclare_function.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/redeclare_function.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/remove_another_class_method_call_extra_argument.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/remove_another_class_method_call_extra_argument.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/remove_another_class_method_call_extra_argument.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/remove_another_class_method_call_extra_argument.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_call_user_func_array.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_call_user_func_array.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_call_user_func_array.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_call_user_func_array.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_commented_param_func_get_args.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_commented_param_func_get_args.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_commented_param_func_get_args.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_commented_param_func_get_args.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_invoke.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_invoke.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_invoke.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_invoke.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_values_passed_from_parent.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_values_passed_from_parent.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_values_passed_from_parent.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_values_passed_from_parent.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/static_call_parent.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/static_call_parent.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/static_call_parent.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/static_call_parent.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/static_calls.php.inc b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/static_calls.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/static_calls.php.inc
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/static_calls.php.inc
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/RemoveExtraParametersRectorTest.php b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/RemoveExtraParametersRectorTest.php
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/RemoveExtraParametersRectorTest.php
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/RemoveExtraParametersRectorTest.php
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/ChildOrmion.php b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/ChildOrmion.php
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/ChildOrmion.php
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/ChildOrmion.php
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/Db.php b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/Db.php
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/Db.php
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/Db.php
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/MagicEventDispatcher.php b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/MagicEventDispatcher.php
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/MagicEventDispatcher.php
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/MagicEventDispatcher.php
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/MethodWithFuncGetArgs.php b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/MethodWithFuncGetArgs.php
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/MethodWithFuncGetArgs.php
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/MethodWithFuncGetArgs.php
diff --git a/rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/Ormion.php b/rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/Ormion.php
similarity index 100%
rename from rules/php-71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/Ormion.php
rename to rules/php71/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/Ormion.php
diff --git a/rules/php-71/tests/Rector/List_/ListToArrayDestructRector/Fixture/fixture.php.inc b/rules/php71/tests/Rector/List_/ListToArrayDestructRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/List_/ListToArrayDestructRector/Fixture/fixture.php.inc
rename to rules/php71/tests/Rector/List_/ListToArrayDestructRector/Fixture/fixture.php.inc
diff --git a/rules/php-71/tests/Rector/List_/ListToArrayDestructRector/ListToArrayDestructRectorTest.php b/rules/php71/tests/Rector/List_/ListToArrayDestructRector/ListToArrayDestructRectorTest.php
similarity index 100%
rename from rules/php-71/tests/Rector/List_/ListToArrayDestructRector/ListToArrayDestructRectorTest.php
rename to rules/php71/tests/Rector/List_/ListToArrayDestructRector/ListToArrayDestructRectorTest.php
diff --git a/rules/php-71/tests/Rector/Name/ReservedObjectRector/Fixture/ReservedObject.php.inc b/rules/php71/tests/Rector/Name/ReservedObjectRector/Fixture/ReservedObject.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/Name/ReservedObjectRector/Fixture/ReservedObject.php.inc
rename to rules/php71/tests/Rector/Name/ReservedObjectRector/Fixture/ReservedObject.php.inc
diff --git a/rules/php-71/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php.inc b/rules/php71/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php.inc
rename to rules/php71/tests/Rector/Name/ReservedObjectRector/Fixture/skip_type_declaration_object.php.inc
diff --git a/rules/php-71/tests/Rector/Name/ReservedObjectRector/ReservedObjectRectorTest.php b/rules/php71/tests/Rector/Name/ReservedObjectRector/ReservedObjectRectorTest.php
similarity index 100%
rename from rules/php-71/tests/Rector/Name/ReservedObjectRector/ReservedObjectRectorTest.php
rename to rules/php71/tests/Rector/Name/ReservedObjectRector/ReservedObjectRectorTest.php
diff --git a/rules/php-71/tests/Rector/TryCatch/MultiExceptionCatchRector/Fixture/fixture.php.inc b/rules/php71/tests/Rector/TryCatch/MultiExceptionCatchRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-71/tests/Rector/TryCatch/MultiExceptionCatchRector/Fixture/fixture.php.inc
rename to rules/php71/tests/Rector/TryCatch/MultiExceptionCatchRector/Fixture/fixture.php.inc
diff --git a/rules/php-71/tests/Rector/TryCatch/MultiExceptionCatchRector/MultiExceptionCatchRectorTest.php b/rules/php71/tests/Rector/TryCatch/MultiExceptionCatchRector/MultiExceptionCatchRectorTest.php
similarity index 100%
rename from rules/php-71/tests/Rector/TryCatch/MultiExceptionCatchRector/MultiExceptionCatchRectorTest.php
rename to rules/php71/tests/Rector/TryCatch/MultiExceptionCatchRector/MultiExceptionCatchRectorTest.php
diff --git a/rules/php-72/src/Rector/ConstFetch/BarewordStringRector.php b/rules/php72/src/Rector/ConstFetch/BarewordStringRector.php
similarity index 100%
rename from rules/php-72/src/Rector/ConstFetch/BarewordStringRector.php
rename to rules/php72/src/Rector/ConstFetch/BarewordStringRector.php
diff --git a/rules/php-72/src/Rector/Each/ListEachRector.php b/rules/php72/src/Rector/Each/ListEachRector.php
similarity index 100%
rename from rules/php-72/src/Rector/Each/ListEachRector.php
rename to rules/php72/src/Rector/Each/ListEachRector.php
diff --git a/rules/php-72/src/Rector/Each/WhileEachToForeachRector.php b/rules/php72/src/Rector/Each/WhileEachToForeachRector.php
similarity index 100%
rename from rules/php-72/src/Rector/Each/WhileEachToForeachRector.php
rename to rules/php72/src/Rector/Each/WhileEachToForeachRector.php
diff --git a/rules/php-72/src/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php b/rules/php72/src/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php
similarity index 100%
rename from rules/php-72/src/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php
rename to rules/php72/src/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector.php
diff --git a/rules/php-72/src/Rector/FuncCall/GetClassOnNullRector.php b/rules/php72/src/Rector/FuncCall/GetClassOnNullRector.php
similarity index 100%
rename from rules/php-72/src/Rector/FuncCall/GetClassOnNullRector.php
rename to rules/php72/src/Rector/FuncCall/GetClassOnNullRector.php
diff --git a/rules/php-72/src/Rector/FuncCall/IsObjectOnIncompleteClassRector.php b/rules/php72/src/Rector/FuncCall/IsObjectOnIncompleteClassRector.php
similarity index 100%
rename from rules/php-72/src/Rector/FuncCall/IsObjectOnIncompleteClassRector.php
rename to rules/php72/src/Rector/FuncCall/IsObjectOnIncompleteClassRector.php
diff --git a/rules/php-72/src/Rector/FuncCall/ParseStrWithResultArgumentRector.php b/rules/php72/src/Rector/FuncCall/ParseStrWithResultArgumentRector.php
similarity index 100%
rename from rules/php-72/src/Rector/FuncCall/ParseStrWithResultArgumentRector.php
rename to rules/php72/src/Rector/FuncCall/ParseStrWithResultArgumentRector.php
diff --git a/rules/php-72/src/Rector/FuncCall/StringifyDefineRector.php b/rules/php72/src/Rector/FuncCall/StringifyDefineRector.php
similarity index 100%
rename from rules/php-72/src/Rector/FuncCall/StringifyDefineRector.php
rename to rules/php72/src/Rector/FuncCall/StringifyDefineRector.php
diff --git a/rules/php-72/src/Rector/FuncCall/StringsAssertNakedRector.php b/rules/php72/src/Rector/FuncCall/StringsAssertNakedRector.php
similarity index 100%
rename from rules/php-72/src/Rector/FuncCall/StringsAssertNakedRector.php
rename to rules/php72/src/Rector/FuncCall/StringsAssertNakedRector.php
diff --git a/rules/php-72/src/Rector/Unset_/UnsetCastRector.php b/rules/php72/src/Rector/Unset_/UnsetCastRector.php
similarity index 100%
rename from rules/php-72/src/Rector/Unset_/UnsetCastRector.php
rename to rules/php72/src/Rector/Unset_/UnsetCastRector.php
diff --git a/rules/php-72/tests/Rector/ConstFetch/BarewordStringRector/BarewordStringRectorTest.php b/rules/php72/tests/Rector/ConstFetch/BarewordStringRector/BarewordStringRectorTest.php
similarity index 100%
rename from rules/php-72/tests/Rector/ConstFetch/BarewordStringRector/BarewordStringRectorTest.php
rename to rules/php72/tests/Rector/ConstFetch/BarewordStringRector/BarewordStringRectorTest.php
diff --git a/rules/php-72/tests/Rector/ConstFetch/BarewordStringRector/Fixture/define.php.inc b/rules/php72/tests/Rector/ConstFetch/BarewordStringRector/Fixture/define.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/ConstFetch/BarewordStringRector/Fixture/define.php.inc
rename to rules/php72/tests/Rector/ConstFetch/BarewordStringRector/Fixture/define.php.inc
diff --git a/rules/php-72/tests/Rector/ConstFetch/BarewordStringRector/Fixture/fixture.php.inc b/rules/php72/tests/Rector/ConstFetch/BarewordStringRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/ConstFetch/BarewordStringRector/Fixture/fixture.php.inc
rename to rules/php72/tests/Rector/ConstFetch/BarewordStringRector/Fixture/fixture.php.inc
diff --git a/rules/php-72/tests/Rector/Each/EachRectorTest.php b/rules/php72/tests/Rector/Each/EachRectorTest.php
similarity index 100%
rename from rules/php-72/tests/Rector/Each/EachRectorTest.php
rename to rules/php72/tests/Rector/Each/EachRectorTest.php
diff --git a/rules/php-72/tests/Rector/Each/Fixture/fixture.php.inc b/rules/php72/tests/Rector/Each/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/Each/Fixture/fixture.php.inc
rename to rules/php72/tests/Rector/Each/Fixture/fixture.php.inc
diff --git a/rules/php-72/tests/Rector/Each/Fixture/fixture2.php.inc b/rules/php72/tests/Rector/Each/Fixture/fixture2.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/Each/Fixture/fixture2.php.inc
rename to rules/php72/tests/Rector/Each/Fixture/fixture2.php.inc
diff --git a/rules/php-72/tests/Rector/Each/Fixture/fixture3.php.inc b/rules/php72/tests/Rector/Each/Fixture/fixture3.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/Each/Fixture/fixture3.php.inc
rename to rules/php72/tests/Rector/Each/Fixture/fixture3.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/CreateFunctionToAnonymousFunctionRectorTest.php b/rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/CreateFunctionToAnonymousFunctionRectorTest.php
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/CreateFunctionToAnonymousFunctionRectorTest.php
rename to rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/CreateFunctionToAnonymousFunctionRectorTest.php
diff --git a/rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/concat.php.inc b/rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/concat.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/concat.php.inc
rename to rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/concat.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/drupal.php.inc b/rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/drupal.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/drupal.php.inc
rename to rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/drupal.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/fixture.php.inc b/rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/fixture.php.inc
rename to rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/fixture.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/php_net.php.inc b/rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/php_net.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/php_net.php.inc
rename to rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/php_net.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/reference.php.inc b/rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/reference.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/reference.php.inc
rename to rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/reference.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/stackoverflow.php.inc b/rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/stackoverflow.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/stackoverflow.php.inc
rename to rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/stackoverflow.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/wordpress.php.inc b/rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/wordpress.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/wordpress.php.inc
rename to rules/php72/tests/Rector/FuncCall/CreateFunctionToAnonymousFunctionRector/Fixture/wordpress.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture/fixture.php.inc b/rules/php72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture/fixture.php.inc
rename to rules/php72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture/fixture.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture/skip_return_before_method_call.php.inc b/rules/php72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture/skip_return_before_method_call.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture/skip_return_before_method_call.php.inc
rename to rules/php72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture/skip_return_before_method_call.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture/tricky_cases.php.inc b/rules/php72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture/tricky_cases.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture/tricky_cases.php.inc
rename to rules/php72/tests/Rector/FuncCall/GetClassOnNullRector/Fixture/tricky_cases.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/GetClassOnNullRector/GetClassOnNullRectorTest.php b/rules/php72/tests/Rector/FuncCall/GetClassOnNullRector/GetClassOnNullRectorTest.php
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/GetClassOnNullRector/GetClassOnNullRectorTest.php
rename to rules/php72/tests/Rector/FuncCall/GetClassOnNullRector/GetClassOnNullRectorTest.php
diff --git a/rules/php-72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/Fixture/fixture.php.inc b/rules/php72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/Fixture/fixture.php.inc
rename to rules/php72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/Fixture/fixture.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/IsObjectOnIncompleteClassRectorTest.php b/rules/php72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/IsObjectOnIncompleteClassRectorTest.php
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/IsObjectOnIncompleteClassRectorTest.php
rename to rules/php72/tests/Rector/FuncCall/IsObjectOnIncompleteClassRector/IsObjectOnIncompleteClassRectorTest.php
diff --git a/rules/php-72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/Fixture/fixture.php.inc b/rules/php72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/Fixture/fixture.php.inc
rename to rules/php72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/Fixture/fixture.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/Fixture/skip_already_set.php.inc b/rules/php72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/Fixture/skip_already_set.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/Fixture/skip_already_set.php.inc
rename to rules/php72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/Fixture/skip_already_set.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/ParseStrWithResultArgumentRectorTest.php b/rules/php72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/ParseStrWithResultArgumentRectorTest.php
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/ParseStrWithResultArgumentRectorTest.php
rename to rules/php72/tests/Rector/FuncCall/ParseStrWithResultArgumentRector/ParseStrWithResultArgumentRectorTest.php
diff --git a/rules/php-72/tests/Rector/FuncCall/StringifyDefineRector/Fixture/fixture.php.inc b/rules/php72/tests/Rector/FuncCall/StringifyDefineRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/StringifyDefineRector/Fixture/fixture.php.inc
rename to rules/php72/tests/Rector/FuncCall/StringifyDefineRector/Fixture/fixture.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/StringifyDefineRector/StringifyDefineRectorTest.php b/rules/php72/tests/Rector/FuncCall/StringifyDefineRector/StringifyDefineRectorTest.php
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/StringifyDefineRector/StringifyDefineRectorTest.php
rename to rules/php72/tests/Rector/FuncCall/StringifyDefineRector/StringifyDefineRectorTest.php
diff --git a/rules/php-72/tests/Rector/FuncCall/StringsAssertNakedRector/Fixture/fixture.php.inc b/rules/php72/tests/Rector/FuncCall/StringsAssertNakedRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/StringsAssertNakedRector/Fixture/fixture.php.inc
rename to rules/php72/tests/Rector/FuncCall/StringsAssertNakedRector/Fixture/fixture.php.inc
diff --git a/rules/php-72/tests/Rector/FuncCall/StringsAssertNakedRector/StringsAssertNakedRectorTest.php b/rules/php72/tests/Rector/FuncCall/StringsAssertNakedRector/StringsAssertNakedRectorTest.php
similarity index 100%
rename from rules/php-72/tests/Rector/FuncCall/StringsAssertNakedRector/StringsAssertNakedRectorTest.php
rename to rules/php72/tests/Rector/FuncCall/StringsAssertNakedRector/StringsAssertNakedRectorTest.php
diff --git a/rules/php-72/tests/Rector/Unset_/UnsetCastRector/Fixture/fixture.php.inc b/rules/php72/tests/Rector/Unset_/UnsetCastRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/Unset_/UnsetCastRector/Fixture/fixture.php.inc
rename to rules/php72/tests/Rector/Unset_/UnsetCastRector/Fixture/fixture.php.inc
diff --git a/rules/php-72/tests/Rector/Unset_/UnsetCastRector/Fixture/unset_expr.php.inc b/rules/php72/tests/Rector/Unset_/UnsetCastRector/Fixture/unset_expr.php.inc
similarity index 100%
rename from rules/php-72/tests/Rector/Unset_/UnsetCastRector/Fixture/unset_expr.php.inc
rename to rules/php72/tests/Rector/Unset_/UnsetCastRector/Fixture/unset_expr.php.inc
diff --git a/rules/php-72/tests/Rector/Unset_/UnsetCastRector/UnsetCastRectorTest.php b/rules/php72/tests/Rector/Unset_/UnsetCastRector/UnsetCastRectorTest.php
similarity index 100%
rename from rules/php-72/tests/Rector/Unset_/UnsetCastRector/UnsetCastRectorTest.php
rename to rules/php72/tests/Rector/Unset_/UnsetCastRector/UnsetCastRectorTest.php
diff --git a/rules/php-73/src/Rector/BinaryOp/IsCountableRector.php b/rules/php73/src/Rector/BinaryOp/IsCountableRector.php
similarity index 100%
rename from rules/php-73/src/Rector/BinaryOp/IsCountableRector.php
rename to rules/php73/src/Rector/BinaryOp/IsCountableRector.php
diff --git a/rules/php-73/src/Rector/ConstFetch/SensitiveConstantNameRector.php b/rules/php73/src/Rector/ConstFetch/SensitiveConstantNameRector.php
similarity index 100%
rename from rules/php-73/src/Rector/ConstFetch/SensitiveConstantNameRector.php
rename to rules/php73/src/Rector/ConstFetch/SensitiveConstantNameRector.php
diff --git a/rules/php-73/src/Rector/FuncCall/ArrayKeyFirstLastRector.php b/rules/php73/src/Rector/FuncCall/ArrayKeyFirstLastRector.php
similarity index 100%
rename from rules/php-73/src/Rector/FuncCall/ArrayKeyFirstLastRector.php
rename to rules/php73/src/Rector/FuncCall/ArrayKeyFirstLastRector.php
diff --git a/rules/php-73/src/Rector/FuncCall/JsonThrowOnErrorRector.php b/rules/php73/src/Rector/FuncCall/JsonThrowOnErrorRector.php
similarity index 100%
rename from rules/php-73/src/Rector/FuncCall/JsonThrowOnErrorRector.php
rename to rules/php73/src/Rector/FuncCall/JsonThrowOnErrorRector.php
diff --git a/rules/php-73/src/Rector/FuncCall/RegexDashEscapeRector.php b/rules/php73/src/Rector/FuncCall/RegexDashEscapeRector.php
similarity index 100%
rename from rules/php-73/src/Rector/FuncCall/RegexDashEscapeRector.php
rename to rules/php73/src/Rector/FuncCall/RegexDashEscapeRector.php
diff --git a/rules/php-73/src/Rector/FuncCall/RemoveMissingCompactVariableRector.php b/rules/php73/src/Rector/FuncCall/RemoveMissingCompactVariableRector.php
similarity index 100%
rename from rules/php-73/src/Rector/FuncCall/RemoveMissingCompactVariableRector.php
rename to rules/php73/src/Rector/FuncCall/RemoveMissingCompactVariableRector.php
diff --git a/rules/php-73/src/Rector/FuncCall/SensitiveDefineRector.php b/rules/php73/src/Rector/FuncCall/SensitiveDefineRector.php
similarity index 100%
rename from rules/php-73/src/Rector/FuncCall/SensitiveDefineRector.php
rename to rules/php73/src/Rector/FuncCall/SensitiveDefineRector.php
diff --git a/rules/php-73/src/Rector/FuncCall/SetCookieRector.php b/rules/php73/src/Rector/FuncCall/SetCookieRector.php
similarity index 100%
rename from rules/php-73/src/Rector/FuncCall/SetCookieRector.php
rename to rules/php73/src/Rector/FuncCall/SetCookieRector.php
diff --git a/rules/php-73/src/Rector/FuncCall/StringifyStrNeedlesRector.php b/rules/php73/src/Rector/FuncCall/StringifyStrNeedlesRector.php
similarity index 100%
rename from rules/php-73/src/Rector/FuncCall/StringifyStrNeedlesRector.php
rename to rules/php73/src/Rector/FuncCall/StringifyStrNeedlesRector.php
diff --git a/rules/php-73/src/Rector/String_/SensitiveHereNowDocRector.php b/rules/php73/src/Rector/String_/SensitiveHereNowDocRector.php
similarity index 100%
rename from rules/php-73/src/Rector/String_/SensitiveHereNowDocRector.php
rename to rules/php73/src/Rector/String_/SensitiveHereNowDocRector.php
diff --git a/rules/php-73/tests/Rector/BinaryOp/IsCountableRector/Fixture/fixture73.php.inc b/rules/php73/tests/Rector/BinaryOp/IsCountableRector/Fixture/fixture73.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/BinaryOp/IsCountableRector/Fixture/fixture73.php.inc
rename to rules/php73/tests/Rector/BinaryOp/IsCountableRector/Fixture/fixture73.php.inc
diff --git a/rules/php-73/tests/Rector/BinaryOp/IsCountableRector/FixtureWithPolyfill/polyfill_function.php.inc b/rules/php73/tests/Rector/BinaryOp/IsCountableRector/FixtureWithPolyfill/polyfill_function.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/BinaryOp/IsCountableRector/FixtureWithPolyfill/polyfill_function.php.inc
rename to rules/php73/tests/Rector/BinaryOp/IsCountableRector/FixtureWithPolyfill/polyfill_function.php.inc
diff --git a/rules/php-73/tests/Rector/BinaryOp/IsCountableRector/IsCountableRectorTest.php b/rules/php73/tests/Rector/BinaryOp/IsCountableRector/IsCountableRectorTest.php
similarity index 100%
rename from rules/php-73/tests/Rector/BinaryOp/IsCountableRector/IsCountableRectorTest.php
rename to rules/php73/tests/Rector/BinaryOp/IsCountableRector/IsCountableRectorTest.php
diff --git a/rules/php-73/tests/Rector/BinaryOp/IsCountableRector/PolyfillRectorTest.php b/rules/php73/tests/Rector/BinaryOp/IsCountableRector/PolyfillRectorTest.php
similarity index 100%
rename from rules/php-73/tests/Rector/BinaryOp/IsCountableRector/PolyfillRectorTest.php
rename to rules/php73/tests/Rector/BinaryOp/IsCountableRector/PolyfillRectorTest.php
diff --git a/rules/php-73/tests/Rector/ConstFetch/SensitiveConstantNameRector/Fixture/fixture.php.inc b/rules/php73/tests/Rector/ConstFetch/SensitiveConstantNameRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/ConstFetch/SensitiveConstantNameRector/Fixture/fixture.php.inc
rename to rules/php73/tests/Rector/ConstFetch/SensitiveConstantNameRector/Fixture/fixture.php.inc
diff --git a/rules/php-73/tests/Rector/ConstFetch/SensitiveConstantNameRector/SensitiveConstantNameRectorTest.php b/rules/php73/tests/Rector/ConstFetch/SensitiveConstantNameRector/SensitiveConstantNameRectorTest.php
similarity index 100%
rename from rules/php-73/tests/Rector/ConstFetch/SensitiveConstantNameRector/SensitiveConstantNameRectorTest.php
rename to rules/php73/tests/Rector/ConstFetch/SensitiveConstantNameRector/SensitiveConstantNameRectorTest.php
diff --git a/rules/php-73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/ArrayKeyFirstLastRectorTest.php b/rules/php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/ArrayKeyFirstLastRectorTest.php
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/ArrayKeyFirstLastRectorTest.php
rename to rules/php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/ArrayKeyFirstLastRectorTest.php
diff --git a/rules/php-73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/array_key_first.php.inc b/rules/php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/array_key_first.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/array_key_first.php.inc
rename to rules/php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/array_key_first.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/array_key_last.php.inc b/rules/php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/array_key_last.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/array_key_last.php.inc
rename to rules/php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/array_key_last.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/both.php.inc b/rules/php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/both.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/both.php.inc
rename to rules/php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/both.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/skip_other_function_name.php.inc b/rules/php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/skip_other_function_name.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/skip_other_function_name.php.inc
rename to rules/php73/tests/Rector/FuncCall/ArrayKeyFirstLastRector/Fixture/skip_other_function_name.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/JsonThrowOnErrorRector/Fixture/fixture.php.inc b/rules/php73/tests/Rector/FuncCall/JsonThrowOnErrorRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/JsonThrowOnErrorRector/Fixture/fixture.php.inc
rename to rules/php73/tests/Rector/FuncCall/JsonThrowOnErrorRector/Fixture/fixture.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/JsonThrowOnErrorRector/JsonThrowOnErrorRectorTest.php b/rules/php73/tests/Rector/FuncCall/JsonThrowOnErrorRector/JsonThrowOnErrorRectorTest.php
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/JsonThrowOnErrorRector/JsonThrowOnErrorRectorTest.php
rename to rules/php73/tests/Rector/FuncCall/JsonThrowOnErrorRector/JsonThrowOnErrorRectorTest.php
diff --git a/rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/const.php.inc b/rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/const.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/const.php.inc
rename to rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/const.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/external_const.php.inc b/rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/external_const.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/external_const.php.inc
rename to rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/external_const.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/false_positive.php.inc b/rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/false_positive.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/false_positive.php.inc
rename to rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/false_positive.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/fixture.php.inc b/rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/fixture.php.inc
rename to rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/fixture.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/method_call.php.inc b/rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/method_call.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/method_call.php.inc
rename to rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/method_call.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/multiple_variables.php.inc b/rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/multiple_variables.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/multiple_variables.php.inc
rename to rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/multiple_variables.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/variable.php.inc b/rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/variable.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/variable.php.inc
rename to rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/Fixture/variable.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/RegexDashEscapeRectorTest.php b/rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/RegexDashEscapeRectorTest.php
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/RegexDashEscapeRector/RegexDashEscapeRectorTest.php
rename to rules/php73/tests/Rector/FuncCall/RegexDashEscapeRector/RegexDashEscapeRectorTest.php
diff --git a/rules/php-73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture/empty_compact.php.inc b/rules/php73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture/empty_compact.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture/empty_compact.php.inc
rename to rules/php73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture/empty_compact.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture/fixture.php.inc b/rules/php73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture/fixture.php.inc
rename to rules/php73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture/fixture.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture/skip_maybe_defined.inc b/rules/php73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture/skip_maybe_defined.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture/skip_maybe_defined.inc
rename to rules/php73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/Fixture/skip_maybe_defined.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/RemoveMissingCompactVariableRectorTest.php b/rules/php73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/RemoveMissingCompactVariableRectorTest.php
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/RemoveMissingCompactVariableRectorTest.php
rename to rules/php73/tests/Rector/FuncCall/RemoveMissingCompactVariableRector/RemoveMissingCompactVariableRectorTest.php
diff --git a/rules/php-73/tests/Rector/FuncCall/SensitiveDefineRector/Fixture/fixture.php.inc b/rules/php73/tests/Rector/FuncCall/SensitiveDefineRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/SensitiveDefineRector/Fixture/fixture.php.inc
rename to rules/php73/tests/Rector/FuncCall/SensitiveDefineRector/Fixture/fixture.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/SensitiveDefineRector/SensitiveDefineRectorTest.php b/rules/php73/tests/Rector/FuncCall/SensitiveDefineRector/SensitiveDefineRectorTest.php
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/SensitiveDefineRector/SensitiveDefineRectorTest.php
rename to rules/php73/tests/Rector/FuncCall/SensitiveDefineRector/SensitiveDefineRectorTest.php
diff --git a/rules/php-73/tests/Rector/FuncCall/SetcookieRector/Fixture/no_modified.php.inc b/rules/php73/tests/Rector/FuncCall/SetcookieRector/Fixture/no_modified.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/SetcookieRector/Fixture/no_modified.php.inc
rename to rules/php73/tests/Rector/FuncCall/SetcookieRector/Fixture/no_modified.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/SetcookieRector/Fixture/options_specified.php.inc b/rules/php73/tests/Rector/FuncCall/SetcookieRector/Fixture/options_specified.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/SetcookieRector/Fixture/options_specified.php.inc
rename to rules/php73/tests/Rector/FuncCall/SetcookieRector/Fixture/options_specified.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/SetcookieRector/SetCookieRectorTest.php b/rules/php73/tests/Rector/FuncCall/SetcookieRector/SetCookieRectorTest.php
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/SetcookieRector/SetCookieRectorTest.php
rename to rules/php73/tests/Rector/FuncCall/SetcookieRector/SetCookieRectorTest.php
diff --git a/rules/php-73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/fixture.php.inc b/rules/php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/fixture.php.inc
rename to rules/php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/fixture.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/skip_already_string.php.inc b/rules/php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/skip_already_string.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/skip_already_string.php.inc
rename to rules/php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/skip_already_string.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/skip_twice.php.inc b/rules/php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/skip_twice.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/skip_twice.php.inc
rename to rules/php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/skip_twice.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/trait.php.inc b/rules/php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/trait.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/trait.php.inc
rename to rules/php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/Fixture/trait.php.inc
diff --git a/rules/php-73/tests/Rector/FuncCall/StringifyStrNeedlesRector/StringifyStrNeedlesRectorTest.php b/rules/php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/StringifyStrNeedlesRectorTest.php
similarity index 100%
rename from rules/php-73/tests/Rector/FuncCall/StringifyStrNeedlesRector/StringifyStrNeedlesRectorTest.php
rename to rules/php73/tests/Rector/FuncCall/StringifyStrNeedlesRector/StringifyStrNeedlesRectorTest.php
diff --git a/rules/php-73/tests/Rector/String_/SensitiveHereNowDocRector/Fixture/fixture.php.inc b/rules/php73/tests/Rector/String_/SensitiveHereNowDocRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-73/tests/Rector/String_/SensitiveHereNowDocRector/Fixture/fixture.php.inc
rename to rules/php73/tests/Rector/String_/SensitiveHereNowDocRector/Fixture/fixture.php.inc
diff --git a/rules/php-73/tests/Rector/String_/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php b/rules/php73/tests/Rector/String_/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php
similarity index 100%
rename from rules/php-73/tests/Rector/String_/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php
rename to rules/php73/tests/Rector/String_/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php
diff --git a/rules/php-74/src/Rector/Assign/NullCoalescingOperatorRector.php b/rules/php74/src/Rector/Assign/NullCoalescingOperatorRector.php
similarity index 100%
rename from rules/php-74/src/Rector/Assign/NullCoalescingOperatorRector.php
rename to rules/php74/src/Rector/Assign/NullCoalescingOperatorRector.php
diff --git a/rules/php-74/src/Rector/Closure/ClosureToArrowFunctionRector.php b/rules/php74/src/Rector/Closure/ClosureToArrowFunctionRector.php
similarity index 100%
rename from rules/php-74/src/Rector/Closure/ClosureToArrowFunctionRector.php
rename to rules/php74/src/Rector/Closure/ClosureToArrowFunctionRector.php
diff --git a/rules/php-74/src/Rector/Double/RealToFloatTypeCastRector.php b/rules/php74/src/Rector/Double/RealToFloatTypeCastRector.php
similarity index 100%
rename from rules/php-74/src/Rector/Double/RealToFloatTypeCastRector.php
rename to rules/php74/src/Rector/Double/RealToFloatTypeCastRector.php
diff --git a/rules/php-74/src/Rector/FuncCall/ArrayKeyExistsOnPropertyRector.php b/rules/php74/src/Rector/FuncCall/ArrayKeyExistsOnPropertyRector.php
similarity index 100%
rename from rules/php-74/src/Rector/FuncCall/ArrayKeyExistsOnPropertyRector.php
rename to rules/php74/src/Rector/FuncCall/ArrayKeyExistsOnPropertyRector.php
diff --git a/rules/php-74/src/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php b/rules/php74/src/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php
similarity index 100%
rename from rules/php-74/src/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php
rename to rules/php74/src/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector.php
diff --git a/rules/php-74/src/Rector/FuncCall/FilterVarToAddSlashesRector.php b/rules/php74/src/Rector/FuncCall/FilterVarToAddSlashesRector.php
similarity index 100%
rename from rules/php-74/src/Rector/FuncCall/FilterVarToAddSlashesRector.php
rename to rules/php74/src/Rector/FuncCall/FilterVarToAddSlashesRector.php
diff --git a/rules/php-74/src/Rector/FuncCall/GetCalledClassToStaticClassRector.php b/rules/php74/src/Rector/FuncCall/GetCalledClassToStaticClassRector.php
similarity index 100%
rename from rules/php-74/src/Rector/FuncCall/GetCalledClassToStaticClassRector.php
rename to rules/php74/src/Rector/FuncCall/GetCalledClassToStaticClassRector.php
diff --git a/rules/php-74/src/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector.php b/rules/php74/src/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector.php
similarity index 100%
rename from rules/php-74/src/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector.php
rename to rules/php74/src/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector.php
diff --git a/rules/php-74/src/Rector/Function_/ReservedFnFunctionRector.php b/rules/php74/src/Rector/Function_/ReservedFnFunctionRector.php
similarity index 100%
rename from rules/php-74/src/Rector/Function_/ReservedFnFunctionRector.php
rename to rules/php74/src/Rector/Function_/ReservedFnFunctionRector.php
diff --git a/rules/php-74/src/Rector/LNumber/AddLiteralSeparatorToNumberRector.php b/rules/php74/src/Rector/LNumber/AddLiteralSeparatorToNumberRector.php
similarity index 100%
rename from rules/php-74/src/Rector/LNumber/AddLiteralSeparatorToNumberRector.php
rename to rules/php74/src/Rector/LNumber/AddLiteralSeparatorToNumberRector.php
diff --git a/rules/php-74/src/Rector/MagicConstClass/ClassConstantToSelfClassRector.php b/rules/php74/src/Rector/MagicConstClass/ClassConstantToSelfClassRector.php
similarity index 100%
rename from rules/php-74/src/Rector/MagicConstClass/ClassConstantToSelfClassRector.php
rename to rules/php74/src/Rector/MagicConstClass/ClassConstantToSelfClassRector.php
diff --git a/rules/php-74/src/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector.php b/rules/php74/src/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector.php
similarity index 100%
rename from rules/php-74/src/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector.php
rename to rules/php74/src/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector.php
diff --git a/rules/php74/src/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector.php b/rules/php74/src/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector.php
new file mode 100644
index 000000000000..e1fd883c0f90
--- /dev/null
+++ b/rules/php74/src/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector.php
@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Php74\Rector\Property;
+
+use PhpParser\Node;
+use PhpParser\Node\NullableType;
+use PhpParser\Node\Stmt\Property;
+use Rector\Core\Rector\AbstractRector;
+use Rector\Core\RectorDefinition\CodeSample;
+use Rector\Core\RectorDefinition\RectorDefinition;
+use Rector\Core\ValueObject\PhpVersionFeature;
+
+/**
+ * @see \Rector\Php74\Tests\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector\RestoreDefaultNullToNullableTypePropertyRectorTest
+ */
+final class RestoreDefaultNullToNullableTypePropertyRector extends AbstractRector
+{
+    public function getDefinition(): RectorDefinition
+    {
+        return new RectorDefinition('Add null default to properties with PHP 7.4 property nullable type', [
+            new CodeSample(
+                <<<'PHP'
+class SomeClass
+{
+    public ?string $name;
+}
+PHP
+,
+                <<<'PHP'
+class SomeClass
+{
+    public ?string $name = null;
+}
+PHP
+
+            ),
+        ]);
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getNodeTypes(): array
+    {
+        return [Property::class];
+    }
+
+    /**
+     * @param Property $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        if ($this->shouldSkip($node)) {
+            return null;
+        }
+
+        $onlyProperty = $node->props[0];
+        $onlyProperty->default = $this->createNull();
+
+        return $node;
+    }
+
+    private function shouldSkip(Property $property): bool
+    {
+        if (! $this->isAtLeastPhpVersion(PhpVersionFeature::TYPED_PROPERTIES)) {
+            return true;
+        }
+
+        if (! $property->type instanceof NullableType) {
+            return true;
+        }
+
+        if (count($property->props) > 1) {
+            return true;
+        }
+
+        $onlyProperty = $property->props[0];
+
+        return $onlyProperty->default !== null;
+    }
+}
diff --git a/rules/php-74/src/Rector/Property/TypedPropertyRector.php b/rules/php74/src/Rector/Property/TypedPropertyRector.php
similarity index 100%
rename from rules/php-74/src/Rector/Property/TypedPropertyRector.php
rename to rules/php74/src/Rector/Property/TypedPropertyRector.php
diff --git a/rules/php-74/src/Rector/StaticCall/ExportToReflectionFunctionRector.php b/rules/php74/src/Rector/StaticCall/ExportToReflectionFunctionRector.php
similarity index 100%
rename from rules/php-74/src/Rector/StaticCall/ExportToReflectionFunctionRector.php
rename to rules/php74/src/Rector/StaticCall/ExportToReflectionFunctionRector.php
diff --git a/rules/php-74/tests/Rector/Assign/NullCoalescingOperatorRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/Assign/NullCoalescingOperatorRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Assign/NullCoalescingOperatorRector/Fixture/fixture.php.inc
rename to rules/php74/tests/Rector/Assign/NullCoalescingOperatorRector/Fixture/fixture.php.inc
diff --git a/rules/php-74/tests/Rector/Assign/NullCoalescingOperatorRector/NullCoalescingOperatorRectorTest.php b/rules/php74/tests/Rector/Assign/NullCoalescingOperatorRector/NullCoalescingOperatorRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/Assign/NullCoalescingOperatorRector/NullCoalescingOperatorRectorTest.php
rename to rules/php74/tests/Rector/Assign/NullCoalescingOperatorRector/NullCoalescingOperatorRectorTest.php
diff --git a/rules/php-74/tests/Rector/Closure/ClosureToArrowFunctionRector/ClosureToArrowFunctionRectorTest.php b/rules/php74/tests/Rector/Closure/ClosureToArrowFunctionRector/ClosureToArrowFunctionRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/Closure/ClosureToArrowFunctionRector/ClosureToArrowFunctionRectorTest.php
rename to rules/php74/tests/Rector/Closure/ClosureToArrowFunctionRector/ClosureToArrowFunctionRectorTest.php
diff --git a/rules/php-74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/fixture.php.inc
rename to rules/php74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/fixture.php.inc
diff --git a/rules/php-74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/referenced_but_not_used.php.inc b/rules/php74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/referenced_but_not_used.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/referenced_but_not_used.php.inc
rename to rules/php74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/referenced_but_not_used.php.inc
diff --git a/rules/php-74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/retain_static.php.inc b/rules/php74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/retain_static.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/retain_static.php.inc
rename to rules/php74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/retain_static.php.inc
diff --git a/rules/php-74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/skip_no_return.php.inc b/rules/php74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/skip_no_return.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/skip_no_return.php.inc
rename to rules/php74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/skip_no_return.php.inc
diff --git a/rules/php-74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/skip_referenced_value.php.inc b/rules/php74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/skip_referenced_value.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/skip_referenced_value.php.inc
rename to rules/php74/tests/Rector/Closure/ClosureToArrowFunctionRector/Fixture/skip_referenced_value.php.inc
diff --git a/rules/php-74/tests/Rector/Double/RealToFloatTypeCastRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/Double/RealToFloatTypeCastRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Double/RealToFloatTypeCastRector/Fixture/fixture.php.inc
rename to rules/php74/tests/Rector/Double/RealToFloatTypeCastRector/Fixture/fixture.php.inc
diff --git a/rules/php-74/tests/Rector/Double/RealToFloatTypeCastRector/RealToFloatTypeCastRectorTest.php b/rules/php74/tests/Rector/Double/RealToFloatTypeCastRector/RealToFloatTypeCastRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/Double/RealToFloatTypeCastRector/RealToFloatTypeCastRectorTest.php
rename to rules/php74/tests/Rector/Double/RealToFloatTypeCastRector/RealToFloatTypeCastRectorTest.php
diff --git a/rules/php-74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/ArrayKeyExistsOnPropertyRectorTest.php b/rules/php74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/ArrayKeyExistsOnPropertyRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/ArrayKeyExistsOnPropertyRectorTest.php
rename to rules/php74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/ArrayKeyExistsOnPropertyRectorTest.php
diff --git a/rules/php-74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/Fixture/fixture.php.inc
rename to rules/php74/tests/Rector/FuncCall/ArrayKeyExistsOnPropertyRector/Fixture/fixture.php.inc
diff --git a/rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/ArraySpreadInsteadOfArrayMergeRectorTest.php b/rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/ArraySpreadInsteadOfArrayMergeRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/ArraySpreadInsteadOfArrayMergeRectorTest.php
rename to rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/ArraySpreadInsteadOfArrayMergeRectorTest.php
diff --git a/rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/fixture.php.inc
rename to rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/fixture.php.inc
diff --git a/rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/integer_keys.php.inc b/rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/integer_keys.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/integer_keys.php.inc
rename to rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/integer_keys.php.inc
diff --git a/rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/iterator_to_array.php.inc b/rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/iterator_to_array.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/iterator_to_array.php.inc
rename to rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/iterator_to_array.php.inc
diff --git a/rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_get_iterator.php.inc b/rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_get_iterator.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_get_iterator.php.inc
rename to rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_get_iterator.php.inc
diff --git a/rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_parse_url.php.inc b/rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_parse_url.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_parse_url.php.inc
rename to rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_parse_url.php.inc
diff --git a/rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_simple_array_merge.php.inc b/rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_simple_array_merge.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_simple_array_merge.php.inc
rename to rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_simple_array_merge.php.inc
diff --git a/rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_spread_array_merge.php.inc b/rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_spread_array_merge.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_spread_array_merge.php.inc
rename to rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_spread_array_merge.php.inc
diff --git a/rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_string_keys.php.inc b/rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_string_keys.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_string_keys.php.inc
rename to rules/php74/tests/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/Fixture/skip_string_keys.php.inc
diff --git a/rules/php-74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/FilterVarToAddSlashesRectorTest.php b/rules/php74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/FilterVarToAddSlashesRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/FilterVarToAddSlashesRectorTest.php
rename to rules/php74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/FilterVarToAddSlashesRectorTest.php
diff --git a/rules/php-74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/Fixture/fixture.php.inc
rename to rules/php74/tests/Rector/FuncCall/FilterVarToAddSlashesRector/Fixture/fixture.php.inc
diff --git a/rules/php-74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/Fixture/fixture.php.inc
rename to rules/php74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/Fixture/fixture.php.inc
diff --git a/rules/php-74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/GetCalledClassToStaticClassRectorTest.php b/rules/php74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/GetCalledClassToStaticClassRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/GetCalledClassToStaticClassRectorTest.php
rename to rules/php74/tests/Rector/FuncCall/GetCalledClassToStaticClassRector/GetCalledClassToStaticClassRectorTest.php
diff --git a/rules/php-74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/Fixture/fixture.php.inc
rename to rules/php74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/Fixture/fixture.php.inc
diff --git a/rules/php-74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/MbStrrposEncodingArgumentPositionRectorTest.php b/rules/php74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/MbStrrposEncodingArgumentPositionRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/MbStrrposEncodingArgumentPositionRectorTest.php
rename to rules/php74/tests/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector/MbStrrposEncodingArgumentPositionRectorTest.php
diff --git a/rules/php-74/tests/Rector/Function_/ReservedFnFunctionRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/Function_/ReservedFnFunctionRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Function_/ReservedFnFunctionRector/Fixture/fixture.php.inc
rename to rules/php74/tests/Rector/Function_/ReservedFnFunctionRector/Fixture/fixture.php.inc
diff --git a/rules/php-74/tests/Rector/Function_/ReservedFnFunctionRector/ReservedFnFunctionRectorTest.php b/rules/php74/tests/Rector/Function_/ReservedFnFunctionRector/ReservedFnFunctionRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/Function_/ReservedFnFunctionRector/ReservedFnFunctionRectorTest.php
rename to rules/php74/tests/Rector/Function_/ReservedFnFunctionRector/ReservedFnFunctionRectorTest.php
diff --git a/rules/php-74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/AddLiteralSeparatorToNumberRectorTest.php b/rules/php74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/AddLiteralSeparatorToNumberRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/AddLiteralSeparatorToNumberRectorTest.php
rename to rules/php74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/AddLiteralSeparatorToNumberRectorTest.php
diff --git a/rules/php-74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture/fixture.php.inc
rename to rules/php74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture/fixture.php.inc
diff --git a/rules/php-74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture/skip_hexadecimal.php.inc b/rules/php74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture/skip_hexadecimal.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture/skip_hexadecimal.php.inc
rename to rules/php74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture/skip_hexadecimal.php.inc
diff --git a/rules/php-74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture/skip_non_dec_simple_float_numbers.php.inc b/rules/php74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture/skip_non_dec_simple_float_numbers.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture/skip_non_dec_simple_float_numbers.php.inc
rename to rules/php74/tests/Rector/LNumber/AddLiteralSeparatorToNumberRector/Fixture/skip_non_dec_simple_float_numbers.php.inc
diff --git a/rules/php-74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/ClassConstantToSelfClassRectorTest.php b/rules/php74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/ClassConstantToSelfClassRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/ClassConstantToSelfClassRectorTest.php
rename to rules/php74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/ClassConstantToSelfClassRectorTest.php
diff --git a/rules/php-74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/Fixture/fixture.php.inc
rename to rules/php74/tests/Rector/MagicConstClass/ClassConstantToSelfClassRector/Fixture/fixture.php.inc
diff --git a/rules/php-74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/ChangeReflectionTypeToStringToGetNameRectorTest.php b/rules/php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/ChangeReflectionTypeToStringToGetNameRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/ChangeReflectionTypeToStringToGetNameRectorTest.php
rename to rules/php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/ChangeReflectionTypeToStringToGetNameRectorTest.php
diff --git a/rules/php-74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/fixture.php.inc
rename to rules/php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/fixture.php.inc
diff --git a/rules/php-74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/keep_returned_value.php.inc b/rules/php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/keep_returned_value.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/keep_returned_value.php.inc
rename to rules/php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/keep_returned_value.php.inc
diff --git a/rules/php-74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/known_has_type.php.inc b/rules/php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/known_has_type.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/known_has_type.php.inc
rename to rules/php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/known_has_type.php.inc
diff --git a/rules/php-74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/parameter_type.php.inc b/rules/php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/parameter_type.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/parameter_type.php.inc
rename to rules/php74/tests/Rector/MethodCall/ChangeReflectionTypeToStringToGetNameRector/Fixture/parameter_type.php.inc
diff --git a/rules/php74/tests/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector/Fixture/fixture.php.inc
new file mode 100644
index 000000000000..f0a3672865dc
--- /dev/null
+++ b/rules/php74/tests/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector/Fixture/fixture.php.inc
@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Php74\Tests\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector\Fixture;
+
+class SomeClass
+{
+    public ?string $name;
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Php74\Tests\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector\Fixture;
+
+class SomeClass
+{
+    public ?string $name = null;
+}
+
+?>
diff --git a/rules/php74/tests/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector/RestoreDefaultNullToNullableTypePropertyRectorTest.php b/rules/php74/tests/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector/RestoreDefaultNullToNullableTypePropertyRectorTest.php
new file mode 100644
index 000000000000..7501b2e786bb
--- /dev/null
+++ b/rules/php74/tests/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector/RestoreDefaultNullToNullableTypePropertyRectorTest.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Php74\Tests\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector;
+
+use Iterator;
+use Rector\Core\Testing\PHPUnit\AbstractRectorTestCase;
+use Rector\Php74\Rector\Property\RestoreDefaultNullToNullableTypePropertyRector;
+
+final class RestoreDefaultNullToNullableTypePropertyRectorTest extends AbstractRectorTestCase
+{
+    /**
+     * @requires PHP >= 7.4
+     * @dataProvider provideData()
+     */
+    public function test(string $file): void
+    {
+        $this->doTestFile($file);
+    }
+
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    protected function getRectorClass(): string
+    {
+        return RestoreDefaultNullToNullableTypePropertyRector::class;
+    }
+}
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/DoctrineTypedPropertyRectorTest.php b/rules/php74/tests/Rector/Property/TypedPropertyRector/DoctrineTypedPropertyRectorTest.php
similarity index 88%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/DoctrineTypedPropertyRectorTest.php
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/DoctrineTypedPropertyRectorTest.php
index ea2d36aa7569..b5002f5ced34 100644
--- a/rules/php-74/tests/Rector/Property/TypedPropertyRector/DoctrineTypedPropertyRectorTest.php
+++ b/rules/php74/tests/Rector/Property/TypedPropertyRector/DoctrineTypedPropertyRectorTest.php
@@ -6,6 +6,7 @@
 
 use Iterator;
 use Rector\Core\Testing\PHPUnit\AbstractRectorTestCase;
+use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\Php74\Rector\Property\TypedPropertyRector;
 
 final class DoctrineTypedPropertyRectorTest extends AbstractRectorTestCase
@@ -30,7 +31,6 @@ protected function getRectorClass(): string
 
     protected function getPhpVersion(): string
     {
-        // before union type
-        return '7.4';
+        return PhpVersionFeature::BEFORE_UNION_TYPES;
     }
 }
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/add_null.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/add_null.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/add_null.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/add_null.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/assert_choice.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/assert_choice.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/assert_choice.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/assert_choice.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/bool_property.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/bool_property.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/bool_property.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/bool_property.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/class_property.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/class_property.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/class_property.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/class_property.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/complex_array.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/complex_array.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/complex_array.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/complex_array.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/default_values.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/default_values.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/default_values.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/default_values.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/default_values_for_nullable_iterables.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/default_values_for_nullable_iterables.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/default_values_for_nullable_iterables.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/default_values_for_nullable_iterables.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/match_types.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/match_types.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/match_types.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/match_types.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/match_types_parent.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/match_types_parent.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/match_types_parent.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/match_types_parent.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/non_array_generic_types.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/non_array_generic_types.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/non_array_generic_types.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/non_array_generic_types.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/nullable_property.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/nullable_property.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/nullable_property.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/nullable_property.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/nullable_property_scalar.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/nullable_property_scalar.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/nullable_property_scalar.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/nullable_property_scalar.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/parent_has_untyped_property.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/parent_has_untyped_property.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/parent_has_untyped_property.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/parent_has_untyped_property.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/parent_of_parent_has_untyped_property.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/parent_of_parent_has_untyped_property.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/parent_of_parent_has_untyped_property.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/parent_of_parent_has_untyped_property.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/property.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/property.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/property.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/property.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/simple_array.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/simple_array.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/simple_array.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/simple_array.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/skip_invalid_property.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/skip_invalid_property.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/skip_invalid_property.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/skip_invalid_property.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/static_analysis_based.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/static_analysis_based.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/static_analysis_based.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/static_analysis_based.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/static_property.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/static_property.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Fixture/static_property.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Fixture/static_property.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_collection.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_collection.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_collection.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_collection.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_collection_with_default_array.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_collection_with_default_array.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_collection_with_default_array.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_collection_with_default_array.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_id.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_id.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_id.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_id.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_intersect_collection.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_intersect_collection.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_intersect_collection.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/FixtureDoctrine/doctrine_intersect_collection.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/FixtureUnionTypes/two_types.php.inc b/rules/php74/tests/Rector/Property/TypedPropertyRector/FixtureUnionTypes/two_types.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/FixtureUnionTypes/two_types.php.inc
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/FixtureUnionTypes/two_types.php.inc
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/Source/SomeParent.php b/rules/php74/tests/Rector/Property/TypedPropertyRector/Source/SomeParent.php
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/Source/SomeParent.php
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/Source/SomeParent.php
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/TypedPropertyRectorTest.php b/rules/php74/tests/Rector/Property/TypedPropertyRector/TypedPropertyRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/TypedPropertyRectorTest.php
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/TypedPropertyRectorTest.php
diff --git a/rules/php-74/tests/Rector/Property/TypedPropertyRector/UnionTypedPropertyRectorTest.php b/rules/php74/tests/Rector/Property/TypedPropertyRector/UnionTypedPropertyRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/Property/TypedPropertyRector/UnionTypedPropertyRectorTest.php
rename to rules/php74/tests/Rector/Property/TypedPropertyRector/UnionTypedPropertyRectorTest.php
diff --git a/rules/php-74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/ExportToReflectionFunctionRectorTest.php b/rules/php74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/ExportToReflectionFunctionRectorTest.php
similarity index 100%
rename from rules/php-74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/ExportToReflectionFunctionRectorTest.php
rename to rules/php74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/ExportToReflectionFunctionRectorTest.php
diff --git a/rules/php-74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/Fixture/fixture.php.inc b/rules/php74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/Fixture/fixture.php.inc
rename to rules/php74/tests/Rector/StaticCall/ExportToReflectionFunctionRector/Fixture/fixture.php.inc
diff --git a/rules/php-80/src/Rector/FunctionLike/UnionTypesRector.php b/rules/php80/src/Rector/FunctionLike/UnionTypesRector.php
similarity index 100%
rename from rules/php-80/src/Rector/FunctionLike/UnionTypesRector.php
rename to rules/php80/src/Rector/FunctionLike/UnionTypesRector.php
diff --git a/rules/php-80/tests/Rector/FunctionLike/UnionTypesRector/Fixture/fixture.php.inc b/rules/php80/tests/Rector/FunctionLike/UnionTypesRector/Fixture/fixture.php.inc
similarity index 100%
rename from rules/php-80/tests/Rector/FunctionLike/UnionTypesRector/Fixture/fixture.php.inc
rename to rules/php80/tests/Rector/FunctionLike/UnionTypesRector/Fixture/fixture.php.inc
diff --git a/rules/php-80/tests/Rector/FunctionLike/UnionTypesRector/UnionTypesRectorTest.php b/rules/php80/tests/Rector/FunctionLike/UnionTypesRector/UnionTypesRectorTest.php
similarity index 100%
rename from rules/php-80/tests/Rector/FunctionLike/UnionTypesRector/UnionTypesRectorTest.php
rename to rules/php80/tests/Rector/FunctionLike/UnionTypesRector/UnionTypesRectorTest.php