[CodeQuality] Change behaviour of OptionalParametersAfterRequiredRector to fill null default value when previous param is optional

rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/mashup.php.inc

@@ -17,7 +17,7 @@ namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterReq
 
 class Mashup
 {
-    public function run($required, $yetRequired, $optional = 1, $anotherOptional = false)
+    public function run($optional = 1, $required = null, $anotherOptional = false, $yetRequired = null)
     {
     }
 }

rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/new_the_constructor.php.inc

@@ -26,13 +26,13 @@ namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterReq
 
 final class NewTheConstructor
 {
-    public function __construct($required, $optional = 1)
+    public function __construct($optional = 1, $required = null)
     {
     }
 
     public function create()
     {
-        return new self(5, 1);
+        return new self(1, 5);
     }
 }
 

rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/on_function.php.inc

@@ -14,10 +14,10 @@ foo($optional, $required);
 
 namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
 
-function foo($required, $optional = 1)
+function foo($optional = 1, $required = null)
 {
 }
 
-foo($required, $optional);
+foo($optional, $required);
 
 ?>

rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/some_object.php.inc

@@ -17,7 +17,7 @@ namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterReq
 
 class SomeObject
 {
-    public function run($required, $optional = 1)
+    public function run($optional = 1, $required = null)
     {
     }
 }

rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/typed_params.php.inc

@@ -0,0 +1,41 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
+
+class TypedParams
+{
+    function run1($optional = 1, int $required)
+    {
+    }
+
+    function run2($optional = 1, string|int $required)
+    {
+    }
+
+    function run3($optional = 1, null|int $required)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
+
+class TypedParams
+{
+    function run1($optional = 1, ?int $required = null)
+    {
+    }
+
+    function run2($optional = 1, string|int|null $required = null)
+    {
+    }
+
+    function run3($optional = 1, null|int $required = null)
+    {
+    }
+}
+
+?>

rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/update_method_call.php.inc

@@ -26,13 +26,13 @@ namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterReq
 
 final class UpdateMethodCall
 {
-    public function run($required, $optional = 1)
+    public function run($optional = 1, $required = null)
     {
     }
 
     public function process()
     {
-        $this->run(5, 1);
+        $this->run(1, 5);
     }
 }
 

rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/update_method_call_by_fluent.php.inc

@@ -32,7 +32,7 @@ namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterReq
 
 final class UpdateMethodCallByFluent
 {
-    public function run($required, $optional = 1)
+    public function run($optional = 1, $required = null)
     {
         return $this;
     }
@@ -43,7 +43,7 @@ final class UpdateMethodCallByFluent
 
     public function process()
     {
-        $this->run(5, 1)
+        $this->run(1, 5)
              ->execute();
     }
 }

rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/update_method_call_by_fluent2.php.inc

@@ -38,15 +38,15 @@ final class UpdateMethodCallByFluent2
         return $this;
     }
 
-    public function run($required, $optional = 1)
+    public function run($optional = 1, $required = null)
     {
         return $this;
     }
 
     public function process()
     {
         $this->execute()
-             ->run(5, 1);
+             ->run(1, 5);
     }
 }
 

rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/update_params_order_of_static_method_call.php.inc

@@ -24,12 +24,12 @@ namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterReq
 
 final class WebUtil
 {
-    public static function radioList($name, $selected, $items = [], $class = "", $groupingCount = 0, $groupingClass = "", $required = false)
+    public static function radioList($name, $items = [], $selected = null, $class = "", $groupingCount = 0, $groupingClass = "", $required = false)
     {
 
     }
 }
 
-WebUtil::radioList("inPersonOrVirtual", $selected, $inPersonOrVirtualItems, "", 1, "col-sm-3 margin-bottom-10");
+WebUtil::radioList("inPersonOrVirtual", $inPersonOrVirtualItems, $selected, "", 1, "col-sm-3 margin-bottom-10");
 
 ?>

rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/uses_with_less_params.php.inc

@@ -27,14 +27,14 @@ namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterReq
 
 final class UsesWithLess
 {
-    public function blah($required, $optional = 1, $optional_2 = 2)
+    public function blah($optional = 1, $required = null, $optional_2 = 2)
     {
     }
 
     public function process()
     {
-        $this->blah(5, 1);
-        $this->blah(5, 1, 2);
+        $this->blah(1, 5);
+        $this->blah(1, 5, 2);
     }
 }