Merge pull request #651 from kukulich/optional

Parameter with default value before variadic parameter should be optional
Roave · Jun 9, 2020 · 4cda6ae · 4cda6ae
2 parents 9982305 + ee2c824
commit 4cda6ae
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/src/Reflection/ReflectionFunctionAbstract.php b/src/Reflection/ReflectionFunctionAbstract.php
@@ -101,16 +101,16 @@ private function setNodeOptionalFlag() : void
         $overallOptionalFlag = true;
         $lastParamIndex      = count($this->getNode()->params) - 1;
         for ($i = $lastParamIndex; $i >= 0; $i--) {
-            $hasDefault = ($this->getNode()->params[$i]->default !== null);
+            $param = $this->getNode()->params[$i];
 
-            // When we find the first parameter that does not have a default,
+            // When we find the first parameter that does not have a default or is not variadic,
             // flip the flag as all params for this are no longer optional
             // EVEN if they have a default value
-            if (! $hasDefault) {
+            if ($param->default === null && ! $param->variadic) {
                 $overallOptionalFlag = false;
             }
 
-            $this->getNode()->params[$i]->isOptional = $overallOptionalFlag;
+            $param->isOptional = $overallOptionalFlag;
         }
     }
 

diff --git a/test/unit/Fixture/Methods.php b/test/unit/Fixture/Methods.php
@@ -67,6 +67,10 @@ public function methodWithVariadic($nonVariadicParameter, ...$variadicParameter)
     {
     }
 
+    public function methodWithFirstParameterWithDefaultValueAndSecondParameterIsVariadic($parameterWithDefaultValue = null, ...$variadicParameter)
+    {
+    }
+
     public function methodWithReference($nonRefParameter, &$refParameter)
     {
     }

diff --git a/test/unit/Reflection/ReflectionClassTest.php b/test/unit/Reflection/ReflectionClassTest.php
@@ -173,7 +173,7 @@ public function getMethodsWithFilterDataProvider() : array
             [CoreReflectionMethod::IS_STATIC, 1],
             [CoreReflectionMethod::IS_ABSTRACT, 1],
             [CoreReflectionMethod::IS_FINAL, 1],
-            [CoreReflectionMethod::IS_PUBLIC, 16],
+            [CoreReflectionMethod::IS_PUBLIC, 17],
             [CoreReflectionMethod::IS_PROTECTED, 1],
             [CoreReflectionMethod::IS_PRIVATE, 1],
             [
@@ -183,7 +183,7 @@ public function getMethodsWithFilterDataProvider() : array
                 CoreReflectionMethod::IS_PUBLIC |
                 CoreReflectionMethod::IS_PROTECTED |
                 CoreReflectionMethod::IS_PRIVATE,
-                18,
+                19,
             ],
         ];
     }

diff --git a/test/unit/Reflection/ReflectionParameterTest.php b/test/unit/Reflection/ReflectionParameterTest.php
@@ -443,6 +443,20 @@ public function testGetDefaultValueAndIsOptional() : void
         self::assertFalse($secondParam->isDefaultValueAvailable());
     }
 
+    public function testParameterWithDefaultValueBeforeVariadicParameterShouldBeOptional() : void
+    {
+        $classInfo = $this->reflector->reflect(Methods::class);
+        $method    = $classInfo->getMethod('methodWithFirstParameterWithDefaultValueAndSecondParameterIsVariadic');
+
+        $firstParam = $method->getParameter('parameterWithDefaultValue');
+        self::assertTrue($firstParam->isOptional());
+        self::assertTrue($firstParam->isDefaultValueAvailable());
+
+        $secondParam = $method->getParameter('variadicParameter');
+        self::assertTrue($secondParam->isOptional());
+        self::assertTrue($secondParam->isVariadic());
+    }
+
     /**
      * @group 109
      */