Use proper syntax for variadic functions

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

src/PhpSpreadsheet/CalcEngine/Logger.php

@@ -112,11 +112,11 @@ class Logger
     /**
      * 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 @@ class Calculation
         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 @@ class DateTime
      *
      * @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
+        //    Get the optional days
-        $dateArgs = Functions::flattenArray(func_get_args());
+        $dateArgs = Functions::flattenArray($dateArgs);
-        array_shift($dateArgs);
-        array_shift($dateArgs);
 
         //    Validate the start and end dates
         if (is_string($startDate = $sDate = self::getDateValue($startDate))) {
@@ -1035,15 +1033,13 @@ class DateTime
      * @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
+        //    Get the optional days
-        $dateArgs = Functions::flattenArray(func_get_args());
+        $dateArgs = Functions::flattenArray($dateArgs);
-        array_shift($dateArgs);
-        array_shift($dateArgs);
 
         if ((is_string($startDate = self::getDateValue($startDate))) || (!is_numeric($endDays))) {
             return Functions::VALUE();

src/PhpSpreadsheet/Calculation/Engineering.php

@@ -2291,18 +2291,18 @@ class Engineering
      * 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 @@ class Engineering
      * 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 @@ class Financial
      *
      * 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 @@ class Financial
      *
      * @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 @@ class Logical
      *
      * @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 @@ class Logical
      *
      * @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 @@ class LookupRef
      */
     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 @@ class LookupRef
      * @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 @@ class LookupRef
             return 0;
         }
 
-        $args = func_get_args();
-        $pCell = array_pop($args);
         if (!is_object($pCell)) {
             return Functions::REF();
         }
@@ -468,9 +464,8 @@ class LookupRef
      *
      * @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;
 

src/PhpSpreadsheet/Calculation/MathTrig.php

@@ -343,16 +343,16 @@ class MathTrig
      *
      * @category Mathematical and Trigonometric Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return int Greatest Common Divisor
      */
-    public static function GCD()
+    public static function GCD(...$args)
     {
         $returnValue = 1;
         $allValuesFactors = [];
         // Loop through arguments
-        foreach (Functions::flattenArray(func_get_args()) as $value) {
+        foreach (Functions::flattenArray($args) as $value) {
             if (!is_numeric($value)) {
                 return Functions::VALUE();
             } elseif ($value == 0) {
@@ -452,16 +452,16 @@ class MathTrig
      *
      * @category Mathematical and Trigonometric Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return int Lowest Common Multiplier
      */
-    public static function LCM()
+    public static function LCM(...$args)
     {
         $returnValue = 1;
         $allPoweredFactors = [];
         // Loop through arguments
-        foreach (Functions::flattenArray(func_get_args()) as $value) {
+        foreach (Functions::flattenArray($args) as $value) {
             if (!is_numeric($value)) {
                 return Functions::VALUE();
             }
@@ -755,12 +755,12 @@ class MathTrig
      *
      * @return float
      */
-    public static function MULTINOMIAL()
+    public static function MULTINOMIAL(...$args)
     {
         $summer = 0;
         $divisor = 1;
         // Loop through arguments
-        foreach (Functions::flattenArray(func_get_args()) as $arg) {
+        foreach (Functions::flattenArray($args) as $arg) {
             // Is it a numeric value?
             if (is_numeric($arg)) {
                 if ($arg < 1) {
@@ -855,17 +855,17 @@ class MathTrig
      *
      * @category Mathematical and Trigonometric Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function PRODUCT()
+    public static function PRODUCT(...$args)
     {
         // Return value
         $returnValue = null;
 
         // Loop through arguments
-        foreach (Functions::flattenArray(func_get_args()) as $arg) {
+        foreach (Functions::flattenArray($args) as $arg) {
             // Is it a numeric value?
             if ((is_numeric($arg)) && (!is_string($arg))) {
                 if (is_null($returnValue)) {
@@ -895,17 +895,17 @@ class MathTrig
      *
      * @category Mathematical and Trigonometric Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function QUOTIENT()
+    public static function QUOTIENT(...$args)
     {
         // Return value
         $returnValue = null;
 
         // Loop through arguments
-        foreach (Functions::flattenArray(func_get_args()) as $arg) {
+        foreach (Functions::flattenArray($args) as $arg) {
             // Is it a numeric value?
             if ((is_numeric($arg)) && (!is_string($arg))) {
                 if (is_null($returnValue)) {
@@ -1042,12 +1042,12 @@ class MathTrig
      *
      * @return float
      */
-    public static function SERIESSUM()
+    public static function SERIESSUM(...$args)
     {
         $returnValue = 0;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
 
         $x = array_shift($aArgs);
         $n = array_shift($aArgs);
@@ -1134,9 +1134,9 @@ class MathTrig
      *
      * @return float
      */
-    public static function SUBTOTAL()
+    public static function SUBTOTAL(...$args)
     {
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
 
         // Calculate
         $subtotal = array_shift($aArgs);
@@ -1181,16 +1181,16 @@ class MathTrig
      *
      * @category Mathematical and Trigonometric Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function SUM()
+    public static function SUM(...$args)
     {
         $returnValue = 0;
 
         // Loop through the arguments
-        foreach (Functions::flattenArray(func_get_args()) as $arg) {
+        foreach (Functions::flattenArray($args) as $arg) {
             // Is it a numeric value?
             if ((is_numeric($arg)) && (!is_string($arg))) {
                 $returnValue += $arg;
@@ -1210,7 +1210,7 @@ class MathTrig
      *
      * @category Mathematical and Trigonometric Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $aArgs Data values
      * @param string $condition the criteria that defines which cells will be summed
      * @param mixed $aArgs
      * @param mixed $sumArgs
@@ -1254,14 +1254,14 @@ class MathTrig
      *
      *    @category Mathematical and Trigonometric Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      * @param string $condition the criteria that defines which cells will be summed
      *
      * @return float
      */
-    public static function SUMIFS()
+    public static function SUMIFS(...$args)
     {
-        $arrayList = func_get_args();
+        $arrayList = $args;
 
         // Return value
         $returnValue = 0;
@@ -1302,13 +1302,13 @@ class MathTrig
      *
      * @category Mathematical and Trigonometric Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function SUMPRODUCT()
+    public static function SUMPRODUCT(...$args)
     {
-        $arrayList = func_get_args();
+        $arrayList = $args;
 
         $wrkArray = Functions::flattenArray(array_shift($arrayList));
         $wrkCellCount = count($wrkArray);
@@ -1347,16 +1347,16 @@ class MathTrig
      *
      * @category Mathematical and Trigonometric Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function SUMSQ()
+    public static function SUMSQ(...$args)
     {
         $returnValue = 0;
 
         // Loop through arguments
-        foreach (Functions::flattenArray(func_get_args()) as $arg) {
+        foreach (Functions::flattenArray($args) as $arg) {
             // Is it a numeric value?
             if ((is_numeric($arg)) && (!is_string($arg))) {
                 $returnValue += ($arg * $arg);

src/PhpSpreadsheet/Calculation/Statistical.php

@@ -722,13 +722,13 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function AVEDEV()
+    public static function AVEDEV(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed(func_get_args());
+        $aArgs = Functions::flattenArrayIndexed($args);
 
         // Return value
         $returnValue = null;
@@ -773,16 +773,16 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function AVERAGE()
+    public static function AVERAGE(...$args)
     {
         $returnValue = $aCount = 0;
 
         // Loop through arguments
-        foreach (Functions::flattenArrayIndexed(func_get_args()) as $k => $arg) {
+        foreach (Functions::flattenArrayIndexed($args) as $k => $arg) {
             if ((is_bool($arg)) &&
                 ((!Functions::isCellValue($k)) || (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))) {
                 $arg = (int) $arg;
@@ -816,17 +816,17 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function AVERAGEA()
+    public static function AVERAGEA(...$args)
     {
         $returnValue = null;
 
         $aCount = 0;
         // Loop through arguments
-        foreach (Functions::flattenArrayIndexed(func_get_args()) as $k => $arg) {
+        foreach (Functions::flattenArrayIndexed($args) as $k => $arg) {
             if ((is_bool($arg)) &&
                 (!Functions::isMatrixValue($k))) {
             } else {
@@ -863,10 +863,9 @@ class Statistical
      *
      * @category Mathematical and Trigonometric Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $aArgs Data values
      * @param string $condition the criteria that defines which cells will be checked
      * @param mixed[] $averageArgs Data values
-     * @param mixed $aArgs
      *
      * @return float
      */
@@ -1210,16 +1209,16 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return int
      */
-    public static function COUNT()
+    public static function COUNT(...$args)
     {
         $returnValue = 0;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArrayIndexed(func_get_args());
+        $aArgs = Functions::flattenArrayIndexed($args);
         foreach ($aArgs as $k => $arg) {
             if ((is_bool($arg)) &&
                 ((!Functions::isCellValue($k)) || (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))) {
@@ -1244,16 +1243,16 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return int
      */
-    public static function COUNTA()
+    public static function COUNTA(...$args)
     {
         $returnValue = 0;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         foreach ($aArgs as $arg) {
             // Is it a numeric, boolean or string value?
             if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
@@ -1274,16 +1273,16 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return int
      */
-    public static function COUNTBLANK()
+    public static function COUNTBLANK(...$args)
     {
         $returnValue = 0;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         foreach ($aArgs as $arg) {
             // Is it a blank cell?
             if ((is_null($arg)) || ((is_string($arg)) && ($arg == ''))) {
@@ -1304,9 +1303,8 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $aArgs Data values
      * @param string $condition the criteria that defines which cells will be counted
-     * @param mixed $aArgs
      *
      * @return int
      */
@@ -1495,13 +1493,13 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function DEVSQ()
+    public static function DEVSQ(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed(func_get_args());
+        $aArgs = Functions::flattenArrayIndexed($args);
 
         // Return value
         $returnValue = null;
@@ -1789,13 +1787,13 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function GEOMEAN()
+    public static function GEOMEAN(...$args)
     {
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
 
         $aMean = MathTrig::PRODUCT($aArgs);
         if (is_numeric($aMean) && ($aMean > 0)) {
@@ -1855,17 +1853,17 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function HARMEAN()
+    public static function HARMEAN(...$args)
     {
         // Return value
         $returnValue = Functions::NA();
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         if (self::MIN($aArgs) < 0) {
             return Functions::NAN();
         }
@@ -1975,9 +1973,9 @@ class Statistical
      *
      * @return float
      */
-    public static function KURT()
+    public static function KURT(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed(func_get_args());
+        $aArgs = Functions::flattenArrayIndexed($args);
         $mean = self::AVERAGE($aArgs);
         $stdDev = self::STDEV($aArgs);
 
@@ -2016,14 +2014,14 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      * @param int $entry Position (ordered from the largest) in the array or range of data to return
      *
      * @return float
      */
-    public static function LARGE()
+    public static function LARGE(...$args)
     {
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
 
         // Calculate
         $entry = floor(array_pop($aArgs));
@@ -2253,16 +2251,16 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function MAX()
+    public static function MAX(...$args)
     {
         $returnValue = null;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         foreach ($aArgs as $arg) {
             // Is it a numeric value?
             if ((is_numeric($arg)) && (!is_string($arg))) {
@@ -2289,16 +2287,16 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function MAXA()
+    public static function MAXA(...$args)
     {
         $returnValue = null;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         foreach ($aArgs as $arg) {
             // Is it a numeric value?
             if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
@@ -2330,9 +2328,8 @@ class Statistical
      *
      * @category Mathematical and Trigonometric Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $aArgs Data values
      * @param string $condition the criteria that defines which cells will be checked
-     * @param mixed $aArgs
      * @param mixed $sumArgs
      *
      * @return float
@@ -2373,17 +2370,17 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function MEDIAN()
+    public static function MEDIAN(...$args)
     {
         $returnValue = Functions::NAN();
 
         $mArgs = [];
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         foreach ($aArgs as $arg) {
             // Is it a numeric value?
             if ((is_numeric($arg)) && (!is_string($arg))) {
@@ -2417,16 +2414,16 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function MIN()
+    public static function MIN(...$args)
     {
         $returnValue = null;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         foreach ($aArgs as $arg) {
             // Is it a numeric value?
             if ((is_numeric($arg)) && (!is_string($arg))) {
@@ -2453,16 +2450,16 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function MINA()
+    public static function MINA(...$args)
     {
         $returnValue = null;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         foreach ($aArgs as $arg) {
             // Is it a numeric value?
             if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
@@ -2494,9 +2491,8 @@ class Statistical
      *
      * @category Mathematical and Trigonometric Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $aArgs Data values
      * @param string $condition the criteria that defines which cells will be checked
-     * @param mixed $aArgs
      * @param mixed $sumArgs
      *
      * @return float
@@ -2574,16 +2570,16 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function MODE()
+    public static function MODE(...$args)
     {
         $returnValue = Functions::NA();
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
 
         $mArgs = [];
         foreach ($aArgs as $arg) {
@@ -2748,14 +2744,14 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      * @param float $entry Percentile value in the range 0..1, inclusive.
      *
      * @return float
      */
-    public static function PERCENTILE()
+    public static function PERCENTILE(...$args)
     {
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
 
         // Calculate
         $entry = array_pop($aArgs);
@@ -2920,14 +2916,14 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      * @param int $entry Quartile value in the range 1..3, inclusive.
      *
      * @return float
      */
-    public static function QUARTILE()
+    public static function QUARTILE(...$args)
     {
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
 
         // Calculate
         $entry = floor(array_pop($aArgs));
@@ -3026,9 +3022,9 @@ class Statistical
      *
      * @return float
      */
-    public static function SKEW()
+    public static function SKEW(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed(func_get_args());
+        $aArgs = Functions::flattenArrayIndexed($args);
         $mean = self::AVERAGE($aArgs);
         $stdDev = self::STDEV($aArgs);
 
@@ -3095,14 +3091,14 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      * @param int $entry Position (ordered from the smallest) in the array or range of data to return
      *
      * @return float
      */
-    public static function SMALL()
+    public static function SMALL(...$args)
     {
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
 
         // Calculate
         $entry = array_pop($aArgs);
@@ -3167,13 +3163,13 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function STDEV()
+    public static function STDEV(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed(func_get_args());
+        $aArgs = Functions::flattenArrayIndexed($args);
 
         // Return value
         $returnValue = null;
@@ -3216,13 +3212,13 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function STDEVA()
+    public static function STDEVA(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed(func_get_args());
+        $aArgs = Functions::flattenArrayIndexed($args);
 
         $returnValue = null;
 
@@ -3268,13 +3264,13 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function STDEVP()
+    public static function STDEVP(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed(func_get_args());
+        $aArgs = Functions::flattenArrayIndexed($args);
 
         $returnValue = null;
 
@@ -3315,13 +3311,13 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function STDEVPA()
+    public static function STDEVPA(...$args)
     {
-        $aArgs = Functions::flattenArrayIndexed(func_get_args());
+        $aArgs = Functions::flattenArrayIndexed($args);
 
         $returnValue = null;
 
@@ -3559,14 +3555,14 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      * @param float $discard Percentage to discard
      *
      * @return float
      */
-    public static function TRIMMEAN()
+    public static function TRIMMEAN(...$args)
     {
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
 
         // Calculate
         $percent = array_pop($aArgs);
@@ -3605,18 +3601,18 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function VARFunc()
+    public static function VARFunc(...$args)
     {
         $returnValue = Functions::DIV0();
 
         $summerA = $summerB = 0;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         $aCount = 0;
         foreach ($aArgs as $arg) {
             if (is_bool($arg)) {
@@ -3649,18 +3645,18 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function VARA()
+    public static function VARA(...$args)
     {
         $returnValue = Functions::DIV0();
 
         $summerA = $summerB = 0;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArrayIndexed(func_get_args());
+        $aArgs = Functions::flattenArrayIndexed($args);
         $aCount = 0;
         foreach ($aArgs as $k => $arg) {
             if ((is_string($arg)) &&
@@ -3702,11 +3698,11 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function VARP()
+    public static function VARP(...$args)
     {
         // Return value
         $returnValue = Functions::DIV0();
@@ -3714,7 +3710,7 @@ class Statistical
         $summerA = $summerB = 0;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         $aCount = 0;
         foreach ($aArgs as $arg) {
             if (is_bool($arg)) {
@@ -3747,18 +3743,18 @@ class Statistical
      *
      * @category Statistical Functions
      *
-     * @param mixed $arg,... Data values
+     * @param mixed $args Data values
      *
      * @return float
      */
-    public static function VARPA()
+    public static function VARPA(...$args)
     {
         $returnValue = Functions::DIV0();
 
         $summerA = $summerB = 0;
 
         // Loop through arguments
-        $aArgs = Functions::flattenArrayIndexed(func_get_args());
+        $aArgs = Functions::flattenArrayIndexed($args);
         $aCount = 0;
         foreach ($aArgs as $k => $arg) {
             if ((is_string($arg)) &&

src/PhpSpreadsheet/Calculation/TextData.php

@@ -143,12 +143,12 @@ class TextData
      *
      * @return string
      */
-    public static function CONCATENATE()
+    public static function CONCATENATE(...$args)
     {
         $returnValue = '';
 
         // Loop through arguments
-        $aArgs = Functions::flattenArray(func_get_args());
+        $aArgs = Functions::flattenArray($args);
         foreach ($aArgs as $arg) {
             if (is_bool($arg)) {
                 if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {

src/PhpSpreadsheet/Shared/JAMA/Matrix.php

@@ -47,10 +47,9 @@ class Matrix
      *
      * As PHP has no support for polymorphic constructors, we use tricks to make our own sort of polymorphism using func_num_args, func_get_arg, and gettype. In essence, we're just implementing a simple RTTI filter and calling the appropriate constructor.
      */
-    public function __construct()
+    public function __construct(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count($args) > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -156,10 +155,9 @@ class Matrix
      *
      * @return Matrix Submatrix
      */
-    public function getMatrix()
+    public function getMatrix(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count($args) > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -462,10 +460,9 @@ class Matrix
      *
      * @return Matrix Sum
      */
-    public function plus()
+    public function plus(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count($args) > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -504,10 +501,9 @@ class Matrix
      *
      * @return Matrix Sum
      */
-    public function plusEquals()
+    public function plusEquals(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count($args) > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -560,10 +556,9 @@ class Matrix
      *
      * @return Matrix Sum
      */
-    public function minus()
+    public function minus(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count($args) > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -602,10 +597,9 @@ class Matrix
      *
      * @return Matrix Sum
      */
-    public function minusEquals()
+    public function minusEquals(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count($args) > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -659,10 +653,9 @@ class Matrix
      *
      * @return Matrix Matrix Cij
      */
-    public function arrayTimes()
+    public function arrayTimes(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count($args) > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -702,10 +695,9 @@ class Matrix
      *
      * @return Matrix Matrix Aij
      */
-    public function arrayTimesEquals()
+    public function arrayTimesEquals(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count($args) > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -759,10 +751,9 @@ class Matrix
      *
      * @return Matrix Division result
      */
-    public function arrayRightDivide()
+    public function arrayRightDivide(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count($args) > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -821,10 +812,9 @@ class Matrix
      *
      * @return Matrix Matrix Aij
      */
-    public function arrayRightDivideEquals()
+    public function arrayRightDivideEquals(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count($args) > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -864,10 +854,9 @@ class Matrix
      *
      * @return Matrix Division result
      */
-    public function arrayLeftDivide()
+    public function arrayLeftDivide(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count($args) > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -907,10 +896,9 @@ class Matrix
      *
      * @return Matrix Matrix Aij
      */
-    public function arrayLeftDivideEquals()
+    public function arrayLeftDivideEquals(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count($args) > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -949,10 +937,9 @@ class Matrix
      *
      * @return Matrix Product
      */
-    public function times()
+    public function times(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count() > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -1042,10 +1029,9 @@ class Matrix
      *
      * @return Matrix Sum
      */
-    public function power()
+    public function power(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count() > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {
@@ -1098,10 +1084,9 @@ class Matrix
      *
      * @return Matrix Sum
      */
-    public function concat()
+    public function concat(...$args)
     {
-        if (func_num_args() > 0) {
+        if (count($args) > 0) {
-            $args = func_get_args();
             $match = implode(',', array_map('gettype', $args));
 
             switch ($match) {

src/PhpSpreadsheet/Shared/JAMA/utils/Maths.php

@@ -25,21 +25,4 @@ function hypo($a, $b)
     }
 
     return $r;
-}    //    function hypo()
-
-/*
- *    Mike Bommarito's version.
- *    Compute n-dimensional hyotheneuse.
- *
-function hypot() {
-    $s = 0;
-    foreach (func_get_args() as $d) {
-        if (is_numeric($d)) {
-            $s += pow($d, 2);
-        } else {
-            throw new \PhpOffice\PhpSpreadsheet\Calculation\Exception(JAMAError(ARGUMENT_TYPE_EXCEPTION));
-        }
-    }
-    return sqrt($s);
 }
-*/

tests/PhpSpreadsheetTests/Calculation/DateTimeTest.php

@@ -18,12 +18,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDATE
+     *
+     * @param mixed $expectedResult
      */
-    public function testDATE()
+    public function testDATE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::DATE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'DATE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -71,12 +71,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDATEVALUE
+     *
+     * @param mixed $expectedResult
      */
-    public function testDATEVALUE()
+    public function testDATEVALUE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::DATEVALUE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'DATEVALUE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -108,12 +108,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerYEAR
+     *
+     * @param mixed $expectedResult
      */
-    public function testYEAR()
+    public function testYEAR($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::YEAR(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'YEAR'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -124,12 +124,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerMONTH
+     *
+     * @param mixed $expectedResult
      */
-    public function testMONTH()
+    public function testMONTH($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::MONTHOFYEAR(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'MONTHOFYEAR'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -140,12 +140,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerWEEKNUM
+     *
+     * @param mixed $expectedResult
      */
-    public function testWEEKNUM()
+    public function testWEEKNUM($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::WEEKNUM(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'WEEKNUM'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -156,12 +156,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerWEEKDAY
+     *
+     * @param mixed $expectedResult
      */
-    public function testWEEKDAY()
+    public function testWEEKDAY($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::WEEKDAY(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'WEEKDAY'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -172,12 +172,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDAY
+     *
+     * @param mixed $expectedResult
      */
-    public function testDAY()
+    public function testDAY($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::DAYOFMONTH(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'DAYOFMONTH'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -188,12 +188,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerTIME
+     *
+     * @param mixed $expectedResult
      */
-    public function testTIME()
+    public function testTIME($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::TIME(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'TIME'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -225,12 +225,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerTIMEVALUE
+     *
+     * @param mixed $expectedResult
      */
-    public function testTIMEVALUE()
+    public function testTIMEVALUE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::TIMEVALUE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'TIMEVALUE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -262,12 +262,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerHOUR
+     *
+     * @param mixed $expectedResult
      */
-    public function testHOUR()
+    public function testHOUR($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::HOUROFDAY(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'HOUROFDAY'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -278,12 +278,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerMINUTE
+     *
+     * @param mixed $expectedResult
      */
-    public function testMINUTE()
+    public function testMINUTE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::MINUTE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'MINUTE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -294,12 +294,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerSECOND
+     *
+     * @param mixed $expectedResult
      */
-    public function testSECOND()
+    public function testSECOND($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::SECOND(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'SECOND'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -310,12 +310,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerNETWORKDAYS
+     *
+     * @param mixed $expectedResult
      */
-    public function testNETWORKDAYS()
+    public function testNETWORKDAYS($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::NETWORKDAYS(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'NETWORKDAYS'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -326,12 +326,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerWORKDAY
+     *
+     * @param mixed $expectedResult
      */
-    public function testWORKDAY()
+    public function testWORKDAY($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::WORKDAY(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'WORKDAY'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -342,12 +342,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerEDATE
+     *
+     * @param mixed $expectedResult
      */
-    public function testEDATE()
+    public function testEDATE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::EDATE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'EDATE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -379,12 +379,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerEOMONTH
+     *
+     * @param mixed $expectedResult
      */
-    public function testEOMONTH()
+    public function testEOMONTH($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::EOMONTH(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'EOMONTH'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -416,12 +416,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDATEDIF
+     *
+     * @param mixed $expectedResult
      */
-    public function testDATEDIF()
+    public function testDATEDIF($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::DATEDIF(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'DATEDIF'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -432,12 +432,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDAYS360
+     *
+     * @param mixed $expectedResult
      */
-    public function testDAYS360()
+    public function testDAYS360($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::DAYS360(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'DAYS360'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -448,12 +448,12 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerYEARFRAC
+     *
+     * @param mixed $expectedResult
      */
-    public function testYEARFRAC()
+    public function testYEARFRAC($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = DateTime::YEARFRAC(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([DateTime::class, 'YEARFRAC'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 

tests/PhpSpreadsheetTests/Calculation/EngineeringTest.php

@@ -25,12 +25,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerBESSELI
+     *
+     * @param mixed $expectedResult
      */
-    public function testBESSELI()
+    public function testBESSELI($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::BESSELI(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'BESSELI'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -41,12 +41,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerBESSELJ
+     *
+     * @param mixed $expectedResult
      */
-    public function testBESSELJ()
+    public function testBESSELJ($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::BESSELJ(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'BESSELJ'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -57,12 +57,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerBESSELK
+     *
+     * @param mixed $expectedResult
      */
-    public function testBESSELK()
+    public function testBESSELK($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::BESSELK(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'BESSELK'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -73,12 +73,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerBESSELY
+     *
+     * @param mixed $expectedResult
      */
-    public function testBESSELY()
+    public function testBESSELY($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::BESSELY(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'BESSELY'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -89,12 +89,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCOMPLEX
+     *
+     * @param mixed $expectedResult
      */
-    public function testCOMPLEX()
+    public function testCOMPLEX($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::COMPLEX(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'COMPLEX'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -105,12 +105,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIMAGINARY
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMAGINARY()
+    public function testIMAGINARY($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMAGINARY(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMAGINARY'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -121,12 +121,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIMREAL
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMREAL()
+    public function testIMREAL($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMREAL(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMREAL'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -137,12 +137,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIMABS
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMABS()
+    public function testIMABS($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMABS(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMABS'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -154,12 +154,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerIMARGUMENT
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMARGUMENT()
+    public function testIMARGUMENT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMARGUMENT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMARGUMENT'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -170,12 +170,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIMCONJUGATE
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMCONJUGATE()
+    public function testIMCONJUGATE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMCONJUGATE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMCONJUGATE'], $args);
         $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
     }
 
@@ -186,12 +186,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIMCOS
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMCOS()
+    public function testIMCOS($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMCOS(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMCOS'], $args);
         $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
     }
 
@@ -203,14 +203,14 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerIMDIV
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMDIV()
+    public function testIMDIV($expectedResult, ...$args)
     {
         $this->markTestIncomplete('TODO: This test should be fixed');
 
-        $args = func_get_args();
+        $result = Engineering::IMDIV(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMDIV'], $args);
         $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
     }
 
@@ -221,12 +221,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIMEXP
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMEXP()
+    public function testIMEXP($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMEXP(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMEXP'], $args);
         $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
     }
 
@@ -237,12 +237,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIMLN
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMLN()
+    public function testIMLN($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMLN(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMLN'], $args);
         $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
     }
 
@@ -253,12 +253,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIMLOG2
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMLOG2()
+    public function testIMLOG2($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMLOG2(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMLOG2'], $args);
         $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
     }
 
@@ -269,12 +269,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIMLOG10
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMLOG10()
+    public function testIMLOG10($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMLOG10(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMLOG10'], $args);
         $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
     }
 
@@ -286,14 +286,14 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerIMPOWER
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMPOWER()
+    public function testIMPOWER($expectedResult, ...$args)
     {
         $this->markTestIncomplete('TODO: This test should be fixed');
 
-        $args = func_get_args();
+        $result = Engineering::IMPOWER(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMPOWER'], $args);
         $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
     }
 
@@ -304,12 +304,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIMPRODUCT
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMPRODUCT()
+    public function testIMPRODUCT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMPRODUCT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMPRODUCT'], $args);
         $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
     }
 
@@ -320,12 +320,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIMSIN
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMSIN()
+    public function testIMSIN($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMSIN(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMSIN'], $args);
         $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
     }
 
@@ -336,12 +336,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIMSQRT
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMSQRT()
+    public function testIMSQRT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMSQRT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMSQRT'], $args);
         $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
     }
 
@@ -353,14 +353,14 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerIMSUB
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMSUB()
+    public function testIMSUB($expectedResult, ...$args)
     {
         $this->markTestIncomplete('TODO: This test should be fixed');
 
-        $args = func_get_args();
+        $result = Engineering::IMSUB(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMSUB'], $args);
         $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
     }
 
@@ -372,12 +372,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerIMSUM
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testIMSUM()
+    public function testIMSUM($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::IMSUM(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'IMSUM'], $args);
         $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
     }
 
@@ -388,12 +388,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerERF
+     *
+     * @param mixed $expectedResult
      */
-    public function testERF()
+    public function testERF($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::ERF(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'ERF'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -404,12 +404,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerERFC
+     *
+     * @param mixed $expectedResult
      */
-    public function testERFC()
+    public function testERFC($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::ERFC(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'ERFC'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -420,12 +420,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerBIN2DEC
+     *
+     * @param mixed $expectedResult
      */
-    public function testBIN2DEC()
+    public function testBIN2DEC($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::BINTODEC(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'BINTODEC'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -436,12 +436,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerBIN2HEX
+     *
+     * @param mixed $expectedResult
      */
-    public function testBIN2HEX()
+    public function testBIN2HEX($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::BINTOHEX(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'BINTOHEX'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -452,12 +452,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerBIN2OCT
+     *
+     * @param mixed $expectedResult
      */
-    public function testBIN2OCT()
+    public function testBIN2OCT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::BINTOOCT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'BINTOOCT'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -468,12 +468,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDEC2BIN
+     *
+     * @param mixed $expectedResult
      */
-    public function testDEC2BIN()
+    public function testDEC2BIN($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::DECTOBIN(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'DECTOBIN'], $args);
         $this->assertEquals($expectedResult, $result, null);
     }
 
@@ -484,12 +484,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDEC2HEX
+     *
+     * @param mixed $expectedResult
      */
-    public function testDEC2HEX()
+    public function testDEC2HEX($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::DECTOHEX(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'DECTOHEX'], $args);
         $this->assertEquals($expectedResult, $result, null);
     }
 
@@ -500,12 +500,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDEC2OCT
+     *
+     * @param mixed $expectedResult
      */
-    public function testDEC2OCT()
+    public function testDEC2OCT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::DECTOOCT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'DECTOOCT'], $args);
         $this->assertEquals($expectedResult, $result, null);
     }
 
@@ -516,12 +516,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerHEX2BIN
+     *
+     * @param mixed $expectedResult
      */
-    public function testHEX2BIN()
+    public function testHEX2BIN($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::HEXTOBIN(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'HEXTOBIN'], $args);
         $this->assertEquals($expectedResult, $result, null);
     }
 
@@ -532,12 +532,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerHEX2DEC
+     *
+     * @param mixed $expectedResult
      */
-    public function testHEX2DEC()
+    public function testHEX2DEC($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::HEXTODEC(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'HEXTODEC'], $args);
         $this->assertEquals($expectedResult, $result, null);
     }
 
@@ -548,12 +548,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerHEX2OCT
+     *
+     * @param mixed $expectedResult
      */
-    public function testHEX2OCT()
+    public function testHEX2OCT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::HEXTOOCT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'HEXTOOCT'], $args);
         $this->assertEquals($expectedResult, $result, null);
     }
 
@@ -564,12 +564,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerOCT2BIN
+     *
+     * @param mixed $expectedResult
      */
-    public function testOCT2BIN()
+    public function testOCT2BIN($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::OCTTOBIN(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'OCTTOBIN'], $args);
         $this->assertEquals($expectedResult, $result, null);
     }
 
@@ -580,12 +580,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerOCT2DEC
+     *
+     * @param mixed $expectedResult
      */
-    public function testOCT2DEC()
+    public function testOCT2DEC($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::OCTTODEC(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'OCTTODEC'], $args);
         $this->assertEquals($expectedResult, $result, null);
     }
 
@@ -596,12 +596,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerOCT2HEX
+     *
+     * @param mixed $expectedResult
      */
-    public function testOCT2HEX()
+    public function testOCT2HEX($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::OCTTOHEX(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'OCTTOHEX'], $args);
         $this->assertEquals($expectedResult, $result, null);
     }
 
@@ -612,12 +612,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDELTA
+     *
+     * @param mixed $expectedResult
      */
-    public function testDELTA()
+    public function testDELTA($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::DELTA(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'DELTA'], $args);
         $this->assertEquals($expectedResult, $result, null);
     }
 
@@ -628,12 +628,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerGESTEP
+     *
+     * @param mixed $expectedResult
      */
-    public function testGESTEP()
+    public function testGESTEP($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::GESTEP(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'GESTEP'], $args);
         $this->assertEquals($expectedResult, $result, null);
     }
 
@@ -668,12 +668,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCONVERTUOM
+     *
+     * @param mixed $expectedResult
      */
-    public function testCONVERTUOM()
+    public function testCONVERTUOM($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Engineering::CONVERTUOM(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Engineering::class, 'CONVERTUOM'], $args);
         $this->assertEquals($expectedResult, $result, null);
     }
 

tests/PhpSpreadsheetTests/Calculation/FinancialTest.php

@@ -15,12 +15,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerACCRINT
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testACCRINT()
+    public function testACCRINT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::ACCRINT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'ACCRINT'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -31,12 +31,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerACCRINTM
+     *
+     * @param mixed $expectedResult
      */
-    public function testACCRINTM()
+    public function testACCRINTM($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::ACCRINTM(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'ACCRINTM'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -47,12 +47,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerAMORDEGRC
+     *
+     * @param mixed $expectedResult
      */
-    public function testAMORDEGRC()
+    public function testAMORDEGRC($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::AMORDEGRC(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'AMORDEGRC'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -63,12 +63,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerAMORLINC
+     *
+     * @param mixed $expectedResult
      */
-    public function testAMORLINC()
+    public function testAMORLINC($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::AMORLINC(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'AMORLINC'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -79,12 +79,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCOUPDAYBS
+     *
+     * @param mixed $expectedResult
      */
-    public function testCOUPDAYBS()
+    public function testCOUPDAYBS($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::COUPDAYBS(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'COUPDAYBS'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -95,12 +95,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCOUPDAYS
+     *
+     * @param mixed $expectedResult
      */
-    public function testCOUPDAYS()
+    public function testCOUPDAYS($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::COUPDAYS(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'COUPDAYS'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -111,12 +111,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCOUPDAYSNC
+     *
+     * @param mixed $expectedResult
      */
-    public function testCOUPDAYSNC()
+    public function testCOUPDAYSNC($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::COUPDAYSNC(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'COUPDAYSNC'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -127,12 +127,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCOUPNCD
+     *
+     * @param mixed $expectedResult
      */
-    public function testCOUPNCD()
+    public function testCOUPNCD($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::COUPNCD(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'COUPNCD'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -143,12 +143,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCOUPNUM
+     *
+     * @param mixed $expectedResult
      */
-    public function testCOUPNUM()
+    public function testCOUPNUM($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::COUPNUM(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'COUPNUM'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -159,12 +159,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCOUPPCD
+     *
+     * @param mixed $expectedResult
      */
-    public function testCOUPPCD()
+    public function testCOUPPCD($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::COUPPCD(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'COUPPCD'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -175,12 +175,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCUMIPMT
+     *
+     * @param mixed $expectedResult
      */
-    public function testCUMIPMT()
+    public function testCUMIPMT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::CUMIPMT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'CUMIPMT'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -191,12 +191,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCUMPRINC
+     *
+     * @param mixed $expectedResult
      */
-    public function testCUMPRINC()
+    public function testCUMPRINC($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::CUMPRINC(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'CUMPRINC'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -207,12 +207,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDB
+     *
+     * @param mixed $expectedResult
      */
-    public function testDB()
+    public function testDB($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::DB(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'DB'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -223,12 +223,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDDB
+     *
+     * @param mixed $expectedResult
      */
-    public function testDDB()
+    public function testDDB($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::DDB(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'DDB'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -239,12 +239,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDISC
+     *
+     * @param mixed $expectedResult
      */
-    public function testDISC()
+    public function testDISC($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::DISC(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'DISC'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -255,12 +255,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDOLLARDE
+     *
+     * @param mixed $expectedResult
      */
-    public function testDOLLARDE()
+    public function testDOLLARDE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::DOLLARDE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'DOLLARDE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -271,12 +271,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDOLLARFR
+     *
+     * @param mixed $expectedResult
      */
-    public function testDOLLARFR()
+    public function testDOLLARFR($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::DOLLARFR(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'DOLLARFR'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -287,12 +287,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerEFFECT
+     *
+     * @param mixed $expectedResult
      */
-    public function testEFFECT()
+    public function testEFFECT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::EFFECT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'EFFECT'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -303,12 +303,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerFV
+     *
+     * @param mixed $expectedResult
      */
-    public function testFV()
+    public function testFV($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::FV(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'FV'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -319,12 +319,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerFVSCHEDULE
+     *
+     * @param mixed $expectedResult
      */
-    public function testFVSCHEDULE()
+    public function testFVSCHEDULE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::FVSCHEDULE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'FVSCHEDULE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -335,12 +335,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerINTRATE
+     *
+     * @param mixed $expectedResult
      */
-    public function testINTRATE()
+    public function testINTRATE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::INTRATE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'INTRATE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -351,12 +351,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIPMT
+     *
+     * @param mixed $expectedResult
      */
-    public function testIPMT()
+    public function testIPMT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::IPMT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'IPMT'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -367,12 +367,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIRR
+     *
+     * @param mixed $expectedResult
      */
-    public function testIRR()
+    public function testIRR($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::IRR(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'IRR'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -383,12 +383,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerISPMT
+     *
+     * @param mixed $expectedResult
      */
-    public function testISPMT()
+    public function testISPMT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::ISPMT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'ISPMT'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -399,12 +399,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerMIRR
+     *
+     * @param mixed $expectedResult
      */
-    public function testMIRR()
+    public function testMIRR($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::MIRR(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'MIRR'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -415,12 +415,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerNOMINAL
+     *
+     * @param mixed $expectedResult
      */
-    public function testNOMINAL()
+    public function testNOMINAL($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::NOMINAL(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'NOMINAL'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -431,12 +431,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerNPER
+     *
+     * @param mixed $expectedResult
      */
-    public function testNPER()
+    public function testNPER($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::NPER(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'NPER'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -447,12 +447,12 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerNPV
+     *
+     * @param mixed $expectedResult
      */
-    public function testNPV()
+    public function testNPV($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Financial::NPV(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'NPV'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -464,14 +464,14 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerPRICE
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testPRICE()
+    public function testPRICE($expectedResult, ...$args)
     {
         $this->markTestIncomplete('TODO: This test should be fixed');
 
-        $args = func_get_args();
+        $result = Financial::PRICE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'PRICE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -483,14 +483,14 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerRATE
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testRATE()
+    public function testRATE($expectedResult, ...$args)
     {
         $this->markTestIncomplete('TODO: This test should be fixed');
 
-        $args = func_get_args();
+        $result = Financial::RATE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'RATE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -502,14 +502,14 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerXIRR
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testXIRR()
+    public function testXIRR($expectedResult, ...$args)
     {
         $this->markTestIncomplete('TODO: This test should be fixed');
 
-        $args = func_get_args();
+        $result = Financial::XIRR(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Financial::class, 'XIRR'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 

tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php

@@ -61,12 +61,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIsBlank
+     *
+     * @param mixed $expectedResult
      */
-    public function testIsBlank()
+    public function testIsBlank($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Functions::isBlank(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Functions::class, 'isBlank'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -77,12 +77,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIsErr
+     *
+     * @param mixed $expectedResult
      */
-    public function testIsErr()
+    public function testIsErr($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Functions::isErr(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Functions::class, 'isErr'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -93,12 +93,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIsError
+     *
+     * @param mixed $expectedResult
      */
-    public function testIsError()
+    public function testIsError($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Functions::isError(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Functions::class, 'isError'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -109,12 +109,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerErrorType
+     *
+     * @param mixed $expectedResult
      */
-    public function testErrorType()
+    public function testErrorType($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Functions::errorType(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Functions::class, 'errorType'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -125,12 +125,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIsLogical
+     *
+     * @param mixed $expectedResult
      */
-    public function testIsLogical()
+    public function testIsLogical($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Functions::isLogical(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Functions::class, 'isLogical'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -141,12 +141,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIsNa
+     *
+     * @param mixed $expectedResult
      */
-    public function testIsNa()
+    public function testIsNa($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Functions::isNa(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Functions::class, 'isNa'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -157,12 +157,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIsNumber
+     *
+     * @param mixed $expectedResult
      */
-    public function testIsNumber()
+    public function testIsNumber($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Functions::isNumber(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Functions::class, 'isNumber'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -173,12 +173,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIsText
+     *
+     * @param mixed $expectedResult
      */
-    public function testIsText()
+    public function testIsText($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Functions::isText(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Functions::class, 'isText'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -189,12 +189,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIsNonText
+     *
+     * @param mixed $expectedResult
      */
-    public function testIsNonText()
+    public function testIsNonText($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Functions::isNonText(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Functions::class, 'isNonText'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -205,12 +205,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIsEven
+     *
+     * @param mixed $expectedResult
      */
-    public function testIsEven()
+    public function testIsEven($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Functions::isEven(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Functions::class, 'isEven'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -221,12 +221,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIsOdd
+     *
+     * @param mixed $expectedResult
      */
-    public function testIsOdd()
+    public function testIsOdd($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Functions::isOdd(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Functions::class, 'isOdd'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -237,12 +237,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerTYPE
+     *
+     * @param mixed $expectedResult
      */
-    public function testTYPE()
+    public function testTYPE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Functions::TYPE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Functions::class, 'TYPE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 
@@ -253,12 +253,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerN
+     *
+     * @param mixed $expectedResult
      */
-    public function testN()
+    public function testN($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Functions::n(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Functions::class, 'n'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 

tests/PhpSpreadsheetTests/Calculation/LogicalTest.php

@@ -26,12 +26,12 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerAND
+     *
+     * @param mixed $expectedResult
      */
-    public function testAND()
+    public function testAND($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Logical::logicalAnd(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Logical::class, 'logicalAnd'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -42,12 +42,12 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerOR
+     *
+     * @param mixed $expectedResult
      */
-    public function testOR()
+    public function testOR($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Logical::logicalOr(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Logical::class, 'logicalOr'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -58,12 +58,12 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerNOT
+     *
+     * @param mixed $expectedResult
      */
-    public function testNOT()
+    public function testNOT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Logical::NOT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Logical::class, 'NOT'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -74,12 +74,12 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIF
+     *
+     * @param mixed $expectedResult
      */
-    public function testIF()
+    public function testIF($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Logical::statementIf(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Logical::class, 'statementIf'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -90,12 +90,12 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIFERROR
+     *
+     * @param mixed $expectedResult
      */
-    public function testIFERROR()
+    public function testIFERROR($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Logical::IFERROR(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Logical::class, 'IFERROR'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 

tests/PhpSpreadsheetTests/Calculation/LookupRefTest.php

@@ -18,12 +18,12 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerHLOOKUP
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testHLOOKUP()
+    public function testHLOOKUP($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = LookupRef::HLOOKUP(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([LookupRef::class, 'HLOOKUP'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -35,12 +35,12 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerVLOOKUP
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testVLOOKUP()
+    public function testVLOOKUP($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = LookupRef::VLOOKUP(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([LookupRef::class, 'VLOOKUP'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 

tests/PhpSpreadsheetTests/Calculation/MathTrigTest.php

@@ -15,12 +15,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerATAN2
+     *
+     * @param mixed $expectedResult
      */
-    public function testATAN2()
+    public function testATAN2($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::ATAN2(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'ATAN2'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -31,12 +31,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCEILING
+     *
+     * @param mixed $expectedResult
      */
-    public function testCEILING()
+    public function testCEILING($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::CEILING(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'CEILING'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -47,12 +47,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCOMBIN
+     *
+     * @param mixed $expectedResult
      */
-    public function testCOMBIN()
+    public function testCOMBIN($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::COMBIN(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'COMBIN'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -63,12 +63,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerEVEN
+     *
+     * @param mixed $expectedResult
      */
-    public function testEVEN()
+    public function testEVEN($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::EVEN(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'EVEN'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -79,12 +79,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerODD
+     *
+     * @param mixed $expectedResult
      */
-    public function testODD()
+    public function testODD($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::ODD(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'ODD'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -95,12 +95,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerFACT
+     *
+     * @param mixed $expectedResult
      */
-    public function testFACT()
+    public function testFACT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::FACT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'FACT'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -111,12 +111,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerFACTDOUBLE
+     *
+     * @param mixed $expectedResult
      */
-    public function testFACTDOUBLE()
+    public function testFACTDOUBLE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::FACTDOUBLE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'FACTDOUBLE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -127,12 +127,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerFLOOR
+     *
+     * @param mixed $expectedResult
      */
-    public function testFLOOR()
+    public function testFLOOR($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::FLOOR(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'FLOOR'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -143,12 +143,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerGCD
+     *
+     * @param mixed $expectedResult
      */
-    public function testGCD()
+    public function testGCD($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::GCD(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'GCD'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -159,12 +159,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerLCM
+     *
+     * @param mixed $expectedResult
      */
-    public function testLCM()
+    public function testLCM($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::LCM(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'LCM'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -175,12 +175,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerINT
+     *
+     * @param mixed $expectedResult
      */
-    public function testINT()
+    public function testINT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::INT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'INT'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -191,12 +191,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerSIGN
+     *
+     * @param mixed $expectedResult
      */
-    public function testSIGN()
+    public function testSIGN($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::SIGN(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'SIGN'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -207,12 +207,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerPOWER
+     *
+     * @param mixed $expectedResult
      */
-    public function testPOWER()
+    public function testPOWER($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::POWER(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'POWER'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -223,12 +223,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerLOG
+     *
+     * @param mixed $expectedResult
      */
-    public function testLOG()
+    public function testLOG($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::logBase(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'logBase'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -239,12 +239,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerMOD
+     *
+     * @param mixed $expectedResult
      */
-    public function testMOD()
+    public function testMOD($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::MOD(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'MOD'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -255,12 +255,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerMDETERM
+     *
+     * @param mixed $expectedResult
      */
-    public function testMDETERM()
+    public function testMDETERM($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::MDETERM(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'MDETERM'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -272,14 +272,14 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerMINVERSE
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testMINVERSE()
+    public function testMINVERSE($expectedResult, ...$args)
     {
         $this->markTestIncomplete('TODO: This test should be fixed');
 
-        $args = func_get_args();
+        $result = MathTrig::MINVERSE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'MINVERSE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -291,14 +291,14 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerMMULT
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testMMULT()
+    public function testMMULT($expectedResult, ...$args)
     {
         $this->markTestIncomplete('TODO: This test should be fixed');
 
-        $args = func_get_args();
+        $result = MathTrig::MMULT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'MMULT'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -309,12 +309,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerMULTINOMIAL
+     *
+     * @param mixed $expectedResult
      */
-    public function testMULTINOMIAL()
+    public function testMULTINOMIAL($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::MULTINOMIAL(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'MULTINOMIAL'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -325,13 +325,13 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerMROUND
+     *
+     * @param mixed $expectedResult
      */
-    public function testMROUND()
+    public function testMROUND($expectedResult, ...$args)
     {
-        $args = func_get_args();
-        $expectedResult = array_pop($args);
         Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_VALUE);
-        $result = call_user_func_array([MathTrig::class, 'MROUND'], $args);
+        $result = MathTrig::MROUND(...$args);
         Calculation::setArrayReturnType(Calculation::RETURN_ARRAY_AS_ARRAY);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
@@ -343,12 +343,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerPRODUCT
+     *
+     * @param mixed $expectedResult
      */
-    public function testPRODUCT()
+    public function testPRODUCT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::PRODUCT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'PRODUCT'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -359,12 +359,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerQUOTIENT
+     *
+     * @param mixed $expectedResult
      */
-    public function testQUOTIENT()
+    public function testQUOTIENT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::QUOTIENT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'QUOTIENT'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -375,12 +375,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerROUNDUP
+     *
+     * @param mixed $expectedResult
      */
-    public function testROUNDUP()
+    public function testROUNDUP($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::ROUNDUP(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'ROUNDUP'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -391,12 +391,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerROUNDDOWN
+     *
+     * @param mixed $expectedResult
      */
-    public function testROUNDDOWN()
+    public function testROUNDDOWN($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::ROUNDDOWN(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'ROUNDDOWN'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -407,12 +407,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerSERIESSUM
+     *
+     * @param mixed $expectedResult
      */
-    public function testSERIESSUM()
+    public function testSERIESSUM($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::SERIESSUM(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'SERIESSUM'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -423,12 +423,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerSUMSQ
+     *
+     * @param mixed $expectedResult
      */
-    public function testSUMSQ()
+    public function testSUMSQ($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::SUMSQ(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'SUMSQ'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -439,12 +439,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerTRUNC
+     *
+     * @param mixed $expectedResult
      */
-    public function testTRUNC()
+    public function testTRUNC($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::TRUNC(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'TRUNC'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -455,12 +455,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerROMAN
+     *
+     * @param mixed $expectedResult
      */
-    public function testROMAN()
+    public function testROMAN($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::ROMAN(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'ROMAN'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -471,12 +471,12 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerSQRTPI
+     *
+     * @param mixed $expectedResult
      */
-    public function testSQRTPI()
+    public function testSQRTPI($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::SQRTPI(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'SQRTPI'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
@@ -487,75 +487,17 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerSUMIF
+     *
+     * @param mixed $expectedResult
      */
-    public function testSUMIF()
+    public function testSUMIF($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = MathTrig::SUMIF(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([MathTrig::class, 'SUMIF'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-12);
     }
 
     public function providerSUMIF()
     {
-        return [
+        return require 'data/Calculation/MathTrig/SUMIF.php';
-            [
-                [
-                    [1],
-                    [5],
-                    [10],
-                ],
-                '>=5',
-                15,
-            ],
-            [
-                [
-                    ['text'],
-                    [2],
-                ],
-                '=text',
-                [
-                    [10],
-                    [100],
-                ],
-                10,
-            ],
-            [
-                [
-                    ['"text with quotes"'],
-                    [2],
-                ],
-                '="text with quotes"',
-                [
-                    [10],
-                    [100],
-                ],
-                10,
-            ],
-            [
-                [
-                    ['"text with quotes"'],
-                    [''],
-                ],
-                '>"', // Compare to the single characater " (double quote)
-                [
-                    [10],
-                    [100],
-                ],
-                10,
-            ],
-            [
-                [
-                    [''],
-                    ['anything'],
-                ],
-                '>"', // Compare to the single characater " (double quote)
-                [
-                    [10],
-                    [100],
-                ],
-                100,
-            ],
-        ];
     }
 }

tests/PhpSpreadsheetTests/Calculation/TextDataTest.php

@@ -15,12 +15,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCHAR
+     *
+     * @param mixed $expectedResult
      */
-    public function testCHAR()
+    public function testCHAR($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::CHARACTER(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'CHARACTER'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -31,12 +31,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCODE
+     *
+     * @param mixed $expectedResult
      */
-    public function testCODE()
+    public function testCODE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::ASCIICODE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'ASCIICODE'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -47,12 +47,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCONCATENATE
+     *
+     * @param mixed $expectedResult
      */
-    public function testCONCATENATE()
+    public function testCONCATENATE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::CONCATENATE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'CONCATENATE'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -63,12 +63,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerLEFT
+     *
+     * @param mixed $expectedResult
      */
-    public function testLEFT()
+    public function testLEFT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::LEFT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'LEFT'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -79,12 +79,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerMID
+     *
+     * @param mixed $expectedResult
      */
-    public function testMID()
+    public function testMID($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::MID(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'MID'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -95,12 +95,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerRIGHT
+     *
+     * @param mixed $expectedResult
      */
-    public function testRIGHT()
+    public function testRIGHT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::RIGHT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'RIGHT'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -111,12 +111,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerLOWER
+     *
+     * @param mixed $expectedResult
      */
-    public function testLOWER()
+    public function testLOWER($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::LOWERCASE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'LOWERCASE'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -127,12 +127,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerUPPER
+     *
+     * @param mixed $expectedResult
      */
-    public function testUPPER()
+    public function testUPPER($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::UPPERCASE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'UPPERCASE'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -143,12 +143,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerPROPER
+     *
+     * @param mixed $expectedResult
      */
-    public function testPROPER()
+    public function testPROPER($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::PROPERCASE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'PROPERCASE'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -159,12 +159,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerLEN
+     *
+     * @param mixed $expectedResult
      */
-    public function testLEN()
+    public function testLEN($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::STRINGLENGTH(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'STRINGLENGTH'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -175,12 +175,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerSEARCH
+     *
+     * @param mixed $expectedResult
      */
-    public function testSEARCH()
+    public function testSEARCH($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::SEARCHINSENSITIVE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'SEARCHINSENSITIVE'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -191,12 +191,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerFIND
+     *
+     * @param mixed $expectedResult
      */
-    public function testFIND()
+    public function testFIND($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::SEARCHSENSITIVE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'SEARCHSENSITIVE'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -207,12 +207,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerREPLACE
+     *
+     * @param mixed $expectedResult
      */
-    public function testREPLACE()
+    public function testREPLACE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::REPLACE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'REPLACE'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -223,12 +223,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerSUBSTITUTE
+     *
+     * @param mixed $expectedResult
      */
-    public function testSUBSTITUTE()
+    public function testSUBSTITUTE($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::SUBSTITUTE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'SUBSTITUTE'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -239,12 +239,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerTRIM
+     *
+     * @param mixed $expectedResult
      */
-    public function testTRIM()
+    public function testTRIM($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::TRIMSPACES(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'TRIMSPACES'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -255,12 +255,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCLEAN
+     *
+     * @param mixed $expectedResult
      */
-    public function testCLEAN()
+    public function testCLEAN($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::TRIMNONPRINTABLE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'TRIMNONPRINTABLE'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -271,12 +271,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDOLLAR
+     *
+     * @param mixed $expectedResult
      */
-    public function testDOLLAR()
+    public function testDOLLAR($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::DOLLAR(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'DOLLAR'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -287,12 +287,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerFIXED
+     *
+     * @param mixed $expectedResult
      */
-    public function testFIXED()
+    public function testFIXED($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::FIXEDFORMAT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'FIXEDFORMAT'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -303,12 +303,12 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerT
+     *
+     * @param mixed $expectedResult
      */
-    public function testT()
+    public function testT($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = TextData::RETURNSTRING(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'RETURNSTRING'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -319,17 +319,17 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerTEXT
+     *
+     * @param mixed $expectedResult
      */
-    public function testTEXT()
+    public function testTEXT($expectedResult, ...$args)
     {
         //    Enforce decimal and thousands separator values to UK/US, and currency code to USD
         StringHelper::setDecimalSeparator('.');
         StringHelper::setThousandsSeparator(',');
         StringHelper::setCurrencyCode('$');
 
-        $args = func_get_args();
+        $result = TextData::TEXTFORMAT(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'TEXTFORMAT'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -340,16 +340,16 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerVALUE
+     *
+     * @param mixed $expectedResult
      */
-    public function testVALUE()
+    public function testVALUE($expectedResult, ...$args)
     {
         StringHelper::setDecimalSeparator('.');
         StringHelper::setThousandsSeparator(' ');
         StringHelper::setCurrencyCode('$');
 
-        $args = func_get_args();
+        $result = TextData::VALUE(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([TextData::class, 'VALUE'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-8);
     }
 

tests/PhpSpreadsheetTests/Cell/DefaultValueBinderTest.php

@@ -64,11 +64,12 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDataTypeForValue
+     *
+     * @param mixed $expectedResult
      */
-    public function testDataTypeForValue()
+    public function testDataTypeForValue($expectedResult, ...$args)
     {
-        list($args, $expectedResult) = func_get_args();
+        $result = DefaultValueBinder::dataTypeForValue(...$args);
-        $result = call_user_func_array([DefaultValueBinder::class, 'dataTypeForValue'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 

tests/PhpSpreadsheetTests/CellTest.php

@@ -9,12 +9,12 @@ class CellTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerColumnString
+     *
+     * @param mixed $expectedResult
      */
-    public function testColumnIndexFromString()
+    public function testColumnIndexFromString($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Cell::columnIndexFromString(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Cell::class, 'columnIndexFromString'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -53,12 +53,12 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerColumnIndex
+     *
+     * @param mixed $expectedResult
      */
-    public function testStringFromColumnIndex()
+    public function testStringFromColumnIndex($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Cell::stringFromColumnIndex(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Cell::class, 'stringFromColumnIndex'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -69,12 +69,12 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCoordinates
+     *
+     * @param mixed $expectedResult
      */
-    public function testCoordinateFromString()
+    public function testCoordinateFromString($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Cell::coordinateFromString(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Cell::class, 'coordinateFromString'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -127,12 +127,12 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerAbsoluteCoordinates
+     *
+     * @param mixed $expectedResult
      */
-    public function testAbsoluteCoordinateFromString()
+    public function testAbsoluteCoordinateFromString($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Cell::absoluteCoordinate(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Cell::class, 'absoluteCoordinate'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -157,12 +157,12 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerAbsoluteReferences
+     *
+     * @param mixed $expectedResult
      */
-    public function testAbsoluteReferenceFromString()
+    public function testAbsoluteReferenceFromString($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Cell::absoluteReference(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Cell::class, 'absoluteReference'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -187,12 +187,12 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerSplitRange
+     *
+     * @param mixed $expectedResult
      */
-    public function testSplitRange()
+    public function testSplitRange($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Cell::splitRange(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Cell::class, 'splitRange'], $args);
         foreach ($result as $key => $split) {
             if (!is_array($expectedResult[$key])) {
                 $this->assertEquals($expectedResult[$key], $split[0]);
@@ -209,12 +209,12 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerBuildRange
+     *
+     * @param mixed $expectedResult
      */
-    public function testBuildRange()
+    public function testBuildRange($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Cell::buildRange(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Cell::class, 'buildRange'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -239,12 +239,12 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerRangeBoundaries
+     *
+     * @param mixed $expectedResult
      */
-    public function testRangeBoundaries()
+    public function testRangeBoundaries($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Cell::rangeBoundaries(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Cell::class, 'rangeBoundaries'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -255,12 +255,12 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerRangeDimension
+     *
+     * @param mixed $expectedResult
      */
-    public function testRangeDimension()
+    public function testRangeDimension($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Cell::rangeDimension(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Cell::class, 'rangeDimension'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -271,12 +271,12 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerGetRangeBoundaries
+     *
+     * @param mixed $expectedResult
      */
-    public function testGetRangeBoundaries()
+    public function testGetRangeBoundaries($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Cell::getRangeBoundaries(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Cell::class, 'getRangeBoundaries'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -287,12 +287,12 @@ class CellTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerExtractAllCellReferencesInRange
+     *
+     * @param mixed $expectedResult
      */
-    public function testExtractAllCellReferencesInRange()
+    public function testExtractAllCellReferencesInRange($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Cell::extractAllCellReferencesInRange(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Cell::class, 'extractAllCellReferencesInRange'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 

tests/PhpSpreadsheetTests/SettingsTest.php

@@ -16,7 +16,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
 
     public function testSetXMLSettings()
     {
-        call_user_func_array([\PhpOffice\PhpSpreadsheet\Settings::class, 'setLibXmlLoaderOptions'], [LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID]);
+        \PhpOffice\PhpSpreadsheet\Settings::setLibXmlLoaderOptions(LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID);
         $result = \PhpOffice\PhpSpreadsheet\Settings::getLibXmlLoaderOptions();
         $this->assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID) & $result));
     }

tests/PhpSpreadsheetTests/Shared/CodePageTest.php

@@ -9,12 +9,12 @@ class CodePageTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerCodePage
+     *
+     * @param mixed $expectedResult
      */
-    public function testCodePageNumberToName()
+    public function testCodePageNumberToName($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = CodePage::numberToName(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([CodePage::class, 'numberToName'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 

tests/PhpSpreadsheetTests/Shared/DateTest.php

@@ -28,14 +28,14 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDateTimeExcelToTimestamp1900
+     *
+     * @param mixed $expectedResult
      */
-    public function testDateTimeExcelToTimestamp1900()
+    public function testDateTimeExcelToTimestamp1900($expectedResult, ...$args)
     {
         Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
 
-        $args = func_get_args();
+        $result = Date::excelToTimestamp(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Date::class, 'excelToTimestamp'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -46,14 +46,14 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDateTimeTimestampToExcel1900
+     *
+     * @param mixed $expectedResult
      */
-    public function testDateTimeTimestampToExcel1900()
+    public function testDateTimeTimestampToExcel1900($expectedResult, ...$args)
     {
         Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
 
-        $args = func_get_args();
+        $result = Date::timestampToExcel(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Date::class, 'timestampToExcel'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-5);
     }
 
@@ -64,14 +64,14 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDateTimeDateTimeToExcel
+     *
+     * @param mixed $expectedResult
      */
-    public function testDateTimeDateTimeToExcel()
+    public function testDateTimeDateTimeToExcel($expectedResult, ...$args)
     {
         Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
 
-        $args = func_get_args();
+        $result = Date::dateTimeToExcel(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Date::class, 'dateTimeToExcel'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-5);
     }
 
@@ -82,14 +82,14 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDateTimeFormattedPHPToExcel1900
+     *
+     * @param mixed $expectedResult
      */
-    public function testDateTimeFormattedPHPToExcel1900()
+    public function testDateTimeFormattedPHPToExcel1900($expectedResult, ...$args)
     {
         Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
 
-        $args = func_get_args();
+        $result = Date::formattedPHPToExcel(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Date::class, 'formattedPHPToExcel'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-5);
     }
 
@@ -100,14 +100,14 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDateTimeExcelToTimestamp1904
+     *
+     * @param mixed $expectedResult
      */
-    public function testDateTimeExcelToTimestamp1904()
+    public function testDateTimeExcelToTimestamp1904($expectedResult, ...$args)
     {
         Date::setExcelCalendar(Date::CALENDAR_MAC_1904);
 
-        $args = func_get_args();
+        $result = Date::excelToTimestamp(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Date::class, 'excelToTimestamp'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -118,14 +118,14 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDateTimeTimestampToExcel1904
+     *
+     * @param mixed $expectedResult
      */
-    public function testDateTimeTimestampToExcel1904()
+    public function testDateTimeTimestampToExcel1904($expectedResult, ...$args)
     {
         Date::setExcelCalendar(Date::CALENDAR_MAC_1904);
 
-        $args = func_get_args();
+        $result = Date::timestampToExcel(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Date::class, 'timestampToExcel'], $args);
         $this->assertEquals($expectedResult, $result, null, 1E-5);
     }
 
@@ -136,12 +136,12 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerIsDateTimeFormatCode
+     *
+     * @param mixed $expectedResult
      */
-    public function testIsDateTimeFormatCode()
+    public function testIsDateTimeFormatCode($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Date::isDateTimeFormatCode(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Date::class, 'isDateTimeFormatCode'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -152,14 +152,14 @@ class DateTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerDateTimeExcelToTimestamp1900Timezone
+     *
+     * @param mixed $expectedResult
      */
-    public function testDateTimeExcelToTimestamp1900Timezone()
+    public function testDateTimeExcelToTimestamp1900Timezone($expectedResult, ...$args)
     {
         Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
 
-        $args = func_get_args();
+        $result = Date::excelToTimestamp(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Date::class, 'excelToTimestamp'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 

tests/PhpSpreadsheetTests/Shared/FontTest.php

@@ -37,12 +37,12 @@ class FontTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerFontSizeToPixels
+     *
+     * @param mixed $expectedResult
      */
-    public function testFontSizeToPixels()
+    public function testFontSizeToPixels($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Font::fontSizeToPixels(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Font::class, 'fontSizeToPixels'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -53,12 +53,12 @@ class FontTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerInchSizeToPixels
+     *
+     * @param mixed $expectedResult
      */
-    public function testInchSizeToPixels()
+    public function testInchSizeToPixels($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Font::inchSizeToPixels(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Font::class, 'inchSizeToPixels'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -69,12 +69,12 @@ class FontTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerCentimeterSizeToPixels
+     *
+     * @param mixed $expectedResult
      */
-    public function testCentimeterSizeToPixels()
+    public function testCentimeterSizeToPixels($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Font::centimeterSizeToPixels(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Font::class, 'centimeterSizeToPixels'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 

tests/PhpSpreadsheetTests/Shared/PasswordHasherTest.php

@@ -9,12 +9,12 @@ class PasswordHasherTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider providerHashPassword
      * @group fail19
+     *
+     * @param mixed $expectedResult
      */
-    public function testHashPassword()
+    public function testHashPassword($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = PasswordHasher::hashPassword(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([PasswordHasher::class, 'hashPassword'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 

tests/PhpSpreadsheetTests/Style/ColorTest.php

@@ -8,12 +8,12 @@ class ColorTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider providerColorGetRed
+     *
+     * @param mixed $expectedResult
      */
-    public function testGetRed()
+    public function testGetRed($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Color::getRed(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Color::class, 'getRed'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -24,12 +24,12 @@ class ColorTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerColorGetGreen
+     *
+     * @param mixed $expectedResult
      */
-    public function testGetGreen()
+    public function testGetGreen($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Color::getGreen(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Color::class, 'getGreen'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -40,12 +40,12 @@ class ColorTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerColorGetBlue
+     *
+     * @param mixed $expectedResult
      */
-    public function testGetBlue()
+    public function testGetBlue($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = Color::getBlue(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([Color::class, 'getBlue'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 
@@ -56,11 +56,12 @@ class ColorTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerColorChangeBrightness
+     *
+     * @param mixed $expectedResult
      */
-    public function testChangeBrightness()
+    public function testChangeBrightness($expectedResult, ...$args)
     {
-        list($args, $expectedResult) = func_get_args();
+        $result = Color::changeBrightness(...$args);
-        $result = call_user_func_array([Color::class, 'changeBrightness'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 

tests/PhpSpreadsheetTests/Style/NumberFormatDateTest.php

@@ -15,12 +15,12 @@ class NumberFormatDateTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerNumberFormat
+     *
+     * @param mixed $expectedResult
      */
-    public function testFormatValueWithMask()
+    public function testFormatValueWithMask($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = NumberFormat::toFormattedString(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([NumberFormat::class, 'toFormattedString'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 

tests/PhpSpreadsheetTests/Style/NumberFormatTest.php

@@ -15,12 +15,12 @@ class NumberFormatTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider providerNumberFormat
+     *
+     * @param mixed $expectedResult
      */
-    public function testFormatValueWithMask()
+    public function testFormatValueWithMask($expectedResult, ...$args)
     {
-        $args = func_get_args();
+        $result = NumberFormat::toFormattedString(...$args);
-        $expectedResult = array_pop($args);
-        $result = call_user_func_array([NumberFormat::class, 'toFormattedString'], $args);
         $this->assertEquals($expectedResult, $result);
     }
 

tests/data/Calculation/DateTime/DATE.php

@@ -4,486 +4,486 @@
 
 return [
     [
+        6890,
         18,
         11,
         11,
-        6890,
     ],
     // Excel 1900 Calendar Base Date
     [
-        1900,
         1,
+        1900,
         1,
         1,
     ],
     // Day before Excel mythical 1900 leap day
     [
+        59,
         1900,
         2,
         28,
-        59,
     ],
     // Excel mythical 1900 leap day
     [
+        60,
         1900,
         2,
         29,
-        60,
     ],
     // Day after Excel mythical 1900 leap day
     [
+        61,
         1900,
         3,
         1,
-        61,
     ],
     // Day after Excel mythical 1900 leap day
     [
+        713,
         1901,
         12,
         13,
-        713,
     ],
     // PHP 32-bit Earliest Date
     [
+        714,
         1901,
         12,
         14,
-        714,
     ],
     [
+        1461,
         1903,
         12,
         31,
-        1461,
     ],
     // Excel 1904 Calendar Base Date
     [
+        1462,
         1904,
         1,
         1,
-        1462,
     ],
     [
+        1463,
         1904,
         1,
         2,
-        1463,
     ],
     [
+        22269,
         1960,
         12,
         19,
-        22269,
     ],
     // PHP Base Date
     [
+        25569,
         1970,
         1,
         1,
-        25569,
     ],
     [
+        30292,
         1982,
         12,
         7,
-        30292,
     ],
     [
+        39611,
         2008,
         6,
         12,
-        39611,
     ],
     // PHP 32-bit Latest Date
     [
+        50424,
         2038,
         1,
         19,
-        50424,
     ],
     // Day after PHP 32-bit Latest Date
     [
+        50425,
         2038,
         1,
         20,
-        50425,
     ],
     [
+        39448,
         2008,
         1,
         1,
-        39448,
     ],
     [
+        39447,
         2008,
         1,
         null,
-        39447,
     ],
     [
+        39446,
         2008,
         1,
         -1,
-        39446,
     ],
     [
+        39417,
         2008,
         1,
         -30,
-        39417,
     ],
     [
+        39416,
         2008,
         1,
         -31,
-        39416,
     ],
     [
-        2008,
-        1,
-        -365,
         39082,
+        2008,
+        1,
+        -365,
     ],
     [
+        39508,
         2008,
         3,
         1,
-        39508,
     ],
     [
+        39507,
         2008,
         3,
         null,
-        39507,
     ],
     [
+        39506,
         2008,
         3,
         -1,
-        39506,
     ],
     [
+        39142,
         2008,
         3,
         -365,
-        39142,
     ],
     [
+        39417,
         2008,
         null,
         1,
-        39417,
     ],
     [
+        39387,
         2008,
         -1,
         1,
-        39387,
     ],
     [
+        39083,
         2008,
         -11,
         1,
-        39083,
     ],
     [
+        39052,
         2008,
         -12,
         1,
-        39052,
     ],
     [
+        39022,
         2008,
         -13,
         1,
-        39022,
     ],
     [
+        39051,
         2008,
         -13,
         30,
-        39051,
     ],
     [
+        39021,
         2008,
         -13,
         null,
-        39021,
     ],
     [
+        38991,
         2008,
         -13,
         -30,
-        38991,
     ],
     [
+        38990,
         2008,
         -13,
         -31,
-        38990,
     ],
     [
+        39814,
         2008,
         13,
         1,
-        39814,
     ],
     [
+        39507,
         2007,
         15,
         null,
-        39507,
     ],
     [
+        40210,
         2008,
         26,
         1,
-        40210,
     ],
     [
+        40199,
         2008,
         26,
         -10,
-        40199,
     ],
     [
+        38686,
         2008,
         -26,
         61,
-        38686,
     ],
     [
-        2010,
-        -15,
-        -50,
         39641,
+        2010,
+        -15,
+        -50,
     ],
     [
+        39741,
         2010,
         -15,
         50,
-        39741,
     ],
     [
+        40552,
         2010,
         15,
         -50,
-        40552,
     ],
     [
+        40652,
         2010,
         15,
         50,
-        40652,
     ],
     [
+        40179,
         2010,
         1.5,
         1,
-        40179,
     ],
     [
-        2010,
-        1.5,
-        0,
         40178,
+        2010,
+        1.5,
+        0,
     ],
     [
+        40148,
         2010,
         0,
         1.5,
-        40148,
     ],
     [
+        40179,
         2010,
         1,
         1.5,
-        40179,
     ],
     [
-        2012,
-        6,
-        15,
         41075,
-    ],
-    [
         2012,
         6,
-        null,
+        15,
+    ],
+    [
         41060,
+        2012,
+        6,
+        null,
     ],
     [
+        40892,
         2012,
         null,
         15,
-        40892,
     ],
     [
-        null,
-        6,
-        15,
         167,
-    ],
+        null,
-    [
-        10,
         6,
         15,
+    ],
+    [
         3819,
+        10,
+        6,
+        15,
     ],
     [
-        10,
-        null,
-        null,
         3622,
-    ],
-    [
-        null,
         10,
         null,
+        null,
+    ],
+    [
         274,
+        null,
+        10,
+        null,
     ],
     [
+        '#NUM!',
         null,
         null,
         10,
-        '#NUM!',
     ],
     [
+        '#NUM!',
         -20,
         null,
         null,
-        '#NUM!',
     ],
     [
+        '#NUM!',
         -20,
         6,
         15,
-        '#NUM!',
     ],
     // Excel Maximum Date
     [
+        2958465,
         9999,
         12,
         31,
-        2958465,
     ],
     // Exceeded Excel Maximum Date
     [
+        '#NUM!',
         10000,
         1,
         1,
-        '#NUM!',
     ],
     [
+        39670,
         2008,
         8,
         10,
-        39670,
     ],
     [
+        39813,
         2008,
         12,
         31,
-        39813,
     ],
     [
+        39692,
         2008,
         8,
         32,
-        39692,
     ],
     [
+        39844,
         2008,
         13,
         31,
-        39844,
     ],
     [
-        2009,
-        1,
-        0,
         39813,
+        2009,
+        1,
+        0,
     ],
     [
+        39812,
         2009,
         1,
         -1,
-        39812,
     ],
     [
-        2009,
-        0,
-        0,
         39782,
-    ],
-    [
         2009,
         0,
-        -1,
+        0,
+    ],
+    [
         39781,
+        2009,
+        0,
+        -1,
     ],
     [
+        39752,
         2009,
         -1,
         0,
-        39752,
     ],
     [
+        39751,
         2009,
         -1,
         -1,
-        39751,
     ],
     [
+        40146,
         2010,
         0,
         -1,
-        40146,
     ],
     [
+        40329,
         2010,
         5,
         31,
-        40329,
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
+        40199,
         2010,
         1,
         '21st',
-        40199,
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
+        40258,
         2010,
         'March',
         '21st',
-        40258,
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
+        40258,
         2010,
         'March',
         21,
-        40258,
     ],
     [
+        '#VALUE!',
         'ABC',
         1,
         21,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         2010,
         'DEF',
         21,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         2010,
         3,
         'GHI',
-        '#VALUE!',
     ],
 ];

tests/data/Calculation/DateTime/DATEDIF.php

@@ -2,615 +2,615 @@
 
 return [
     [
+        365,
         '2016-01-01',
         '2016-12-31',
         'YD',
-        365,
     ],
     [
+        364,
         '2015-01-01',
         '2015-12-31',
         'YD',
-        364,
     ],
     [
+        364,
         '2015-01-01',
         '2016-12-31',
         'YD',
-        364,
     ],
     [
+        365,
         '2016-01-01',
         '2017-12-31',
         'YD',
-        365,
     ],
     [
+        364,
         '2017-01-01',
         '2018-12-31',
         'YD',
-        364,
     ],
     [
+        '#VALUE!',
         'ABC',
         '2007-1-10',
         'Y',
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '2007-1-1',
         'DEF',
         'Y',
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '2007-1-1',
         '2007-1-10',
         'XYZ',
-        '#VALUE!',
     ],
     [
+        '#NUM!',
         '2007-1-10',
         '2007-1-1',
         'Y',
-        '#NUM!',
     ],
     [
+        0,
         '2007-12-31',
         '2008-1-10',
         'Y',
-        0,
     ],
     [
+        0,
         '2007-1-1',
         '2007-1-10',
         'Y',
-        0,
     ],
     [
+        0,
         '2007-1-1',
         '2007-1-10',
         'M',
-        0,
     ],
     [
+        9,
         '2007-1-1',
         '2007-1-10',
         'D',
-        9,
     ],
     [
+        0,
         '2007-1-1',
         '2007-1-10',
         'YM',
-        0,
     ],
     [
+        9,
         '2007-1-1',
         '2007-1-10',
         'YD',
-        9,
     ],
     [
+        9,
         '2007-1-1',
         '2007-1-10',
         'MD',
-        9,
     ],
     [
+        0,
         '2007-1-1',
         '2007-12-31',
         'Y',
-        0,
     ],
     [
+        11,
         '2007-1-1',
         '2007-12-31',
         'M',
-        11,
     ],
     [
+        364,
         '2007-1-1',
         '2007-12-31',
         'D',
-        364,
     ],
     [
+        11,
         '2007-1-1',
         '2007-12-31',
         'YM',
-        11,
     ],
     [
+        364,
         '2007-1-1',
         '2007-12-31',
         'YD',
-        364,
     ],
     [
-        '2007-1-1',
-        '2007-12-31',
-        'MD',
         30,
+        '2007-1-1',
+        '2007-12-31',
+        'MD',
     ],
     [
+        1,
         '2007-1-1',
         '2008-7-1',
         'Y',
-        1,
     ],
     [
-        '2007-1-1',
-        '2008-7-1',
-        'M',
         18,
-    ],
-    [
         '2007-1-1',
         '2008-7-1',
-        'D',
+        'M',
+    ],
+    [
         547,
+        '2007-1-1',
+        '2008-7-1',
+        'D',
     ],
     [
+        6,
         '2007-1-1',
         '2008-7-1',
         'YM',
-        6,
     ],
     [
-        '2007-1-1',
-        '2008-7-1',
-        'YD',
         181,
+        '2007-1-1',
+        '2008-7-1',
+        'YD',
     ],
     [
+        0,
         '2007-1-1',
         '2008-7-1',
         'MD',
-        0,
     ],
     [
+        0,
         '2007-1-1',
         '2007-1-31',
         'Y',
-        0,
     ],
     [
+        0,
         '2007-1-1',
         '2007-1-31',
         'M',
-        0,
     ],
     [
+        30,
         '2007-1-1',
         '2007-1-31',
         'D',
-        30,
     ],
     [
+        0,
         '2007-1-1',
         '2007-1-31',
         'YM',
-        0,
     ],
     [
+        30,
         '2007-1-1',
         '2007-1-31',
         'YD',
-        30,
     ],
     [
+        30,
         '2007-1-1',
         '2007-1-31',
         'MD',
-        30,
     ],
     [
+        0,
         '2007-1-1',
         '2007-2-1',
         'Y',
-        0,
     ],
     [
+        1,
         '2007-1-1',
         '2007-2-1',
         'M',
-        1,
     ],
     [
-        '2007-1-1',
-        '2007-2-1',
-        'D',
         31,
+        '2007-1-1',
+        '2007-2-1',
+        'D',
     ],
     [
+        1,
         '2007-1-1',
         '2007-2-1',
         'YM',
-        1,
     ],
     [
+        31,
         '2007-1-1',
         '2007-2-1',
         'YD',
-        31,
     ],
     [
+        0,
         '2007-1-1',
         '2007-2-1',
         'MD',
-        0,
     ],
     [
+        0,
         '2007-1-1',
         '2007-2-28',
         'Y',
-        0,
     ],
     [
+        1,
         '2007-1-1',
         '2007-2-28',
         'M',
-        1,
     ],
     [
+        58,
         '2007-1-1',
         '2007-2-28',
         'D',
-        58,
     ],
     [
+        1,
         '2007-1-1',
         '2007-2-28',
         'YM',
-        1,
     ],
     [
+        58,
         '2007-1-1',
         '2007-2-28',
         'YD',
-        58,
     ],
     [
-        '2007-1-1',
-        '2007-2-28',
-        'MD',
         27,
+        '2007-1-1',
+        '2007-2-28',
+        'MD',
     ],
     [
+        0,
         '2007-1-31',
         '2007-2-1',
         'Y',
-        0,
     ],
     [
+        0,
         '2007-1-31',
         '2007-2-1',
         'M',
-        0,
     ],
     [
+        1,
         '2007-1-31',
         '2007-2-1',
         'D',
-        1,
     ],
     [
+        0,
         '2007-1-31',
         '2007-2-1',
         'YM',
-        0,
     ],
     [
+        1,
         '2007-1-31',
         '2007-2-1',
         'YD',
-        1,
     ],
     [
+        1,
         '2007-1-31',
         '2007-2-1',
         'MD',
-        1,
     ],
     [
+        0,
         '2007-1-31',
         '2007-3-1',
         'Y',
-        0,
     ],
     [
+        1,
         '2007-1-31',
         '2007-3-1',
         'M',
-        1,
     ],
     [
+        29,
         '2007-1-31',
         '2007-3-1',
         'D',
-        29,
     ],
     [
+        1,
         '2007-1-31',
         '2007-3-1',
         'YM',
-        1,
     ],
     [
+        29,
         '2007-1-31',
         '2007-3-1',
         'YD',
-        29,
     ],
     [
-        '2007-1-31',
-        '2007-3-1',
-        'MD',
         -2,
+        '2007-1-31',
+        '2007-3-1',
+        'MD',
     ],
     [
+        0,
         '2007-1-31',
         '2007-3-31',
         'Y',
-        0,
     ],
     [
+        2,
         '2007-1-31',
         '2007-3-31',
         'M',
-        2,
     ],
     [
+        59,
         '2007-1-31',
         '2007-3-31',
         'D',
-        59,
     ],
     [
+        2,
         '2007-1-31',
         '2007-3-31',
         'YM',
-        2,
     ],
     [
+        59,
         '2007-1-31',
         '2007-3-31',
         'YD',
-        59,
     ],
     [
+        0,
         '2007-1-31',
         '2007-3-31',
         'MD',
-        0,
     ],
     [
+        0,
         '2008-1-1',
         '2008-9-1',
         'Y',
-        0,
     ],
     [
+        8,
         '2008-1-1',
         '2008-9-1',
         'M',
-        8,
     ],
     [
+        244,
         '2008-1-1',
         '2008-9-1',
         'D',
-        244,
     ],
     [
+        8,
         '2008-1-1',
         '2008-9-1',
         'YM',
-        8,
     ],
     [
+        244,
         '2008-1-1',
         '2008-9-1',
         'YD',
-        244,
     ],
     [
+        0,
         '2008-1-1',
         '2008-9-1',
         'MD',
-        0,
     ],
     [
-        '2007-2-1',
-        '2008-4-1',
-        'Y',
         1,
-    ],
-    [
         '2007-2-1',
         '2008-4-1',
-        'M',
+        'Y',
+    ],
+    [
         14,
-    ],
-    [
         '2007-2-1',
         '2008-4-1',
-        'D',
+        'M',
+    ],
+    [
         425,
+        '2007-2-1',
+        '2008-4-1',
+        'D',
     ],
     [
+        2,
         '2007-2-1',
         '2008-4-1',
         'YM',
-        2,
     ],
     [
-        '2007-2-1',
-        '2008-4-1',
-        'YD',
         59,
+        '2007-2-1',
+        '2008-4-1',
+        'YD',
     ],
     [
+        0,
         '2007-2-1',
         '2008-4-1',
         'MD',
-        0,
     ],
     [
-        '1960-12-19',
-        '2008-6-28',
-        'Y',
         47,
-    ],
-    [
         '1960-12-19',
         '2008-6-28',
-        'M',
+        'Y',
+    ],
+    [
         570,
-    ],
-    [
         '1960-12-19',
         '2008-6-28',
-        'D',
+        'M',
+    ],
+    [
         17358,
+        '1960-12-19',
+        '2008-6-28',
+        'D',
     ],
     [
+        6,
         '1960-12-19',
         '2008-6-28',
         'YM',
-        6,
     ],
     [
-        '1960-12-19',
-        '2008-6-28',
-        'YD',
         191,
+        '1960-12-19',
+        '2008-6-28',
+        'YD',
     ],
     [
+        9,
         '1960-12-19',
         '2008-6-28',
         'MD',
-        9,
     ],
     [
-        '1982-12-7',
-        '2008-6-28',
-        'Y',
         25,
-    ],
-    [
         '1982-12-7',
         '2008-6-28',
-        'M',
+        'Y',
+    ],
+    [
         306,
-    ],
-    [
         '1982-12-7',
         '2008-6-28',
-        'D',
+        'M',
+    ],
+    [
         9335,
-    ],
-    [
         '1982-12-7',
         '2008-6-28',
-        'YM',
+        'D',
+    ],
+    [
         6,
-    ],
-    [
         '1982-12-7',
         '2008-6-28',
-        'YD',
+        'YM',
+    ],
+    [
         203,
+        '1982-12-7',
+        '2008-6-28',
+        'YD',
     ],
     [
+        21,
         '1982-12-7',
         '2008-6-28',
         'MD',
-        21,
     ],
     [
+        2,
         '2007-12-25',
         '2010-3-17',
         'Y',
-        2,
     ],
     [
-        '2007-12-25',
-        '2010-3-17',
-        'M',
         26,
+        '2007-12-25',
+        '2010-3-17',
+        'M',
     ],
     [
+        813,
         '2007-12-25',
         '2010-3-17',
         'D',
-        813,
     ],
     [
+        2,
         '2007-12-25',
         '2010-3-17',
         'YM',
-        2,
     ],
     [
+        82,
         '2007-12-25',
         '2010-3-17',
         'YD',
-        82,
     ],
     [
+        20,
         '2007-12-25',
         '2010-3-17',
         'MD',
-        20,
     ],
     [
+        51,
         '19-12-1960',
         '26-01-2012',
         'Y',
-        51,
     ],
     [
+        613,
         '19-12-1960',
         '26-01-2012',
         'M',
-        613,
     ],
     [
+        18665,
         '19-12-1960',
         '26-01-2012',
         'D',
-        18665,
     ],
     [
+        1,
         '19-12-1960',
         '26-01-2012',
         'YM',
-        1,
     ],
     [
+        38,
         '19-12-1960',
         '26-01-2012',
         'YD',
-        38,
     ],
     [
+        7,
         '19-12-1960',
         '26-01-2012',
         'MD',
-        7,
     ],
     [
+        50,
         '19-12-1960',
         '12-12-2012',
         'Y',
-        50,
     ],
     [
+        0,
         '1982-12-07',
         '1982-12-7',
         'D',
-        0,
     ],
 ];

tests/data/Calculation/DateTime/DATEVALUE.php

@@ -4,290 +4,290 @@
 
 return [
     [
+        '#VALUE!',
         '25-Dec-1899',
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '31-Dec-1899',
-        '#VALUE!',
     ],
     [
-        '1-Jan-1900',
         1,
+        '1-Jan-1900',
     ],
     [
-        '1900/2/28',
         59,
+        '1900/2/28',
     ],
     [
+        '#VALUE!',
         '29-02-1900',
-        '#VALUE!',
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
+        '#VALUE!',
         '29th February 1900',
-        '#VALUE!',
     ],
     [
-        '1900/3/1',
         61,
+        '1900/3/1',
     ],
     [
-        '13-12-1901',
         713,
+        '13-12-1901',
     ],
     [
-        '14-12-1901',
         714,
+        '14-12-1901',
     ],
     [
-        '1903/12/31',
         1461,
+        '1903/12/31',
     ],
     [
-        '1-Jan-1904',
         1462,
+        '1-Jan-1904',
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
-        '2nd-Jan-1904',
         1463,
+        '2nd-Jan-1904',
     ],
     [
-        '19-12-1960',
         22269,
+        '19-12-1960',
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
-        '1st January 1970',
         25569,
+        '1st January 1970',
     ],
     [
-        '7-Dec-1982',
         30292,
+        '7-Dec-1982',
     ],
     [
-        '1-1-2008',
         39448,
+        '1-1-2008',
     ],
     [
-        '2038-01-19',
         50424,
+        '2038-01-19',
     ],
     [
-        '2-6-2008',
         39601,
+        '2-6-2008',
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
-        'December 25th 2008',
         39807,
+        'December 25th 2008',
     ],
     [
-        '1 Jan-2008',
         39448,
+        '1 Jan-2008',
     ],
     // MS Excel success or failure dependent on country settings
     [
+        39813,
         '12-31-2008',
-        39813,
     ],
     // PhpSpreadsheet tries to handle both US and UK formats, irrespective of country settings
     [
+        39813,
         '31-12-2008',
-        39813,
     ],
     // MS Excel success or failure dependent on country settings
     [
+        39682,
         '8/22/2008',
-        39682,
     ],
     // PhpSpreadsheet tries to handle both US and UK formats, irrespective of country settings
     [
+        39682,
         '22/8/2008',
-        39682,
     ],
     [
+        39682,
         '22/8/08',
-        39682,
     ],
     [
+        39682,
         '22-AUG-2008',
-        39682,
     ],
     [
-        '2008/02/23',
         39501,
+        '2008/02/23',
     ],
     [
-        '6-7-2008',
         39635,
+        '6-7-2008',
     ],
     // MS Excel success or failure dependent on country settings
     [
-        '28-2-2007',
         39141,
+        '28-2-2007',
     ],
     // PhpSpreadsheet tries to handle both US and UK formats, irrespective of country settings
     [
-        '2-28-2007',
         39141,
+        '2-28-2007',
     ],
     // Should fail because it's an invalid date, but PhpSpreadsheet currently adjusts to 1-3-2007 - FIX NEEDED
     [
-        '29-2-2007',
         '#VALUE!',
+        '29-2-2007',
     ],
     [
-        '1/1/1999',
         36161,
+        '1/1/1999',
     ],
     [
-        '1954-07-20',
         19925,
+        '1954-07-20',
     ],
     [
-        '22 August 98',
         36029,
+        '22 August 98',
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
-        '1st March 2007',
         39142,
+        '1st March 2007',
     ],
     [
-        'The 1st day of March 2007',
         '#VALUE!',
+        'The 1st day of March 2007',
     ],
     // 01/01 of the current year
     [
-        '1 Jan',
         42736,
+        '1 Jan',
     ],
     // 31/12 of the current year
     [
-        '31/12',
         43100,
+        '31/12',
     ],
     // Excel reads as 1st December 1931, not 31st December in current year
     [
-        '12/31',
         11658,
+        '12/31',
     ],
     // 05/07 of the current year
     [
+        42921,
         '5-JUL',
-        42921,
     ],
     // 05/07 of the current year
     [
-        '5 Jul',
         42921,
+        '5 Jul',
     ],
     [
-        '12/2008',
         39783,
+        '12/2008',
     ],
     [
-        '10/32',
         11963,
+        '10/32',
     ],
     [
+        '#VALUE!',
         11,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         true,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         false,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         1,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         12345,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         12,
-        '#VALUE!',
     ],
     [
+        40221,
         '12-Feb-2010',
-        40221,
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
+        40221,
         'Feb-12-2010',
-        40221,
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
+        40221,
         'February-12-2010',
-        40221,
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
+        40221,
         'February 12 2010',
-        40221,
     ],
     [
+        40227,
         '18 Feb 2010',
-        40227,
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
-        '17th 3rd 2010',
         40254,
+        '17th 3rd 2010',
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
-        'Feb 18th 2010',
         40227,
+        'Feb 18th 2010',
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
+        40210,
         '1st Feb 2010',
-        40210,
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
+        40210,
         '1st-Feb-2010',
-        40210,
     ],
     [
+        '#VALUE!',
         '1me Fev 2010',
-        '#VALUE!',
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
-        'February 1st 2010',
         40210,
+        'February 1st 2010',
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
-        '2nd Feb 2010',
         40211,
+        '2nd Feb 2010',
     ],
     [
+        '#VALUE!',
         'Second Feb 2010',
-        '#VALUE!',
     ],
     [
-        'First August 2010',
         '#VALUE!',
+        'First August 2010',
     ],
     // MS Excel will fail with a #VALUE return, but PhpSpreadsheet can parse this date
     [
-        '1st August 2010',
         40391,
+        '1st August 2010',
     ],
     [
-        '15:30:25',
         0,
+        '15:30:25',
     ],
 ];

tests/data/Calculation/DateTime/DAY.php

@@ -4,31 +4,31 @@
 
 return [
     [
-        22269,
         19,
+        22269,
     ],
     [
-        30348,
         1,
+        30348,
     ],
     [
-        30843,
         10,
+        30843,
     ],
     [
-        '11-Nov-1918',
         11,
+        '11-Nov-1918',
     ],
     [
-        '28-Feb-1904',
         28,
+        '28-Feb-1904',
     ],
     [
-        'Invalid',
         '#VALUE!',
+        'Invalid',
     ],
     [
-        -1,
         '#NUM!',
+        -1,
     ],
 ];

tests/data/Calculation/DateTime/DAYS360.php

@@ -2,207 +2,207 @@
 
 return [
     [
+        '#VALUE!',
         'ABC',
         '2007-1-10',
         false,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '2007-1-1',
         'DEF',
         true,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '2007-1-1',
         '2007-1-10',
         'XYZ',
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '2007-1-10',
         '2007-1-1',
         'Y',
-        '#VALUE!',
     ],
     [
+        9,
         '2007-1-1',
         '2007-1-10',
         false,
-        9,
     ],
     [
+        9,
         '2007-1-1',
         '2007-1-10',
         true,
-        9,
     ],
     [
-        '2007-1-1',
-        '2007-12-31',
-        false,
         360,
+        '2007-1-1',
+        '2007-12-31',
+        false,
     ],
     [
+        359,
         '2007-1-1',
         '2007-12-31',
         true,
-        359,
     ],
     [
+        540,
         '2007-1-1',
         '2008-7-1',
         false,
-        540,
     ],
     [
+        540,
         '2007-1-1',
         '2008-7-1',
         true,
-        540,
     ],
     [
-        '2007-1-1',
-        '2007-1-31',
-        false,
         30,
-    ],
-    [
         '2007-1-1',
         '2007-1-31',
-        true,
+        false,
+    ],
+    [
         29,
+        '2007-1-1',
+        '2007-1-31',
+        true,
     ],
     [
+        30,
         '2007-1-1',
         '2007-2-1',
         false,
-        30,
     ],
     [
+        30,
         '2007-1-1',
         '2007-2-1',
         true,
-        30,
     ],
     [
+        57,
         '2007-1-1',
         '2007-2-28',
         false,
-        57,
     ],
     [
+        57,
         '2007-1-1',
         '2007-2-28',
         true,
-        57,
     ],
     [
+        1,
         '2007-1-31',
         '2007-2-1',
         false,
-        1,
     ],
     [
+        1,
         '2007-1-31',
         '2007-2-1',
         true,
-        1,
     ],
     [
+        31,
         '2007-1-31',
         '2007-3-1',
         false,
-        31,
     ],
     [
+        31,
         '2007-1-31',
         '2007-3-1',
         true,
-        31,
     ],
     [
+        60,
         '2007-1-31',
         '2007-3-31',
         false,
-        60,
     ],
     [
+        60,
         '2007-1-31',
         '2007-3-31',
         true,
-        60,
     ],
     [
+        240,
         '2008-1-1',
         '2008-9-1',
         false,
-        240,
     ],
     [
+        240,
         '2008-1-1',
         '2008-9-1',
         true,
-        240,
     ],
     [
+        420,
         '2007-2-1',
         '2008-4-1',
         false,
-        420,
     ],
     [
+        420,
         '2007-2-1',
         '2008-4-1',
         true,
-        420,
     ],
     [
+        17109,
         '1960-12-19',
         '2008-6-28',
         false,
-        17109,
     ],
     [
+        17109,
         '1960-12-19',
         '2008-6-28',
         true,
-        17109,
     ],
     [
+        9201,
         '1982-12-7',
         '2008-6-28',
         false,
-        9201,
     ],
     [
+        9201,
         '1982-12-7',
         '2008-6-28',
         true,
-        9201,
     ],
     [
-        '2000-2-28',
-        '2000-3-31',
-        false,
         33,
+        '2000-2-28',
+        '2000-3-31',
+        false,
     ],
     [
+        32,
         '2000-2-28',
         '2000-3-31',
         true,
-        32,
     ],
     [
+        30,
         '2000-2-29',
         '2000-3-31',
         false,
-        30,
     ],
     [
+        31,
         '2000-2-29',
         '2000-3-31',
         true,
-        31,
     ],
 ];

tests/data/Calculation/DateTime/EDATE.php

@@ -2,78 +2,78 @@
 
 return [
     [
+        39493,
         '15-Jan-2008',
         1,
-        39493,
     ],
     [
+        39431,
         '15-Jan-2008',
         -1,
-        39431,
     ],
     [
+        39522,
         '15-Jan-2008',
         2,
-        39522,
     ],
     [
+        39202,
         '31-Mar-2007',
         1,
-        39202,
     ],
     [
+        39141,
         '31-Mar-2007',
         -1,
-        39141,
     ],
     [
+        39507,
         '31-Mar-2008',
         -1,
-        39507,
     ],
     [
+        39416,
         '31-Mar-2008',
         -4,
-        39416,
     ],
     [
+        39141,
         '29-Feb-2008',
         -12,
-        39141,
     ],
     [
+        39248,
         '15-Mar-2007',
         3,
-        39248,
     ],
     [
+        22269,
         22269.0,
         0,
-        22269,
     ],
     [
+        22331,
         22269.0,
         2,
-        22331,
     ],
     [
+        25618,
         22269.0,
         110,
-        25618,
     ],
     [
+        18920,
         22269.0,
         -110,
-        18920,
     ],
     [
+        '#VALUE!',
         '15-Mar-2007',
         'ABC',
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         'Invalid',
         12,
-        '#VALUE!',
     ],
 ];

tests/data/Calculation/DateTime/EOMONTH.php

@@ -2,88 +2,88 @@
 
 return [
     [
+        39507,
         '15-Jan-2008',
         1,
-        39507,
     ],
     [
+        39447,
         '15-Jan-2008',
         -1,
-        39447,
     ],
     [
+        39538,
         '15-Jan-2008',
         2,
-        39538,
     ],
     [
+        39202,
         '31-Mar-2007',
         1,
-        39202,
     ],
     [
+        39141,
         '31-Mar-2007',
         -1,
-        39141,
     ],
     [
+        39507,
         '31-Mar-2008',
         -1,
-        39507,
     ],
     [
+        39416,
         '31-Mar-2008',
         -4,
-        39416,
     ],
     [
+        39141,
         '29-Feb-2008',
         -12,
-        39141,
     ],
     [
+        39263,
         '15-Mar-2007',
         3,
-        39263,
     ],
     [
+        22281,
         22269.0,
         0,
-        22281,
     ],
     [
+        22340,
         22269.0,
         2,
-        22340,
     ],
     [
+        25627,
         22269.0,
         110,
-        25627,
     ],
     [
+        18932,
         22269.0,
         -110,
-        18932,
     ],
     [
+        22371,
         22269.0,
         3,
-        22371,
     ],
     [
+        22371,
         22269.0,
         3.75,
-        22371,
     ],
     [
+        '#VALUE!',
         '15-Mar-2007',
         'ABC',
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         'Invalid',
         12,
-        '#VALUE!',
     ],
 ];

tests/data/Calculation/DateTime/HOUR.php

@@ -2,51 +2,51 @@
 
 return [
     [
-        0.25,
         6,
+        0.25,
     ],
     [
-        0.75,
         18,
+        0.75,
     ],
     [
-        0.5,
         12,
+        0.5,
     ],
     [
-        0.59999999999999998,
         14,
+        0.59999999999999998,
     ],
     [
-        '11-Nov-1918 11:11',
         11,
+        '11-Nov-1918 11:11',
     ],
     [
+        23,
         '11:59 PM',
-        23,
     ],
     [
+        23,
         '23:59:59',
-        23,
     ],
     [
+        0,
         3600,
-        0,
     ],
     [
-        -3600,
         '#NUM!',
+        -3600,
     ],
     [
+        0,
         7200,
-        0,
     ],
     [
+        0,
         65535,
-        0,
     ],
     [
-        '1 O\'Clock',
         '#VALUE!',
+        '1 O\'Clock',
     ],
 ];

tests/data/Calculation/DateTime/MINUTE.php

@@ -2,51 +2,51 @@
 
 return [
     [
-        0.20000000000000001,
         48,
+        0.20000000000000001,
     ],
     [
-        0.40000000000000002,
         36,
+        0.40000000000000002,
     ],
     [
-        0.59999999999999998,
         24,
+        0.59999999999999998,
     ],
     [
-        0.80000000000000004,
         12,
+        0.80000000000000004,
     ],
     [
-        '11-Nov-1918 11:15',
         15,
+        '11-Nov-1918 11:15',
     ],
     [
+        59,
         '11:59 PM',
-        59,
     ],
     [
+        59,
         '23:59:59',
-        59,
     ],
     [
+        0,
         3600,
-        0,
     ],
     [
-        -3600,
         '#NUM!',
+        -3600,
     ],
     [
+        0,
         12500,
-        0,
     ],
     [
+        0,
         65535,
-        0,
     ],
     [
-        'Half past 1 O\'Clock',
         '#VALUE!',
+        'Half past 1 O\'Clock',
     ],
 ];

tests/data/Calculation/DateTime/MONTH.php

@@ -2,51 +2,51 @@
 
 return [
     [
+        1,
         null,
-        1,
     ],
     [
+        1,
         0,
-        1,
     ],
     [
+        12,
         22269.0,
-        12,
     ],
     [
+        2,
         30348.0,
-        2,
     ],
     [
-        30843.0,
         6,
+        30843.0,
     ],
     [
-        '11-Nov-1918',
         11,
+        '11-Nov-1918',
     ],
     [
-        '28-Feb-1904',
         2,
+        '28-Feb-1904',
     ],
     [
-        '01 Jul 2003',
         7,
+        '01 Jul 2003',
     ],
     [
-        38094,
         4,
+        38094,
     ],
     [
-        'Dec 2003',
         12,
+        'Dec 2003',
     ],
     [
-        -10,
         '#NUM!',
+        -10,
     ],
     [
-        'ABCD',
         '#VALUE!',
+        'ABCD',
     ],
 ];

tests/data/Calculation/DateTime/NETWORKDAYS.php

@@ -2,102 +2,102 @@
 
 return [
     [
+        8,
         '1-Jan-2007',
         '10-Jan-2007',
-        8,
     ],
     [
+        3,
         '18-Jun-2008',
         '20-Jun-2008',
-        3,
     ],
     [
+        5,
         '16-Jun-2008',
         '20-Jun-2008',
-        5,
     ],
     [
+        5,
         '14-Jun-2008',
         '20-Jun-2008',
-        5,
     ],
     [
-        '20-Jun-2008',
-        '20-Jun-2008',
         1,
+        '20-Jun-2008',
+        '20-Jun-2008',
     ],
     [
+        0,
         '21-Jun-2008',
         '21-Jun-2008',
-        0,
     ],
     [
-        '20-Jun-2008',
-        '20-Jun-2008',
-        '20-Jun-2008',
         0,
+        '20-Jun-2008',
+        '20-Jun-2008',
+        '20-Jun-2008',
     ],
     [
-        '20-Jun-2008',
-        '20-Jun-2008',
-        '20-Jun-2008',
-        '20-Jun-2008',
         0,
+        '20-Jun-2008',
+        '20-Jun-2008',
+        '20-Jun-2008',
+        '20-Jun-2008',
     ],
     [
+        8,
         '14-Jun-2008',
         '25-Jun-2008',
-        8,
     ],
     [
-        '19-Dec-1960',
-        '10-Jan-1961',
         17,
+        '19-Dec-1960',
+        '10-Jan-1961',
     ],
     [
-        '10-Jan-1961',
-        '19-Dec-1960',
         -17,
+        '10-Jan-1961',
+        '19-Dec-1960',
     ],
     [
-        '19-Dec-1960',
-        '10-Jan-1961',
-        '25-Dec-1960',
-        '26-Dec-1960',
-        '01-Jan-1961',
         16,
+        '19-Dec-1960',
+        '10-Jan-1961',
+        '25-Dec-1960',
+        '26-Dec-1960',
+        '01-Jan-1961',
     ],
     [
+        -16,
         '10-Jan-1961',
         '19-Dec-1960',
         '25-Dec-1960',
         '26-Dec-1960',
         '01-Jan-1961',
-        -16,
     ],
     [
+        65,
         '1-Jan-2007',
         '31-Mar-2007',
-        65,
     ],
     [
+        23,
         '1-Jan-2007',
         '31-Jan-2007',
-        23,
     ],
     [
+        24,
         '1-Jan-2007',
         '1-Feb-2007',
-        24,
     ],
     [
+        43,
         '1-Jan-2007',
         '28-Feb-2007',
-        43,
     ],
     [
+        2,
         '31-Jan-2007',
         '1-Feb-2007',
-        2,
     ],
 ];

tests/data/Calculation/DateTime/SECOND.php

@@ -2,51 +2,51 @@
 
 return [
     [
-        0.2339930556,
         57,
+        0.2339930556,
     ],
     [
-        0.4202893519,
         13,
+        0.4202893519,
     ],
     [
-        0.60789351849999995,
         22,
+        0.60789351849999995,
     ],
     [
-        0.80221064809999998,
         11,
+        0.80221064809999998,
     ],
     [
-        '11-Nov-1918 11:15:35',
         35,
+        '11-Nov-1918 11:15:35',
     ],
     [
+        0,
         '11:59 PM',
-        0,
     ],
     [
-        '23:59:59',
         59,
+        '23:59:59',
     ],
     [
+        0,
         3600,
-        0,
     ],
     [
-        -3601,
         '#NUM!',
+        -3601,
     ],
     [
+        0,
         12500,
-        0,
     ],
     [
+        0,
         65535,
-        0,
     ],
     [
-        'Half past 1 O\'Clock',
         '#VALUE!',
+        'Half past 1 O\'Clock',
     ],
 ];

tests/data/Calculation/DateTime/TIME.php

@@ -2,135 +2,135 @@
 
 return [
     [
+        0.75776620370400005,
         18,
         11,
         11,
-        0.75776620370400005,
     ],
     [
+        0.26047453703700002,
         6,
         15,
         5,
-        0.26047453703700002,
     ],
     [
+        0.52094907407400004,
         12,
         30,
         10,
-        0.52094907407400004,
     ],
     [
+        0.78153935185199996,
         18,
         45,
         25,
-        0.78153935185199996,
     ],
     [
+        0.64780092592600003,
         15,
         32,
         50,
-        0.64780092592600003,
     ],
     [
+        0.50070601851899998,
         12,
         null,
         61,
-        0.50070601851899998,
     ],
     [
+        0.45832175925899998,
         11,
         null,
         -1,
-        0.45832175925899998,
     ],
     [
+        0.41589120370400001,
         10,
         null,
         -67,
-        0.41589120370400001,
     ],
     [
+        0.58478009259300001,
         13,
         62,
         5,
-        0.58478009259300001,
     ],
     [
+        0.31964120370400001,
         9,
         -80,
         17,
-        0.31964120370400001,
     ],
     [
+        0.22083333333300001,
         8,
         -162,
         null,
-        0.22083333333300001,
     ],
     [
+        '#NUM!',
         2,
         -120,
         -1,
-        '#NUM!',
     ],
     [
+        0.0,
         2,
         -120,
         null,
-        0.0,
     ],
     [
+        1.1574074E-5,
         2,
         -120,
         1,
-        1.1574074E-5,
     ],
     [
+        0.50071759259299997,
         36,
         1,
         2,
-        0.50071759259299997,
     ],
     [
+        '#NUM!',
         -1,
         2,
         3,
-        '#NUM!',
     ],
     [
+        0.001030092593,
         -1,
         61,
         29,
-        0.001030092593,
     ],
     [
+        0.0,
         -1,
         61,
         -60,
-        0.0,
     ],
     [
+        '#VALUE!',
         'A',
         null,
         null,
-        '#VALUE!',
     ],
     [
+        0.49930555555599998,
         11,
         59,
         0,
-        0.49930555555599998,
     ],
     [
+        0.5,
         12,
         0,
         0,
-        0.5,
     ],
     [
+        0.70011574074100003,
         16,
         48,
         10,
-        0.70011574074100003,
     ],
 ];

tests/data/Calculation/DateTime/TIMEVALUE.php

@@ -2,55 +2,55 @@
 
 return [
     [
-        '12:00:00 am',
         0,
+        '12:00:00 am',
     ],
     [
-        '12:01:02 am',
         0.00071759299999999999,
+        '12:01:02 am',
     ],
     [
-        '12:03 pm',
         0.50208333299999997,
+        '12:03 pm',
     ],
     [
-        '12:7:11 pm',
         0.50498842600000005,
+        '12:7:11 pm',
     ],
     [
-        '4:13:39',
         0.176145833,
+        '4:13:39',
     ],
     [
-        '6:20:17 pm',
         0.76408564800000001,
+        '6:20:17 pm',
     ],
     [
-        '18:33:27',
         0.773229167,
+        '18:33:27',
     ],
     [
-        '31/12/2007 03:27:15',
         0.14392361100000001,
+        '31/12/2007 03:27:15',
     ],
     [
-        '9:44:55 pm',
         0.90619212999999998,
+        '9:44:55 pm',
     ],
     [
+        '#VALUE!',
         12,
-        '#VALUE!',
     ],
     [
-        '13:01',
         0.54236111099999995,
+        '13:01',
     ],
     [
-        '33:45',
         0.40625,
+        '33:45',
     ],
     [
-        '13:01PM',
         '#VALUE!',
+        '13:01PM',
     ],
 ];

tests/data/Calculation/DateTime/WEEKDAY.php

@@ -2,129 +2,129 @@
 
 return [
     [
-        '24-Oct-1968',
         5,
+        '24-Oct-1968',
     ],
     [
+        4,
         '24-Oct-1968',
         2,
-        4,
     ],
     [
+        3,
         '24-Oct-1968',
         3,
-        3,
     ],
     [
-        '2000-06-14',
         4,
+        '2000-06-14',
     ],
     [
+        3,
         '2000-06-14',
         2,
-        3,
     ],
     [
+        2,
         '2000-06-14',
         3,
-        2,
     ],
     [
-        '1996-07-24',
         4,
+        '1996-07-24',
     ],
     [
+        3,
         '1996-07-24',
         2,
-        3,
     ],
     [
+        2,
         '1996-07-24',
         3,
-        2,
     ],
     [
-        '1996-07-27',
         7,
+        '1996-07-27',
     ],
     [
+        6,
         '1996-07-27',
         2,
-        6,
     ],
     [
-        '1996-07-27',
-        3,
         5,
+        '1996-07-27',
+        3,
     ],
     [
-        '1977-7-31',
         1,
+        '1977-7-31',
     ],
     [
-        '1977-7-31',
-        2,
         7,
+        '1977-7-31',
+        2,
     ],
     [
+        6,
         '1977-7-31',
         3,
-        6,
     ],
     [
-        '1977-8-1',
         2,
+        '1977-8-1',
     ],
     [
-        '1977-8-1',
-        2,
         1,
+        '1977-8-1',
+        2,
     ],
     [
-        '1977-8-1',
-        3,
         0,
+        '1977-8-1',
+        3,
     ],
     [
+        7,
         '1900-2-5',
         2,
-        7,
     ],
     [
-        '1900-2-1',
         4,
+        '1900-2-1',
     ],
     [
-        38093,
         6,
+        38093,
     ],
     [
+        5,
         38093,
         2,
-        5,
     ],
     [
+        4,
         38093,
         3,
-        4,
     ],
     [
+        '#VALUE!',
         '3/7/1977',
         'A',
-        '#VALUE!',
     ],
     [
+        '#NUM!',
         '3/7/1977',
         0,
-        '#NUM!',
     ],
     [
+        '#VALUE!',
         'Invalid',
         1,
-        '#VALUE!',
     ],
     [
-        -1,
         '#NUM!',
+        -1,
     ],
 ];

tests/data/Calculation/DateTime/WEEKNUM.php

@@ -2,76 +2,76 @@
 
 return [
     [
+        52,
         '21-Dec-2000',
         1,
-        52,
     ],
     [
+        1,
         '2000-01-01',
         1,
-        1,
     ],
     [
+        2,
         '2000-01-02',
         1,
-        2,
     ],
     [
+        1,
         '2000-01-01',
         2,
-        1,
     ],
     [
+        2,
         '2000-01-03',
         2,
-        2,
     ],
     [
+        1,
         '1995-01-01',
         1,
-        1,
     ],
     [
+        1,
         '1995-01-07',
         1,
-        1,
     ],
     [
+        2,
         '1995-01-08',
         1,
-        2,
     ],
     [
+        1,
         '1995-01-01',
         2,
-        1,
     ],
     [
+        2,
         '1995-01-02',
         2,
-        2,
     ],
     [
-        '3/7/1977',
         28,
+        '3/7/1977',
     ],
     [
+        '#VALUE!',
         '3/7/1977',
         'A',
-        '#VALUE!',
     ],
     [
+        '#NUM!',
         '3/7/1977',
         0,
-        '#NUM!',
     ],
     [
+        '#VALUE!',
         'Invalid',
         1,
-        '#VALUE!',
     ],
     [
-        -1,
         '#NUM!',
+        -1,
     ],
 ];

tests/data/Calculation/DateTime/WORKDAY.php

@@ -2,59 +2,60 @@
 
 return [
     [
+        '#VALUE!',
         '1-Jan-2007',
         'ABC',
-        '#VALUE!',
     ],
     [
+        39094,
         '1-Jan-2007',
         9,
-        39094,
     ],
     [
+        39619,
         '18-Jun-2008',
         2,
-        39619,
     ],
     [
+        39619,
         '16-Jun-2008',
         4,
-        39619,
     ],
     [
+        39622,
         '14-Jun-2008',
         6,
-        39622,
     ],
     [
+        39629,
         '14-Jun-2008',
         11,
-        39629,
     ],
     [
+        39611,
         '14-Jun-2008',
         -2,
-        39611,
     ],
     [
+        39605,
         '14-Jun-2008',
         -6,
-        39605,
     ],
     [
-        '19-Dec-2008',
-        10,
         39815,
+        '19-Dec-2008',
+        10,
     ],
     [
+        39820,
         '19-Dec-2008',
         10,
         '25-Dec-2008',
         '26-Dec-2008',
         '01-Jan-2009',
-        39820,
     ],
     [
+        39820,
         '19-Dec-2008',
         10,
         [
@@ -64,9 +65,9 @@ return [
                 '01-Jan-2009',
             ],
         ],
-        39820,
     ],
     [
+        39801,
         39820,
         -10,
         [
@@ -76,9 +77,9 @@ return [
                 '01-Jan-2009',
             ],
         ],
-        39801,
     ],
     [
+        41010,
         '5-Apr-2012',
         3,
         [
@@ -87,6 +88,5 @@ return [
                 '9-Apr-2012',
             ],
         ],
-        41010,
     ],
 ];

tests/data/Calculation/DateTime/YEAR.php

@@ -2,47 +2,47 @@
 
 return [
     [
+        1900,
         null,
-        1900,
     ],
     [
+        1900,
         1,
-        1900,
     ],
     [
-        33333.330000000002,
         1991,
+        33333.330000000002,
     ],
     [
-        22269.0,
         1960,
+        22269.0,
     ],
     [
-        30348.0,
         1983,
+        30348.0,
     ],
     [
-        30843.0,
         1984,
+        30843.0,
     ],
     [
-        '01 Jan 2525',
         2525,
+        '01 Jan 2525',
     ],
     [
-        '11-Nov-1918',
         1918,
+        '11-Nov-1918',
     ],
     [
-        '28-Feb-1904',
         1904,
+        '28-Feb-1904',
     ],
     [
-        -10,
         '#NUM!',
+        -10,
     ],
     [
-        'ABCD',
         '#VALUE!',
+        'ABCD',
     ],
 ];

tests/data/Calculation/DateTime/YEARFRAC.php

@@ -2,387 +2,387 @@
 
 return [
     [
+        0.025,
         '2007-1-1',
         '2007-1-10',
         0,
-        0.025,
     ],
     [
+        0.024657534246580001,
         '2007-1-1',
         '2007-1-10',
         1,
-        0.024657534246580001,
     ],
     [
+        0.025,
         '2007-1-1',
         '2007-1-10',
         2,
-        0.025,
     ],
     [
+        0.024657534246580001,
         '2007-1-1',
         '2007-1-10',
         3,
-        0.024657534246580001,
     ],
     [
+        0.025,
         '2007-1-1',
         '2007-1-10',
         4,
-        0.025,
     ],
     [
-        '2007-1-1',
-        '2007-12-31',
-        0,
         1.0,
+        '2007-1-1',
+        '2007-12-31',
+        0,
     ],
     [
+        0.99726027397259998,
         '2007-1-1',
         '2007-12-31',
         1,
-        0.99726027397259998,
     ],
     [
-        '2007-1-1',
-        '2007-12-31',
-        2,
         1.01111111111111,
-    ],
-    [
         '2007-1-1',
         '2007-12-31',
-        3,
+        2,
+    ],
+    [
         0.99726027397259998,
+        '2007-1-1',
+        '2007-12-31',
+        3,
     ],
     [
+        0.99722222222222001,
         '2007-1-1',
         '2007-12-31',
         4,
-        0.99722222222222001,
     ],
     [
+        1.5,
         '2007-1-1',
         '2008-7-1',
         0,
-        1.5,
     ],
     [
-        '2007-1-1',
-        '2008-7-1',
-        1,
         1.49658002735978,
-    ],
-    [
         '2007-1-1',
         '2008-7-1',
-        2,
+        1,
+    ],
+    [
         1.5194444444444399,
-    ],
-    [
         '2007-1-1',
         '2008-7-1',
-        3,
+        2,
+    ],
+    [
         1.4986301369863,
+        '2007-1-1',
+        '2008-7-1',
+        3,
     ],
     [
+        1.5,
         '2007-1-1',
         '2008-7-1',
         4,
-        1.5,
     ],
     [
+        0.083333333333329998,
         '2007-1-1',
         '2007-1-31',
         0,
-        0.083333333333329998,
     ],
     [
+        0.082191780821919996,
         '2007-1-1',
         '2007-1-31',
         1,
-        0.082191780821919996,
     ],
     [
+        0.083333333333329998,
         '2007-1-1',
         '2007-1-31',
         2,
-        0.083333333333329998,
     ],
     [
+        0.082191780821919996,
         '2007-1-1',
         '2007-1-31',
         3,
-        0.082191780821919996,
     ],
     [
-        '2007-1-1',
-        '2007-1-31',
-        4,
         0.080555555555560002,
+        '2007-1-1',
+        '2007-1-31',
+        4,
     ],
     [
+        0.083333333333329998,
         '2007-1-1',
         '2007-2-1',
         0,
-        0.083333333333329998,
     ],
     [
+        0.084931506849319993,
         '2007-1-1',
         '2007-2-1',
         1,
-        0.084931506849319993,
     ],
     [
+        0.08611111111111,
         '2007-1-1',
         '2007-2-1',
         2,
-        0.08611111111111,
     ],
     [
+        0.084931506849319993,
         '2007-1-1',
         '2007-2-1',
         3,
-        0.084931506849319993,
     ],
     [
+        0.083333333333329998,
         '2007-1-1',
         '2007-2-1',
         4,
-        0.083333333333329998,
     ],
     [
+        0.15833333333333,
         '2007-1-1',
         '2007-2-28',
         0,
-        0.15833333333333,
     ],
     [
+        0.15890410958904,
         '2007-1-1',
         '2007-2-28',
         1,
-        0.15890410958904,
     ],
     [
-        '2007-1-1',
-        '2007-2-28',
-        2,
         0.16111111111111001,
-    ],
-    [
         '2007-1-1',
         '2007-2-28',
-        3,
+        2,
+    ],
+    [
         0.15890410958904,
+        '2007-1-1',
+        '2007-2-28',
+        3,
     ],
     [
+        0.15833333333333,
         '2007-1-1',
         '2007-2-28',
         4,
-        0.15833333333333,
     ],
     [
+        0.0027777777777800001,
         '2007-1-31',
         '2007-2-1',
         0,
-        0.0027777777777800001,
     ],
     [
+        0.0027397260273999999,
         '2007-1-31',
         '2007-2-1',
         1,
-        0.0027397260273999999,
     ],
     [
+        0.0027777777777800001,
         '2007-1-31',
         '2007-2-1',
         2,
-        0.0027777777777800001,
     ],
     [
+        0.0027397260273999999,
         '2007-1-31',
         '2007-2-1',
         3,
-        0.0027397260273999999,
     ],
     [
+        0.0027777777777800001,
         '2007-1-31',
         '2007-2-1',
         4,
-        0.0027777777777800001,
     ],
     [
+        0.08611111111111,
         '2007-1-31',
         '2007-3-1',
         0,
-        0.08611111111111,
     ],
     [
+        0.07945205479452,
         '2007-1-31',
         '2007-3-1',
         1,
-        0.07945205479452,
     ],
     [
-        '2007-1-31',
-        '2007-3-1',
-        2,
         0.080555555555560002,
-    ],
-    [
         '2007-1-31',
         '2007-3-1',
-        3,
+        2,
+    ],
+    [
         0.07945205479452,
+        '2007-1-31',
+        '2007-3-1',
+        3,
     ],
     [
+        0.08611111111111,
         '2007-1-31',
         '2007-3-1',
         4,
-        0.08611111111111,
     ],
     [
+        0.16666666666666999,
         '2007-1-31',
         '2007-3-31',
         0,
-        0.16666666666666999,
     ],
     [
+        0.16164383561644,
         '2007-1-31',
         '2007-3-31',
         1,
-        0.16164383561644,
     ],
     [
-        '2007-1-31',
-        '2007-3-31',
-        2,
         0.16388888888889,
-    ],
-    [
         '2007-1-31',
         '2007-3-31',
-        3,
+        2,
+    ],
+    [
         0.16164383561644,
+        '2007-1-31',
+        '2007-3-31',
+        3,
     ],
     [
+        0.16666666666666999,
         '2007-1-31',
         '2007-3-31',
         4,
-        0.16666666666666999,
     ],
     [
+        0.66666666666666996,
         '2008-1-1',
         '2008-9-1',
         0,
-        0.66666666666666996,
     ],
     [
+        0.66666666666666996,
         '2008-1-1',
         '2008-9-1',
         1,
-        0.66666666666666996,
     ],
     [
-        '2008-1-1',
-        '2008-9-1',
-        2,
         0.67777777777778003,
-    ],
-    [
         '2008-1-1',
         '2008-9-1',
-        3,
+        2,
+    ],
+    [
         0.66849315068492998,
+        '2008-1-1',
+        '2008-9-1',
+        3,
     ],
     [
+        0.66666666666666996,
         '2008-1-1',
         '2008-9-1',
         4,
-        0.66666666666666996,
     ],
     [
+        1.1666666666666701,
         '2007-2-1',
         '2008-4-1',
         0,
-        1.1666666666666701,
     ],
     [
-        '2007-2-1',
-        '2008-4-1',
-        1,
         1.16279069767442,
+        '2007-2-1',
+        '2008-4-1',
+        1,
     ],
     [
+        1.18055555555556,
         '2007-2-1',
         '2008-4-1',
         2,
-        1.18055555555556,
     ],
     [
+        1.16438356164384,
         '2007-2-1',
         '2008-4-1',
         3,
-        1.16438356164384,
     ],
     [
+        1.1666666666666701,
         '2007-2-1',
         '2008-4-1',
         4,
-        1.1666666666666701,
     ],
     [
+        47.524999999999999,
         '1960-12-19',
         '2008-6-28',
         0,
-        47.524999999999999,
     ],
     [
+        48.216666666666697,
         '1960-12-19',
         '2008-6-28',
         2,
-        48.216666666666697,
     ],
     [
+        47.556164383561601,
         '1960-12-19',
         '2008-6-28',
         3,
-        47.556164383561601,
     ],
     [
+        47.524999999999999,
         '1960-12-19',
         '2008-6-28',
         4,
-        47.524999999999999,
     ],
     [
+        25.558333333333302,
         '1982-12-7',
         '2008-6-28',
         0,
-        25.558333333333302,
     ],
     [
+        25.5571892111134,
         '1982-12-7',
         '2008-6-28',
         1,
-        25.5571892111134,
     ],
     [
+        25.9305555555556,
         '1982-12-7',
         '2008-6-28',
         2,
-        25.9305555555556,
     ],
     [
+        25.575342465753401,
         '1982-12-7',
         '2008-6-28',
         3,
-        25.575342465753401,
     ],
     [
+        25.558333333333302,
         '1982-12-7',
         '2008-6-28',
         4,
-        25.558333333333302,
     ],
 ];

tests/data/Calculation/Engineering/BESSELI.php

@@ -2,278 +2,278 @@
 
 return [
     [
+        '#NUM!',
         1.5,
         -1,
-        '#NUM!',
     ],
     [
+        2.249E-5,
         -1,
         6,
-        2.249E-5,
     ],
     [
-        0,
-        3,
         0.0,
+        0,
+        3,
     ],
     [
+        4.8807925900000004,
         3,
         0,
-        4.8807925900000004,
     ],
     [
+        0.00027146000000000001,
         1,
         5,
-        0.00027146000000000001,
     ],
     [
+        0.98166642999999998,
         1.5,
         1,
-        0.98166642999999998,
     ],
     [
+        0.33783461999999997,
         -1.5,
         2.5,
-        0.33783461999999997,
     ],
     [
+        0.0,
         -1.5,
         14.99,
-        0.0,
     ],
     [
+        0.0,
         1,
         30,
-        0.0,
     ],
     [
+        2.51671625,
         2.5,
         1,
-        2.51671625,
     ],
     [
+        2.51671625,
         2.5,
         1.5,
-        2.51671625,
     ],
     [
+        -2.51671625,
         -2.5,
         1.5,
-        -2.51671625,
     ],
     [
+        6.20583492,
         3.5,
         1,
-        6.20583492,
     ],
     [
+        0.0073673699999999998,
         0.69999999999999996,
         3,
-        0.0073673699999999998,
     ],
     [
+        3.8320120499999999,
         3.5,
         2,
-        3.8320120499999999,
     ],
     [
+        '#VALUE!',
         1.5,
         'XYZ',
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         'ABC',
         3,
-        '#VALUE!',
     ],
     [
+        -1030.9147225199999,
         -9,
         1,
-        -1030.9147225199999,
     ],
     [
+        -6.20583492,
         -3.5,
         1,
-        -6.20583492,
     ],
     [
+        -0.39288151999999998,
         -0.73499999999999999,
         1,
-        -0.39288151999999998,
     ],
     [
+        0.0,
         0,
         1,
-        0.0,
     ],
     [
+        0.01750268,
         0.035000000000000003,
         1,
-        0.01750268,
     ],
     [
-        1,
-        1,
         0.56515910000000003,
+        1,
+        1,
     ],
     [
+        0.98166642999999998,
         1.5,
         1,
-        0.98166642999999998,
     ],
     [
+        2.51671625,
         2.5,
         1,
-        2.51671625,
     ],
     [
+        6.20583492,
         3.5,
         1,
-        6.20583492,
     ],
     [
+        864.49619395000002,
         -9,
         2,
-        864.49619395000002,
     ],
     [
+        3.8320120499999999,
         -3.5,
         2,
-        3.8320120499999999,
     ],
     [
+        0.070619940000000006,
         -0.73499999999999999,
         2,
-        0.070619940000000006,
     ],
     [
+        0.0,
         0,
         2,
-        0.0,
     ],
     [
+        0.00015313999999999999,
         0.035000000000000003,
         2,
-        0.00015313999999999999,
     ],
     [
+        0.10825973,
         0.90000000000000002,
         2,
-        0.10825973,
     ],
     [
+        0.13574766999999999,
         1,
         2,
-        0.13574766999999999,
     ],
     [
+        0.60327242999999997,
         1.8999999999999999,
         2,
-        0.60327242999999997,
     ],
     [
+        1.2764661500000001,
         2.5,
         2,
-        1.2764661500000001,
     ],
     [
+        3.8320120499999999,
         3.5,
         2,
-        3.8320120499999999,
     ],
     [
+        6.4221893799999998,
         4,
         2,
-        6.4221893799999998,
     ],
     [
+        8.8999999999999995E-7,
         0.035000000000000003,
         3,
-        8.8999999999999995E-7,
     ],
     [
+        0.0073673699999999998,
         0.69999999999999996,
         3,
-        0.0073673699999999998,
     ],
     [
+        0.0154285,
         0.89000000000000001,
         3,
-        0.0154285,
     ],
     [
+        3.3372757800000001,
         4,
         3,
-        3.3372757800000001,
     ],
     [
+        0.50472435999999998,
         4,
         5,
-        0.50472435999999998,
     ],
     [
+        2.8410000000000001E-5,
         1.5,
         7,
-        2.8410000000000001E-5,
     ],
     [
+        0.00013237000000000001,
         3,
         9,
-        0.00013237000000000001,
     ],
     [
+        7.3782034300000001,
         -3.5,
         0,
-        7.3782034300000001,
     ],
     [
+        1.6467231899999999,
         -1.5,
         0,
-        1.6467231899999999,
     ],
     [
-        0,
-        0,
         1.0,
+        0,
+        0,
     ],
     [
+        1.26606588,
         1,
         0,
-        1.26606588,
     ],
     [
+        1.6467231899999999,
         1.5,
         0,
-        1.6467231899999999,
     ],
     [
+        3.2898391400000002,
         2.5,
         0,
-        3.2898391400000002,
     ],
     [
+        7.3782034300000001,
         3.5,
         0,
-        7.3782034300000001,
     ],
     [
+        '#NUM!',
         -3.5,
         -1,
-        '#NUM!',
     ],
     [
+        '#VALUE!',
         true,
         1,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         1,
         true,
-        '#VALUE!',
     ],
     [
+        104777847.71856035,
         21,
         2,
-        104777847.71856035,
     ],
 ];

tests/data/Calculation/Engineering/BESSELJ.php

@@ -2,168 +2,168 @@
 
 return [
     [
+        '#NUM!',
         1.5,
         -1,
-        '#NUM!',
     ],
     [
+        0.0,
         0,
         1,
-        0.0,
     ],
     [
-        1,
-        1,
         0.44005059000000002,
+        1,
+        1,
     ],
     [
+        0.00024976000000000002,
         1,
         5,
-        0.00024976000000000002,
     ],
     [
+        0.32992572999999997,
         1.8999999999999999,
         2,
-        0.32992572999999997,
     ],
     [
+        -0.49709409999999998,
         -2.5,
         1.5,
-        -0.49709409999999998,
     ],
     [
+        0.13737753,
         3.5,
         1,
-        0.13737753,
     ],
     [
+        0.013974,
         0.89000000000000001,
         3,
-        0.013974,
     ],
     [
+        0.45862918000000003,
         3.5,
         2,
-        0.45862918000000003,
     ],
     [
+        '#VALUE!',
         1.5,
         'XYZ',
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         'ABC',
         3,
-        '#VALUE!',
     ],
     [
+        -0.13737753,
         -3.5,
         1,
-        -0.13737753,
     ],
     [
+        -0.34323577999999999,
         -0.73499999999999999,
         1,
-        -0.34323577999999999,
     ],
     [
+        0.0,
         0,
         1,
-        0.0,
     ],
     [
+        0.01749732,
         0.035000000000000003,
         1,
-        0.01749732,
     ],
     [
+        0.55793651,
         1.5,
         1,
-        0.55793651,
     ],
     [
+        0.49709409999999998,
         2.5,
         1,
-        0.49709409999999998,
     ],
     [
+        0.13737753,
         3.5,
         1,
-        0.13737753,
     ],
     [
+        0.14484733999999999,
         -9,
         2,
-        0.14484733999999999,
     ],
     [
+        0.064538960000000006,
         -0.73499999999999999,
         2,
-        0.064538960000000006,
     ],
     [
+        0.0,
         0,
         2,
-        0.0,
     ],
     [
+        0.094586299999999998,
         0.90000000000000002,
         2,
-        0.094586299999999998,
     ],
     [
+        0.32992572999999997,
         1.8999999999999999,
         2,
-        0.32992572999999997,
     ],
     [
+        0.00015311,
         0.035000000000000003,
         2,
-        0.00015311,
     ],
     [
+        0.45862918000000003,
         3.5,
         2,
-        0.45862918000000003,
     ],
     [
+        0.36412814999999998,
         4,
         2,
-        0.36412814999999998,
     ],
     [
+        8.8999999999999995E-7,
         0.035000000000000003,
         3,
-        8.8999999999999995E-7,
     ],
     [
+        0.0069296499999999999,
         0.69999999999999996,
         3,
-        0.0069296499999999999,
     ],
     [
+        0.013974,
         0.89000000000000001,
         3,
-        0.013974,
     ],
     [
+        0.43017147,
         4,
         3,
-        0.43017147,
     ],
     [
+        0.13208665999999999,
         4,
         5,
-        0.13208665999999999,
     ],
     [
+        2.4680000000000001E-5,
         1.5,
         7,
-        2.4680000000000001E-5,
     ],
     [
+        8.4400000000000005E-5,
         3,
         9,
-        8.4400000000000005E-5,
     ],
 ];

tests/data/Calculation/Engineering/BESSELK.php

@@ -2,193 +2,193 @@
 
 return [
     [
+        '#NUM!',
         1.5,
         -1,
-        '#NUM!',
     ],
     [
+        '#NUM!',
         0,
         2,
-        '#NUM!',
     ],
     [
+        7990.0124327800004,
         0.10000000000000001,
         3,
-        7990.0124327800004,
     ],
     [
+        0.42102444,
         1,
         0,
-        0.42102444,
     ],
     [
+        0.21380557,
         1.5,
         0,
-        0.21380557,
     ],
     [
+        '#NUM!',
         -1.5,
         2,
-        '#NUM!',
     ],
     [
+        0.27738780000000002,
         1.5,
         1,
-        0.27738780000000002,
     ],
     [
+        0.58365597000000002,
         1.5,
         2,
-        0.58365597000000002,
     ],
     [
+        0.094982449999999996,
         2.2999999999999998,
         1.5,
-        0.094982449999999996,
     ],
     [
+        0.073890819999999996,
         2.5,
         1,
-        0.073890819999999996,
     ],
     [
+        0.022239390000000001,
         3.5,
         1,
-        0.022239390000000001,
     ],
     [
+        0.059161819999999997,
         3.5,
         3,
-        0.059161819999999997,
     ],
     [
+        397.95880105999998,
         3,
         9,
-        397.95880105999998,
     ],
     [
+        0.032307120000000002,
         3.5,
         2,
-        0.032307120000000002,
     ],
     [
+        '#VALUE!',
         1.5,
         'XYZ',
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         'ABC',
         3,
-        '#VALUE!',
     ],
     [
+        '#NUM!',
         -3.5,
         1,
-        '#NUM!',
     ],
     [
+        '#NUM!',
         -0.73499999999999999,
         1,
-        '#NUM!',
     ],
     [
+        '#NUM!',
         0,
         1,
-        '#NUM!',
     ],
     [
+        28.50197,
         0.035000000000000003,
         1,
-        28.50197,
     ],
     [
+        0.27738780000000002,
         1.5,
         1,
-        0.27738780000000002,
     ],
     [
+        0.073890819999999996,
         2.5,
         1,
-        0.073890819999999996,
     ],
     [
+        0.022239390000000001,
         3.5,
         1,
-        0.022239390000000001,
     ],
     [
+        '#NUM!',
         -9,
         2,
-        '#NUM!',
     ],
     [
+        '#NUM!',
         -0.73499999999999999,
         2,
-        '#NUM!',
     ],
     [
+        '#NUM!',
         0,
         2,
-        '#NUM!',
     ],
     [
+        2.0790271499999999,
         0.90000000000000002,
         2,
-        2.0790271499999999,
     ],
     [
+        0.29690929999999999,
         1.8999999999999999,
         2,
-        0.29690929999999999,
     ],
     [
+        1632.1537072900001,
         0.035000000000000003,
         2,
-        1632.1537072900001,
     ],
     [
+        0.032307120000000002,
         3.5,
         2,
-        0.032307120000000002,
     ],
     [
+        0.017401429999999999,
         4,
         2,
-        0.017401429999999999,
     ],
     [
+        186560.35423214,
         0.035000000000000003,
         3,
-        186560.35423214,
     ],
     [
+        21.972169050000002,
         0.69999999999999996,
         3,
-        21.972169050000002,
     ],
     [
+        10.31747315,
         0.89000000000000001,
         3,
-        10.31747315,
     ],
     [
+        0.029884919999999999,
         4,
         3,
-        0.029884919999999999,
     ],
     [
+        0.15434255,
         4,
         5,
-        0.15434255,
     ],
     [
+        2457.7004395499998,
         1.5,
         7,
-        2457.7004395499998,
     ],
     [
+        397.95880105999998,
         3,
         9,
-        397.95880105999998,
     ],
 ];

tests/data/Calculation/Engineering/BESSELY.php

@@ -2,118 +2,118 @@
 
 return [
     [
+        '#NUM!',
         1.5,
         -1,
-        '#NUM!',
     ],
     [
+        0.49807035999999999,
         2.5,
         0,
-        0.49807035999999999,
     ],
     [
+        0.14591814,
         2.5,
         1,
-        0.14591814,
     ],
     [
+        -0.38133584999999998,
         2.5,
         2,
-        -0.38133584999999998,
     ],
     [
+        0.41018842,
         3.5,
         1,
-        0.41018842,
     ],
     [
+        -0.35833535,
         3.5,
         3,
-        -0.35833535,
     ],
     [
+        0.045371439999999999,
         3.5,
         2,
-        0.045371439999999999,
     ],
     [
+        -0.17121431000000001,
         12.5,
         0,
-        -0.17121431000000001,
     ],
     [
+        '#VALUE!',
         1.5,
         'XYZ',
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         'ABC',
         3,
-        '#VALUE!',
     ],
     [
+        '#NUM!',
         -3.5,
         1,
-        '#NUM!',
     ],
     [
+        '#NUM!',
         -0.73499999999999999,
         1,
-        '#NUM!',
     ],
     [
+        '#NUM!',
         0,
         1,
-        '#NUM!',
     ],
     [
+        -0.41230863000000001,
         1.5,
         1,
-        -0.41230863000000001,
     ],
     [
+        0.14591814,
         2.5,
         1,
-        0.14591814,
     ],
     [
+        0.41018842,
         3.5,
         1,
-        0.41018842,
     ],
     [
+        '#NUM!',
         -9,
         2,
-        '#NUM!',
     ],
     [
+        '#NUM!',
         -0.73499999999999999,
         2,
-        '#NUM!',
     ],
     [
+        '#NUM!',
         0,
         2,
-        '#NUM!',
     ],
     [
+        -1.9459096,
         0.90000000000000002,
         2,
-        -1.9459096,
     ],
     [
+        -0.66987867999999995,
         1.8999999999999999,
         2,
-        -0.66987867999999995,
     ],
     [
+        0.045371439999999999,
         3.5,
         2,
-        0.045371439999999999,
     ],
     [
+        -0.79585141999999998,
         4,
         5,
-        -0.79585141999999998,
     ],
 ];

tests/data/Calculation/Engineering/BIN2DEC.php

@@ -2,25 +2,25 @@
 
 return [
     [
-        '10110010',
         '178',
+        '10110010',
     ],
     [
-        '1100100',
         '100',
+        '1100100',
     ],
     // Too large
     [
-        '111001010101',
         '#NUM!',
+        '111001010101',
     ],
     [
-        '101',
         '5',
+        '101',
     ],
     [
-        '10',
         '2',
+        '10',
     ],
     [
         '0',
@@ -28,22 +28,22 @@ return [
     ],
     // Invalid binary number
     [
-        '21',
         '#NUM!',
+        '21',
     ],
     // Non string
     [
-        true,
         '#VALUE!',
+        true,
     ],
     // 2's Complement
     [
-        '1110010101',
         '-107',
+        '1110010101',
     ],
     // 2's Complement
     [
-        '1111111111',
         '-1',
+        '1111111111',
     ],
 ];

tests/data/Calculation/Engineering/BIN2HEX.php

@@ -2,49 +2,49 @@
 
 return [
     [
-        '10110010',
         'B2',
+        '10110010',
     ],
     // Too large
     [
-        '111001010101',
         '#NUM!',
+        '111001010101',
     ],
     // Leading places
     [
+        '00FB',
         '11111011',
         4,
-        '00FB',
     ],
     // Leading places as a float
     [
+        '0FB',
         '11111011',
         3.75,
-        '0FB',
     ],
     // Leading places negative
     [
+        '#NUM!',
         '11111011',
         -1,
-        '#NUM!',
     ],
     // Leading places non-numeric
     [
+        '#VALUE!',
         '11111011',
         'ABC',
-        '#VALUE!',
     ],
     [
-        '1110',
         'E',
+        '1110',
     ],
     [
-        '101',
         '5',
+        '101',
     ],
     [
-        '10',
         '2',
+        '10',
     ],
     [
         '0',
@@ -52,22 +52,22 @@ return [
     ],
     // Invalid binary number
     [
-        '21',
         '#NUM!',
+        '21',
     ],
     // Non string
     [
-        true,
         '#VALUE!',
+        true,
     ],
     // 2's Complement
     [
-        '1110010101',
         'FFFFFFFF95',
+        '1110010101',
     ],
     // 2's Complement
     [
-        '1111111111',
         'FFFFFFFFFF',
+        '1111111111',
     ],
 ];

tests/data/Calculation/Engineering/BIN2OCT.php

@@ -2,53 +2,53 @@
 
 return [
     [
-        '1100100',
         '144',
+        '1100100',
     ],
     [
-        '10110010',
         '262',
+        '10110010',
     ],
     // Too large
     [
-        '111001010101',
         '#NUM!',
+        '111001010101',
     ],
     // Leading places
     [
+        '011',
         '1001',
         3,
-        '011',
     ],
     // Leading places as a float
     [
+        '0011',
         '1001',
         4.75,
-        '0011',
     ],
     // Leading places negative
     [
+        '#NUM!',
         '1001',
         -1,
-        '#NUM!',
     ],
     // Leading places non-numeric
     [
+        '#VALUE!',
         '1001',
         'ABC',
-        '#VALUE!',
     ],
     [
-        '00000010',
         '2',
+        '00000010',
     ],
     [
-        '00000101',
         '5',
+        '00000101',
     ],
     [
-        '00001101',
         '15',
+        '00001101',
     ],
     [
         '0',
@@ -56,22 +56,22 @@ return [
     ],
     // Invalid binary number
     [
-        '21',
         '#NUM!',
+        '21',
     ],
     // Non string
     [
-        true,
         '#VALUE!',
+        true,
     ],
     // 2's Complement
     [
-        '1110010101',
         '7777777625',
+        '1110010101',
     ],
     // 2's Complement
     [
-        '1111111111',
         '7777777777',
+        '1111111111',
     ],
 ];

tests/data/Calculation/Engineering/CONVERTUOM.php

@@ -2,147 +2,147 @@
 
 return [
     [
+        0.45359230974880999,
         1.0,
         'lbm',
         'kg',
-        0.45359230974880999,
     ],
     [
         123.45,
-        'kg',
-        'kg',
         123.45,
-    ],
+        'kg',
-    [
+        'kg',
-        68,
-        'F',
-        'C',
-        20,
     ],
     [
+        20,
+        68,
+        'F',
+        'C',
+    ],
+    [
+        68,
         20,
         'C',
         'F',
-        68,
-    ],
-    [
-        68,
-        'F',
-        'K',
-        293.14999999999998,
     ],
     [
         293.14999999999998,
-        'K',
-        'F',
         68,
+        'F',
+        'K',
     ],
     [
+        68,
+        293.14999999999998,
+        'K',
+        'F',
+    ],
+    [
+        295.14999999999998,
         22,
         'C',
         'K',
-        295.14999999999998,
     ],
     [
+        22.5,
         295.64999999999998,
         'K',
         'C',
-        22.5,
     ],
     [
+        '#N/A',
         2.5,
         'ft',
         'sec',
-        '#N/A',
-    ],
-    [
-        12345,
-        'm',
-        'km',
-        12.345000000000001,
     ],
     [
         12.345000000000001,
-        'km',
-        'm',
         12345,
+        'm',
+        'km',
     ],
     [
+        12345,
+        12.345000000000001,
+        'km',
+        'm',
+    ],
+    [
+        0.62137119223732995,
         1,
         'km',
         'mi',
-        0.62137119223732995,
     ],
     [
+        '#VALUE!',
         'three',
         'ft',
         'yds',
-        '#VALUE!',
     ],
     [
+        123.45,
         123.45,
         'K',
         'kel',
-        123.45,
     ],
     [
+        123.45,
         123.45,
         'C',
         'cel',
-        123.45,
     ],
     [
+        123.45,
         123.45,
         'F',
         'fah',
-        123.45,
     ],
     [
+        '#N/A',
         1,
         'ft',
         'day',
-        '#N/A',
     ],
     [
         123.45,
-        'm',
-        'm',
         123.45,
+        'm',
+        'm',
     ],
     [
+        234.56,
         234.56,
         'km',
         'km',
-        234.56,
     ],
     [
+        '#N/A',
         234.56,
         'kpt',
         'lt',
-        '#N/A',
     ],
     [
+        '#N/A',
         234.56,
         'sm',
         'm',
-        '#N/A',
     ],
     [
+        '#N/A',
         234.56,
         'lt',
         'kpt',
-        '#N/A',
     ],
     [
+        '#N/A',
         234.56,
         'm',
         'sm',
-        '#N/A',
     ],
     [
+        12345000,
         12.345000000000001,
         'km',
         'mm',
-        12345000,
     ],
 ];

tests/data/Calculation/Engineering/DEC2BIN.php

@@ -2,90 +2,90 @@
 
 return [
     [
-        357,
         '101100101',
+        357,
     ],
     // Too large
     [
-        512,
         '#NUM!',
+        512,
     ],
     // Too small
     [
-        -513,
         '#NUM!',
+        -513,
     ],
     [
+        '1001',
         9,
         4,
-        '1001',
     ],
     [
+        '00001001',
         9,
         8,
-        '00001001',
     ],
     // Leading places as a float
     [
+        '001001',
         9,
         6.75,
-        '001001',
     ],
     // Leading places negative
     [
+        '#NUM!',
         9,
         -1,
-        '#NUM!',
     ],
     // Leading places non-numeric
     [
+        '#VALUE!',
         9,
         'ABC',
-        '#VALUE!',
     ],
     [
-        246,
         '11110110',
+        246,
     ],
     [
+        '#NUM!',
         12345,
-        '#NUM!',
     ],
     [
+        '#NUM!',
         123456789,
-        '#NUM!',
     ],
     [
-        123.45,
         '1111011',
+        123.45,
     ],
     [
-        0,
         '0',
+        0,
     ],
     // Invalid decimal
     [
-        '3579A',
         '#VALUE!',
+        '3579A',
     ],
     // Non string
     [
-        true,
         '#VALUE!',
+        true,
     ],
     // 2's Complement
     [
-        -100,
         '1110011100',
+        -100,
     ],
     // 2's Complement
     [
-        -107,
         '1110010101',
+        -107,
     ],
     // 2's Complement
     [
-        -512,
         '1000000000',
+        -512,
     ],
 ];

tests/data/Calculation/Engineering/DEC2HEX.php

@@ -2,51 +2,51 @@
 
 return [
     [
-        '357',
         '165',
+        '357',
     ],
     [
-        '1357',
         '54D',
+        '1357',
     ],
     [
-        '246',
         'F6',
+        '246',
     ],
     [
-        '12345',
         '3039',
+        '12345',
     ],
     [
-        '123456789',
         '75BCD15',
+        '123456789',
     ],
     [
+        '0064',
         '100',
         4,
-        '0064',
     ],
     // Leading places as a float
     [
+        '00064',
         '100',
         5.75,
-        '00064',
     ],
     // Leading places negative
     [
+        '#NUM!',
         '100',
         -1,
-        '#NUM!',
     ],
     // Leading places non-numeric
     [
+        '#VALUE!',
         '100',
         'ABC',
-        '#VALUE!',
     ],
     [
-        '123.45',
         '7B',
+        '123.45',
     ],
     [
         '0',
@@ -54,22 +54,22 @@ return [
     ],
     // Invalid decimal
     [
-        '3579A',
         '#VALUE!',
+        '3579A',
     ],
     // Non string
     [
-        true,
         '#VALUE!',
+        true,
     ],
     // 2's Complement
     [
-        '-54',
         'FFFFFFFFCA',
+        '-54',
     ],
     // 2's Complement
     [
-        '-107',
         'FFFFFFFF95',
+        '-107',
     ],
 ];

tests/data/Calculation/Engineering/DEC2OCT.php

@@ -2,33 +2,33 @@
 
 return [
     [
-        '357',
         '545',
+        '357',
     ],
     [
-        '1357',
         '2515',
+        '1357',
     ],
     [
-        '246',
         '366',
+        '246',
     ],
     [
-        '12345',
         '30071',
+        '12345',
     ],
     [
-        '123456789',
         '726746425',
+        '123456789',
     ],
     [
-        '123.45',
         '173',
+        '123.45',
     ],
     [
+        '072',
         '58',
         3,
-        '072',
     ],
     [
         '0',
@@ -36,22 +36,22 @@ return [
     ],
     // Invalid decimal
     [
-        '3579A',
         '#VALUE!',
+        '3579A',
     ],
     // Non string
     [
-        true,
         '#VALUE!',
+        true,
     ],
     // 2's Complement
     [
-        '-100',
         '7777777634',
+        '-100',
     ],
     // 2's Complement
     [
-        '-107',
         '7777777625',
+        '-107',
     ],
 ];

tests/data/Calculation/Engineering/DELTA.php

@@ -2,128 +2,128 @@
 
 return [
     [
-        -1.5,
-        -1.5,
         1,
+        -1.5,
+        -1.5,
     ],
     [
+        0,
         -0.75,
         -1.5,
-        0,
     ],
     [
+        0,
         0,
         -1.5,
-        0,
     ],
     [
+        0,
         0.75,
         -1.5,
-        0,
     ],
     [
+        0,
         1.5,
         -1.5,
-        0,
     ],
     [
+        0,
         -1.5,
         -0.75,
-        0,
     ],
     [
-        -0.75,
-        -0.75,
         1,
+        -0.75,
+        -0.75,
     ],
     [
+        0,
         0,
         -0.75,
-        0,
     ],
     [
+        0,
         0.75,
         -0.75,
-        0,
     ],
     [
+        0,
         1.5,
         -0.75,
-        0,
     ],
     [
+        0,
         -1.5,
         0,
-        0,
     ],
     [
+        0,
         -0.75,
         0,
-        0,
     ],
     [
-        0,
-        0,
         1,
+        0,
+        0,
     ],
     [
+        0,
         0.75,
         0,
-        0,
     ],
     [
+        0,
         1.5,
         0,
-        0,
     ],
     [
+        0,
         -1.5,
         0.75,
-        0,
     ],
     [
+        0,
         -0.75,
         0.75,
-        0,
     ],
     [
         0,
-        0.75,
         0,
+        0.75,
     ],
     [
-        0.75,
-        0.75,
         1,
+        0.75,
+        0.75,
     ],
     [
+        0,
         1.5,
         0.75,
-        0,
     ],
     [
+        0,
         -1.5,
         1.5,
-        0,
     ],
     [
+        0,
         -0.75,
         1.5,
-        0,
     ],
     [
+        0,
         0,
         1.5,
-        0,
     ],
     [
+        0,
         0.75,
         1.5,
-        0,
     ],
     [
-        1.5,
-        1.5,
         1,
+        1.5,
+        1.5,
     ],
 ];

tests/data/Calculation/Engineering/ERF.php

@@ -4,578 +4,578 @@
 
 return [
     [
-        0,
         0.0,
+        0,
     ],
     [
-        0.01,
         0.0112834155558496,
+        0.01,
     ],
     [
-        0.050000000000000003,
         0.056371977797016602,
+        0.050000000000000003,
     ],
     [
-        0.10000000000000001,
         0.11246291601828499,
+        0.10000000000000001,
     ],
     [
-        0.125,
         0.140316204801334,
+        0.125,
     ],
     [
-        0.14999999999999999,
         0.167995971427363,
+        0.14999999999999999,
     ],
     [
-        0.20000000000000001,
         0.222702589210478,
+        0.20000000000000001,
     ],
     [
-        0.25,
         0.27632639016823701,
+        0.25,
     ],
     [
-        0.29999999999999999,
         0.328626759459127,
+        0.29999999999999999,
     ],
     [
-        0.34999999999999998,
         0.37938205356230997,
+        0.34999999999999998,
     ],
     [
-        0.40000000000000002,
         0.42839235504666801,
+        0.40000000000000002,
     ],
     [
-        0.45000000000000001,
         0.475481719786924,
+        0.45000000000000001,
     ],
     [
-        0.5,
         0.52049987781304696,
+        0.5,
     ],
     [
-        0.59999999999999998,
         0.60385609084792602,
+        0.59999999999999998,
     ],
     [
-        0.69999999999999996,
         0.67780119383741799,
+        0.69999999999999996,
     ],
     [
-        0.80000000000000004,
         0.74210096470766096,
+        0.80000000000000004,
     ],
     [
-        0.90000000000000002,
         0.79690821242283205,
+        0.90000000000000002,
     ],
     [
-        1,
         0.84270079294971501,
+        1,
     ],
     [
-        1.1000000000000001,
         0.88020506957408196,
+        1.1000000000000001,
     ],
     [
-        1.2,
         0.910313978229635,
+        1.2,
     ],
     [
-        1.3,
         0.93400794494065198,
+        1.3,
     ],
     [
-        1.3999999999999999,
         0.95228511976264896,
+        1.3999999999999999,
     ],
     [
-        1.5,
         0.96610514647531098,
+        1.5,
     ],
     [
-        1.75,
         0.98667167121918198,
+        1.75,
     ],
     [
+        0.99532226501895305,
         2,
-        0.99532226501895305,
     ],
     [
-        2.5,
         0.99959304798255499,
+        2.5,
     ],
     [
-        3,
         0.99997790950300103,
+        3,
     ],
     [
-        3.5,
         0.99999925690162805,
+        3.5,
     ],
     [
-        4,
         0.99999998458274197,
+        4,
     ],
     [
-        4.5,
         0.99999999980338405,
+        4.5,
     ],
     [
-        5,
         0.99999999999846301,
+        5,
     ],
     [
-        5.5,
         0.99999999999999301,
+        5.5,
     ],
     [
+        1.0,
         6,
-        1.0,
     ],
     [
+        1.0,
         32,
-        1.0,
     ],
     [
-        -0.10000000000000001,
         -0.11246291601828499,
+        -0.10000000000000001,
     ],
     [
-        -1,
         -0.84270079294971501,
+        -1,
     ],
     [
+        '#VALUE!',
         true,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         false,
-        '#VALUE!',
     ],
     [
-        '2',
         0.99532226501895305,
+        '2',
     ],
     [
-        'TWO',
         '#VALUE!',
+        'TWO',
     ],
     [
-        -1.5,
-        -1.5,
         0.0,
+        -1.5,
+        -1.5,
     ],
     [
+        -0.25494951282179601,
         -0.75,
         -1.5,
-        -0.25494951282179601,
     ],
     [
+        -0.96610514647531098,
         0,
         -1.5,
-        -0.96610514647531098,
     ],
     [
+        -1.67726078012883,
         0.75,
         -1.5,
-        -1.67726078012883,
     ],
     [
-        1.5,
-        -1.5,
         -1.93221029295062,
+        1.5,
+        -1.5,
     ],
     [
-        2.25,
-        -1.5,
         -1.96464242988863,
+        2.25,
+        -1.5,
     ],
     [
-        3,
-        -1.5,
         -1.96608305597831,
+        3,
+        -1.5,
     ],
     [
-        3.75,
-        -1.5,
         -1.96610503274805,
+        3.75,
+        -1.5,
     ],
     [
-        4.5,
-        -1.5,
         -1.96610514627869,
+        4.5,
+        -1.5,
     ],
     [
+        0.25494951282179601,
         -1.5,
         -0.75,
-        0.25494951282179601,
     ],
     [
-        -0.75,
-        -0.75,
         0.0,
+        -0.75,
+        -0.75,
     ],
     [
+        -0.71115563365351497,
         0,
         -0.75,
-        -0.71115563365351497,
     ],
     [
-        0.75,
-        -0.75,
         -1.4223112673070299,
+        0.75,
+        -0.75,
     ],
     [
-        1.5,
-        -0.75,
         -1.67726078012883,
+        1.5,
+        -0.75,
     ],
     [
-        2.25,
-        -0.75,
         -1.70969291706683,
+        2.25,
+        -0.75,
     ],
     [
-        3,
-        -0.75,
         -1.71113354315652,
+        3,
+        -0.75,
     ],
     [
-        3.75,
-        -0.75,
         -1.71115551992626,
+        3.75,
+        -0.75,
     ],
     [
-        4.5,
-        -0.75,
         -1.7111556334569,
+        4.5,
+        -0.75,
     ],
     [
+        0.96610514647531098,
         -1.5,
         0,
-        0.96610514647531098,
     ],
     [
+        0.71115563365351497,
         -0.75,
         0,
-        0.71115563365351497,
     ],
     [
-        0,
-        0,
         0.0,
+        0,
+        0,
     ],
     [
-        0.75,
-        0,
         -0.71115563365351497,
+        0.75,
+        0,
     ],
     [
-        1.5,
-        0,
         -0.96610514647531098,
+        1.5,
+        0,
     ],
     [
-        2.25,
-        0,
         -0.99853728341331904,
+        2.25,
+        0,
     ],
     [
-        3,
-        0,
         -0.99997790950300103,
+        3,
+        0,
     ],
     [
-        3.75,
-        0,
         -0.99999988627274305,
+        3.75,
+        0,
     ],
     [
-        4.5,
-        0,
         -0.99999999980338405,
+        4.5,
+        0,
     ],
     [
+        1.67726078012883,
         -1.5,
         0.75,
-        1.67726078012883,
     ],
     [
-        -0.75,
-        0.75,
         1.4223112673070299,
+        -0.75,
+        0.75,
     ],
     [
-        0,
-        0.75,
         0.71115563365351497,
+        0,
+        0.75,
     ],
     [
-        0.75,
-        0.75,
         0.0,
+        0.75,
+        0.75,
     ],
     [
-        1.5,
-        0.75,
         -0.25494951282179601,
+        1.5,
+        0.75,
     ],
     [
-        2.25,
-        0.75,
         -0.28738164975980401,
+        2.25,
+        0.75,
     ],
     [
-        3,
-        0.75,
         -0.288822275849486,
+        3,
+        0.75,
     ],
     [
-        3.75,
-        0.75,
         -0.28884425261922803,
+        3.75,
+        0.75,
     ],
     [
-        4.5,
-        0.75,
         -0.28884436614986903,
+        4.5,
+        0.75,
     ],
     [
-        -1.5,
-        1.5,
         1.93221029295062,
+        -1.5,
+        1.5,
     ],
     [
-        -0.75,
-        1.5,
         1.67726078012883,
+        -0.75,
+        1.5,
     ],
     [
-        0,
-        1.5,
         0.96610514647531098,
+        0,
+        1.5,
     ],
     [
-        0.75,
-        1.5,
         0.25494951282179601,
+        0.75,
+        1.5,
     ],
     [
-        1.5,
-        1.5,
         0.0,
+        1.5,
+        1.5,
     ],
     [
-        2.25,
-        1.5,
         -0.032432136938008102,
+        2.25,
+        1.5,
     ],
     [
-        3,
-        1.5,
         -0.0338727630276906,
+        3,
+        1.5,
     ],
     [
-        3.75,
-        1.5,
         -0.033894739797432599,
+        3.75,
+        1.5,
     ],
     [
-        4.5,
-        1.5,
         -0.033894853328073203,
+        4.5,
+        1.5,
     ],
     [
-        -1.5,
-        2.25,
         1.96464242988863,
+        -1.5,
+        2.25,
     ],
     [
-        -0.75,
-        2.25,
         1.70969291706683,
+        -0.75,
+        2.25,
     ],
     [
-        0,
-        2.25,
         0.99853728341331904,
+        0,
+        2.25,
     ],
     [
-        0.75,
-        2.25,
         0.28738164975980401,
+        0.75,
+        2.25,
     ],
     [
-        1.5,
-        2.25,
         0.032432136938008102,
+        1.5,
+        2.25,
     ],
     [
-        2.25,
-        2.25,
         0.0,
+        2.25,
+        2.25,
     ],
     [
-        3,
-        2.25,
         -0.0014406260896824999,
+        3,
+        2.25,
     ],
     [
-        3.75,
-        2.25,
         -0.0014626028594246,
+        3.75,
+        2.25,
     ],
     [
-        4.5,
-        2.25,
         -0.0014627163900651,
+        4.5,
+        2.25,
     ],
     [
-        -1.5,
-        3,
         1.96608305597831,
+        -1.5,
+        3,
     ],
     [
-        -0.75,
-        3,
         1.71113354315652,
+        -0.75,
+        3,
     ],
     [
-        0,
-        3,
         0.99997790950300103,
+        0,
+        3,
     ],
     [
-        0.75,
-        3,
         0.288822275849486,
+        0.75,
+        3,
     ],
     [
-        1.5,
-        3,
         0.0338727630276906,
+        1.5,
+        3,
     ],
     [
-        2.25,
-        3,
         0.0014406260896824999,
+        2.25,
+        3,
     ],
     [
-        3,
-        3,
         0.0,
+        3,
+        3,
     ],
     [
-        3.75,
-        3,
         -2.1976769741999999E-5,
+        3.75,
+        3,
     ],
     [
-        4.5,
-        3,
         -2.2090300382599999E-5,
+        4.5,
+        3,
     ],
     [
-        -1.5,
-        3.75,
         1.96610503274805,
+        -1.5,
+        3.75,
     ],
     [
+        1.71115551992626,
         -0.75,
         3.75,
-        1.71115551992626,
     ],
     [
+        0.99999988627274305,
         0,
         3.75,
-        0.99999988627274305,
     ],
     [
+        0.28884425261922803,
         0.75,
         3.75,
-        0.28884425261922803,
     ],
     [
+        0.033894739797432599,
         1.5,
         3.75,
-        0.033894739797432599,
     ],
     [
+        0.0014626028594246,
         2.25,
         3.75,
-        0.0014626028594246,
     ],
     [
+        2.1976769741999999E-5,
         3,
         3.75,
-        2.1976769741999999E-5,
     ],
     [
-        3.75,
-        3.75,
         0.0,
+        3.75,
+        3.75,
     ],
     [
+        -1.135306406E-7,
         4.5,
         3.75,
-        -1.135306406E-7,
     ],
     [
+        1.96610514627869,
         -1.5,
         4.5,
-        1.96610514627869,
     ],
     [
+        1.7111556334569,
         -0.75,
         4.5,
-        1.7111556334569,
     ],
     [
+        0.99999999980338405,
         0,
         4.5,
-        0.99999999980338405,
     ],
     [
+        0.28884436614986903,
         0.75,
         4.5,
-        0.28884436614986903,
     ],
     [
+        0.033894853328073203,
         1.5,
         4.5,
-        0.033894853328073203,
     ],
     [
+        0.0014627163900651,
         2.25,
         4.5,
-        0.0014627163900651,
     ],
     [
+        2.2090300382599999E-5,
         3,
         4.5,
-        2.2090300382599999E-5,
     ],
     [
+        1.135306406E-7,
         3.75,
         4.5,
-        1.135306406E-7,
     ],
     [
-        4.5,
-        4.5,
         0.0,
+        4.5,
+        4.5,
     ],
     [
+        -1.84270079294818,
         5,
         -1,
-        -1.84270079294818,
     ],
     [
+        1.84270079294818,
         -5,
         1,
-        1.84270079294818,
     ],
 ];

tests/data/Calculation/Engineering/ERFC.php

@@ -4,163 +4,163 @@
 
 return [
     [
-        0,
         1.0,
+        0,
     ],
     [
-        0.01,
         0.98871658444415,
+        0.01,
     ],
     [
-        0.050000000000000003,
         0.94362802220298303,
+        0.050000000000000003,
     ],
     [
-        0.10000000000000001,
         0.88753708398171505,
+        0.10000000000000001,
     ],
     [
-        0.125,
         0.859683795198666,
+        0.125,
     ],
     [
-        0.14999999999999999,
         0.832004028572636,
+        0.14999999999999999,
     ],
     [
-        0.20000000000000001,
         0.77729741078952197,
+        0.20000000000000001,
     ],
     [
-        0.25,
         0.72367360983176299,
+        0.25,
     ],
     [
-        0.29999999999999999,
         0.671373240540873,
+        0.29999999999999999,
     ],
     [
-        0.34999999999999998,
         0.62061794643768997,
+        0.34999999999999998,
     ],
     [
-        0.40000000000000002,
         0.57160764495333205,
+        0.40000000000000002,
     ],
     [
-        0.45000000000000001,
         0.524518280213076,
+        0.45000000000000001,
     ],
     [
-        0.5,
         0.47950012218695298,
+        0.5,
     ],
     [
-        0.59999999999999998,
         0.39614390915207398,
+        0.59999999999999998,
     ],
     [
-        0.69999999999999996,
         0.32219880616258201,
+        0.69999999999999996,
     ],
     [
-        0.80000000000000004,
         0.25789903529233899,
+        0.80000000000000004,
     ],
     [
-        0.90000000000000002,
         0.203091787577168,
+        0.90000000000000002,
     ],
     [
-        1,
         0.15729920705028499,
+        1,
     ],
     [
-        1.1000000000000001,
         0.119794930425918,
+        1.1000000000000001,
     ],
     [
-        1.2,
         0.089686021770364596,
+        1.2,
     ],
     [
-        1.3,
         0.065992055059347507,
+        1.3,
     ],
     [
-        1.3999999999999999,
         0.047714880237351202,
+        1.3999999999999999,
     ],
     [
-        1.5,
         0.033894853524689302,
+        1.5,
     ],
     [
-        1.75,
         0.0133283287808176,
+        1.75,
     ],
     [
+        0.0046777349810473001,
         2,
-        0.0046777349810473001,
     ],
     [
-        2.5,
         0.00040695201744500001,
+        2.5,
     ],
     [
-        3,
         2.20904969986E-5,
+        3,
     ],
     [
-        3.5,
         7.4309837229999996E-7,
+        3.5,
     ],
     [
-        4,
         1.54172579E-8,
+        4,
     ],
     [
-        4.5,
         1.9661600000000001E-10,
+        4.5,
     ],
     [
-        5,
         1.5375000000000001E-12,
+        5,
     ],
     [
-        5.5,
         7.4000000000000003E-15,
+        5.5,
     ],
     [
+        0.0,
         6,
-        0.0,
     ],
     [
+        0.0,
         32,
-        0.0,
     ],
     [
-        -0.10000000000000001,
         1.1124629160182899,
+        -0.10000000000000001,
     ],
     [
-        -1,
         1.8427007929497099,
+        -1,
     ],
     [
+        '#VALUE!',
         true,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         false,
-        '#VALUE!',
     ],
     [
-        '2',
         0.0046777349810473001,
+        '2',
     ],
     [
-        'TWO',
         '#VALUE!',
+        'TWO',
     ],
 ];

tests/data/Calculation/Engineering/GESTEP.php

@@ -2,408 +2,408 @@
 
 return [
     [
-        -1.5,
-        -1.5,
         1,
+        -1.5,
+        -1.5,
     ],
     [
+        1,
         -0.75,
         -1.5,
-        1,
     ],
     [
+        1,
         0,
         -1.5,
-        1,
     ],
     [
+        1,
         0.75,
         -1.5,
-        1,
     ],
     [
+        1,
         1.5,
         -1.5,
-        1,
     ],
     [
+        1,
         2.25,
         -1.5,
-        1,
     ],
     [
+        1,
         3,
         -1.5,
-        1,
     ],
     [
+        1,
         3.75,
         -1.5,
-        1,
     ],
     [
+        1,
         4.5,
         -1.5,
-        1,
     ],
     [
+        0,
         -1.5,
         -0.75,
-        0,
     ],
     [
-        -0.75,
-        -0.75,
         1,
+        -0.75,
+        -0.75,
     ],
     [
+        1,
         0,
         -0.75,
-        1,
     ],
     [
+        1,
         0.75,
         -0.75,
-        1,
     ],
     [
+        1,
         1.5,
         -0.75,
-        1,
     ],
     [
+        1,
         2.25,
         -0.75,
-        1,
     ],
     [
+        1,
         3,
         -0.75,
-        1,
     ],
     [
+        1,
         3.75,
         -0.75,
-        1,
     ],
     [
+        1,
         4.5,
         -0.75,
-        1,
     ],
     [
+        0,
         -1.5,
         0,
-        0,
     ],
     [
+        0,
         -0.75,
         0,
-        0,
     ],
     [
-        0,
-        0,
         1,
-    ],
-    [
-        0.75,
         0,
-        1,
-    ],
-    [
-        1.5,
         0,
-        1,
     ],
     [
-        2.25,
-        0,
         1,
-    ],
-    [
-        3,
-        0,
-        1,
-    ],
-    [
-        3.75,
-        0,
-        1,
-    ],
-    [
-        4.5,
-        0,
-        1,
-    ],
-    [
-        -1.5,
         0.75,
         0,
     ],
     [
-        -0.75,
-        0.75,
-        0,
-    ],
-    [
-        0,
-        0.75,
-        0,
-    ],
-    [
-        0.75,
-        0.75,
         1,
-    ],
-    [
-        1.5,
-        0.75,
-        1,
-    ],
-    [
-        2.25,
-        0.75,
-        1,
-    ],
-    [
-        3,
-        0.75,
-        1,
-    ],
-    [
-        3.75,
-        0.75,
-        1,
-    ],
-    [
-        4.5,
-        0.75,
-        1,
-    ],
-    [
-        -1.5,
         1.5,
         0,
     ],
     [
-        -0.75,
-        1.5,
-        0,
-    ],
-    [
-        0,
-        1.5,
-        0,
-    ],
-    [
-        0.75,
-        1.5,
-        0,
-    ],
-    [
-        1.5,
-        1.5,
         1,
-    ],
-    [
-        2.25,
-        1.5,
-        1,
-    ],
-    [
-        3,
-        1.5,
-        1,
-    ],
-    [
-        3.75,
-        1.5,
-        1,
-    ],
-    [
-        4.5,
-        1.5,
-        1,
-    ],
-    [
-        -1.5,
         2.25,
         0,
     ],
     [
-        -0.75,
-        2.25,
-        0,
-    ],
-    [
-        0,
-        2.25,
-        0,
-    ],
-    [
-        0.75,
-        2.25,
-        0,
-    ],
-    [
-        1.5,
-        2.25,
-        0,
-    ],
-    [
-        2.25,
-        2.25,
         1,
+        3,
+        0,
     ],
     [
-        3,
-        2.25,
         1,
+        3.75,
+        0,
     ],
     [
-        3.75,
-        2.25,
         1,
-    ],
-    [
-        4.5,
-        2.25,
-        1,
-    ],
-    [
-        -1.5,
-        3,
-        0,
-    ],
-    [
-        -0.75,
-        3,
-        0,
-    ],
-    [
-        0,
-        3,
-        0,
-    ],
-    [
-        0.75,
-        3,
-        0,
-    ],
-    [
-        1.5,
-        3,
-        0,
-    ],
-    [
-        2.25,
-        3,
-        0,
-    ],
-    [
-        3,
-        3,
-        1,
-    ],
-    [
-        3.75,
-        3,
-        1,
-    ],
-    [
-        4.5,
-        3,
-        1,
-    ],
-    [
-        -1.5,
-        3.75,
-        0,
-    ],
-    [
-        -0.75,
-        3.75,
-        0,
-    ],
-    [
-        0,
-        3.75,
-        0,
-    ],
-    [
-        0.75,
-        3.75,
-        0,
-    ],
-    [
-        1.5,
-        3.75,
-        0,
-    ],
-    [
-        2.25,
-        3.75,
-        0,
-    ],
-    [
-        3,
-        3.75,
-        0,
-    ],
-    [
-        3.75,
-        3.75,
-        1,
-    ],
-    [
-        4.5,
-        3.75,
-        1,
-    ],
-    [
-        -1.5,
-        4.5,
-        0,
-    ],
-    [
-        -0.75,
         4.5,
         0,
     ],
     [
         0,
-        4.5,
+        -1.5,
-        0,
+        0.75,
     ],
     [
+        0,
+        -0.75,
+        0.75,
+    ],
+    [
+        0,
+        0,
+        0.75,
+    ],
+    [
+        1,
+        0.75,
+        0.75,
+    ],
+    [
+        1,
+        1.5,
+        0.75,
+    ],
+    [
+        1,
+        2.25,
+        0.75,
+    ],
+    [
+        1,
+        3,
+        0.75,
+    ],
+    [
+        1,
+        3.75,
+        0.75,
+    ],
+    [
+        1,
+        4.5,
+        0.75,
+    ],
+    [
+        0,
+        -1.5,
+        1.5,
+    ],
+    [
+        0,
+        -0.75,
+        1.5,
+    ],
+    [
+        0,
+        0,
+        1.5,
+    ],
+    [
+        0,
+        0.75,
+        1.5,
+    ],
+    [
+        1,
+        1.5,
+        1.5,
+    ],
+    [
+        1,
+        2.25,
+        1.5,
+    ],
+    [
+        1,
+        3,
+        1.5,
+    ],
+    [
+        1,
+        3.75,
+        1.5,
+    ],
+    [
+        1,
+        4.5,
+        1.5,
+    ],
+    [
+        0,
+        -1.5,
+        2.25,
+    ],
+    [
+        0,
+        -0.75,
+        2.25,
+    ],
+    [
+        0,
+        0,
+        2.25,
+    ],
+    [
+        0,
+        0.75,
+        2.25,
+    ],
+    [
+        0,
+        1.5,
+        2.25,
+    ],
+    [
+        1,
+        2.25,
+        2.25,
+    ],
+    [
+        1,
+        3,
+        2.25,
+    ],
+    [
+        1,
+        3.75,
+        2.25,
+    ],
+    [
+        1,
+        4.5,
+        2.25,
+    ],
+    [
+        0,
+        -1.5,
+        3,
+    ],
+    [
+        0,
+        -0.75,
+        3,
+    ],
+    [
+        0,
+        0,
+        3,
+    ],
+    [
+        0,
+        0.75,
+        3,
+    ],
+    [
+        0,
+        1.5,
+        3,
+    ],
+    [
+        0,
+        2.25,
+        3,
+    ],
+    [
+        1,
+        3,
+        3,
+    ],
+    [
+        1,
+        3.75,
+        3,
+    ],
+    [
+        1,
+        4.5,
+        3,
+    ],
+    [
+        0,
+        -1.5,
+        3.75,
+    ],
+    [
+        0,
+        -0.75,
+        3.75,
+    ],
+    [
+        0,
+        0,
+        3.75,
+    ],
+    [
+        0,
+        0.75,
+        3.75,
+    ],
+    [
+        0,
+        1.5,
+        3.75,
+    ],
+    [
+        0,
+        2.25,
+        3.75,
+    ],
+    [
+        0,
+        3,
+        3.75,
+    ],
+    [
+        1,
+        3.75,
+        3.75,
+    ],
+    [
+        1,
+        4.5,
+        3.75,
+    ],
+    [
+        0,
+        -1.5,
+        4.5,
+    ],
+    [
+        0,
+        -0.75,
+        4.5,
+    ],
+    [
+        0,
+        0,
+        4.5,
+    ],
+    [
+        0,
         0.75,
         4.5,
-        0,
     ],
     [
+        0,
         1.5,
         4.5,
-        0,
     ],
     [
+        0,
         2.25,
         4.5,
-        0,
     ],
     [
+        0,
         3,
         4.5,
-        0,
     ],
     [
+        0,
         3.75,
         4.5,
-        0,
     ],
     [
-        4.5,
-        4.5,
         1,
+        4.5,
+        4.5,
     ],
 ];

tests/data/Calculation/Engineering/HEX2BIN.php

@@ -2,70 +2,70 @@
 
 return [
     [
-        'FF',
         '11111111',
+        'FF',
     ],
     [
-        '1FF',
         '111111111',
+        '1FF',
     ],
     [
+        '#NUM!',
         '200',
-        '#NUM!',
     ],
     // 2's Complement
     [
-        'FFFFFFFE00',
         '1000000000',
+        'FFFFFFFE00',
     ],
     // 2's Complement
     [
+        '#NUM!',
         'FFFFFFFDFF',
-        '#NUM!',
     ],
     [
-        '01AB',
         '110101011',
+        '01AB',
     ],
     [
-        'ABCD',
         '#NUM!',
+        'ABCD',
     ],
     [
-        'F6',
         '11110110',
+        'F6',
     ],
     [
+        '00001111',
         'F',
         8,
-        '00001111',
     ],
     [
-        'B7',
         '10110111',
+        'B7',
     ],
     [
+        '#NUM!',
         '12345',
-        '#NUM!',
     ],
     [
+        '#NUM!',
         '123456789',
-        '#NUM!',
     ],
     [
+        '#NUM!',
         '123.45',
+    ],
+    [
+        '0',
+        '0',
+    ],
+    [
         '#NUM!',
-    ],
-    [
-        '0',
-        '0',
-    ],
-    [
         'G3579A',
-        '#NUM!',
     ],
     [
-        true,
         '#VALUE!',
+        true,
     ],
 ];

tests/data/Calculation/Engineering/HEX2DEC.php

@@ -2,66 +2,66 @@
 
 return [
     [
-        '01AB',
         '427',
+        '01AB',
     ],
     [
-        'ABCD',
         '43981',
+        'ABCD',
     ],
     [
-        'F6',
         '246',
+        'F6',
     ],
     [
-        '12345',
         '74565',
+        '12345',
     ],
     [
-        '123456789',
         '4886718345',
+        '123456789',
     ],
     [
+        '#NUM!',
         '123.45',
+    ],
+    [
+        '0',
+        '0',
+    ],
+    [
         '#NUM!',
-    ],
-    [
-        '0',
-        '0',
-    ],
-    [
         'G3579A',
-        '#NUM!',
     ],
     [
-        true,
         '#VALUE!',
+        true,
     ],
     [
-        '-107',
         '#NUM!',
+        '-107',
     ],
     [
-        'A5',
         '165',
+        'A5',
     ],
     [
-        '3DA408B9',
         '1034160313',
+        '3DA408B9',
     ],
     // 2's Complement
     [
-        'FFFFFFFF5B',
         '-165',
+        'FFFFFFFF5B',
     ],
     // 2's Complement
     [
-        'FFFFFFFFFF',
         '-1',
+        'FFFFFFFFFF',
     ],
     // Too large
     [
-        '1FFFFFFFFFF',
         '#NUM!',
+        '1FFFFFFFFFF',
     ],
 ];

tests/data/Calculation/Engineering/HEX2OCT.php

@@ -2,57 +2,57 @@
 
 return [
     [
-        '01AB',
         '653',
+        '01AB',
     ],
     [
-        'ABCD',
         '125715',
+        'ABCD',
     ],
     [
-        'F6',
         '366',
+        'F6',
     ],
     [
-        '3B4E',
         '35516',
+        '3B4E',
     ],
     [
+        '017',
         'F',
         3,
-        '017',
     ],
     [
-        '12345',
         '221505',
+        '12345',
     ],
     [
+        '#NUM!',
         '123456789',
-        '#NUM!',
     ],
     [
+        '#NUM!',
         '123.45',
+    ],
+    [
+        '0',
+        '0',
+    ],
+    [
         '#NUM!',
-    ],
-    [
-        '0',
-        '0',
-    ],
-    [
         'G3579A',
-        '#NUM!',
     ],
     [
-        true,
         '#VALUE!',
+        true,
     ],
     [
-        '-107',
         '#NUM!',
+        '-107',
     ],
     // 2's Complement
     [
-        'FFFFFFFF00',
         '7777777400',
+        'FFFFFFFF00',
     ],
 ];

tests/data/Calculation/Engineering/IMABS.php

@@ -2,111 +2,111 @@
 
 return [
     [
-        '12.34+5.67j',
         13.58029822942,
+        '12.34+5.67j',
     ],
     [
-        '1.234E-5+6.78E9i',
         6780000000.0,
+        '1.234E-5+6.78E9i',
     ],
     [
+        4.3011626335209998,
         '3.5+2.5i',
-        4.3011626335209998,
     ],
     [
+        3.6400549446400001,
         '3.5+i',
-        3.6400549446400001,
     ],
     [
+        3.5,
         '3.5',
-        3.5,
     ],
     [
+        3.6400549446400001,
         '3.5-i',
-        3.6400549446400001,
     ],
     [
+        4.3011626335209998,
         '3.5-2.5i',
-        4.3011626335209998,
     ],
     [
+        2.6925824035670001,
         '1+2.5i',
-        2.6925824035670001,
     ],
     [
+        1.4142135623730001,
         '1+i',
-        1.4142135623730001,
     ],
     [
+        1,
         '1',
-        1,
     ],
     [
+        1.4142135623730001,
         '1-i',
-        1.4142135623730001,
     ],
     [
+        2.6925824035670001,
         '1-2.5i',
-        2.6925824035670001,
     ],
     [
+        2.5,
         '2.5i',
-        2.5,
     ],
     [
+        1,
         'i',
-        1,
     ],
     [
-        '0',
         0,
+        '0',
     ],
     [
+        1,
         '-i',
-        1,
     ],
     [
-        '-2.5i',
         2.5,
+        '-2.5i',
     ],
     [
+        2.6925824035670001,
         '-1+2.5i',
-        2.6925824035670001,
     ],
     [
+        1.4142135623730001,
         '-1+i',
-        1.4142135623730001,
     ],
     [
-        '-1',
         1,
+        '-1',
     ],
     [
-        '-1-i',
         1.4142135623730001,
+        '-1-i',
     ],
     [
-        '-1-2.5i',
         2.6925824035670001,
+        '-1-2.5i',
     ],
     [
+        4.3011626335209998,
         '-3.5+2.5i',
-        4.3011626335209998,
     ],
     [
+        3.6400549446400001,
         '-3.5+i',
-        3.6400549446400001,
     ],
     [
-        '-3.5',
         3.5,
+        '-3.5',
     ],
     [
-        '-3.5-i',
         3.6400549446400001,
+        '-3.5-i',
     ],
     [
-        '-3.5-2.5i',
         4.3011626335209998,
+        '-3.5-2.5i',
     ],
 ];

tests/data/Calculation/Engineering/IMAGINARY.php

@@ -2,123 +2,123 @@
 
 return [
     [
-        '12.34+5.67j',
         5.6699999999999999,
+        '12.34+5.67j',
     ],
     [
-        '1.234E-5+6.78E9i',
         6780000000.0,
+        '1.234E-5+6.78E9i',
     ],
     [
+        2.5,
         '3.5+2.5i',
-        2.5,
     ],
     [
+        1,
         '3.5+i',
-        1,
     ],
     [
+        0,
         '3.5',
-        0,
     ],
     [
+        -1,
         '3.5-i',
-        -1,
     ],
     [
+        -2.5,
         '3.5-2.5i',
-        -2.5,
     ],
     [
+        2.5,
         '1+2.5i',
-        2.5,
     ],
     [
+        1,
         '1+i',
-        1,
     ],
     [
+        0,
         '1',
-        0,
     ],
     [
+        0,
         1,
-        0,
     ],
     [
+        -1,
         '1-i',
-        -1,
     ],
     [
+        -2.5,
         '1-2.5i',
-        -2.5,
     ],
     [
+        2.5,
         '2.5i',
-        2.5,
     ],
     [
+        1,
         'i',
-        1,
     ],
     [
+        0,
         '0',
-        0,
     ],
     [
         0,
         0,
     ],
     [
+        0,
         0.0,
-        0,
     ],
     [
+        -1,
         '-i',
-        -1,
     ],
     [
+        -2.5,
         '-2.5i',
-        -2.5,
     ],
     [
+        2.5,
         '-1+2.5i',
-        2.5,
     ],
     [
+        1,
         '-1+i',
-        1,
     ],
     [
+        0,
         '-1',
-        0,
     ],
     [
+        -1,
         '-1-i',
-        -1,
     ],
     [
+        -2.5,
         '-1-2.5i',
-        -2.5,
     ],
     [
-        '-3.5+2.5i',
         2.5,
+        '-3.5+2.5i',
     ],
     [
-        '-3.5+i',
         1,
+        '-3.5+i',
     ],
     [
-        '-3.5',
         0,
+        '-3.5',
     ],
     [
-        '-3.5-i',
         -1,
+        '-3.5-i',
     ],
     [
-        '-3.5-2.5i',
         -2.5,
+        '-3.5-2.5i',
     ],
 ];

tests/data/Calculation/Engineering/IMARGUMENT.php

@@ -2,107 +2,107 @@
 
 return [
     [
-        '12.34+5.67j',
         0.43071059555000002,
+        '12.34+5.67j',
     ],
     [
-        '3.5+2.5i',
         0.620249485983,
+        '3.5+2.5i',
     ],
     [
-        '3.5+i',
         0.27829965900499998,
+        '3.5+i',
     ],
     [
+        0,
         '3.5',
-        0,
     ],
     [
-        '3.5-i',
         -0.27829965900499998,
+        '3.5-i',
     ],
     [
-        '3.5-2.5i',
         -0.620249485983,
+        '3.5-2.5i',
     ],
     [
-        '1+2.5i',
         1.1902899496829999,
+        '1+2.5i',
     ],
     [
-        '1+i',
         0.78539816339699997,
+        '1+i',
     ],
     [
-        '1',
         0,
+        '1',
     ],
     [
-        '1-i',
         -0.78539816339699997,
+        '1-i',
     ],
     [
-        '1-2.5i',
         -1.1902899496829999,
+        '1-2.5i',
     ],
     [
+        1.570796326795,
         '2.5i',
-        1.570796326795,
     ],
     [
+        1.570796326795,
         'i',
-        1.570796326795,
     ],
     [
-        '0',
         '#DIV/0!',
+        '0',
     ],
     [
+        -1.570796326795,
         '-i',
-        -1.570796326795,
     ],
     [
+        -1.570796326795,
         '-2.5i',
-        -1.570796326795,
     ],
     [
-        '-1+2.5i',
         1.9513027039069999,
+        '-1+2.5i',
     ],
     [
-        '-1+i',
         2.3561944901919998,
+        '-1+i',
     ],
     [
+        3.1415926535900001,
         '-1',
-        3.1415926535900001,
     ],
     [
-        '-1-i',
         -2.3561944901919998,
+        '-1-i',
     ],
     [
-        '-1-2.5i',
         -1.9513027039069999,
+        '-1-2.5i',
     ],
     [
-        '-3.5+2.5i',
         2.5213431676070002,
+        '-3.5+2.5i',
     ],
     [
-        '-3.5+i',
         2.8632929945850001,
+        '-3.5+i',
     ],
     [
-        '-3.5',
         3.1415926535900001,
+        '-3.5',
     ],
     [
-        '-3.5-i',
         -2.8632929945850001,
+        '-3.5-i',
     ],
     [
-        '-3.5-2.5i',
         -2.5213431676070002,
+        '-3.5-2.5i',
     ],
 ];

tests/data/Calculation/Engineering/IMCONJUGATE.php

@@ -2,107 +2,107 @@
 
 return [
     [
-        '12.34+5.67j',
         '12.34-5.67j',
-    ],
+        '12.34+5.67j',
-    [
-        '3.5+2.5i',
-        '3.5-2.5i',
-    ],
-    [
-        '3.5+i',
-        '3.5-i',
-    ],
-    [
-        '3.5',
-        '3.5',
-    ],
-    [
-        '3.5-i',
-        '3.5+i',
     ],
     [
         '3.5-2.5i',
         '3.5+2.5i',
     ],
     [
-        '1+2.5i',
+        '3.5-i',
-        '1-2.5i',
+        '3.5+i',
     ],
     [
-        '1+i',
+        '3.5',
-        '1-i',
+        '3.5',
     ],
     [
-        '1',
+        '3.5+i',
-        '1',
+        '3.5-i',
     ],
     [
-        '1-i',
+        '3.5+2.5i',
-        '1+i',
+        '3.5-2.5i',
     ],
     [
         '1-2.5i',
         '1+2.5i',
     ],
     [
-        '2.5i',
+        '1-i',
-        '-2.5i',
+        '1+i',
     ],
     [
-        'i',
+        '1',
-        '-i',
+        '1',
     ],
     [
-        '0',
+        '1+i',
-        '0',
+        '1-i',
     ],
     [
-        '-i',
+        '1+2.5i',
-        'i',
+        '1-2.5i',
     ],
     [
         '-2.5i',
         '2.5i',
     ],
     [
-        '-1+2.5i',
+        '-i',
-        '-1-2.5i',
+        'i',
     ],
     [
-        '-1+i',
+        '0',
-        '-1-i',
+        '0',
     ],
     [
-        '-1',
+        'i',
-        '-1',
+        '-i',
     ],
     [
-        '-1-i',
+        '2.5i',
-        '-1+i',
+        '-2.5i',
     ],
     [
         '-1-2.5i',
         '-1+2.5i',
     ],
     [
-        '-3.5+2.5i',
+        '-1-i',
+        '-1+i',
+    ],
+    [
+        '-1',
+        '-1',
+    ],
+    [
+        '-1+i',
+        '-1-i',
+    ],
+    [
+        '-1+2.5i',
+        '-1-2.5i',
+    ],
+    [
         '-3.5-2.5i',
-    ],
+        '-3.5+2.5i',
-    [
-        '-3.5+i',
-        '-3.5-i',
-    ],
-    [
-        '-3.5',
-        '-3.5',
     ],
     [
         '-3.5-i',
         '-3.5+i',
     ],
     [
-        '-3.5-2.5i',
+        '-3.5',
+        '-3.5',
+    ],
+    [
+        '-3.5+i',
+        '-3.5-i',
+    ],
+    [
         '-3.5+2.5i',
+        '-3.5-2.5i',
     ],
 ];

tests/data/Calculation/Engineering/IMCOS.php

@@ -2,111 +2,111 @@
 
 return [
     [
-        '12.34+5.67j',
         '141.319179436356+32.547610312508j',
+        '12.34+5.67j',
     ],
     [
+        '-5.74262349163406+2.12231025604134i',
         '3.5+2.5i',
-        '-5.74262349163406+2.12231025604134i',
     ],
     [
+        '-1.44502817950166+0.412240867891067i',
         '3.5+i',
-        '-1.44502817950166+0.412240867891067i',
     ],
     [
+        '-0.936456687290796',
         '3.5',
-        '-0.936456687290796',
     ],
     [
+        '-1.44502817950166-0.412240867891067i',
         '3.5-i',
-        '-1.44502817950166-0.412240867891067i',
     ],
     [
+        '-5.74262349163406-2.12231025604134i',
         '3.5-2.5i',
-        '-5.74262349163406-2.12231025604134i',
     ],
     [
+        '3.31329014611322-5.0910715229497i',
         '1+2.5i',
-        '3.31329014611322-5.0910715229497i',
     ],
     [
+        '0.833730025131149-0.988897705762865i',
         '1+i',
-        '0.833730025131149-0.988897705762865i',
     ],
     [
-        '1',
         '0.54030230586814',
+        '1',
     ],
     [
+        '0.833730025131149+0.988897705762865i',
         '1-i',
-        '0.833730025131149+0.988897705762865i',
     ],
     [
+        '3.31329014611322+5.0910715229497i',
         '1-2.5i',
-        '3.31329014611322+5.0910715229497i',
     ],
     [
+        '6.13228947966369',
         '2.5i',
-        '6.13228947966369',
     ],
     [
+        '1.54308063481524',
         'i',
-        '1.54308063481524',
     ],
     [
-        '0',
         '1',
+        '0',
     ],
     [
-        '-i',
         '1.54308063481524',
+        '-i',
     ],
     [
-        '-2.5i',
         '6.13228947966369',
+        '-2.5i',
     ],
     [
-        '-1+2.5i',
         '3.31329014611322+5.0910715229497i',
+        '-1+2.5i',
     ],
     [
-        '-1+i',
         '0.833730025131149+0.988897705762865i',
+        '-1+i',
     ],
     [
-        '-1',
         '0.54030230586814',
+        '-1',
     ],
     [
-        '-1-i',
         '0.833730025131149-0.988897705762865i',
+        '-1-i',
     ],
     [
-        '-1-2.5i',
         '3.31329014611322-5.0910715229497i',
+        '-1-2.5i',
     ],
     [
-        '-3.5+2.5i',
         '-5.74262349163406-2.12231025604134i',
+        '-3.5+2.5i',
     ],
     [
-        '-3.5+i',
         '-1.44502817950166-0.412240867891067i',
+        '-3.5+i',
     ],
     [
-        '-3.5',
         '-0.936456687290796',
+        '-3.5',
     ],
     [
-        '-3.5-i',
         '-1.44502817950166+0.412240867891067i',
+        '-3.5-i',
     ],
     [
-        '-3.5-2.5i',
         '-5.74262349163406+2.12231025604134i',
+        '-3.5-2.5i',
     ],
     [
-        '3',
         '-0.989992496600445',
+        '3',
     ],
 ];

tests/data/Calculation/Engineering/IMDIV.php

@@ -2,103 +2,103 @@
 
 return [
     [
+        '#NUM!',
         '12.34+5.67j',
         '123.45+67.89i',
-        '#NUM!',
     ],
     [
+        '0.0961415519586104-0.00694248653276682j',
         '12.34+5.67j',
         '123.45+67.89j',
-        '0.0961415519586104-0.00694248653276682j',
     ],
     [
-        '-12.34+5.67i',
-        '-123.45+67.89i',
         '0.0961415519586104+0.00694248653276682i',
+        '-12.34+5.67i',
+        '-123.45+67.89i',
     ],
     [
-        '-12.34-5.67i',
-        '-123.45+67.89i',
         '0.0573549954111941+0.0774712890924744i',
+        '-12.34-5.67i',
+        '-123.45+67.89i',
     ],
     [
-        '-12.34+5.67i',
-        '-123.45-67.89i',
         '0.0573549954111941-0.0774712890924744i',
+        '-12.34+5.67i',
+        '-123.45-67.89i',
     ],
     [
-        '-12.34-5.67i',
-        '-123.45-67.89i',
         '0.0961415519586104-0.00694248653276682i',
+        '-12.34-5.67i',
+        '-123.45-67.89i',
     ],
     [
+        '-0.0573549954111941-0.0774712890924744i',
         '12.34+5.67i',
         '-123.45+67.89i',
-        '-0.0573549954111941-0.0774712890924744i',
     ],
     [
+        '-0.0961415519586104-0.00694248653276682i',
         '12.34-5.67i',
         '-123.45+67.89i',
-        '-0.0961415519586104-0.00694248653276682i',
     ],
     [
+        '-0.0961415519586104+0.00694248653276682i',
         '12.34+5.67i',
         '-123.45-67.89i',
-        '-0.0961415519586104+0.00694248653276682i',
     ],
     [
+        '-0.0573549954111941+0.0774712890924744i',
         '12.34-5.67i',
         '-123.45-67.89i',
-        '-0.0573549954111941+0.0774712890924744i',
     ],
     [
+        '-0.0573549954111941+0.0774712890924744i',
         '-12.34+5.67i',
         '123.45+67.89i',
-        '-0.0573549954111941+0.0774712890924744i',
     ],
     [
-        '-12.34-5.67i',
-        '123.45+67.89i',
         '-0.0961415519586104+0.00694248653276682i',
+        '-12.34-5.67i',
+        '123.45+67.89i',
     ],
     [
+        '-0.0961415519586104-0.00694248653276682i',
         '-12.34+5.67i',
         '123.45-67.89i',
-        '-0.0961415519586104-0.00694248653276682i',
     ],
     [
+        '-0.0573549954111941-0.0774712890924744i',
         '-12.34-5.67i',
         '123.45-67.89i',
-        '-0.0573549954111941-0.0774712890924744i',
     ],
     [
+        '#NUM!',
         '-12.34-5.67i',
         '123.45-67.89',
-        '#NUM!',
     ],
     [
+        '#NUM!',
         '-12.34-5.67j',
         '123.45-67.89',
-        '#NUM!',
     ],
     [
+        '#NUM!',
         '-12.34-5.67',
         '123.45-67.89j',
-        '#NUM!',
     ],
     [
-        '-12.34-5.67i',
-        '-12.34-5.67i',
         '1',
+        '-12.34-5.67i',
+        '-12.34-5.67i',
     ],
     [
+        '-0.0767482736849023-0.0422068878126206i',
         '-12.34',
         '123.45-67.89i',
-        '-0.0767482736849023-0.0422068878126206i',
     ],
     [
+        '1+0.459481361426256i',
         '-12.34-5.67i',
         '-12.34',
-        '1+0.459481361426256i',
     ],
 ];

tests/data/Calculation/Engineering/IMEXP.php

@@ -2,111 +2,111 @@
 
 return [
     [
-        '12.34+5.67j',
         '187004.11273906-131589.323796073j',
+        '12.34+5.67j',
     ],
     [
-        '-12.34E-5+6.78E9i',
         '0.519482808316086+0.85433649244115i',
+        '-12.34E-5+6.78E9i',
     ],
     [
-        '3.5+2.5i',
         '-26.5302329126575+19.8186755366902i',
+        '3.5+2.5i',
     ],
     [
-        '3.5+i',
         '17.8923550531471+27.8656919720394i',
+        '3.5+i',
     ],
     [
-        '3.5',
         '33.1154519586923',
+        '3.5',
     ],
     [
-        '3.5-i',
         '17.8923550531471-27.8656919720394i',
+        '3.5-i',
     ],
     [
-        '3.5-2.5i',
         '-26.5302329126575-19.8186755366902i',
+        '3.5-2.5i',
     ],
     [
-        '1+2.5i',
         '-2.17773413212721+1.62681595415671i',
+        '1+2.5i',
     ],
     [
-        '1+i',
         '1.46869393991589+2.28735528717884i',
+        '1+i',
     ],
     [
-        '1',
         '2.71828182845905',
-    ],
-    [
-        '1-i',
-        '1.46869393991589-2.28735528717884i',
-    ],
-    [
-        '1-2.5i',
-        '-2.17773413212721-1.62681595415671i',
-    ],
-    [
-        '2.5i',
-        '-0.801143615546934+0.598472144103957i',
-    ],
-    [
-        'i',
-        '0.54030230586814+0.841470984807897i',
-    ],
-    [
-        '0',
         '1',
     ],
     [
-        '-i',
+        '1.46869393991589-2.28735528717884i',
+        '1-i',
+    ],
+    [
+        '-2.17773413212721-1.62681595415671i',
+        '1-2.5i',
+    ],
+    [
+        '-0.801143615546934+0.598472144103957i',
+        '2.5i',
+    ],
+    [
+        '0.54030230586814+0.841470984807897i',
+        'i',
+    ],
+    [
+        '1',
+        '0',
+    ],
+    [
         '0.54030230586814-0.841470984807897i',
+        '-i',
     ],
     [
-        '-2.5i',
         '-0.801143615546934-0.598472144103957i',
+        '-2.5i',
     ],
     [
-        '-1+2.5i',
         '-0.294724265585475+0.220165597929638i',
+        '-1+2.5i',
     ],
     [
-        '-1+i',
         '0.198766110346413+0.309559875653112i',
+        '-1+i',
     ],
     [
-        '-1',
         '0.367879441171442',
+        '-1',
     ],
     [
-        '-1-i',
         '0.198766110346413-0.309559875653112i',
+        '-1-i',
     ],
     [
-        '-1-2.5i',
         '-0.294724265585475-0.220165597929638i',
+        '-1-2.5i',
     ],
     [
-        '-3.5+2.5i',
         '-0.0241924409350133+0.0180722928030842i',
+        '-3.5+2.5i',
     ],
     [
-        '-3.5+i',
         '0.016315715894263+0.025410221967i',
+        '-3.5+i',
     ],
     [
-        '-3.5',
         '0.0301973834223185',
+        '-3.5',
     ],
     [
-        '-3.5-i',
         '0.016315715894263-0.025410221967i',
+        '-3.5-i',
     ],
     [
-        '-3.5-2.5i',
         '-0.0241924409350133-0.0180722928030842i',
+        '-3.5-2.5i',
     ],
 ];

tests/data/Calculation/Engineering/IMLN.php

@@ -2,111 +2,111 @@
 
 return [
     [
-        '12.34+5.67j',
         '2.60862008281875+0.430710595550204j',
+        '12.34+5.67j',
     ],
     [
-        '-1.234E-5+6.78E9i',
         '22.6372429388987+1.5707963267949i',
+        '-1.234E-5+6.78E9i',
     ],
     [
-        '3.5+2.5i',
         '1.45888536604214+0.620249485982821i',
+        '3.5+2.5i',
     ],
     [
-        '3.5+i',
         '1.29199877621612+0.278299659005111i',
+        '3.5+i',
     ],
     [
-        '3.5',
         '1.25276296849537',
+        '3.5',
     ],
     [
-        '3.5-i',
         '1.29199877621612-0.278299659005111i',
+        '3.5-i',
     ],
     [
-        '3.5-2.5i',
         '1.45888536604214-0.620249485982821i',
+        '3.5-2.5i',
     ],
     [
-        '1+2.5i',
         '0.990500734433292+1.19028994968253i',
+        '1+2.5i',
     ],
     [
-        '1+i',
         '0.346573590279973+0.785398163397448i',
+        '1+i',
     ],
     [
+        '0',
         '1',
-        '0',
     ],
     [
-        '1-i',
         '0.346573590279973-0.785398163397448i',
+        '1-i',
     ],
     [
-        '1-2.5i',
         '0.990500734433292-1.19028994968253i',
+        '1-2.5i',
     ],
     [
-        '2.5i',
         '0.916290731874155+1.5707963267949i',
+        '2.5i',
     ],
     [
-        'i',
         '1.5707963267949i',
+        'i',
     ],
     [
-        '0',
         '#NUM!',
+        '0',
     ],
     [
-        '-i',
         '-1.5707963267949i',
+        '-i',
     ],
     [
-        '-2.5i',
         '0.916290731874155-1.5707963267949i',
+        '-2.5i',
     ],
     [
-        '-1+2.5i',
         '0.990500734433292+1.95130270390726i',
+        '-1+2.5i',
     ],
     [
-        '-1+i',
         '0.346573590279973+2.35619449019234i',
+        '-1+i',
     ],
     [
-        '-1',
         '3.14159265358979i',
+        '-1',
     ],
     [
-        '-1-i',
         '0.346573590279973-2.35619449019234i',
+        '-1-i',
     ],
     [
-        '-1-2.5i',
         '0.990500734433292-1.95130270390726i',
+        '-1-2.5i',
     ],
     [
-        '-3.5+2.5i',
         '1.45888536604214+2.52134316760697i',
+        '-3.5+2.5i',
     ],
     [
-        '-3.5+i',
         '1.29199877621612+2.86329299458468i',
+        '-3.5+i',
     ],
     [
-        '-3.5',
         '1.25276296849537+3.14159265358979i',
+        '-3.5',
     ],
     [
-        '-3.5-i',
         '1.29199877621612-2.86329299458468i',
+        '-3.5-i',
     ],
     [
-        '-3.5-2.5i',
         '1.45888536604214-2.52134316760697i',
+        '-3.5-2.5i',
     ],
 ];

tests/data/Calculation/Engineering/IMLOG10.php

@@ -2,111 +2,111 @@
 
 return [
     [
-        '12.34+5.67j',
         '1.13290930735019+0.187055234944717j',
+        '12.34+5.67j',
     ],
     [
-        '-12.34E-5+6.78E9i',
         '9.83122969386706+0.682188176920927i',
+        '-12.34E-5+6.78E9i',
     ],
     [
-        '3.5+2.5i',
         '0.633585864201507+0.269370929165668i',
+        '3.5+2.5i',
     ],
     [
-        '3.5+i',
         '0.561107939136413+0.120864006221476i',
+        '3.5+i',
     ],
     [
-        '3.5',
         '0.544068044350276',
+        '3.5',
     ],
     [
-        '3.5-i',
         '0.561107939136413-0.120864006221476i',
+        '3.5-i',
     ],
     [
-        '3.5-2.5i',
         '0.633585864201507-0.269370929165668i',
+        '3.5-2.5i',
     ],
     [
-        '1+2.5i',
         '0.430169003285497+0.516936357012023i',
+        '1+2.5i',
     ],
     [
-        '1+i',
         '0.150514997831991+0.34109408846046i',
+        '1+i',
     ],
     [
+        '0',
         '1',
-        '0',
     ],
     [
-        '1-i',
         '0.150514997831991-0.34109408846046i',
+        '1-i',
     ],
     [
-        '1-2.5i',
         '0.430169003285497-0.516936357012023i',
+        '1-2.5i',
     ],
     [
-        '2.5i',
         '0.397940008672038+0.68218817692092i',
+        '2.5i',
     ],
     [
-        'i',
         '0.68218817692092i',
+        'i',
     ],
     [
-        '0',
         '#NUM!',
+        '0',
     ],
     [
-        '-i',
         '-0.68218817692092i',
+        '-i',
     ],
     [
-        '-2.5i',
         '0.397940008672038-0.68218817692092i',
+        '-2.5i',
     ],
     [
-        '-1+2.5i',
         '0.430169003285497+0.847439996829817i',
+        '-1+2.5i',
     ],
     [
-        '-1+i',
         '0.150514997831991+1.02328226538138i',
+        '-1+i',
     ],
     [
-        '-1',
         '1.36437635384184i',
+        '-1',
     ],
     [
-        '-1-i',
         '0.150514997831991-1.02328226538138i',
+        '-1-i',
     ],
     [
-        '-1-2.5i',
         '0.430169003285497-0.847439996829817i',
+        '-1-2.5i',
     ],
     [
-        '-3.5+2.5i',
         '0.633585864201507+1.09500542467617i',
+        '-3.5+2.5i',
     ],
     [
-        '-3.5+i',
         '0.561107939136413+1.24351234762036i',
+        '-3.5+i',
     ],
     [
-        '-3.5',
         '0.544068044350276+1.36437635384184i',
+        '-3.5',
     ],
     [
-        '-3.5-i',
         '0.561107939136413-1.24351234762036i',
+        '-3.5-i',
     ],
     [
-        '-3.5-2.5i',
         '0.633585864201507-1.09500542467617i',
+        '-3.5-2.5i',
     ],
 ];

tests/data/Calculation/Engineering/IMLOG2.php

@@ -2,111 +2,111 @@
 
 return [
     [
-        '12.34+5.67j',
         '3.76344325733562+0.621384040306436j',
+        '12.34+5.67j',
     ],
     [
-        '-12.34E-5+6.78E9i',
         '32.6586381298614+2.26618007108803i',
+        '-12.34E-5+6.78E9i',
     ],
     [
-        '3.5+2.5i',
         '2.10472668297646+0.894830857610216i',
+        '3.5+2.5i',
     ],
     [
-        '3.5+i',
         '1.86396022742506+0.401501537958665i',
+        '3.5+i',
     ],
     [
-        '3.5',
         '1.80735492219671',
+        '3.5',
     ],
     [
-        '3.5-i',
         '1.86396022742506-0.401501537958665i',
+        '3.5-i',
     ],
     [
-        '3.5-2.5i',
         '2.10472668297646-0.894830857610216i',
+        '3.5-2.5i',
     ],
     [
-        '1+2.5i',
         '1.42899049767377+1.71722540775913i',
+        '1+2.5i',
     ],
     [
-        '1+i',
         '0.500000000038482+1.13309003554401i',
+        '1+i',
     ],
     [
+        '0',
         '1',
-        '0',
     ],
     [
-        '1-i',
         '0.500000000038482-1.13309003554401i',
+        '1-i',
     ],
     [
-        '1-2.5i',
         '1.42899049767377-1.71722540775913i',
+        '1-2.5i',
     ],
     [
-        '2.5i',
         '1.3219280949891+2.26618007108801i',
+        '2.5i',
     ],
     [
-        'i',
         '2.26618007108801i',
+        'i',
     ],
     [
-        '0',
         '#NUM!',
+        '0',
     ],
     [
-        '-i',
         '-2.26618007108801i',
+        '-i',
     ],
     [
-        '-2.5i',
         '1.3219280949891-2.26618007108801i',
+        '-2.5i',
     ],
     [
-        '-1+2.5i',
         '1.42899049767377+2.81513473441689i',
+        '-1+2.5i',
     ],
     [
-        '-1+i',
         '0.500000000038482+3.39927010663201i',
+        '-1+i',
     ],
     [
-        '-1',
         '4.53236014217602i',
+        '-1',
     ],
     [
-        '-1-i',
         '0.500000000038482-3.39927010663201i',
+        '-1-i',
     ],
     [
-        '-1-2.5i',
         '1.42899049767377-2.81513473441689i',
+        '-1-2.5i',
     ],
     [
-        '-3.5+2.5i',
         '2.10472668297646+3.63752928456581i',
+        '-3.5+2.5i',
     ],
     [
-        '-3.5+i',
         '1.86396022742506+4.13085860421736i',
+        '-3.5+i',
     ],
     [
-        '-3.5',
         '1.80735492219671+4.53236014217602i',
+        '-3.5',
     ],
     [
-        '-3.5-i',
         '1.86396022742506-4.13085860421736i',
+        '-3.5-i',
     ],
     [
-        '-3.5-2.5i',
         '2.10472668297646-3.63752928456581i',
+        '-3.5-2.5i',
     ],
 ];

tests/data/Calculation/Engineering/IMPOWER.php

@@ -2,93 +2,93 @@
 
 return [
     [
+        '120.1267+139.9356j',
         '12.34+5.67j',
         2,
-        '120.1267+139.9356j',
     ],
     [
+        '688.928626+2407.923693j',
         '12.34+5.67j',
         3,
-        '688.928626+2407.923693j',
     ],
     [
+        '6.69108496973016E-002-3.07442883131037E-002j',
         '12.34+5.67j',
         -1,
-        '6.69108496973016E-002-3.07442883131037E-002j',
     ],
     [
+        '3.53185054333564E-003-4.11425290873718E-003j',
         '12.34+5.67j',
         -2,
-        '3.53185054333564E-003-4.11425290873718E-003j',
     ],
     [
+        '3.60002071031685+0.787495469644252j',
         '12.34+5.67j',
         0.5,
-        '3.60002071031685+0.787495469644252j',
     ],
     [
+        '0.517904976730581-5.59833234375533E-002j',
         '12.34+5.67j',
         -0.25,
-        '0.517904976730581-5.59833234375533E-002j',
     ],
     [
+        '1',
         '12.34+5.67j',
         0,
-        '1',
     ],
     [
+        '-1-1.34451369308841E-014i',
         '-i',
         2,
-        '-1-1.34451369308841E-014i',
     ],
     [
+        '1.22460635382238E-016-2i',
         '1-i',
         2,
-        '1.22460635382238E-016-2i',
     ],
     [
+        '-6.25+8.40321058180257E-014i',
         '2.5i',
         2,
-        '-6.25+8.40321058180257E-014i',
     ],
     [
-        '2.5i',
-        '2.5',
         '-6.98771242968685-6.98771242968684i',
+        '2.5i',
+        '2.5',
     ],
     [
-        '2.5i',
-        '2.5i',
         '#VALUE!',
+        '2.5i',
+        '2.5i',
     ],
     [
-        '2.5',
-        '2.5',
         9.8821176880261898,
+        '2.5',
+        '2.5',
     ],
     [
-        '2',
-        '2',
         4,
+        '2',
+        '2',
     ],
     [
-        '-12.34-5.67i',
-        '-12.34',
         '-4.69972844488573E-15+9.35464904349343E-15i',
+        '-12.34-5.67i',
+        '-12.34',
     ],
     [
+        '5.93343000067521E-15-8.62503997728057E-15i',
         '12.34-5.67i',
         '-12.34',
-        '5.93343000067521E-15-8.62503997728057E-15i',
     ],
     [
+        '-42881944468901.9-85355046682682.3i',
         '-12.34-5.67i',
         '12.34',
-        '-42881944468901.9-85355046682682.3i',
     ],
     [
+        '54138663282971.3+78697841733874.3i',
         '12.34-5.67i',
         '12.34',
-        '54138663282971.3+78697841733874.3i',
     ],
 ];

tests/data/Calculation/Engineering/IMPRODUCT.php

@@ -2,79 +2,79 @@
 
 return [
     [
-        '12.34+5.67j',
-        '123.45+67.89i',
         '#NUM!',
-    ],
-    [
         '12.34+5.67j',
-        '12.34+5.67j',
-    ],
-    [
-        '12.34+5.67i',
         '123.45+67.89i',
-        '5.67',
+    ],
+    [
+        '12.34+5.67j',
+        '12.34+5.67j',
+    ],
+    [
         '6454.936089+8718.895647i',
+        '12.34+5.67i',
+        '123.45+67.89i',
+        '5.67',
     ],
     [
+        '6454.936089+8718.895647j',
         '12.34+5.67j',
         '123.45+67.89j',
         '5.67',
-        '6454.936089+8718.895647j',
     ],
     [
+        '1138.4367+1537.7241j',
         '12.34+5.67j',
         '123.45+67.89j',
-        '1138.4367+1537.7241j',
     ],
     [
+        '1908.3093+137.8011i',
         '12.34-5.67i',
         '123.45+67.89i',
-        '1908.3093+137.8011i',
     ],
     [
+        '1908.3093-137.8011i',
         '12.34+5.67i',
         '123.45-67.89i',
-        '1908.3093-137.8011i',
     ],
     [
+        '1138.4367-1537.7241i',
         '12.34-5.67i',
         '123.45-67.89i',
-        '1138.4367-1537.7241i',
     ],
     [
+        '-1908.3093-137.8011i',
         '-12.34+5.67i',
         '123.45+67.89i',
-        '-1908.3093-137.8011i',
     ],
     [
+        '-1138.4367-1537.7241i',
         '-12.34-5.67i',
         '123.45+67.89i',
-        '-1138.4367-1537.7241i',
     ],
     [
+        '-1908.3093+137.8011i',
         '12.34+5.67i',
         '-123.45+67.89i',
-        '-1908.3093+137.8011i',
     ],
     [
+        '1138.4367-1537.7241i',
         '-12.34+5.67i',
         '-123.45+67.89i',
-        '1138.4367-1537.7241i',
     ],
     [
+        '1138.4367+1537.7241i',
         '-12.34-5.67i',
         '-123.45-67.89i',
-        '1138.4367+1537.7241i',
     ],
     [
+        '-1523.373+837.7626i',
         '-12.34',
         '123.45-67.89i',
-        '-1523.373+837.7626i',
     ],
     [
+        '152.2756+69.9678i',
         '-12.34-5.67i',
         '-12.34',
-        '152.2756+69.9678i',
     ],
 ];

tests/data/Calculation/Engineering/IMREAL.php

@@ -2,123 +2,123 @@
 
 return [
     [
-        '12.34+5.67j"',
         12.34,
+        '12.34+5.67j"',
     ],
     [
-        '-1.234E-5+6.78E9i',
         -1.234E-5,
+        '-1.234E-5+6.78E9i',
     ],
     [
+        3.5,
         '3.5+2.5i',
-        3.5,
     ],
     [
+        3.5,
         '3.5+i',
-        3.5,
     ],
     [
+        3.5,
         '3.5',
-        3.5,
     ],
     [
         3.5,
         3.5,
     ],
     [
+        3.5,
         '3.5-i',
-        3.5,
     ],
     [
+        3.5,
         '3.5-2.5i',
-        3.5,
     ],
     [
+        1,
         '1+2.5i',
-        1,
     ],
     [
+        1,
         '1+i',
-        1,
     ],
     [
+        1,
         '1',
-        1,
     ],
     [
         1,
         1,
     ],
     [
+        1,
         '1-i',
-        1,
     ],
     [
+        1,
         '1-2.5i',
-        1,
     ],
     [
+        0,
         '2.5i',
-        0,
     ],
     [
+        0,
         'i',
-        0,
     ],
     [
+        0,
         '0',
-        0,
     ],
     [
         0,
         0,
     ],
     [
+        0,
         '-i',
-        0,
     ],
     [
+        0,
         '-2.5i',
-        0,
     ],
     [
+        -1,
         '-1+2.5i',
-        -1,
     ],
     [
+        -1,
         '-1+i',
-        -1,
     ],
     [
+        -1,
         '-1',
-        -1,
     ],
     [
+        -1,
         '-1-i',
-        -1,
     ],
     [
+        -1,
         '-1-2.5i',
-        -1,
     ],
     [
+        -3.5,
         '-3.5+2.5i',
-        -3.5,
     ],
     [
+        -3.5,
         '-3.5+i',
-        -3.5,
     ],
     [
+        -3.5,
         '-3.5',
-        -3.5,
     ],
     [
+        -3.5,
         '-3.5-i',
-        -3.5,
     ],
     [
-        '-3.5-2.5i',
         -3.5,
+        '-3.5-2.5i',
     ],
 ];

tests/data/Calculation/Engineering/IMSIN.php

@@ -2,111 +2,111 @@
 
 return [
     [
-        '12.34+5.67j',
         '-32.5483841590412+141.315819535092j',
+        '12.34+5.67j',
     ],
     [
-        '3.5+2.5i',
         '-2.15110429680353-5.66575444574645i',
+        '3.5+2.5i',
     ],
     [
-        '3.5+i',
         '-0.541286805665839-1.10052501669986i',
+        '3.5+i',
     ],
     [
-        '3.5',
         '-0.35078322768962',
+        '3.5',
     ],
     [
-        '3.5-i',
         '-0.541286805665839+1.10052501669986i',
+        '3.5-i',
     ],
     [
-        '3.5-2.5i',
         '-2.15110429680353+5.66575444574645i',
+        '3.5-2.5i',
     ],
     [
-        '1+2.5i',
         '5.16014366757971+3.26893943207955i',
+        '1+2.5i',
     ],
     [
-        '1+i',
         '1.29845758141598+0.634963914784736i',
+        '1+i',
     ],
     [
-        '1',
         '0.841470984807897',
+        '1',
     ],
     [
-        '1-i',
         '1.29845758141598-0.634963914784736i',
+        '1-i',
     ],
     [
-        '1-2.5i',
         '5.16014366757971-3.26893943207955i',
+        '1-2.5i',
     ],
     [
-        '2.5i',
         '6.05020448103979i',
+        '2.5i',
     ],
     [
-        'i',
         '1.1752011936438i',
+        'i',
     ],
     [
         '0',
         '0',
     ],
     [
-        '-i',
         '-1.1752011936438i',
+        '-i',
     ],
     [
-        '-2.5i',
         '-6.05020448103979i',
+        '-2.5i',
     ],
     [
-        '-1+2.5i',
         '-5.16014366757971+3.26893943207955i',
+        '-1+2.5i',
     ],
     [
-        '-1+i',
         '-1.29845758141598+0.634963914784736i',
+        '-1+i',
     ],
     [
-        '-1',
         '-0.841470984807897',
+        '-1',
     ],
     [
-        '-1-i',
         '-1.29845758141598-0.634963914784736i',
+        '-1-i',
     ],
     [
-        '-1-2.5i',
         '-5.16014366757971-3.26893943207955i',
+        '-1-2.5i',
     ],
     [
-        '-3.5+2.5i',
         '2.15110429680353-5.66575444574645i',
+        '-3.5+2.5i',
     ],
     [
-        '-3.5+i',
         '0.541286805665839-1.10052501669986i',
+        '-3.5+i',
     ],
     [
-        '-3.5',
         '0.35078322768962',
+        '-3.5',
     ],
     [
-        '-3.5-i',
         '0.541286805665839+1.10052501669986i',
+        '-3.5-i',
     ],
     [
-        '-3.5-2.5i',
         '2.15110429680353+5.66575444574645i',
+        '-3.5-2.5i',
     ],
     [
-        '3',
         '0.141120008059867',
+        '3',
     ],
 ];

tests/data/Calculation/Engineering/IMSQRT.php

@@ -2,115 +2,115 @@
 
 return [
     [
-        '12.34+5.67j',
         '3.60002071031685+0.787495469644252j',
+        '12.34+5.67j',
     ],
     [
-        '-1.234E-5+6.78E9i',
         '58223.7065120385+58223.7065120386i',
+        '-1.234E-5+6.78E9i',
     ],
     [
-        '3.5+2.5i',
         '1.9749889409211+0.632914936433528i',
+        '3.5+2.5i',
     ],
     [
-        '3.5+i',
         '1.88945163270197+0.264627043818521i',
+        '3.5+i',
     ],
     [
-        '3.5',
         '1.87082869338697',
+        '3.5',
     ],
     [
-        '3.5-i',
         '1.88945163270197-0.264627043818521i',
+        '3.5-i',
     ],
     [
-        '3.5-2.5i',
         '1.9749889409211-0.632914936433528i',
+        '3.5-2.5i',
     ],
     [
-        '1+2.5i',
         '1.35878298553655+0.919940868634298i',
+        '1+2.5i',
     ],
     [
-        '1+i',
         '1.09868411346781+0.455089860562227i',
+        '1+i',
     ],
     [
         '1',
         '1',
     ],
     [
-        '1-i',
         '1.09868411346781-0.455089860562227i',
+        '1-i',
     ],
     [
-        '1-2.5i',
         '1.35878298553655-0.919940868634298i',
+        '1-2.5i',
     ],
     [
-        '2.5i',
         '1.11803398874989+1.11803398874989i',
+        '2.5i',
     ],
     [
-        'i',
         '0.707106781186548+0.707106781186547i',
+        'i',
     ],
     [
         '0',
         '0',
     ],
     [
-        '-i',
         '0.707106781186548-0.707106781186547i',
+        '-i',
     ],
     [
-        '-2.5i',
         '1.11803398874989-1.11803398874989i',
+        '-2.5i',
     ],
     [
-        '-1+2.5i',
         '0.919940868634298+1.35878298553655i',
+        '-1+2.5i',
     ],
     [
-        '-1+i',
         '0.455089860562227+1.09868411346781i',
+        '-1+i',
     ],
     [
-        '-1',
         '6.12303176911189E-017+i',
+        '-1',
     ],
     [
-        '-1-i',
         '0.455089860562227-1.09868411346781i',
+        '-1-i',
     ],
     [
-        '-1-2.5i',
         '0.919940868634298-1.35878298553655i',
+        '-1-2.5i',
     ],
     [
-        '-3.5+2.5i',
         '0.632914936433528+1.9749889409211i',
+        '-3.5+2.5i',
     ],
     [
-        '-3.5+i',
         '0.264627043818521+1.88945163270197i',
+        '-3.5+i',
     ],
     [
-        '-3.5',
         '1.14551435241745E-016+1.87082869338697i',
+        '-3.5',
     ],
     [
-        '-3.5-i',
         '0.264627043818521-1.88945163270197i',
+        '-3.5-i',
     ],
     [
-        '-3.5-2.5i',
         '0.632914936433528-1.9749889409211i',
+        '-3.5-2.5i',
     ],
     [
-        '9',
         '3',
+        '9',
     ],
 ];

tests/data/Calculation/Engineering/IMSUB.php

@@ -2,54 +2,54 @@
 
 return [
     [
+        '#NUM!',
         '12.34+5.67j',
         '123.45+67.89i',
-        '#NUM!',
     ],
     [
-        '123.45+67.89j',
-        '12.34+5.67j',
         '111.11+62.22j',
+        '123.45+67.89j',
+        '12.34+5.67j',
     ],
     [
+        '-111.11-62.22j',
         '12.34+5.67j',
         '123.45+67.89j',
-        '-111.11-62.22j',
     ],
     [
+        '-111.11-62.22i',
         '12.34+5.67i',
         '123.45+67.89i',
         '123.45+67.89i',
-        '-111.11-62.22i',
     ],
     [
+        '-135.79+62.22i',
         '-12.34-5.67i',
         '123.45-67.89i',
-        '-135.79+62.22i',
     ],
     [
+        '135.79+62.22i',
         '12.34-5.67i',
         '-123.45-67.89i',
-        '135.79+62.22i',
     ],
     [
+        '111.11+62.22i',
         '-12.34-5.67i',
         '-123.45-67.89i',
-        '111.11+62.22i',
     ],
     [
+        '#NUM!',
         '-12.34-5.67i',
         '-123.45-67.89',
-        '#NUM!',
     ],
     [
+        '#NUM!',
         '-12.34-5.67j',
         '-123.45-67.89',
-        '#NUM!',
     ],
     [
+        '#NUM!',
         '-12.34-5.67',
         '-123.45-67.89j',
-        '#NUM!',
     ],
 ];

tests/data/Calculation/Engineering/IMSUM.php

@@ -2,55 +2,55 @@
 
 return [
     [
+        '#NUM!',
         '12.34+5.67j',
         '123.45+67.89i',
-        '#NUM!',
     ],
     [
-        '12.34+5.67j',
-        '123.45+67.89j',
         '135.79+73.56j',
+        '12.34+5.67j',
+        '123.45+67.89j',
     ],
     [
-        '12.34-5.67i',
-        '123.45+67.89i',
         '135.79+62.22i',
+        '12.34-5.67i',
+        '123.45+67.89i',
     ],
     [
+        '135.79-62.22i',
         '12.34+5.67i',
         '123.45-67.89i',
-        '135.79-62.22i',
     ],
     [
+        '135.79-73.56i',
         '12.34-5.67i',
         '123.45-67.89i',
-        '135.79-73.56i',
     ],
     [
+        '259.24+141.45i',
         '12.34+5.67i',
         '123.45+67.89i',
         '123.45+67.89i',
-        '259.24+141.45i',
     ],
     [
+        '#NUM!',
         '12.34+5.67i',
         '123.45+67.89i',
         '123.45+67.89j',
-        '#NUM!',
     ],
     [
+        '111.11-73.56i',
         '-12.34-5.67i',
         '123.45-67.89i',
-        '111.11-73.56i',
     ],
     [
+        '-111.11-73.56i',
         '12.34-5.67i',
         '-123.45-67.89i',
-        '-111.11-73.56i',
     ],
     [
+        '-135.79-73.56i',
         '-12.34-5.67i',
         '-123.45-67.89i',
-        '-135.79-73.56i',
     ],
 ];

tests/data/Calculation/Engineering/OCT2BIN.php

@@ -2,60 +2,60 @@
 
 return [
     [
-        '1357',
         '#NUM!',
+        '1357',
     ],
     [
-        '246',
         '10100110',
+        '246',
     ],
     [
+        '011',
         '3',
         3,
-        '011',
     ],
     [
+        '#NUM!',
         '12345',
-        '#NUM!',
     ],
     [
+        '#NUM!',
         '123.45',
-        '#NUM!',
     ],
     [
         '0',
         '0',
     ],
     [
-        true,
         '#VALUE!',
+        true,
     ],
     [
-        '3579',
         '#NUM!',
+        '3579',
     ],
     // 2's Complement
     [
-        '7777777000',
         '1000000000',
+        '7777777000',
     ],
     // 2's Complement
     [
-        '7777777777',
         '1111111111',
+        '7777777777',
     ],
     // Too small
     [
-        '17777777777',
         '#NUM!',
+        '17777777777',
     ],
     [
-        '777',
         '111111111',
+        '777',
     ],
     // Too large
     [
-        '1777',
         '#NUM!',
+        '1777',
     ],
 ];

tests/data/Calculation/Engineering/OCT2DEC.php

@@ -2,40 +2,40 @@
 
 return [
     [
-        '1357',
         '751',
+        '1357',
     ],
     [
-        '246',
         '166',
+        '246',
     ],
     [
-        '12345',
         '5349',
+        '12345',
     ],
     [
+        '#NUM!',
         '123.45',
-        '#NUM!',
     ],
     [
         '0',
         '0',
     ],
     [
-        true,
         '#VALUE!',
+        true,
     ],
     [
-        '3579',
         '#NUM!',
+        '3579',
     ],
     [
-        '54',
         '44',
+        '54',
     ],
     // 2's Complement
     [
-        '7777777533',
         '-165',
+        '7777777533',
     ],
 ];

tests/data/Calculation/Engineering/OCT2HEX.php

@@ -2,41 +2,41 @@
 
 return [
     [
-        '1357',
         '2EF',
+        '1357',
     ],
     [
-        '246',
         'A6',
+        '246',
     ],
     [
-        '12345',
         '14E5',
+        '12345',
     ],
     [
+        '0040',
         '100',
         4,
-        '0040',
     ],
     [
+        '#NUM!',
         '123.45',
-        '#NUM!',
     ],
     [
         '0',
         '0',
     ],
     [
-        true,
         '#VALUE!',
+        true,
     ],
     [
-        '3579',
         '#NUM!',
+        '3579',
     ],
     // 2's Complement
     [
-        '7777777533',
         'FFFFFFFF5B',
+        '7777777533',
     ],
 ];

tests/data/Calculation/Financial/ACCRINT.php

@@ -4,6 +4,7 @@
 
 return [
     [
+        16.666666666666998,
         '2008-03-01',
         '2008-08-31',
         '2008-05-01',
@@ -11,9 +12,9 @@ return [
         1000,
         2,
         0,
-        16.666666666666998,
     ],
     [
+        15.555555555555999,
         '2008-03-05',
         '2008-08-31',
         '2008-05-01',
@@ -21,18 +22,18 @@ return [
         1000,
         2,
         0,
-        15.555555555555999,
     ],
     [
+        200,
         '2010-01-01',
         '2010-06-30',
         '2010-04-01',
         0.080000000000000002,
         10000,
         4,
-        200,
     ],
     [
+        '#NUM!',
         '2008-03-05',
         '2008-08-31',
         '2008-05-01',
@@ -40,9 +41,9 @@ return [
         1000,
         2,
         0,
-        '#NUM!',
     ],
     [
+        '#VALUE!',
         'Invalid Date',
         '2008-08-31',
         '2008-05-01',
@@ -50,9 +51,9 @@ return [
         1000,
         2,
         0,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '2008-03-01',
         '2008-08-31',
         '2008-05-01',
@@ -60,9 +61,9 @@ return [
         1000,
         2,
         0,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '2008-03-01',
         '2008-08-31',
         '2008-05-01',
@@ -70,6 +71,5 @@ return [
         1000,
         2,
         'ABC',
-        '#VALUE!',
     ],
 ];

tests/data/Calculation/Financial/ACCRINTM.php

@@ -4,42 +4,42 @@
 
 return [
     [
+        20.547945205478999,
         '2008-04-01',
         '2008-06-15',
         0.10000000000000001,
         1000,
         3,
-        20.547945205478999,
     ],
     [
+        800,
         '2010-01-01',
         '2010-12-31',
         0.080000000000000002,
         10000,
-        800,
     ],
     [
+        '#NUM!',
         '2008-03-05',
         '2008-08-31',
         -0.10000000000000001,
         1000,
         2,
-        '#NUM!',
     ],
     [
+        '#VALUE!',
         'Invalid Date',
         '2008-08-31',
         0.10000000000000001,
         1000,
         2,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '2008-03-01',
         '2008-08-31',
         'ABC',
         1000,
         2,
-        '#VALUE!',
     ],
 ];

tests/data/Calculation/Financial/AMORDEGRC.php

@@ -4,6 +4,7 @@
 
 return [
     [
+        776,
         2400,
         '2008-08-19',
         '2008-12-31',
@@ -11,9 +12,9 @@ return [
         1,
         0.14999999999999999,
         1,
-        776,
     ],
     [
+        42,
         150,
         '2011-01-01',
         '2011-09-30',
@@ -21,6 +22,5 @@ return [
         1,
         0.20000000000000001,
         4,
-        42,
     ],
 ];

tests/data/Calculation/Financial/AMORLINC.php

@@ -4,6 +4,7 @@
 
 return [
     [
+        360,
         2400,
         '2008-08-19',
         '2008-12-31',
@@ -11,9 +12,9 @@ return [
         1,
         0.14999999999999999,
         1,
-        360,
     ],
     [
+        30,
         150,
         '2011-01-01',
         '2011-09-30',
@@ -21,6 +22,5 @@ return [
         1,
         0.20000000000000001,
         4,
-        30,
     ],
 ];

tests/data/Calculation/Financial/COUPDAYBS.php

@@ -4,37 +4,37 @@
 
 return [
     [
+        71,
         '25-Jan-2007',
         '15-Nov-2008',
         2,
         1,
-        71,
     ],
     [
+        66,
         '2011-01-01',
         '2012-10-25',
         4,
-        66,
     ],
     [
+        '#VALUE!',
         'Invalid Date',
         '15-Nov-2008',
         2,
         1,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '25-Jan-2007',
         'Invalid Date',
         2,
         1,
-        '#VALUE!',
     ],
     [
+        '#NUM!',
         '25-Jan-2007',
         '15-Nov-2008',
         3,
         1,
-        '#NUM!',
     ],
 ];

tests/data/Calculation/Financial/COUPDAYS.php

@@ -4,37 +4,37 @@
 
 return [
     [
+        181,
         '25-Jan-2007',
         '15-Nov-2008',
         2,
         1,
-        181,
     ],
     [
+        90,
         '2011-01-01',
         '2012-10-25',
         4,
-        90,
     ],
     [
+        '#VALUE!',
         'Invalid Date',
         '15-Nov-2008',
         2,
         1,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '25-Jan-2007',
         'Invalid Date',
         2,
         1,
-        '#VALUE!',
     ],
     [
+        '#NUM!',
         '25-Jan-2007',
         '15-Nov-2008',
         3,
         1,
-        '#NUM!',
     ],
 ];

tests/data/Calculation/Financial/COUPDAYSNC.php

@@ -4,37 +4,37 @@
 
 return [
     [
+        110,
         '25-Jan-2007',
         '15-Nov-2008',
         2,
         1,
-        110,
     ],
     [
+        24,
         '2011-01-01',
         '2012-10-25',
         4,
-        24,
     ],
     [
+        '#VALUE!',
         'Invalid Date',
         '15-Nov-2008',
         2,
         1,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '25-Jan-2007',
         'Invalid Date',
         2,
         1,
-        '#VALUE!',
     ],
     [
+        '#NUM!',
         '25-Jan-2007',
         '15-Nov-2008',
         3,
         1,
-        '#NUM!',
     ],
 ];

tests/data/Calculation/Financial/COUPNCD.php

@@ -4,37 +4,37 @@
 
 return [
     [
+        39217,
         '25-Jan-2007',
         '15-Nov-2008',
         2,
         1,
-        39217,
     ],
     [
+        40568,
         '2011-01-01',
         '2012-10-25',
         4,
-        40568,
     ],
     [
+        '#VALUE!',
         'Invalid Date',
         '15-Nov-2008',
         2,
         1,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '25-Jan-2007',
         'Invalid Date',
         2,
         1,
-        '#VALUE!',
     ],
     [
+        '#NUM!',
         '25-Jan-2007',
         '15-Nov-2008',
         3,
         1,
-        '#NUM!',
     ],
 ];

tests/data/Calculation/Financial/COUPNUM.php

@@ -4,45 +4,45 @@
 
 return [
     [
+        4,
         '25-Jan-2007',
         '15-Nov-2008',
         2,
         1,
-        4,
     ],
     [
+        8,
         '2011-01-01',
         '2012-10-25',
         4,
         0,
-        8,
     ],
     [
+        '#VALUE!',
         'Invalid Date',
         '15-Nov-2008',
         2,
         1,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '25-Jan-2007',
         'Invalid Date',
         2,
         1,
-        '#VALUE!',
     ],
     [
+        '#NUM!',
         '25-Jan-2007',
         '15-Nov-2008',
         3,
         1,
-        '#NUM!',
     ],
     [
+        5,
         '01-Jan-2008',
         '31-Dec-2012',
         1,
         1,
-        5,
     ],
 ];

tests/data/Calculation/Financial/COUPPCD.php

@@ -4,37 +4,37 @@
 
 return [
     [
+        39036,
         '25-Jan-2007',
         '15-Nov-2008',
         2,
         1,
-        39036,
     ],
     [
+        40476,
         '2011-01-01',
         '2012-10-25',
         4,
-        40476,
     ],
     [
+        '#VALUE!',
         'Invalid Date',
         '15-Nov-2008',
         2,
         1,
-        '#VALUE!',
     ],
     [
+        '#VALUE!',
         '25-Jan-2007',
         'Invalid Date',
         2,
         1,
-        '#VALUE!',
     ],
     [
+        '#NUM!',
         '25-Jan-2007',
         '15-Nov-2008',
         3,
         1,
-        '#NUM!',
     ],
 ];

tests/data/Calculation/Financial/CUMIPMT.php

@@ -4,84 +4,84 @@
 
 return [
     [
+        -11135.232130750999,
         0.0074999999999999997,
         360,
         125000,
         13,
         24,
         0,
-        -11135.232130750999,
     ],
     [
+        -937.5,
         0.0074999999999999997,
         360,
         125000,
         1,
         1,
         0,
-        -937.5,
     ],
     [
+        -2294.9775375120998,
         0.0041666666669999998,
         60,
         50000,
         1,
         12,
         0,
-        -2294.9775375120998,
     ],
     [
+        -1833.1000667254,
         0.0041666666669999998,
         60,
         50000,
         13,
         24,
         0,
-        -1833.1000667254,
     ],
     [
+        -1347.5920679425001,
         0.0041666666669999998,
         60,
         50000,
         25,
         36,
         0,
-        -1347.5920679425001,
     ],
     [
+        -837.24455850309005,
         0.0041666666669999998,
         60,
         50000,
         37,
         48,
         0,
-        -837.24455850309005,
     ],
     [
+        -300.78670189938998,
         0.0041666666669999998,
         60,
         50000,
         49,
         60,
         0,
-        -300.78670189938998,
     ],
     [
+        '#VALUE!',
         0.0074999999999999997,
         360,
         125000,
         24,
         13,
         0,
-        '#VALUE!',
     ],
     [
+        '#NUM!',
         0.0074999999999999997,
         360,
         125000,
         24,
         13,
         2,
-        '#NUM!',
     ],
 ];

tests/data/Calculation/Financial/CUMPRINC.php

@@ -4,84 +4,84 @@
 
 return [
     [
+        -934.10712342088004,
         0.0074999999999999997,
         360,
         125000,
         13,
         24,
         0,
-        -934.10712342088004,
     ],
     [
+        -68.278271180977001,
         0.0074999999999999997,
         360,
         125000,
         1,
         1,
         0,
-        -68.278271180977001,
     ],
     [
+        -9027.7626490046005,
         0.0041666666669999998,
         60,
         50000,
         1,
         12,
         0,
-        -9027.7626490046005,
     ],
     [
+        -9489.6401197913001,
         0.0041666666669999998,
         60,
         50000,
         13,
         24,
         0,
-        -9489.6401197913001,
     ],
     [
+        -9975.1481185740995,
         0.0041666666669999998,
         60,
         50000,
         25,
         36,
         0,
-        -9975.1481185740995,
     ],
     [
+        -10485.495628014,
         0.0041666666669999998,
         60,
         50000,
         37,
         48,
         0,
-        -10485.495628014,
     ],
     [
+        -11021.953484617001,
         0.0041666666669999998,
         60,
         50000,
         49,
         60,
         0,
-        -11021.953484617001,
     ],
     [
+        '#VALUE!',
         0.0074999999999999997,
         360,
         125000,
         24,
         13,
         0,
-        '#VALUE!',
     ],
     [
+        '#NUM!',
         0.0074999999999999997,
         360,
         125000,
         24,
         13,
         2,
-        '#NUM!',
     ],
 ];