The WORKDAY() function accepts 2 "static" arguments that could be passed as arrays; but also accepts a set of trailing date arguments that are accepted as an array by the splat operator. Only the first two arguments should be tested for returning array values; but the logic still needs to work with the full argument set.

Provide a separate "subset" method in the `ArrayEnabled` Trait, that allows a subset of arguments to be tested for array returns.

Set up basic tests for `WORKDAY()`

Author: MarkBaker

src/PhpSpreadsheet/Calculation/ArrayEnabled.php

@@ -37,6 +37,27 @@ protected static function evaluateArrayArguments(callable $method, ...$arguments
         self::initialiseHelper($arguments);
         $arguments = self::$arrayArgumentHelper->arguments();
 
+        return self::processArguments($method, ...$arguments);
+    }
+
+    /**
+     * @param mixed ...$arguments
+     */
+    protected static function evaluateArrayArgumentsSubset(callable $method, int $limit, ...$arguments): array
+    {
+        self::initialiseHelper(array_slice($arguments, 0, $limit));
+        $trailingArguments = array_slice($arguments, $limit);
+        $arguments = self::$arrayArgumentHelper->arguments();
+        $arguments = array_merge($arguments, $trailingArguments);
+
+        return self::processArguments($method, ...$arguments);
+    }
+
+    /**
+     * @param mixed ...$arguments
+     */
+    private static function processArguments(callable $method, ...$arguments): array
+    {
         if (self::$arrayArgumentHelper->hasArrayArgument() === false) {
             return [$method(...$arguments)];
         }

src/PhpSpreadsheet/Calculation/DateTimeExcel/WorkDay.php

@@ -2,11 +2,14 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 
+use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 
 class WorkDay
 {
+    use ArrayEnabled;
+
     /**
      * WORKDAY.
      *
@@ -18,18 +21,32 @@ class WorkDay
      * Excel Function:
      *        WORKDAY(startDate,endDays[,holidays[,holiday[,...]]])
      *
-     * @param mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
+     * @param array|mixed $startDate Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
-     * @param int $endDays The number of nonweekend and nonholiday days before or after
+     *                         Or can be an array of date values
+     * @param array|int $endDays The number of nonweekend and nonholiday days before or after
      *                                        startDate. A positive value for days yields a future date; a
      *                                        negative value yields a past date.
+     *                         Or can be an array of int values
      * @param mixed $dateArgs
      *
-     * @return mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+     * @return array|mixed Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
+     *         If an array of values is passed for the $startDate or $endDays,arguments, then the returned result
+     *            will also be an array with matching dimensions
      */
     public static function date($startDate, $endDays, ...$dateArgs)
     {
+        if (is_array($startDate) || is_array($endDays)) {
+            return self::evaluateArrayArgumentsSubset(
+                [self::class, __FUNCTION__],
+                2,
+                $startDate,
+                $endDays,
+                ...$dateArgs
+            );
+        }
+
         //    Retrieve the mandatory start date and days that are referenced in the function definition
         try {
             $startDate = Helpers::getDateValue($startDate);
@@ -64,9 +81,9 @@ public static function date($startDate, $endDays, ...$dateArgs)
     private static function incrementing(float $startDate, int $endDays, array $holidayArray)
     {
         //    Adjust the start date if it falls over a weekend
-
         $startDoW = self::getWeekDay($startDate, 3);
-        if (self::getWeekDay($startDate, 3) >= 5) {
+        /** int $startDoW */
+        if ($startDoW >= 5) {
             $startDate += 7 - $startDoW;
             --$endDays;
         }
@@ -78,6 +95,7 @@ private static function incrementing(float $startDate, int $endDays, array $holi
             ++$endDate;
             //    Adjust the calculated end date if it falls over a weekend
             $endDow = self::getWeekDay($endDate, 3);
+            /** int $endDoW */
             if ($endDow >= 5) {
                 $endDate += 7 - $endDow;
             }
@@ -128,7 +146,8 @@ private static function decrementing(float $startDate, int $endDays, array $holi
         //    Adjust the start date if it falls over a weekend
 
         $startDoW = self::getWeekDay($startDate, 3);
-        if (self::getWeekDay($startDate, 3) >= 5) {
+        /** int $startDoW */
+        if ($startDoW >= 5) {
             $startDate += -$startDoW + 4;
             ++$endDays;
         }
@@ -140,6 +159,7 @@ private static function decrementing(float $startDate, int $endDays, array $holi
             --$endDate;
             //    Adjust the calculated end date if it falls over a weekend
             $endDow = self::getWeekDay($endDate, 3);
+            /** int $endDoW */
             if ($endDow >= 5) {
                 $endDate += 4 - $endDow;
             }
@@ -172,6 +192,7 @@ private static function decrementingArray(float $startDate, float $endDate, arra
             }
             //    Adjust the calculated end date if it falls over a weekend
             $endDoW = self::getWeekDay($endDate, 3);
+            /** int $endDoW */
             if ($endDoW >= 5) {
                 $endDate += -$endDoW + 4;
             }

tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/WorkDayTest.php

@@ -2,6 +2,8 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\DateTime;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+
 class WorkDayTest extends AllSetupTeardown
 {
     /**
@@ -49,4 +51,33 @@ public function providerWORKDAY(): array
     {
         return require 'tests/data/Calculation/DateTime/WORKDAY.php';
     }
+
+    /**
+     * @dataProvider providerWorkDayArray
+     */
+    public function testWorkDayArray(array $expectedResult, string $startDate, string $endDays, ?string $holidays): void
+    {
+        $calculation = Calculation::getInstance();
+
+        if ($holidays === null) {
+            $formula = "=WORKDAY({$startDate}, {$endDays})";
+        } else {
+            $formula = "=WORKDAY({$startDate}, {$endDays}, {$holidays})";
+        }
+        $result = $calculation->_calculateFormulaValue($formula);
+        self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
+    }
+
+    public function providerWorkDayArray(): array
+    {
+        return [
+            'row vector #1' => [[[44595, 44596, 44599]], '{"2022-02-01", "2022-02-02", "2022-02-03"}', '2', null],
+            'column vector #1' => [[[44595], [44596], [44599]], '{"2022-02-01"; "2022-02-02"; "2022-02-03"}', '2', null],
+            'matrix #1' => [[[44595, 44596], [44599, 44600]], '{"2022-02-01", "2022-02-02"; "2022-02-03", "2022-02-04"}', '2', null],
+            'row vector #2' => [[[44595, 44596]], '"2022-02-01"', '{2, 3}', null],
+            'column vector #2' => [[[44595], [44596]], '"2022-02-01"', '{2; 3}', null],
+            'row vector with Holiday' => [[[44596, 44599]], '"2022-02-01"', '{2, 3}', '{"2022-02-02"}'],
+            'row vector with Holidays' => [[[44599, 44600]], '"2022-02-01"', '{2, 3}', '{"2022-02-02", "2022-02-03"}'],
+        ];
+    }
 }