Use proper syntax for variadic functions

This simplify code, increase readability and improve the function
signature for API users.

Author: PowerKiKi

src/PhpSpreadsheet/CalcEngine/Logger.php

@@ -112,11 +112,11 @@ public function getEchoDebugLog()
     /**
      * Write an entry to the calculation engine debug log.
      */
-    public function writeDebugLog()
+    public function writeDebugLog(...$args)
     {
         //    Only write the debug log if logging is enabled
         if ($this->writeDebugLog) {
-            $message = implode(func_get_args());
+            $message = implode($args);
             $cellReference = implode(' -> ', $this->cellStack->showStack());
             if ($this->echoDebugLog) {
                 echo $cellReference,

src/PhpSpreadsheet/Calculation.php

@@ -3051,9 +3051,9 @@ private function convertMatrixReferences($formula)
         return $formula;
     }
 
-    private static function mkMatrix()
+    private static function mkMatrix(...$args)
     {
-        return func_get_args();
+        return $args;
     }
 
     //    Binary Operators

src/PhpSpreadsheet/Calculation/DateTime.php

@@ -951,15 +951,13 @@ public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0)
      *
      * @return int Interval between the dates
      */
-    public static function NETWORKDAYS($startDate, $endDate)
+    public static function NETWORKDAYS($startDate, $endDate, ...$dateArgs)
     {
         //    Retrieve the mandatory start and end date that are referenced in the function definition
         $startDate = Functions::flattenSingleValue($startDate);
         $endDate = Functions::flattenSingleValue($endDate);
-        //    Flush the mandatory start and end date that are referenced in the function definition, and get the optional days
-        $dateArgs = Functions::flattenArray(func_get_args());
-        array_shift($dateArgs);
-        array_shift($dateArgs);
+        //    Get the optional days
+        $dateArgs = Functions::flattenArray($dateArgs);
 
         //    Validate the start and end dates
         if (is_string($startDate = $sDate = self::getDateValue($startDate))) {
@@ -1035,15 +1033,13 @@ public static function NETWORKDAYS($startDate, $endDate)
      * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-    public static function WORKDAY($startDate, $endDays)
+    public static function WORKDAY($startDate, $endDays, ...$dateArgs)
     {
         //    Retrieve the mandatory start date and days that are referenced in the function definition
         $startDate = Functions::flattenSingleValue($startDate);
         $endDays = Functions::flattenSingleValue($endDays);
-        //    Flush the mandatory start date and days that are referenced in the function definition, and get the optional days
-        $dateArgs = Functions::flattenArray(func_get_args());
-        array_shift($dateArgs);
-        array_shift($dateArgs);
+        //    Get the optional days
+        $dateArgs = Functions::flattenArray($dateArgs);
 
         if ((is_string($startDate = self::getDateValue($startDate))) || (!is_numeric($endDays))) {
             return Functions::VALUE();

src/PhpSpreadsheet/Calculation/Engineering.php

@@ -2291,18 +2291,18 @@ public static function IMSUB($complexNumber1, $complexNumber2)
      * Excel Function:
      *        IMSUM(complexNumber[,complexNumber[,...]])
      *
-     * @param string $complexNumber,... Series of complex numbers to add
+     * @param string $complexNumbers Series of complex numbers to add
      *
      * @return string
      */
-    public static function IMSUM()
+    public static function IMSUM(...$complexNumbers)
     {
         // Return value
         $returnValue = self::parseComplex('0');
         $activeSuffix = '';
 
         // Loop through the arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($complexNumbers);
         foreach ($aArgs as $arg) {
             $parsedComplex = self::parseComplex($arg);
 
@@ -2331,18 +2331,18 @@ public static function IMSUM()
      * Excel Function:
      *        IMPRODUCT(complexNumber[,complexNumber[,...]])
      *
-     * @param string $complexNumber,... Series of complex numbers to multiply
+     * @param string $complexNumbers Series of complex numbers to multiply
      *
      * @return string
      */
-    public static function IMPRODUCT()
+    public static function IMPRODUCT(...$complexNumbers)
     {
         // Return value
         $returnValue = self::parseComplex('1');
         $activeSuffix = '';
 
         // Loop through the arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($complexNumbers);
         foreach ($aArgs as $arg) {
             $parsedComplex = self::parseComplex($arg);
 

src/PhpSpreadsheet/Calculation/Financial.php

@@ -1480,13 +1480,13 @@ public static function IRR($values, $guess = 0.1)
      *
      * PV is the loan amount or present value of the payments
      */
-    public static function ISPMT()
+    public static function ISPMT(...$args)
     {
         // Return value
         $returnValue = 0;
 
         // Get the parameters
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         $interestRate = array_shift($aArgs);
         $period = array_shift($aArgs);
         $numberPeriods = array_shift($aArgs);
@@ -1627,13 +1627,13 @@ public static function NPER($rate = 0, $pmt = 0, $pv = 0, $fv = 0, $type = 0)
      *
      * @return float
      */
-    public static function NPV()
+    public static function NPV(...$args)
     {
         // Return value
         $returnValue = 0;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
 
         // Calculate
         $rate = array_shift($aArgs);

src/PhpSpreadsheet/Calculation/Logical.php

@@ -78,17 +78,17 @@ public static function false()
      *
      * @category Logical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return string|bool the logical AND of the arguments
      */
-    public static function logicalAnd()
+    public static function logicalAnd(...$args)
     {
         // Return value
         $returnValue = true;
 
         // Loop through the arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         $argCount = -1;
         foreach ($aArgs as $argCount => $arg) {
             // Is it a boolean value?
@@ -135,17 +135,17 @@ public static function logicalAnd()
      *
      * @category Logical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return string|bool the logical OR of the arguments
      */
-    public static function logicalOr()
+    public static function logicalOr(...$args)
     {
         // Return value
         $returnValue = false;
 
         // Loop through the arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         $argCount = -1;
         foreach ($aArgs as $argCount => $arg) {
             // Is it a boolean value?

src/PhpSpreadsheet/Calculation/LookupRef.php

@@ -270,9 +270,6 @@ public static function ROWS($cellAddress = null)
      */
     public static function HYPERLINK($linkURL = '', $displayName = null, \PhpOffice\PhpSpreadsheet\Cell $pCell = null)
     {
-        $args = func_get_args();
-        $pCell = array_pop($args);
-
         $linkURL = (is_null($linkURL)) ? '' : Functions::flattenSingleValue($linkURL);
         $displayName = (is_null($displayName)) ? '' : Functions::flattenSingleValue($displayName);
 
@@ -377,10 +374,11 @@ public static function INDIRECT($cellAddress = null, \PhpOffice\PhpSpreadsheet\C
      * @param mixed $columns
      * @param null|mixed $height
      * @param null|mixed $width
+     * @param \PhpOffice\PhpSpreadsheet\Cell $pCell
      *
      * @return string A reference to a cell or range of cells
      */
-    public static function OFFSET($cellAddress = null, $rows = 0, $columns = 0, $height = null, $width = null)
+    public static function OFFSET($cellAddress = null, $rows = 0, $columns = 0, $height = null, $width = null, \PhpOffice\PhpSpreadsheet\Cell $pCell = null)
     {
         $rows = Functions::flattenSingleValue($rows);
         $columns = Functions::flattenSingleValue($columns);
@@ -390,8 +388,6 @@ public static function OFFSET($cellAddress = null, $rows = 0, $columns = 0, $hei
             return 0;
         }
 
-        $args = func_get_args();
-        $pCell = array_pop($args);
         if (!is_object($pCell)) {
             return Functions::REF();
         }
@@ -468,9 +464,8 @@ public static function OFFSET($cellAddress = null, $rows = 0, $columns = 0, $hei
      *
      * @return mixed The selected value
      */
-    public static function CHOOSE()
+    public static function CHOOSE(...$chooseArgs)
     {
-        $chooseArgs = func_get_args();
         $chosenEntry = Functions::flattenArray(array_shift($chooseArgs));
         $entryCount = count($chooseArgs) - 1;