PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/CachedObjectStorageFactory.php

Doc Comments +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
     /**
      * Return the current cache storage class
      *
-     * @return \CachedObjectStorage\ICache|null
+     * @return string
      **/
     public static function getCacheStorageClass()
     {

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
             return false;
         }
 
-        $cacheStorageClass = '\\PHPExcel\\CachedObjectStorage\\'.$method;
+        $cacheStorageClass = '\\PHPExcel\\CachedObjectStorage\\' . $method;
         if (!call_user_func([$cacheStorageClass, 'cacheMethodIsAvailable'])) {
             return false;
         }

src/PhpSpreadsheet/Calculation.php

Doc Comments +26 added lines, -3 removed lines

@@ -2110,7 +2110,6 @@ 
      * Unset an instance of this class
      *
      * @access    public
-     * @param   Spreadsheet $spreadsheet  Injected spreadsheet identifying the instance to unset
      */
     public function __destruct()
     {
@@ -2401,6 +2400,10 @@ 
         return $formula;
     }
 
+    /**
+     * @param string $fromSeparator
+     * @param string $toSeparator
+     */
     private static function translateFormula($from, $to, $formula, $fromSeparator, $toSeparator)
     {
         //    Convert any Excel function names to the required language
@@ -2718,6 +2721,9 @@ 
     }
 
 
+    /**
+     * @param string $cellReference
+     */
     public function getValueFromCache($cellReference, &$cellValue)
     {
         // Is calculation cacheing enabled?
@@ -2732,6 +2738,9 @@ 
         return false;
     }
 
+    /**
+     * @param string $cellReference
+     */
     public function saveValueToCache($cellReference, $cellValue)
     {
         if ($this->calculationCacheEnabled) {
@@ -2851,7 +2860,7 @@ 
      * Read the dimensions of a matrix, and re-index it with straight numeric keys starting from row 0, column 0
      *
      * @param    mixed        &$matrix        matrix operand
-     * @return    array        An array comprising the number of rows, and number of columns
+     * @return    integer[]        An array comprising the number of rows, and number of columns
      */
     private static function getMatrixDimensions(&$matrix)
     {
@@ -3002,7 +3011,7 @@ 
      * Format type and details of an operand for display in the log (based on operand type)
      *
      * @param    mixed        $value    First matrix operand
-     * @return    mixed
+     * @return    string|null
      */
     private function showTypeDetails($value)
     {
@@ -3036,6 +3045,9 @@ 
     }
 
 
+    /**
+     * @param string $formula
+     */
     private function convertMatrixReferences($formula)
     {
         static $matrixReplaceFrom = array('{', ';', '}');
@@ -3126,6 +3138,10 @@ 
     );
 
     // Convert infix to postfix notation
+
+    /**
+     * @param string $formula
+     */
     private function _parseFormula($formula, Cell $pCell = null)
     {
         if (($formula = $this->convertMatrixReferences(trim($formula))) === false) {
@@ -3493,6 +3509,10 @@ 
     }
 
     // evaluate postfix notation
+
+    /**
+     * @param string $cellID
+     */
     private function processTokenStack($tokens, $cellID = null, Cell $pCell = null)
     {
         if ($tokens == false) {
@@ -4077,6 +4097,9 @@ 
         return strcmp($inversedStr1, $inversedStr2);
     }
 
+    /**
+     * @param string $matrixFunction
+     */
     private function executeNumericBinaryOperation($cellID, $operand1, $operand2, $operation, $matrixFunction, &$stack)
     {
         //    Validate the two operands

Indentation +8 added lines, -8 removed lines

@@ -262,7 +262,7 @@ 
         'NULL'  => null
     );
 
-     //    PHPExcel functions
+        //    PHPExcel functions
     private static $PHPExcelFunctions = array(
         'ABS' => array(
             'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG,
@@ -3137,13 +3137,13 @@ 
         $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null;
 
         $regexpMatchString = '/^('.self::CALCULATION_REGEXP_FUNCTION.
-                               '|'.self::CALCULATION_REGEXP_CELLREF.
-                               '|'.self::CALCULATION_REGEXP_NUMBER.
-                               '|'.self::CALCULATION_REGEXP_STRING.
-                               '|'.self::CALCULATION_REGEXP_OPENBRACE.
-                               '|'.self::CALCULATION_REGEXP_NAMEDRANGE.
-                               '|'.self::CALCULATION_REGEXP_ERROR.
-                             ')/si';
+                                '|'.self::CALCULATION_REGEXP_CELLREF.
+                                '|'.self::CALCULATION_REGEXP_NUMBER.
+                                '|'.self::CALCULATION_REGEXP_STRING.
+                                '|'.self::CALCULATION_REGEXP_OPENBRACE.
+                                '|'.self::CALCULATION_REGEXP_NAMEDRANGE.
+                                '|'.self::CALCULATION_REGEXP_ERROR.
+                                ')/si';
 
         //    Start with initialisation
         $index = 0;

Spacing +131 added lines, -131 removed lines

@@ -51,15 +51,15 @@ 
     //    String operand
     const CALCULATION_REGEXP_STRING        = '"(?:[^"]|"")*"';
     //    Opening bracket
-    const CALCULATION_REGEXP_OPENBRACE    = '\(';
+    const CALCULATION_REGEXP_OPENBRACE = '\(';
     //    Function (allow for the old @ symbol that could be used to prefix a function, but we'll ignore it)
-    const CALCULATION_REGEXP_FUNCTION    = '@?([A-Z][A-Z0-9\.]*)[\s]*\(';
+    const CALCULATION_REGEXP_FUNCTION = '@?([A-Z][A-Z0-9\.]*)[\s]*\(';
     //    Cell reference (cell or range of cells, with or without a sheet reference)
-    const CALCULATION_REGEXP_CELLREF    = CALCULATION_REGEXP_CELLREF;
+    const CALCULATION_REGEXP_CELLREF = CALCULATION_REGEXP_CELLREF;
     //    Named Range of cells
-    const CALCULATION_REGEXP_NAMEDRANGE    = CALCULATION_REGEXP_NAMEDRANGE;
+    const CALCULATION_REGEXP_NAMEDRANGE = CALCULATION_REGEXP_NAMEDRANGE;
     //    Error
-    const CALCULATION_REGEXP_ERROR        = '\#[A-Z][A-Z0_\/]*[!\?]?';
+    const CALCULATION_REGEXP_ERROR = '\#[A-Z][A-Z0_\/]*[!\?]?';
 
 
     /** constants */
@@ -101,7 +101,7 @@ 
      * @access    private
      * @var array
      */
-    private $calculationCache = array ();
+    private $calculationCache = array();
 
 
     /**
@@ -121,10 +121,10 @@ 
      * @var array
      */
     private static $operators = array(
-        '+' => true,    '-' => true,    '*' => true,    '/' => true,
-        '^' => true,    '&' => true,    '%' => false,    '~' => false,
-        '>' => true,    '<' => true,    '=' => true,    '>=' => true,
-        '<=' => true,    '<>' => true,    '|' => true,    ':' => true
+        '+' => true, '-' => true, '*' => true, '/' => true,
+        '^' => true, '&' => true, '%' => false, '~' => false,
+        '>' => true, '<' => true, '=' => true, '>=' => true,
+        '<=' => true, '<>' => true, '|' => true, ':' => true
     );
 
     /**
@@ -134,10 +134,10 @@ 
      * @var array
      */
     private static $binaryOperators = array(
-        '+' => true,    '-' => true,    '*' => true,    '/' => true,
-        '^' => true,    '&' => true,    '>' => true,    '<' => true,
-        '=' => true,    '>=' => true,    '<=' => true,    '<>' => true,
-        '|' => true,    ':' => true
+        '+' => true, '-' => true, '*' => true, '/' => true,
+        '^' => true, '&' => true, '>' => true, '<' => true,
+        '=' => true, '>=' => true, '<=' => true, '<>' => true,
+        '|' => true, ':' => true
     );
 
     /**
@@ -206,7 +206,7 @@ 
      * @var float
      *
      */
-    private $delta    = 0.1e-12;
+    private $delta = 0.1e-12;
 
 
     /**
@@ -215,7 +215,7 @@ 
      * @var string
      *
      */
-    private static $localeLanguage = 'en_us';                    //    US English    (default locale)
+    private static $localeLanguage = 'en_us'; //    US English    (default locale)
 
     /**
      * List of available locale settings
@@ -2073,9 +2073,9 @@ 
 
     private static function loadLocales()
     {
-        $localeFileDirectory = PHPEXCEL_ROOT.'PHPExcel/locale/';
-        foreach (glob($localeFileDirectory.'/*', GLOB_ONLYDIR) as $filename) {
-            $filename = substr($filename, strlen($localeFileDirectory)+1);
+        $localeFileDirectory = PHPEXCEL_ROOT . 'PHPExcel/locale/';
+        foreach (glob($localeFileDirectory . '/*', GLOB_ONLYDIR) as $filename) {
+            $filename = substr($filename, strlen($localeFileDirectory) + 1);
             if ($filename != 'en') {
                 self::$validLocaleLanguages[] = $filename;
             }
@@ -2320,10 +2320,10 @@ 
             //    Default is English, if user isn't requesting english, then read the necessary data from the locale files
             if ($locale != 'en_us') {
                 //    Search for a file with a list of function names for locale
-                $functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $locale).DIRECTORY_SEPARATOR.'functions';
+                $functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $locale) . DIRECTORY_SEPARATOR . 'functions';
                 if (!file_exists($functionNamesFile)) {
                     //    If there isn't a locale specific function file, look for a language specific function file
-                    $functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'functions';
+                    $functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR . $language . DIRECTORY_SEPARATOR . 'functions';
                     if (!file_exists($functionNamesFile)) {
                         return false;
                     }
@@ -2331,7 +2331,7 @@ 
                 //    Retrieve the list of locale or language specific function names
                 $localeFunctions = file($functionNamesFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
                 foreach ($localeFunctions as $localeFunction) {
-                    list($localeFunction) = explode('##', $localeFunction);    //    Strip out comments
+                    list($localeFunction) = explode('##', $localeFunction); //    Strip out comments
                     if (strpos($localeFunction, '=') !== false) {
                         list($fName, $lfName) = explode('=', $localeFunction);
                         $fName = trim($fName);
@@ -2349,14 +2349,14 @@ 
                     self::$localeBoolean['FALSE'] = self::$localeFunctions['FALSE'];
                 }
 
-                $configFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $locale).DIRECTORY_SEPARATOR.'config';
+                $configFile = PHPEXCEL_ROOT . 'PHPExcel' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $locale) . DIRECTORY_SEPARATOR . 'config';
                 if (!file_exists($configFile)) {
-                    $configFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'config';
+                    $configFile = PHPEXCEL_ROOT . 'PHPExcel' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR . $language . DIRECTORY_SEPARATOR . 'config';
                 }
                 if (file_exists($configFile)) {
                     $localeSettings = file($configFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
                     foreach ($localeSettings as $localeSetting) {
-                        list($localeSetting) = explode('##', $localeSetting);    //    Strip out comments
+                        list($localeSetting) = explode('##', $localeSetting); //    Strip out comments
                         if (strpos($localeSetting, '=') !== false) {
                             list($settingName, $settingValue) = explode('=', $localeSetting);
                             $settingName = strtoupper(trim($settingName));
@@ -2394,7 +2394,7 @@ 
                     break;
                 case $fromSeparator:
                     if (!$inBraces) {
-                        $formula = mb_substr($formula, 0, $i).$toSeparator.mb_substr($formula, $i+1);
+                        $formula = mb_substr($formula, 0, $i) . $toSeparator . mb_substr($formula, $i + 1);
                     }
             }
         }
@@ -2440,20 +2440,20 @@ 
         if (self::$functionReplaceFromExcel === null) {
             self::$functionReplaceFromExcel = array();
             foreach (array_keys(self::$localeFunctions) as $excelFunctionName) {
-                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])'.preg_quote($excelFunctionName).'([\s]*\()/Ui';
+                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])' . preg_quote($excelFunctionName) . '([\s]*\()/Ui';
             }
             foreach (array_keys(self::$localeBoolean) as $excelBoolean) {
-                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])'.preg_quote($excelBoolean).'([^\w\.])/Ui';
+                self::$functionReplaceFromExcel[] = '/(@?[^\w\.])' . preg_quote($excelBoolean) . '([^\w\.])/Ui';
             }
         }
 
         if (self::$functionReplaceToLocale === null) {
             self::$functionReplaceToLocale = array();
             foreach (array_values(self::$localeFunctions) as $localeFunctionName) {
-                self::$functionReplaceToLocale[] = '$1'.trim($localeFunctionName).'$2';
+                self::$functionReplaceToLocale[] = '$1' . trim($localeFunctionName) . '$2';
             }
             foreach (array_values(self::$localeBoolean) as $localeBoolean) {
-                self::$functionReplaceToLocale[] = '$1'.trim($localeBoolean).'$2';
+                self::$functionReplaceToLocale[] = '$1' . trim($localeBoolean) . '$2';
             }
         }
 
@@ -2469,20 +2469,20 @@ 
         if (self::$functionReplaceFromLocale === null) {
             self::$functionReplaceFromLocale = array();
             foreach (array_values(self::$localeFunctions) as $localeFunctionName) {
-                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])'.preg_quote($localeFunctionName).'([\s]*\()/Ui';
+                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])' . preg_quote($localeFunctionName) . '([\s]*\()/Ui';
             }
             foreach (array_values(self::$localeBoolean) as $excelBoolean) {
-                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])'.preg_quote($excelBoolean).'([^\w\.])/Ui';
+                self::$functionReplaceFromLocale[] = '/(@?[^\w\.])' . preg_quote($excelBoolean) . '([^\w\.])/Ui';
             }
         }
 
         if (self::$functionReplaceToExcel === null) {
             self::$functionReplaceToExcel = array();
             foreach (array_keys(self::$localeFunctions) as $excelFunctionName) {
-                self::$functionReplaceToExcel[] = '$1'.trim($excelFunctionName).'$2';
+                self::$functionReplaceToExcel[] = '$1' . trim($excelFunctionName) . '$2';
             }
             foreach (array_keys(self::$localeBoolean) as $excelBoolean) {
-                self::$functionReplaceToExcel[] = '$1'.trim($excelBoolean).'$2';
+                self::$functionReplaceToExcel[] = '$1' . trim($excelBoolean) . '$2';
             }
         }
 
@@ -2518,12 +2518,12 @@ 
     {
         if (is_string($value)) {
             //    Error values cannot be "wrapped"
-            if (preg_match('/^'.self::CALCULATION_REGEXP_ERROR.'$/i', $value, $match)) {
+            if (preg_match('/^' . self::CALCULATION_REGEXP_ERROR . '$/i', $value, $match)) {
                 //    Return Excel errors "as is"
                 return $value;
             }
             //    Return strings wrapped in quotes
-            return '"'.$value.'"';
+            return '"' . $value . '"';
         //    Convert numeric errors to NaN error
         } elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
             return Calculation\Functions::NAN();
@@ -2843,7 +2843,7 @@ 
             //    Given two matrices of (potentially) unequal size, convert the larger in each dimension to match the smaller
             self::resizeMatricesShrink($operand1, $operand2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns);
         }
-        return array( $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns);
+        return array($matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns);
     }
 
 
@@ -2929,14 +2929,14 @@ 
         if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
             if ($matrix2Columns < $matrix1Columns) {
                 for ($i = 0; $i < $matrix2Rows; ++$i) {
-                    $x = $matrix2[$i][$matrix2Columns-1];
+                    $x = $matrix2[$i][$matrix2Columns - 1];
                     for ($j = $matrix2Columns; $j < $matrix1Columns; ++$j) {
                         $matrix2[$i][$j] = $x;
                     }
                 }
             }
             if ($matrix2Rows < $matrix1Rows) {
-                $x = $matrix2[$matrix2Rows-1];
+                $x = $matrix2[$matrix2Rows - 1];
                 for ($i = 0; $i < $matrix1Rows; ++$i) {
                     $matrix2[$i] = $x;
                 }
@@ -2946,14 +2946,14 @@ 
         if (($matrix1Columns < $matrix2Columns) || ($matrix1Rows < $matrix2Rows)) {
             if ($matrix1Columns < $matrix2Columns) {
                 for ($i = 0; $i < $matrix1Rows; ++$i) {
-                    $x = $matrix1[$i][$matrix1Columns-1];
+                    $x = $matrix1[$i][$matrix1Columns - 1];
                     for ($j = $matrix1Columns; $j < $matrix2Columns; ++$j) {
                         $matrix1[$i][$j] = $x;
                     }
                 }
             }
             if ($matrix1Rows < $matrix2Rows) {
-                $x = $matrix1[$matrix1Rows-1];
+                $x = $matrix1[$matrix1Rows - 1];
                 for ($i = 0; $i < $matrix2Rows; ++$i) {
                     $matrix1[$i] = $x;
                 }
@@ -2987,9 +2987,9 @@ 
                         $returnMatrix[] = $this->showValue($row);
                     }
                 }
-                return '{ '.implode($rpad, $returnMatrix).' }';
+                return '{ ' . implode($rpad, $returnMatrix) . ' }';
             } elseif (is_string($value) && (trim($value, '"') == $value)) {
-                return '"'.$value.'"';
+                return '"' . $value . '"';
             } elseif (is_bool($value)) {
                 return ($value) ? self::$localeBoolean['TRUE'] : self::$localeBoolean['FALSE'];
             }
@@ -3026,12 +3026,12 @@ 
                 if ($value == '') {
                     return 'an empty string';
                 } elseif ($value{0} == '#') {
-                    return 'a '.$value.' error';
+                    return 'a ' . $value . ' error';
                 } else {
                     $typeString = 'a string';
                 }
             }
-            return $typeString.' with a value of '.$this->showValue($value);
+            return $typeString . ' with a value of ' . $this->showValue($value);
         }
     }
 
@@ -3097,31 +3097,31 @@ 
     //    Binary Operators
     //    These operators always work on two values
     //    Array key is the operator, the value indicates whether this is a left or right associative operator
-    private static $operatorAssociativity    = array(
-        '^' => 0,                                                            //    Exponentiation
-        '*' => 0, '/' => 0,                                                 //    Multiplication and Division
-        '+' => 0, '-' => 0,                                                    //    Addition and Subtraction
-        '&' => 0,                                                            //    Concatenation
-        '|' => 0, ':' => 0,                                                    //    Intersect and Range
+    private static $operatorAssociativity = array(
+        '^' => 0, //    Exponentiation
+        '*' => 0, '/' => 0, //    Multiplication and Division
+        '+' => 0, '-' => 0, //    Addition and Subtraction
+        '&' => 0, //    Concatenation
+        '|' => 0, ':' => 0, //    Intersect and Range
         '>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0        //    Comparison
     );
 
     //    Comparison (Boolean) Operators
     //    These operators work on two values, but always return a boolean result
-    private static $comparisonOperators    = array('>' => true, '<' => true, '=' => true, '>=' => true, '<=' => true, '<>' => true);
+    private static $comparisonOperators = array('>' => true, '<' => true, '=' => true, '>=' => true, '<=' => true, '<>' => true);
 
     //    Operator Precedence
     //    This list includes all valid operators, whether binary (including boolean) or unary (such as %)
     //    Array key is the operator, the value is its precedence
-    private static $operatorPrecedence    = array(
-        ':' => 8,                                                                //    Range
-        '|' => 7,                                                                //    Intersect
-        '~' => 6,                                                                //    Negation
-        '%' => 5,                                                                //    Percentage
-        '^' => 4,                                                                //    Exponentiation
-        '*' => 3, '/' => 3,                                                     //    Multiplication and Division
-        '+' => 2, '-' => 2,                                                        //    Addition and Subtraction
-        '&' => 1,                                                                //    Concatenation
+    private static $operatorPrecedence = array(
+        ':' => 8, //    Range
+        '|' => 7, //    Intersect
+        '~' => 6, //    Negation
+        '%' => 5, //    Percentage
+        '^' => 4, //    Exponentiation
+        '*' => 3, '/' => 3, //    Multiplication and Division
+        '+' => 2, '-' => 2, //    Addition and Subtraction
+        '&' => 1, //    Concatenation
         '>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0            //    Comparison
     );
 
@@ -3136,22 +3136,22 @@ 
         //        so we store the parent worksheet so that we can re-attach it when necessary
         $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null;
 
-        $regexpMatchString = '/^('.self::CALCULATION_REGEXP_FUNCTION.
-                               '|'.self::CALCULATION_REGEXP_CELLREF.
-                               '|'.self::CALCULATION_REGEXP_NUMBER.
-                               '|'.self::CALCULATION_REGEXP_STRING.
-                               '|'.self::CALCULATION_REGEXP_OPENBRACE.
-                               '|'.self::CALCULATION_REGEXP_NAMEDRANGE.
-                               '|'.self::CALCULATION_REGEXP_ERROR.
+        $regexpMatchString = '/^(' . self::CALCULATION_REGEXP_FUNCTION .
+                               '|' . self::CALCULATION_REGEXP_CELLREF .
+                               '|' . self::CALCULATION_REGEXP_NUMBER .
+                               '|' . self::CALCULATION_REGEXP_STRING .
+                               '|' . self::CALCULATION_REGEXP_OPENBRACE .
+                               '|' . self::CALCULATION_REGEXP_NAMEDRANGE .
+                               '|' . self::CALCULATION_REGEXP_ERROR .
                              ')/si';
 
         //    Start with initialisation
         $index = 0;
         $stack = new Calculation\Token\Stack;
         $output = array();
-        $expectingOperator = false;                    //    We use this test in syntax-checking the expression to determine when a
+        $expectingOperator = false; //    We use this test in syntax-checking the expression to determine when a
                                                     //        - is a negation or + is a positive operator rather than an operation
-        $expectingOperand = false;                    //    We use this test in syntax-checking the expression to determine whether an operand
+        $expectingOperand = false; //    We use this test in syntax-checking the expression to determine whether an operand
                                                     //        should be null in a function call
         //    The guts of the lexical parser
         //    Loop through the formula extracting each operator and operand in turn
@@ -3159,7 +3159,7 @@ 
 //echo 'Assessing Expression '.substr($formula, $index), PHP_EOL;
             $opCharacter = $formula{$index};    //    Get the first character of the value at the current index position
 //echo 'Initial character of expression block is '.$opCharacter, PHP_EOL;
-            if ((isset(self::$comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset(self::$comparisonOperators[$formula{$index+1}]))) {
+            if ((isset(self::$comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset(self::$comparisonOperators[$formula{$index + 1}]))) {
                 $opCharacter .= $formula{++$index};
 //echo 'Initial character of expression block is comparison operator '.$opCharacter.PHP_EOL;
             }
@@ -3171,26 +3171,26 @@ 
 
             if ($opCharacter == '-' && !$expectingOperator) {                //    Is it a negation instead of a minus?
 //echo 'Element is a Negation operator', PHP_EOL;
-                $stack->push('Unary Operator', '~');                            //    Put a negation on the stack
-                ++$index;                                                    //        and drop the negation symbol
+                $stack->push('Unary Operator', '~'); //    Put a negation on the stack
+                ++$index; //        and drop the negation symbol
             } elseif ($opCharacter == '%' && $expectingOperator) {
 //echo 'Element is a Percentage operator', PHP_EOL;
-                $stack->push('Unary Operator', '%');                            //    Put a percentage on the stack
+                $stack->push('Unary Operator', '%'); //    Put a percentage on the stack
                 ++$index;
             } elseif ($opCharacter == '+' && !$expectingOperator) {            //    Positive (unary plus rather than binary operator plus) can be discarded?
 //echo 'Element is a Positive number, not Plus operator', PHP_EOL;
-                ++$index;                                                    //    Drop the redundant plus symbol
+                ++$index; //    Drop the redundant plus symbol
             } elseif ((($opCharacter == '~') || ($opCharacter == '|')) && (!$isOperandOrFunction)) {    //    We have to explicitly deny a tilde or pipe, because they are legal
-                return $this->raiseFormulaError("Formula Error: Illegal character '~'");                //        on the stack but not in the input expression
+                return $this->raiseFormulaError("Formula Error: Illegal character '~'"); //        on the stack but not in the input expression
             } elseif ((isset(self::$operators[$opCharacter]) or $isOperandOrFunction) && $expectingOperator) {    //    Are we putting an operator on the stack?
 //echo 'Element with value '.$opCharacter.' is an Operator', PHP_EOL;
                 while ($stack->count() > 0 &&
                     ($o2 = $stack->last()) &&
                     isset(self::$operators[$o2['value']]) &&
                     @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])) {
-                    $output[] = $stack->pop();                                //    Swap operands and higher precedence operators from the stack to the output
+                    $output[] = $stack->pop(); //    Swap operands and higher precedence operators from the stack to the output
                 }
-                $stack->push('Binary Operator', $opCharacter);    //    Finally put our current operator onto the stack
+                $stack->push('Binary Operator', $opCharacter); //    Finally put our current operator onto the stack
                 ++$index;
                 $expectingOperator = false;
             } elseif ($opCharacter == ')' && $expectingOperator) {            //    Are we expecting to close a parenthesis?
@@ -3204,11 +3204,11 @@ 
                     }
                 }
                 $d = $stack->last(2);
-                if (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches)) {    //    Did this parenthesis just close a function?
-                    $functionName = $matches[1];                                        //    Get the function name
+                if (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $d['value'], $matches)) {    //    Did this parenthesis just close a function?
+                    $functionName = $matches[1]; //    Get the function name
 //echo 'Closed Function is '.$functionName, PHP_EOL;
                     $d = $stack->pop();
-                    $argumentCount = $d['value'];        //    See how many arguments there were (argument count is the next value stored on the stack)
+                    $argumentCount = $d['value']; //    See how many arguments there were (argument count is the next value stored on the stack)
 //if ($argumentCount == 0) {
 //    echo 'With no arguments', PHP_EOL;
 //} elseif ($argumentCount == 1) {
@@ -3216,8 +3216,8 @@ 
 //} else {
 //    echo 'With '.$argumentCount.' arguments', PHP_EOL;
 //}
-                    $output[] = $d;                        //    Dump the argument count on the output
-                    $output[] = $stack->pop();            //    Pop the function and push onto the output
+                    $output[] = $d; //    Dump the argument count on the output
+                    $output[] = $stack->pop(); //    Pop the function and push onto the output
                     if (isset(self::$controlFunctions[$functionName])) {
 //echo 'Built-in function '.$functionName, PHP_EOL;
                         $expectedArgumentCount = self::$controlFunctions[$functionName]['argumentCount'];
@@ -3236,7 +3236,7 @@ 
 //echo '$expectedArgumentCount is between 0 and '.abs($expectedArgumentCount), PHP_EOL;
                             if ($argumentCount > abs($expectedArgumentCount)) {
                                 $argumentCountError = true;
-                                $expectedArgumentCountString = 'no more than '.abs($expectedArgumentCount);
+                                $expectedArgumentCountString = 'no more than ' . abs($expectedArgumentCount);
                             }
                         } else {
 //echo '$expectedArgumentCount is numeric '.$expectedArgumentCount, PHP_EOL;
@@ -3253,25 +3253,25 @@ 
                             case '+':
                                 if ($argumentCount < $argMatch[1]) {
                                     $argumentCountError = true;
-                                    $expectedArgumentCountString = $argMatch[1].' or more ';
+                                    $expectedArgumentCountString = $argMatch[1] . ' or more ';
                                 }
                                 break;
                             case '-':
                                 if (($argumentCount < $argMatch[1]) || ($argumentCount > $argMatch[3])) {
                                     $argumentCountError = true;
-                                    $expectedArgumentCountString = 'between '.$argMatch[1].' and '.$argMatch[3];
+                                    $expectedArgumentCountString = 'between ' . $argMatch[1] . ' and ' . $argMatch[3];
                                 }
                                 break;
                             case ',':
                                 if (($argumentCount != $argMatch[1]) && ($argumentCount != $argMatch[3])) {
                                     $argumentCountError = true;
-                                    $expectedArgumentCountString = 'either '.$argMatch[1].' or '.$argMatch[3];
+                                    $expectedArgumentCountString = 'either ' . $argMatch[1] . ' or ' . $argMatch[3];
                                 }
                                 break;
                         }
                     }
                     if ($argumentCountError) {
-                        return $this->raiseFormulaError("Formula Error: Wrong number of arguments for $functionName() function: $argumentCount given, ".$expectedArgumentCountString." expected");
+                        return $this->raiseFormulaError("Formula Error: Wrong number of arguments for $functionName() function: $argumentCount given, " . $expectedArgumentCountString . " expected");
                     }
                 }
                 ++$index;
@@ -3281,7 +3281,7 @@ 
                     if ($o2 === null) {
                         return $this->raiseFormulaError("Formula Error: Unexpected ,");
                     } else {
-                        $output[] = $o2;    // pop the argument expression stuff and push onto the output
+                        $output[] = $o2; // pop the argument expression stuff and push onto the output
                     }
                 }
                 //    If we've a comma when we're expecting an operand, then what we actually have is a null operand;
@@ -3291,12 +3291,12 @@ 
                 }
                 // make sure there was a function
                 $d = $stack->last(2);
-                if (!preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches)) {
+                if (!preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $d['value'], $matches)) {
                     return $this->raiseFormulaError("Formula Error: Unexpected ,");
                 }
                 $d = $stack->pop();
-                $stack->push($d['type'], ++$d['value'], $d['reference']);    // increment the argument count
-                $stack->push('Brace', '(');    // put the ( back on, we'll need to pop back to it again
+                $stack->push($d['type'], ++$d['value'], $d['reference']); // increment the argument count
+                $stack->push('Brace', '('); // put the ( back on, we'll need to pop back to it again
                 $expectingOperator = false;
                 $expectingOperand = true;
                 ++$index;
@@ -3311,24 +3311,24 @@ 
                 $length = strlen($val);
 //                echo 'Element with value '.$val.' is an Operand, Variable, Constant, String, Number, Cell Reference or Function<br />';
 
-                if (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $val, $matches)) {
+                if (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $val, $matches)) {
                     $val = preg_replace('/\s/u', '', $val);
 //                    echo 'Element '.$val.' is a Function<br />';
                     if (isset(self::$PHPExcelFunctions[strtoupper($matches[1])]) || isset(self::$controlFunctions[strtoupper($matches[1])])) {    // it's a function
                         $stack->push('Function', strtoupper($val));
-                        $ax = preg_match('/^\s*(\s*\))/ui', substr($formula, $index+$length), $amatch);
+                        $ax = preg_match('/^\s*(\s*\))/ui', substr($formula, $index + $length), $amatch);
                         if ($ax) {
-                            $stack->push('Operand Count for Function '.strtoupper($val).')', 0);
+                            $stack->push('Operand Count for Function ' . strtoupper($val) . ')', 0);
                             $expectingOperator = true;
                         } else {
-                            $stack->push('Operand Count for Function '.strtoupper($val).')', 1);
+                            $stack->push('Operand Count for Function ' . strtoupper($val) . ')', 1);
                             $expectingOperator = false;
                         }
                         $stack->push('Brace', '(');
                     } else {    // it's a var w/ implicit multiplication
                         $output[] = array('type' => 'Value', 'value' => $matches[1], 'reference' => null);
                     }
-                } elseif (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $val, $matches)) {
+                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $val, $matches)) {
 //                    echo 'Element '.$val.' is a Cell reference<br />';
                     //    Watch for this case-change when modifying to allow cell references in different worksheets...
                     //    Should only be applied to the actual cell column, not the worksheet name
@@ -3340,10 +3340,10 @@ 
                         if ($matches[2] == '') {
                             //    Otherwise, we 'inherit' the worksheet reference from the start cell reference
                             //    The start of the cell range reference should be the last entry in $output
-                            $startCellRef = $output[count($output)-1]['value'];
-                            preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $startCellRef, $startMatches);
+                            $startCellRef = $output[count($output) - 1]['value'];
+                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $startCellRef, $startMatches);
                             if ($startMatches[2] > '') {
-                                $val = $startMatches[2].'!'.$val;
+                                $val = $startMatches[2] . '!' . $val;
                             }
                         } else {
                             return $this->raiseFormulaError("3D Range references are not yet supported");
@@ -3357,7 +3357,7 @@ 
                     //    If the last entry on the stack was a : operator, then we may have a row or column range reference
                     $testPrevOp = $stack->last(1);
                     if ($testPrevOp['value'] == ':') {
-                        $startRowColRef = $output[count($output)-1]['value'];
+                        $startRowColRef = $output[count($output) - 1]['value'];
                         $rangeWS1 = '';
                         if (strpos('!', $startRowColRef) !== false) {
                             list($rangeWS1, $startRowColRef) = explode('!', $startRowColRef);
@@ -3375,15 +3375,15 @@ 
                         if ((is_integer($startRowColRef)) && (ctype_digit($val)) &&
                             ($startRowColRef <= 1048576) && ($val <= 1048576)) {
                             //    Row range
-                            $endRowColRef = ($pCellParent !== null) ? $pCellParent->getHighestColumn() : 'XFD';    //    Max 16,384 columns for Excel2007
-                            $output[count($output)-1]['value'] = $rangeWS1.'A'.$startRowColRef;
-                            $val = $rangeWS2.$endRowColRef.$val;
+                            $endRowColRef = ($pCellParent !== null) ? $pCellParent->getHighestColumn() : 'XFD'; //    Max 16,384 columns for Excel2007
+                            $output[count($output) - 1]['value'] = $rangeWS1 . 'A' . $startRowColRef;
+                            $val = $rangeWS2 . $endRowColRef . $val;
                         } elseif ((ctype_alpha($startRowColRef)) && (ctype_alpha($val)) &&
                             (strlen($startRowColRef) <= 3) && (strlen($val) <= 3)) {
                             //    Column range
-                            $endRowColRef = ($pCellParent !== null) ? $pCellParent->getHighestRow() : 1048576;        //    Max 1,048,576 rows for Excel2007
-                            $output[count($output)-1]['value'] = $rangeWS1.strtoupper($startRowColRef).'1';
-                            $val = $rangeWS2.$val.$endRowColRef;
+                            $endRowColRef = ($pCellParent !== null) ? $pCellParent->getHighestRow() : 1048576; //    Max 1,048,576 rows for Excel2007
+                            $output[count($output) - 1]['value'] = $rangeWS1 . strtoupper($startRowColRef) . '1';
+                            $val = $rangeWS2 . $val . $endRowColRef;
                         }
                     }
 
@@ -3452,16 +3452,16 @@ 
                 //    If we're expecting an operator, but only have a space between the previous and next operands (and both are
                 //        Cell References) then we have an INTERSECTION operator
 //                echo 'Possible Intersect Operator<br />';
-                if (($expectingOperator) && (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'.*/Ui', substr($formula, $index), $match)) &&
-                    ($output[count($output)-1]['type'] == 'Cell Reference')) {
+                if (($expectingOperator) && (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '.*/Ui', substr($formula, $index), $match)) &&
+                    ($output[count($output) - 1]['type'] == 'Cell Reference')) {
 //                    echo 'Element is an Intersect Operator<br />';
                     while ($stack->count() > 0 &&
                         ($o2 = $stack->last()) &&
                         isset(self::$operators[$o2['value']]) &&
                         @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])) {
-                        $output[] = $stack->pop();                                //    Swap operands and higher precedence operators from the stack to the output
+                        $output[] = $stack->pop(); //    Swap operands and higher precedence operators from the stack to the output
                     }
-                    $stack->push('Binary Operator', '|');    //    Put an Intersect Operator on the stack
+                    $stack->push('Binary Operator', '|'); //    Put an Intersect Operator on the stack
                     $expectingOperator = false;
                 }
             }
@@ -3469,7 +3469,7 @@ 
 
         while (($op = $stack->pop()) !== null) {    // pop everything off the stack and push onto output
             if ((is_array($op) && $op['value'] == '(') || ($op === '(')) {
-                return $this->raiseFormulaError("Formula Error: Expecting ')'");    // if there are any opening braces on the stack, then braces were unbalanced
+                return $this->raiseFormulaError("Formula Error: Expecting ')'"); // if there are any opening braces on the stack, then braces were unbalanced
             }
             $output[] = $op;
         }
@@ -3486,7 +3486,7 @@ 
             $cKeys = array_keys(array_keys($operand[$rowKey]));
             $colKey = array_shift($cKeys);
             if (ctype_upper($colKey)) {
-                $operandData['reference'] = $colKey.$rowKey;
+                $operandData['reference'] = $colKey . $rowKey;
             }
         }
         return $operand;
@@ -3559,20 +3559,20 @@ 
                         if ($sheet1 == $sheet2) {
                             if ($operand1Data['reference'] === null) {
                                 if ((trim($operand1Data['value']) != '') && (is_numeric($operand1Data['value']))) {
-                                    $operand1Data['reference'] = $pCell->getColumn().$operand1Data['value'];
+                                    $operand1Data['reference'] = $pCell->getColumn() . $operand1Data['value'];
                                 } elseif (trim($operand1Data['reference']) == '') {
                                     $operand1Data['reference'] = $pCell->getCoordinate();
                                 } else {
-                                    $operand1Data['reference'] = $operand1Data['value'].$pCell->getRow();
+                                    $operand1Data['reference'] = $operand1Data['value'] . $pCell->getRow();
                                 }
                             }
                             if ($operand2Data['reference'] === null) {
                                 if ((trim($operand2Data['value']) != '') && (is_numeric($operand2Data['value']))) {
-                                    $operand2Data['reference'] = $pCell->getColumn().$operand2Data['value'];
+                                    $operand2Data['reference'] = $pCell->getColumn() . $operand2Data['value'];
                                 } elseif (trim($operand2Data['reference']) == '') {
                                     $operand2Data['reference'] = $pCell->getCoordinate();
                                 } else {
-                                    $operand2Data['reference'] = $operand2Data['value'].$pCell->getRow();
+                                    $operand2Data['reference'] = $operand2Data['value'] . $pCell->getRow();
                                 }
                             }
 
@@ -3583,7 +3583,7 @@ 
                                 $oCol[] = Cell::columnIndexFromString($oCR[0]) - 1;
                                 $oRow[] = $oCR[1];
                             }
-                            $cellRef = Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.Cell::stringFromColumnIndex(max($oCol)).max($oRow);
+                            $cellRef = Cell::stringFromColumnIndex(min($oCol)) . min($oRow) . ':' . Cell::stringFromColumnIndex(max($oCol)) . max($oRow);
                             if ($pCellParent !== null) {
                                 $cellValue = $this->extractCellRange($cellRef, $this->spreadsheet->getSheetByName($sheet1), false);
                             } else {
@@ -3633,7 +3633,7 @@ 
                                 $result = '#VALUE!';
                             }
                         } else {
-                            $result = '"'.str_replace('""', '"', self::unwrapResult($operand1, '"').self::unwrapResult($operand2, '"')).'"';
+                            $result = '"' . str_replace('""', '"', self::unwrapResult($operand1, '"') . self::unwrapResult($operand2, '"')) . '"';
                         }
                         $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result));
                         $stack->push('Value', $result);
@@ -3648,7 +3648,7 @@ 
                                 $cellIntersect[$row] = array_intersect_key($operand1[$row], $operand2[$row]);
                             }
                         }
-                        $cellRef = Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.Cell::stringFromColumnIndex(max($oCol)).max($oRow);
+                        $cellRef = Cell::stringFromColumnIndex(min($oCol)) . min($oRow) . ':' . Cell::stringFromColumnIndex(max($oCol)) . max($oRow);
                         $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($cellIntersect));
                         $stack->push('Value', $cellIntersect, $cellRef);
                         break;
@@ -3685,7 +3685,7 @@ 
                 } else {
                     $this->executeNumericBinaryOperation($cellID, $multiplier, $arg, '*', 'arrayTimesEquals', $stack);
                 }
-            } elseif (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $token, $matches)) {
+            } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $token, $matches)) {
                 $cellRef = null;
 //                echo 'Element '.$token.' is a Cell reference<br />';
                 if (isset($matches[8])) {
@@ -3694,7 +3694,7 @@ 
 //                        We can't access the range, so return a REF error
                         $cellValue = Calculation\Functions::REF();
                     } else {
-                        $cellRef = $matches[6].$matches[7].':'.$matches[9].$matches[10];
+                        $cellRef = $matches[6] . $matches[7] . ':' . $matches[9] . $matches[10];
                         if ($matches[2] > '') {
                             $matches[2] = trim($matches[2], "\"'");
                             if ((strpos($matches[2], '[') !== false) || (strpos($matches[2], ']') !== false)) {
@@ -3728,7 +3728,7 @@ 
 //                        We can't access the cell, so return a REF error
                         $cellValue = Calculation\Functions::REF();
                     } else {
-                        $cellRef = $matches[6].$matches[7];
+                        $cellRef = $matches[6] . $matches[7];
                         if ($matches[2] > '') {
                             $matches[2] = trim($matches[2], "\"'");
                             if ((strpos($matches[2], '[') !== false) || (strpos($matches[2], ']') !== false)) {
@@ -3766,7 +3766,7 @@ 
                 $stack->push('Value', $cellValue, $cellRef);
 
             // if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
-            } elseif (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $token, $matches)) {
+            } elseif (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $token, $matches)) {
 //                echo 'Token is a function<br />';
                 $functionName = $matches[1];
                 $argCount = $stack->pop();
@@ -3823,7 +3823,7 @@ 
                     if ($functionName != 'MKMATRIX') {
                         if ($this->_debugLog->getWriteDebugLog()) {
                             krsort($argArrayVals);
-                            $this->_debugLog->writeDebugLog('Evaluating ', self::localeFunc($functionName), '( ', implode(self::$localeArgumentSeparator.' ', Calculation\Functions::flattenArray($argArrayVals)), ' )');
+                            $this->_debugLog->writeDebugLog('Evaluating ', self::localeFunc($functionName), '( ', implode(self::$localeArgumentSeparator . ' ', Calculation\Functions::flattenArray($argArrayVals)), ' )');
                         }
                     }
                     //    Process each argument in turn, building the return value as an array
@@ -3878,7 +3878,7 @@ 
 //                    echo 'Token is a number, boolean, string, null or an Excel error<br />';
                     $stack->push('Value', $token);
                 // if the token is a named range, push the named range name onto the stack
-                } elseif (preg_match('/^'.self::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $token, $matches)) {
+                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $token, $matches)) {
 //                    echo 'Token is a named range<br />';
                     $namedRange = $matches[6];
 //                    echo 'Named Range is '.$namedRange.'<br />';
@@ -4106,8 +4106,8 @@ 
             }
         } else {
             if ((Calculation\Functions::getCompatibilityMode() != Calculation\Functions::COMPATIBILITY_OPENOFFICE) &&
-                ((is_string($operand1) && !is_numeric($operand1) && strlen($operand1)>0) ||
-                 (is_string($operand2) && !is_numeric($operand2) && strlen($operand2)>0))) {
+                ((is_string($operand1) && !is_numeric($operand1) && strlen($operand1) > 0) ||
+                 (is_string($operand2) && !is_numeric($operand2) && strlen($operand2) > 0))) {
                 $result = Calculation\Functions::VALUE();
             } else {
                 //    If we're dealing with non-matrix operations, execute the necessary operation
@@ -4175,7 +4175,7 @@ 
     public function extractCellRange(&$pRange = 'A1', Worksheet $pSheet = null, $resetLog = true)
     {
         // Return value
-        $returnValue = array ();
+        $returnValue = array();
 
 //        echo 'extractCellRange('.$pRange.')', PHP_EOL;
         if ($pSheet !== null) {
@@ -4192,7 +4192,7 @@ 
 
             // Extract range
             $aReferences = Cell::extractAllCellReferencesInRange($pRange);
-            $pRange = $pSheetName.'!'.$pRange;
+            $pRange = $pSheetName . '!' . $pRange;
             if (!isset($aReferences[1])) {
                 //    Single cell in range
                 sscanf($aReferences[0], '%[A-Z]%d', $currentCol, $currentRow);
@@ -4233,7 +4233,7 @@ 
     public function extractNamedRange(&$pRange = 'A1', Worksheet $pSheet = null, $resetLog = true)
     {
         // Return value
-        $returnValue = array ();
+        $returnValue = array();
 
 //        echo 'extractNamedRange('.$pRange.')<br />';
         if ($pSheet !== null) {

src/PhpSpreadsheet/Calculation/DateTime.php

Doc Comments +18 added lines, -26 removed lines

@@ -472,7 +472,7 @@ 
      *
      * @access    public
      * @category Date/Time Functions
-     * @param    string    $dateValue        Text that represents a date in a Microsoft Excel date format.
+     * @param    integer    $dateValue        Text that represents a date in a Microsoft Excel date format.
      *                                    For example, "1/30/2008" or "30-Jan-2008" are text strings within
      *                                    quotation marks that represent dates. Using the default date
      *                                    system in Excel for Windows, date_text must represent a date from
@@ -657,9 +657,9 @@ 
     /**
      * DATEDIF
      *
-     * @param    mixed    $startDate        Excel date serial value, PHP date/time stamp, PHP DateTime object
+     * @param    integer    $startDate        Excel date serial value, PHP date/time stamp, PHP DateTime object
      *                                    or a standard date string
-     * @param    mixed    $endDate        Excel date serial value, PHP date/time stamp, PHP DateTime object
+     * @param    integer    $endDate        Excel date serial value, PHP date/time stamp, PHP DateTime object
      *                                    or a standard date string
      * @param    string    $unit
      * @return    integer    Interval between the dates
@@ -771,9 +771,9 @@ 
      *
      * @access    public
      * @category Date/Time Functions
-     * @param    mixed        $startDate        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer        $startDate        Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
-     * @param    mixed        $endDate        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer        $endDate        Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
      * @param    boolean        $method            US or European Method
      *                                        FALSE or omitted: U.S. (NASD) method. If the starting date is
@@ -832,9 +832,9 @@ 
      *
      * @access    public
      * @category Date/Time Functions
-     * @param    mixed    $startDate        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $startDate        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
-     * @param    mixed    $endDate        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $endDate        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      * @param    integer    $method            Method used for the calculation
      *                                        0 or omitted    US (NASD) 30/360
@@ -934,10 +934,6 @@ 
      *                                            PHP DateTime object, or a standard date string
      * @param    mixed            $endDate        Excel date serial value (float), PHP date timestamp (integer),
      *                                            PHP DateTime object, or a standard date string
-     * @param    mixed            $holidays,...    Optional series of Excel date serial value (float), PHP date
-     *                                            timestamp (integer), PHP DateTime object, or a standard date
-     *                                            strings that will be excluded from the working calendar, such
-     *                                            as state and federal holidays and floating holidays.
      * @return    integer            Interval between the dates
      */
     public static function NETWORKDAYS($startDate, $endDate)
@@ -1020,10 +1016,6 @@ 
      * @param    integer        $endDays        The number of nonweekend and nonholiday days before or after
      *                                        startDate. A positive value for days yields a future date; a
      *                                        negative value yields a past date.
-     * @param    mixed        $holidays,...    Optional series of Excel date serial value (float), PHP date
-     *                                        timestamp (integer), PHP DateTime object, or a standard date
-     *                                        strings that will be excluded from the working calendar, such
-     *                                        as state and federal holidays and floating holidays.
      * @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
      */
@@ -1128,7 +1120,7 @@ 
      * Excel Function:
      *        DAY(dateValue)
      *
-     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      * @return    int        Day of the month
      */
@@ -1162,7 +1154,7 @@ 
      * Excel Function:
      *        WEEKDAY(dateValue[,style])
      *
-     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      * @param    int        $style            A number that determines the type of return value
      *                                        1 or omitted    Numbers 1 (Sunday) through 7 (Saturday).
@@ -1239,9 +1231,9 @@ 
      * Excel Function:
      *        WEEKNUM(dateValue[,style])
      *
-     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
-     * @param    boolean    $method            Week begins on Sunday or Monday
+     * @param    integer    $method            Week begins on Sunday or Monday
      *                                        1 or omitted    Week begins on Sunday.
      *                                        2                Week begins on Monday.
      * @return    int        Week Number
@@ -1288,7 +1280,7 @@ 
      * Excel Function:
      *        MONTH(dateValue)
      *
-     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      * @return    int        Month of the year
      */
@@ -1321,7 +1313,7 @@ 
      * Excel Function:
      *        YEAR(dateValue)
      *
-     * @param    mixed    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard date string
      * @return    int        Year
      */
@@ -1353,7 +1345,7 @@ 
      * Excel Function:
      *        HOUR(timeValue)
      *
-     * @param    mixed    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
      * @return    int        Hour
      */
@@ -1394,7 +1386,7 @@ 
      * Excel Function:
      *        MINUTE(timeValue)
      *
-     * @param    mixed    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
      * @return    int        Minute
      */
@@ -1435,7 +1427,7 @@ 
      * Excel Function:
      *        SECOND(timeValue)
      *
-     * @param    mixed    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $timeValue        Excel date serial value (float), PHP date timestamp (integer),
      *                                    PHP DateTime object, or a standard time string
      * @return    int        Second
      */
@@ -1478,7 +1470,7 @@ 
      * Excel Function:
      *        EDATE(dateValue,adjustmentMonths)
      *
-     * @param    mixed    $dateValue            Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue            Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
      * @param    int        $adjustmentMonths    The number of months before or after start_date.
      *                                        A positive value for months yields a future date;
@@ -1524,7 +1516,7 @@ 
      * Excel Function:
      *        EOMONTH(dateValue,adjustmentMonths)
      *
-     * @param    mixed    $dateValue            Excel date serial value (float), PHP date timestamp (integer),
+     * @param    integer    $dateValue            Excel date serial value (float), PHP date timestamp (integer),
      *                                        PHP DateTime object, or a standard date string
      * @param    int        $adjustmentMonths    The number of months before or after start_date.
      *                                        A positive value for months yields a future date;

Indentation +1 added lines, -1 removed lines

@@ -874,7 +874,7 @@
                             $endDay = self::DAYOFMONTH($endDate);
                             if (($startMonth < 3) ||
                                 (($endMonth * 100 + $endDay) >= (2 * 100 + 29))) {
-                                 $leapDays += 1;
+                                    $leapDays += 1;
                             }
                         }
                     } else {

Spacing +44 added lines, -44 removed lines

@@ -129,10 +129,10 @@ 
 
         $adjustmentMonthsString = (string) $adjustmentMonths;
         if ($adjustmentMonths > 0) {
-            $adjustmentMonthsString = '+'.$adjustmentMonths;
+            $adjustmentMonthsString = '+' . $adjustmentMonths;
         }
         if ($adjustmentMonths != 0) {
-            $PHPDateObject->modify($adjustmentMonthsString.' months');
+            $PHPDateObject->modify($adjustmentMonthsString . ' months');
         }
         $nMonth = (int) $PHPDateObject->format('m');
         $nYear = (int) $PHPDateObject->format('Y');
@@ -140,7 +140,7 @@ 
         $monthDiff = ($nMonth - $oMonth) + (($nYear - $oYear) * 12);
         if ($monthDiff != $adjustmentMonths) {
             $adjustDays = (int) $PHPDateObject->format('d');
-            $adjustDaysString = '-'.$adjustDays.' days';
+            $adjustDaysString = '-' . $adjustDays . ' days';
             $PHPDateObject->modify($adjustDaysString);
         }
         return $PHPDateObject;
@@ -302,20 +302,20 @@ 
             (!is_numeric($day))) {
             return Functions::VALUE();
         }
-        $year    = (integer) $year;
+        $year = (integer) $year;
         $month    = (integer) $month;
-        $day    = (integer) $day;
+        $day = (integer) $day;
 
         $baseYear = \PHPExcel\Shared\Date::getExcelCalendar();
         // Validate parameters
-        if ($year < ($baseYear-1900)) {
+        if ($year < ($baseYear - 1900)) {
             return Functions::NAN();
         }
-        if ((($baseYear-1900) != 0) && ($year < $baseYear) && ($year >= 1900)) {
+        if ((($baseYear - 1900) != 0) && ($year < $baseYear) && ($year >= 1900)) {
             return Functions::NAN();
         }
 
-        if (($year < $baseYear) && ($year >= ($baseYear-1900))) {
+        if (($year < $baseYear) && ($year >= ($baseYear - 1900))) {
             $year += 1900;
         }
 
@@ -435,7 +435,7 @@ 
                 }
                 return (float) \PHPExcel\Shared\Date::formattedPHPToExcel($calendar, 1, $date, $hour, $minute, $second);
             case Functions::RETURNDATE_PHP_NUMERIC:
-                return (integer) \PHPExcel\Shared\Date::excelToPHP(\PHPExcel\Shared\Date::formattedPHPToExcel(1970, 1, 1, $hour, $minute, $second));    // -2147468400; //    -2147472000 + 3600
+                return (integer) \PHPExcel\Shared\Date::excelToPHP(\PHPExcel\Shared\Date::formattedPHPToExcel(1970, 1, 1, $hour, $minute, $second)); // -2147468400; //    -2147472000 + 3600
             case Functions::RETURNDATE_PHP_OBJECT:
                 $dayAdjust = 0;
                 if ($hour < 0) {
@@ -448,9 +448,9 @@ 
                     $dayAdjust = floor($hour / 24);
                     $hour = $hour % 24;
                 }
-                $phpDateObject = new \DateTime('1900-01-01 '.$hour.':'.$minute.':'.$second);
+                $phpDateObject = new \DateTime('1900-01-01 ' . $hour . ':' . $minute . ':' . $second);
                 if ($dayAdjust != 0) {
-                    $phpDateObject->modify($dayAdjust.' days');
+                    $phpDateObject->modify($dayAdjust . ' days');
                 }
                 return $phpDateObject;
         }
@@ -485,12 +485,12 @@ 
      */
     public static function DATEVALUE($dateValue = 1)
     {
-        $dateValueOrig= $dateValue;
+        $dateValueOrig = $dateValue;
         $dateValue = trim(Functions::flattenSingleValue($dateValue), '"');
         //    Strip any ordinals because they're allowed in Excel (English only)
         $dateValue = preg_replace('/(\d)(st|nd|rd|th)([ -\/])/Ui', '$1$3', $dateValue);
         //    Convert separators (/ . or space) to hyphens (should also handle dot used for ordinals in some countries, e.g. Denmark, Germany)
-        $dateValue    = str_replace(array('/', '.', '-', '  '), array(' ', ' ', ' ', ' '), $dateValue);
+        $dateValue = str_replace(array('/', '.', '-', '  '), array(' ', ' ', ' ', ' '), $dateValue);
 
         $yearFound = false;
         $t1 = explode(' ', $dateValue);
@@ -544,9 +544,9 @@ 
             if ($testVal1 < 31 && $testVal2 < 12 && $testVal3 < 12 && strlen($testVal3) == 2) {
                 $testVal3 += 2000;
             }
-            $PHPDateArray = date_parse($testVal1.'-'.$testVal2.'-'.$testVal3);
+            $PHPDateArray = date_parse($testVal1 . '-' . $testVal2 . '-' . $testVal3);
             if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
-                $PHPDateArray = date_parse($testVal2.'-'.$testVal1.'-'.$testVal3);
+                $PHPDateArray = date_parse($testVal2 . '-' . $testVal1 . '-' . $testVal3);
                 if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
                     return Functions::VALUE();
                 }
@@ -586,7 +586,7 @@ 
                 case Functions::RETURNDATE_PHP_NUMERIC:
                     return (integer) \PHPExcel\Shared\Date::excelToPHP($excelDateValue);
                 case Functions::RETURNDATE_PHP_OBJECT:
-                    return new \DateTime($PHPDateArray['year'].'-'.$PHPDateArray['month'].'-'.$PHPDateArray['day'].' 00:00:00');
+                    return new \DateTime($PHPDateArray['year'] . '-' . $PHPDateArray['month'] . '-' . $PHPDateArray['day'] . ' 00:00:00');
             }
         }
         return Functions::VALUE();
@@ -621,7 +621,7 @@ 
         $timeValue = str_replace(array('/', '.'), array('-', '-'), $timeValue);
 
         $arraySplit = preg_split('/[\/:\-\s]/', $timeValue);
-        if ((count($arraySplit) == 2 ||count($arraySplit) == 3) && $arraySplit[0] > 24) {
+        if ((count($arraySplit) == 2 || count($arraySplit) == 3) && $arraySplit[0] > 24) {
             $arraySplit[0] = ($arraySplit[0] % 24);
             $timeValue = implode(':', $arraySplit);
         }
@@ -645,9 +645,9 @@ 
                 case Functions::RETURNDATE_EXCEL:
                     return (float) $excelDateValue;
                 case Functions::RETURNDATE_PHP_NUMERIC:
-                    return (integer) $phpDateValue = \PHPExcel\Shared\Date::excelToPHP($excelDateValue+25569) - 3600;
+                    return (integer) $phpDateValue = \PHPExcel\Shared\Date::excelToPHP($excelDateValue + 25569) - 3600;
                 case Functions::RETURNDATE_PHP_OBJECT:
-                    return new \DateTime('1900-01-01 '.$PHPDateArray['hour'].':'.$PHPDateArray['minute'].':'.$PHPDateArray['second']);
+                    return new \DateTime('1900-01-01 ' . $PHPDateArray['hour'] . ':' . $PHPDateArray['minute'] . ':' . $PHPDateArray['second']);
             }
         }
         return Functions::VALUE();
@@ -722,7 +722,7 @@ 
             case 'MD':
                 if ($endDays < $startDays) {
                     $retVal = $endDays;
-                    $PHPEndDateObject->modify('-'.$endDays.' days');
+                    $PHPEndDateObject->modify('-' . $endDays . ' days');
                     $adjustDays = $PHPEndDateObject->format('j');
                     $retVal += ($adjustDays - $startDays);
                 } else {
@@ -790,8 +790,8 @@ 
      */
     public static function DAYS360($startDate = 0, $endDate = 0, $method = false)
     {
-        $startDate    = Functions::flattenSingleValue($startDate);
-        $endDate    = Functions::flattenSingleValue($endDate);
+        $startDate = Functions::flattenSingleValue($startDate);
+        $endDate = Functions::flattenSingleValue($endDate);
 
         if (is_string($startDate = self::getDateValue($startDate))) {
             return Functions::VALUE();
@@ -846,9 +846,9 @@ 
      */
     public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0)
     {
-        $startDate    = Functions::flattenSingleValue($startDate);
-        $endDate    = Functions::flattenSingleValue($endDate);
-        $method        = Functions::flattenSingleValue($method);
+        $startDate = Functions::flattenSingleValue($startDate);
+        $endDate = Functions::flattenSingleValue($endDate);
+        $method = Functions::flattenSingleValue($method);
 
         if (is_string($startDate = self::getDateValue($startDate))) {
             return Functions::VALUE();
@@ -943,8 +943,8 @@ 
     public static function NETWORKDAYS($startDate, $endDate)
     {
         //    Retrieve the mandatory start and end date that are referenced in the function definition
-        $startDate    = Functions::flattenSingleValue($startDate);
-        $endDate    = Functions::flattenSingleValue($endDate);
+        $startDate = Functions::flattenSingleValue($startDate);
+        $endDate = Functions::flattenSingleValue($endDate);
         //    Flush the mandatory start and end date that are referenced in the function definition, and get the optional days
         $dateArgs = Functions::flattenArray(func_get_args());
         array_shift($dateArgs);
@@ -1030,8 +1030,8 @@ 
     public static function WORKDAY($startDate, $endDays)
     {
         //    Retrieve the mandatory start date and days that are referenced in the function definition
-        $startDate    = Functions::flattenSingleValue($startDate);
-        $endDays    = Functions::flattenSingleValue($endDays);
+        $startDate = Functions::flattenSingleValue($startDate);
+        $endDays = Functions::flattenSingleValue($endDays);
         //    Flush the mandatory start date and days that are referenced in the function definition, and get the optional days
         $dateArgs = Functions::flattenArray(func_get_args());
         array_shift($dateArgs);
@@ -1053,7 +1053,7 @@ 
 
         $startDoW = self::DAYOFWEEK($startDate, 3);
         if (self::DAYOFWEEK($startDate, 3) >= 5) {
-            $startDate += ($decrementing) ? -$startDoW + 4: 7 - $startDoW;
+            $startDate += ($decrementing) ? -$startDoW + 4 : 7 - $startDoW;
             ($decrementing) ? $endDays++ : $endDays--;
         }
 
@@ -1063,7 +1063,7 @@ 
         //    Adjust the calculated end date if it falls over a weekend
         $endDoW = self::DAYOFWEEK($endDate, 3);
         if ($endDoW >= 5) {
-            $endDate += ($decrementing) ? -$endDoW + 4: 7 - $endDoW;
+            $endDate += ($decrementing) ? -$endDoW + 4 : 7 - $endDoW;
         }
 
         //    Test any extra holiday parameters
@@ -1134,7 +1134,7 @@ 
      */
     public static function DAYOFMONTH($dateValue = 1)
     {
-        $dateValue    = Functions::flattenSingleValue($dateValue);
+        $dateValue = Functions::flattenSingleValue($dateValue);
 
         if ($dateValue === null) {
             $dateValue = 1;
@@ -1248,8 +1248,8 @@ 
      */
     public static function WEEKOFYEAR($dateValue = 1, $method = 1)
     {
-        $dateValue    = Functions::flattenSingleValue($dateValue);
-        $method        = Functions::flattenSingleValue($method);
+        $dateValue = Functions::flattenSingleValue($dateValue);
+        $method = Functions::flattenSingleValue($method);
 
         if (!is_numeric($method)) {
             return Functions::VALUE();
@@ -1294,7 +1294,7 @@ 
      */
     public static function MONTHOFYEAR($dateValue = 1)
     {
-        $dateValue    = Functions::flattenSingleValue($dateValue);
+        $dateValue = Functions::flattenSingleValue($dateValue);
 
         if (empty($dateValue)) {
             $dateValue = 1;
@@ -1327,7 +1327,7 @@ 
      */
     public static function YEAR($dateValue = 1)
     {
-        $dateValue    = Functions::flattenSingleValue($dateValue);
+        $dateValue = Functions::flattenSingleValue($dateValue);
 
         if ($dateValue === null) {
             $dateValue = 1;
@@ -1359,7 +1359,7 @@ 
      */
     public static function HOUROFDAY($timeValue = 0)
     {
-        $timeValue    = Functions::flattenSingleValue($timeValue);
+        $timeValue = Functions::flattenSingleValue($timeValue);
 
         if (!is_numeric($timeValue)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
@@ -1400,7 +1400,7 @@ 
      */
     public static function MINUTEOFHOUR($timeValue = 0)
     {
-        $timeValue = $timeTester    = Functions::flattenSingleValue($timeValue);
+        $timeValue = $timeTester = Functions::flattenSingleValue($timeValue);
 
         if (!is_numeric($timeValue)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
@@ -1441,7 +1441,7 @@ 
      */
     public static function SECONDOFMINUTE($timeValue = 0)
     {
-        $timeValue    = Functions::flattenSingleValue($timeValue);
+        $timeValue = Functions::flattenSingleValue($timeValue);
 
         if (!is_numeric($timeValue)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
@@ -1488,8 +1488,8 @@ 
      */
     public static function EDATE($dateValue = 1, $adjustmentMonths = 0)
     {
-        $dateValue            = Functions::flattenSingleValue($dateValue);
-        $adjustmentMonths    = Functions::flattenSingleValue($adjustmentMonths);
+        $dateValue = Functions::flattenSingleValue($dateValue);
+        $adjustmentMonths = Functions::flattenSingleValue($adjustmentMonths);
 
         if (!is_numeric($adjustmentMonths)) {
             return Functions::VALUE();
@@ -1534,8 +1534,8 @@ 
      */
     public static function EOMONTH($dateValue = 1, $adjustmentMonths = 0)
     {
-        $dateValue            = Functions::flattenSingleValue($dateValue);
-        $adjustmentMonths    = Functions::flattenSingleValue($adjustmentMonths);
+        $dateValue = Functions::flattenSingleValue($dateValue);
+        $adjustmentMonths = Functions::flattenSingleValue($adjustmentMonths);
 
         if (!is_numeric($adjustmentMonths)) {
             return Functions::VALUE();
@@ -1547,7 +1547,7 @@ 
         }
 
         // Execute function
-        $PHPDateObject = self::adjustDateByMonths($dateValue, $adjustmentMonths+1);
+        $PHPDateObject = self::adjustDateByMonths($dateValue, $adjustmentMonths + 1);
         $adjustDays = (int) $PHPDateObject->format('d');
         $adjustDaysString = '-' . $adjustDays . ' days';
         $PHPDateObject->modify($adjustDaysString);

src/PhpSpreadsheet/Calculation/Engineering.php

Doc Comments +3 added lines, -5 removed lines

@@ -1826,7 +1826,7 @@ 
      * @access    public
      * @category Engineering Functions
      * @param    string $complexNumber The complex number for which you want the real coefficient.
-     * @return    float
+     * @return    string
      */
     public static function IMREAL($complexNumber)
     {
@@ -2260,7 +2260,6 @@ 
      * Excel Function:
      *        IMSUM(complexNumber[,complexNumber[,...]])
      *
-     * @param    string $complexNumber,... Series of complex numbers to add
      * @return    string
      */
     public static function IMSUM()
@@ -2299,7 +2298,6 @@ 
      * Excel Function:
      *        IMPRODUCT(complexNumber[,complexNumber[,...]])
      *
-     * @param    string $complexNumber,... Series of complex numbers to multiply
      * @return    string
      */
     public static function IMPRODUCT()
@@ -2342,7 +2340,7 @@ 
      *        DELTA(a[,b])
      *
      * @param    float $a The first number.
-     * @param    float $b The second number. If omitted, b is assumed to be zero.
+     * @param    integer $b The second number. If omitted, b is assumed to be zero.
      * @return    int
      */
     public static function DELTA($a, $b = 0)
@@ -2365,7 +2363,7 @@ 
      *    functions you calculate the count of values that exceed a threshold.
      *
      * @param    float $number The value to test against step.
-     * @param    float $step The threshold value.
+     * @param    integer $step The threshold value.
      *                                    If you omit a value for step, GESTEP uses zero.
      * @return    int
      */

Spacing +39 added lines, -39 removed lines

@@ -747,7 +747,7 @@ 
      */
     public static function parseComplex($complexNumber)
     {
-        $workString = (string)$complexNumber;
+        $workString = (string) $complexNumber;
 
         $realNumber = $imaginary = 0;
         //    Extract the suffix, if there is one
@@ -828,7 +828,7 @@ 
     {
         if (!is_null($places)) {
             if (is_numeric($places)) {
-                $places = (int)$places;
+                $places = (int) $places;
             } else {
                 return Functions::VALUE();
             }
@@ -1149,7 +1149,7 @@ 
 
         if (is_bool($x)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int)$x;
+                $x = (int) $x;
             } else {
                 return Functions::VALUE();
             }
@@ -1157,7 +1157,7 @@ 
         if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
             $x = floor($x);
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
             return Functions::NAN();
         }
@@ -1204,7 +1204,7 @@ 
         // Argument X
         if (is_bool($x)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int)$x;
+                $x = (int) $x;
             } else {
                 return Functions::VALUE();
             }
@@ -1212,7 +1212,7 @@ 
         if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
             $x = floor($x);
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
             return Functions::NAN();
         }
@@ -1222,7 +1222,7 @@ 
             //    Two's Complement
             return str_repeat('F', 8) . substr(strtoupper(dechex(bindec(substr($x, -9)))), -2);
         }
-        $hexVal = (string)strtoupper(dechex(bindec($x)));
+        $hexVal = (string) strtoupper(dechex(bindec($x)));
 
         return self::nbrConversionFormat($hexVal, $places);
     }
@@ -1259,7 +1259,7 @@ 
 
         if (is_bool($x)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int)$x;
+                $x = (int) $x;
             } else {
                 return Functions::VALUE();
             }
@@ -1267,7 +1267,7 @@ 
         if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
             $x = floor($x);
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
             return Functions::NAN();
         }
@@ -1277,7 +1277,7 @@ 
             //    Two's Complement
             return str_repeat('7', 7) . substr(strtoupper(decoct(bindec(substr($x, -9)))), -3);
         }
-        $octVal = (string)decoct(bindec($x));
+        $octVal = (string) decoct(bindec($x));
 
         return self::nbrConversionFormat($octVal, $places);
     }
@@ -1318,16 +1318,16 @@ 
 
         if (is_bool($x)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int)$x;
+                $x = (int) $x;
             } else {
                 return Functions::VALUE();
             }
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
             return Functions::VALUE();
         }
-        $x = (string)floor($x);
+        $x = (string) floor($x);
         $r = decbin($x);
         if (strlen($r) == 32) {
             //    Two's Complement
@@ -1375,16 +1375,16 @@ 
 
         if (is_bool($x)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int)$x;
+                $x = (int) $x;
             } else {
                 return Functions::VALUE();
             }
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
             return Functions::VALUE();
         }
-        $x = (string)floor($x);
+        $x = (string) floor($x);
         $r = strtoupper(dechex($x));
         if (strlen($r) == 8) {
             //    Two's Complement
@@ -1431,16 +1431,16 @@ 
 
         if (is_bool($x)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
-                $x = (int)$x;
+                $x = (int) $x;
             } else {
                 return Functions::VALUE();
             }
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
             return Functions::VALUE();
         }
-        $x = (string)floor($x);
+        $x = (string) floor($x);
         $r = decoct($x);
         if (strlen($r) == 11) {
             //    Two's Complement
@@ -1487,7 +1487,7 @@ 
         if (is_bool($x)) {
             return Functions::VALUE();
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
             return Functions::NAN();
         }
@@ -1525,7 +1525,7 @@ 
         if (is_bool($x)) {
             return Functions::VALUE();
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
             return Functions::NAN();
         }
@@ -1583,7 +1583,7 @@ 
         if (is_bool($x)) {
             return Functions::VALUE();
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
             return Functions::NAN();
         }
@@ -1635,7 +1635,7 @@ 
         if (is_bool($x)) {
             return Functions::VALUE();
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
             return Functions::NAN();
         }
@@ -1671,13 +1671,13 @@ 
         if (is_bool($x)) {
             return Functions::VALUE();
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
             return Functions::NAN();
         }
         $binX = '';
         foreach (str_split($x) as $char) {
-            $binX .= str_pad(decbin((int)$char), 3, '0', STR_PAD_LEFT);
+            $binX .= str_pad(decbin((int) $char), 3, '0', STR_PAD_LEFT);
         }
         if (strlen($binX) == 30 && $binX[0] == '1') {
             for ($i = 0; $i < 30; $i++) {
@@ -1725,7 +1725,7 @@ 
         if (is_bool($x)) {
             return Functions::VALUE();
         }
-        $x = (string)$x;
+        $x = (string) $x;
         if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
             return Functions::NAN();
         }
@@ -1760,32 +1760,32 @@ 
         if (((is_numeric($realNumber)) && (is_numeric($imaginary))) &&
             (($suffix == 'i') || ($suffix == 'j') || ($suffix == ''))
         ) {
-            $realNumber = (float)$realNumber;
-            $imaginary = (float)$imaginary;
+            $realNumber = (float) $realNumber;
+            $imaginary = (float) $imaginary;
 
             if ($suffix == '') {
                 $suffix = 'i';
             }
             if ($realNumber == 0.0) {
                 if ($imaginary == 0.0) {
-                    return (string)'0';
+                    return (string) '0';
                 } elseif ($imaginary == 1.0) {
-                    return (string)$suffix;
+                    return (string) $suffix;
                 } elseif ($imaginary == -1.0) {
-                    return (string)'-' . $suffix;
+                    return (string) '-' . $suffix;
                 }
-                return (string)$imaginary . $suffix;
+                return (string) $imaginary . $suffix;
             } elseif ($imaginary == 0.0) {
-                return (string)$realNumber;
+                return (string) $realNumber;
             } elseif ($imaginary == 1.0) {
-                return (string)$realNumber . '+' . $suffix;
+                return (string) $realNumber . '+' . $suffix;
             } elseif ($imaginary == -1.0) {
-                return (string)$realNumber . '-' . $suffix;
+                return (string) $realNumber . '-' . $suffix;
             }
             if ($imaginary > 0) {
-                $imaginary = (string)'+' . $imaginary;
+                $imaginary = (string) '+' . $imaginary;
             }
-            return (string)$realNumber . $imaginary . $suffix;
+            return (string) $realNumber . $imaginary . $suffix;
         }
 
         return Functions::VALUE();
@@ -2350,7 +2350,7 @@ 
         $a = Functions::flattenSingleValue($a);
         $b = Functions::flattenSingleValue($b);
 
-        return (int)($a == $b);
+        return (int) ($a == $b);
     }
 
 
@@ -2374,7 +2374,7 @@ 
         $number = Functions::flattenSingleValue($number);
         $step = Functions::flattenSingleValue($step);
 
-        return (int)($number >= $step);
+        return (int) ($number >= $step);
     }
 
 

src/PhpSpreadsheet/Calculation/Financial.php

Doc Comments +28 added lines, -17 removed lines

@@ -63,6 +63,10 @@ 
     }
 
 
+    /**
+     * @param integer $frequency
+     * @param boolean $next
+     */
     private static function couponFirstPeriodDate($settlement, $maturity, $frequency, $next)
     {
         $months = 12 / $frequency;
@@ -85,6 +89,9 @@ 
     }
 
 
+    /**
+     * @param integer $frequency
+     */
     private static function isValidFrequency($frequency)
     {
         if (($frequency == 1) || ($frequency == 2) || ($frequency == 4)) {
@@ -162,7 +169,7 @@ 
      *                                    The security settlement date is the date after the issue date
      *                                    when the security is traded to the buyer.
      * @param    float    $rate            The security's annual coupon rate.
-     * @param    float    $par            The security's par value.
+     * @param    integer    $par            The security's par value.
      *                                    If you omit par, ACCRINT uses $1,000.
      * @param    integer    $frequency        the number of coupon payments per year.
      *                                    Valid frequency values are:
@@ -432,6 +439,7 @@ 
      *                                        2                Actual/360
      *                                        3                Actual/365
      *                                        4                European 30/360
+     * @param integer $frequency
      * @return    float
      */
     public static function COUPDAYBS($settlement, $maturity, $frequency, $basis = 0)
@@ -491,6 +499,7 @@ 
      *                                        2                Actual/360
      *                                        3                Actual/365
      *                                        4                European 30/360
+     * @param integer $frequency
      * @return    float
      */
     public static function COUPDAYS($settlement, $maturity, $frequency, $basis = 0)
@@ -564,6 +573,7 @@ 
      *                                        2                Actual/360
      *                                        3                Actual/365
      *                                        4                European 30/360
+     * @param integer $frequency
      * @return    float
      */
     public static function COUPDAYSNC($settlement, $maturity, $frequency, $basis = 0)
@@ -681,6 +691,7 @@ 
      *                                        2                Actual/360
      *                                        3                Actual/365
      *                                        4                European 30/360
+     * @param integer $frequency
      * @return    integer
      */
     public static function COUPNUM($settlement, $maturity, $frequency, $basis = 0)
@@ -1144,7 +1155,7 @@ 
      *
      * @access    public
      * @category Financial Functions
-     * @param    float    $nominal_rate        Nominal interest rate
+     * @param    integer    $nominal_rate        Nominal interest rate
      * @param    integer    $npery                Number of compounding payments per year
      * @return    float
      */
@@ -1172,12 +1183,12 @@ 
      *
      * @access    public
      * @category Financial Functions
-     * @param    float    $rate    The interest rate per period
+     * @param    integer    $rate    The interest rate per period
      * @param    int        $nper    Total number of payment periods in an annuity
-     * @param    float    $pmt    The payment made each period: it cannot change over the
+     * @param    integer    $pmt    The payment made each period: it cannot change over the
      *                            life of the annuity. Typically, pmt contains principal
      *                            and interest but no other fees or taxes.
-     * @param    float    $pv        Present Value, or the lump-sum amount that a series of
+     * @param    integer    $pv        Present Value, or the lump-sum amount that a series of
      *                            future payments is worth right now.
      * @param    integer    $type    A number 0 or 1 and indicates when payments are due:
      *                                0 or omitted    At the end of the period.
@@ -1293,7 +1304,7 @@ 
      * @param    int        $per    Period for which we want to find the interest
      * @param    int        $nper    Number of periods
      * @param    float    $pv        Present Value
-     * @param    float    $fv        Future Value
+     * @param    integer    $fv        Future Value
      * @param    int        $type    Payment type: 0 = at the end of each period, 1 = at the beginning of each period
      * @return    float
      */
@@ -1485,7 +1496,7 @@ 
      *
      * Returns the nominal interest rate given the effective rate and the number of compounding payments per year.
      *
-     * @param    float    $effect_rate    Effective interest rate
+     * @param    integer    $effect_rate    Effective interest rate
      * @param    int        $npery            Number of compounding payments per year
      * @return    float
      */
@@ -1509,10 +1520,10 @@ 
      *
      * Returns the number of periods for a cash flow with constant periodic payments (annuities), and interest rate.
      *
-     * @param    float    $rate    Interest rate per period
+     * @param    integer    $rate    Interest rate per period
      * @param    int        $pmt    Periodic payment (annuity)
-     * @param    float    $pv        Present Value
-     * @param    float    $fv        Future Value
+     * @param    integer    $pv        Present Value
+     * @param    integer    $fv        Future Value
      * @param    int        $type    Payment type: 0 = at the end of each period, 1 = at the beginning of each period
      * @return    float
      */
@@ -1575,10 +1586,10 @@ 
      *
      * Returns the constant payment (annuity) for a cash flow with a constant interest rate.
      *
-     * @param    float    $rate    Interest rate per period
+     * @param    integer    $rate    Interest rate per period
      * @param    int        $nper    Number of periods
-     * @param    float    $pv        Present Value
-     * @param    float    $fv        Future Value
+     * @param    integer    $pv        Present Value
+     * @param    integer    $fv        Future Value
      * @param    int        $type    Payment type: 0 = at the end of each period, 1 = at the beginning of each period
      * @return    float
      */
@@ -1612,7 +1623,7 @@ 
      * @param    int        $per    Period for which we want to find the interest
      * @param    int        $nper    Number of periods
      * @param    float    $pv        Present Value
-     * @param    float    $fv        Future Value
+     * @param    integer    $fv        Future Value
      * @param    int        $type    Payment type: 0 = at the end of each period, 1 = at the beginning of each period
      * @return    float
      */
@@ -1795,10 +1806,10 @@ 
      *
      * Returns the Present Value of a cash flow with constant payments and interest rate (annuities).
      *
-     * @param    float    $rate    Interest rate per period
+     * @param    integer    $rate    Interest rate per period
      * @param    int        $nper    Number of periods
-     * @param    float    $pmt    Periodic payment (annuity)
-     * @param    float    $fv        Future Value
+     * @param    integer    $pmt    Periodic payment (annuity)
+     * @param    integer    $fv        Future Value
      * @param    int        $type    Payment type: 0 = at the end of each period, 1 = at the beginning of each period
      * @return    float
      */

Spacing +99 added lines, -99 removed lines

@@ -71,10 +71,10 @@ 
         $eom = self::isLastDayOfMonth($result);
 
         while ($settlement < \PHPExcel\Shared\Date::PHPToExcel($result)) {
-            $result->modify('-'.$months.' months');
+            $result->modify('-' . $months . ' months');
         }
         if ($next) {
-            $result->modify('+'.$months.' months');
+            $result->modify('+' . $months . ' months');
         }
 
         if ($eom) {
@@ -137,7 +137,7 @@ 
     {
         $pmt = self::PMT($rate, $nper, $pv, $fv, $type);
         $capital = $pv;
-        for ($i = 1; $i<= $per; ++$i) {
+        for ($i = 1; $i <= $per; ++$i) {
             $interest = ($type && $i == 1) ? 0 : -$capital * $rate;
             $principal = $pmt - $interest;
             $capital += $principal;
@@ -183,18 +183,18 @@ 
      */
     public static function ACCRINT($issue, $firstinterest, $settlement, $rate, $par = 1000, $frequency = 1, $basis = 0)
     {
-        $issue        = Functions::flattenSingleValue($issue);
-        $firstinterest    = Functions::flattenSingleValue($firstinterest);
-        $settlement    = Functions::flattenSingleValue($settlement);
-        $rate        = Functions::flattenSingleValue($rate);
-        $par        = (is_null($par))        ? 1000 :    Functions::flattenSingleValue($par);
-        $frequency    = (is_null($frequency))    ? 1    :         Functions::flattenSingleValue($frequency);
-        $basis        = (is_null($basis))        ? 0    :        Functions::flattenSingleValue($basis);
+        $issue = Functions::flattenSingleValue($issue);
+        $firstinterest = Functions::flattenSingleValue($firstinterest);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $rate = Functions::flattenSingleValue($rate);
+        $par = (is_null($par)) ? 1000 : Functions::flattenSingleValue($par);
+        $frequency    = (is_null($frequency)) ? 1 : Functions::flattenSingleValue($frequency);
+        $basis        = (is_null($basis)) ? 0 : Functions::flattenSingleValue($basis);
 
         //    Validate
         if ((is_numeric($rate)) && (is_numeric($par))) {
-            $rate    = (float) $rate;
-            $par    = (float) $par;
+            $rate = (float) $rate;
+            $par = (float) $par;
             if (($rate <= 0) || ($par <= 0)) {
                 return Functions::NAN();
             }
@@ -235,16 +235,16 @@ 
      */
     public static function ACCRINTM($issue, $settlement, $rate, $par = 1000, $basis = 0)
     {
-        $issue        = Functions::flattenSingleValue($issue);
-        $settlement    = Functions::flattenSingleValue($settlement);
-        $rate        = Functions::flattenSingleValue($rate);
-        $par        = (is_null($par))    ? 1000 :    Functions::flattenSingleValue($par);
-        $basis        = (is_null($basis))    ? 0 :        Functions::flattenSingleValue($basis);
+        $issue = Functions::flattenSingleValue($issue);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $rate = Functions::flattenSingleValue($rate);
+        $par = (is_null($par)) ? 1000 : Functions::flattenSingleValue($par);
+        $basis = (is_null($basis)) ? 0 : Functions::flattenSingleValue($basis);
 
         //    Validate
         if ((is_numeric($rate)) && (is_numeric($par))) {
-            $rate    = (float) $rate;
-            $par    = (float) $par;
+            $rate = (float) $rate;
+            $par = (float) $par;
             if (($rate <= 0) || ($par <= 0)) {
                 return Functions::NAN();
             }
@@ -292,13 +292,13 @@ 
      */
     public static function AMORDEGRC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis = 0)
     {
-        $cost            = Functions::flattenSingleValue($cost);
-        $purchased        = Functions::flattenSingleValue($purchased);
+        $cost = Functions::flattenSingleValue($cost);
+        $purchased = Functions::flattenSingleValue($purchased);
         $firstPeriod    = Functions::flattenSingleValue($firstPeriod);
         $salvage        = Functions::flattenSingleValue($salvage);
-        $period            = floor(Functions::flattenSingleValue($period));
-        $rate            = Functions::flattenSingleValue($rate);
-        $basis            = (is_null($basis))    ? 0 :    (int) Functions::flattenSingleValue($basis);
+        $period = floor(Functions::flattenSingleValue($period));
+        $rate = Functions::flattenSingleValue($rate);
+        $basis = (is_null($basis)) ? 0 : (int) Functions::flattenSingleValue($basis);
 
         //    The depreciation coefficients are:
         //    Life of assets (1/rate)        Depreciation coefficient
@@ -628,10 +628,10 @@ 
      */
     public static function COUPNCD($settlement, $maturity, $frequency, $basis = 0)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
         $frequency    = (int) Functions::flattenSingleValue($frequency);
-        $basis        = (is_null($basis))    ? 0 :    (int) Functions::flattenSingleValue($basis);
+        $basis        = (is_null($basis)) ? 0 : (int) Functions::flattenSingleValue($basis);
 
         if (is_string($settlement = DateTime::getDateValue($settlement))) {
             return Functions::VALUE();
@@ -685,10 +685,10 @@ 
      */
     public static function COUPNUM($settlement, $maturity, $frequency, $basis = 0)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
         $frequency    = (int) Functions::flattenSingleValue($frequency);
-        $basis        = (is_null($basis))    ? 0 :    (int) Functions::flattenSingleValue($basis);
+        $basis        = (is_null($basis)) ? 0 : (int) Functions::flattenSingleValue($basis);
 
         if (is_string($settlement = DateTime::getDateValue($settlement))) {
             return Functions::VALUE();
@@ -757,10 +757,10 @@ 
      */
     public static function COUPPCD($settlement, $maturity, $frequency, $basis = 0)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
         $frequency    = (int) Functions::flattenSingleValue($frequency);
-        $basis        = (is_null($basis))    ? 0 :    (int) Functions::flattenSingleValue($basis);
+        $basis        = (is_null($basis)) ? 0 : (int) Functions::flattenSingleValue($basis);
 
         if (is_string($settlement = DateTime::getDateValue($settlement))) {
             return Functions::VALUE();
@@ -804,10 +804,10 @@ 
     {
         $rate    = Functions::flattenSingleValue($rate);
         $nper    = (int) Functions::flattenSingleValue($nper);
-        $pv        = Functions::flattenSingleValue($pv);
-        $start    = (int) Functions::flattenSingleValue($start);
-        $end    = (int) Functions::flattenSingleValue($end);
-        $type    = (int) Functions::flattenSingleValue($type);
+        $pv = Functions::flattenSingleValue($pv);
+        $start = (int) Functions::flattenSingleValue($start);
+        $end = (int) Functions::flattenSingleValue($end);
+        $type = (int) Functions::flattenSingleValue($type);
 
         // Validate parameters
         if ($type != 0 && $type != 1) {
@@ -852,10 +852,10 @@ 
     {
         $rate    = Functions::flattenSingleValue($rate);
         $nper    = (int) Functions::flattenSingleValue($nper);
-        $pv        = Functions::flattenSingleValue($pv);
-        $start    = (int) Functions::flattenSingleValue($start);
-        $end    = (int) Functions::flattenSingleValue($end);
-        $type    = (int) Functions::flattenSingleValue($type);
+        $pv = Functions::flattenSingleValue($pv);
+        $start = (int) Functions::flattenSingleValue($start);
+        $end = (int) Functions::flattenSingleValue($end);
+        $type = (int) Functions::flattenSingleValue($type);
 
         // Validate parameters
         if ($type != 0 && $type != 1) {
@@ -904,10 +904,10 @@ 
     public static function DB($cost, $salvage, $life, $period, $month = 12)
     {
         $cost        = Functions::flattenSingleValue($cost);
-        $salvage    = Functions::flattenSingleValue($salvage);
+        $salvage = Functions::flattenSingleValue($salvage);
         $life        = Functions::flattenSingleValue($life);
-        $period        = Functions::flattenSingleValue($period);
-        $month        = Functions::flattenSingleValue($month);
+        $period = Functions::flattenSingleValue($period);
+        $month = Functions::flattenSingleValue($month);
 
         //    Validate
         if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period)) && (is_numeric($month))) {
@@ -972,7 +972,7 @@ 
     public static function DDB($cost, $salvage, $life, $period, $factor = 2.0)
     {
         $cost        = Functions::flattenSingleValue($cost);
-        $salvage    = Functions::flattenSingleValue($salvage);
+        $salvage = Functions::flattenSingleValue($salvage);
         $life        = Functions::flattenSingleValue($life);
         $period        = Functions::flattenSingleValue($period);
         $factor        = Functions::flattenSingleValue($factor);
@@ -1034,7 +1034,7 @@ 
     public static function DISC($settlement, $maturity, $price, $redemption, $basis = 0)
     {
         $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
+        $maturity = Functions::flattenSingleValue($maturity);
         $price        = Functions::flattenSingleValue($price);
         $redemption    = Functions::flattenSingleValue($redemption);
         $basis        = Functions::flattenSingleValue($basis);
@@ -1042,7 +1042,7 @@ 
         //    Validate
         if ((is_numeric($price)) && (is_numeric($redemption)) && (is_numeric($basis))) {
             $price        = (float) $price;
-            $redemption    = (float) $redemption;
+            $redemption = (float) $redemption;
             $basis        = (int) $basis;
             if (($price <= 0) || ($redemption <= 0)) {
                 return Functions::NAN();
@@ -1077,8 +1077,8 @@ 
      */
     public static function DOLLARDE($fractional_dollar = null, $fraction = 0)
     {
-        $fractional_dollar    = Functions::flattenSingleValue($fractional_dollar);
-        $fraction            = (int)Functions::flattenSingleValue($fraction);
+        $fractional_dollar = Functions::flattenSingleValue($fractional_dollar);
+        $fraction = (int) Functions::flattenSingleValue($fraction);
 
         // Validate parameters
         if (is_null($fractional_dollar) || $fraction < 0) {
@@ -1114,8 +1114,8 @@ 
      */
     public static function DOLLARFR($decimal_dollar = null, $fraction = 0)
     {
-        $decimal_dollar    = Functions::flattenSingleValue($decimal_dollar);
-        $fraction        = (int)Functions::flattenSingleValue($fraction);
+        $decimal_dollar = Functions::flattenSingleValue($decimal_dollar);
+        $fraction = (int) Functions::flattenSingleValue($fraction);
 
         // Validate parameters
         if (is_null($decimal_dollar) || $fraction < 0) {
@@ -1150,8 +1150,8 @@ 
      */
     public static function EFFECT($nominal_rate = 0, $npery = 0)
     {
-        $nominal_rate    = Functions::flattenSingleValue($nominal_rate);
-        $npery            = (int)Functions::flattenSingleValue($npery);
+        $nominal_rate = Functions::flattenSingleValue($nominal_rate);
+        $npery = (int) Functions::flattenSingleValue($npery);
 
         // Validate parameters
         if ($nominal_rate <= 0 || $npery < 1) {
@@ -1188,8 +1188,8 @@ 
     {
         $rate    = Functions::flattenSingleValue($rate);
         $nper    = Functions::flattenSingleValue($nper);
-        $pmt    = Functions::flattenSingleValue($pmt);
-        $pv        = Functions::flattenSingleValue($pv);
+        $pmt = Functions::flattenSingleValue($pmt);
+        $pv = Functions::flattenSingleValue($pv);
         $type    = Functions::flattenSingleValue($type);
 
         // Validate parameters
@@ -1220,8 +1220,8 @@ 
      */
     public static function FVSCHEDULE($principal, $schedule)
     {
-        $principal    = Functions::flattenSingleValue($principal);
-        $schedule    = Functions::flattenArray($schedule);
+        $principal = Functions::flattenSingleValue($principal);
+        $schedule = Functions::flattenArray($schedule);
 
         foreach ($schedule as $rate) {
             $principal *= 1 + $rate;
@@ -1256,16 +1256,16 @@ 
     public static function INTRATE($settlement, $maturity, $investment, $redemption, $basis = 0)
     {
         $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
+        $maturity = Functions::flattenSingleValue($maturity);
         $investment    = Functions::flattenSingleValue($investment);
         $redemption    = Functions::flattenSingleValue($redemption);
-        $basis        = Functions::flattenSingleValue($basis);
+        $basis = Functions::flattenSingleValue($basis);
 
         //    Validate
         if ((is_numeric($investment)) && (is_numeric($redemption)) && (is_numeric($basis))) {
             $investment    = (float) $investment;
             $redemption    = (float) $redemption;
-            $basis        = (int) $basis;
+            $basis = (int) $basis;
             if (($investment <= 0) || ($redemption <= 0)) {
                 return Functions::NAN();
             }
@@ -1300,7 +1300,7 @@ 
     public static function IPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0)
     {
         $rate    = Functions::flattenSingleValue($rate);
-        $per    = (int) Functions::flattenSingleValue($per);
+        $per = (int) Functions::flattenSingleValue($per);
         $nper    = (int) Functions::flattenSingleValue($nper);
         $pv        = Functions::flattenSingleValue($pv);
         $fv        = Functions::flattenSingleValue($fv);
@@ -1419,7 +1419,7 @@ 
 
         // Calculate
         $principlePayment = ($principleRemaining * 1.0) / ($numberPeriods * 1.0);
-        for ($i=0; $i <= $period; ++$i) {
+        for ($i = 0; $i <= $period; ++$i) {
             $returnValue = $interestRate * $principleRemaining * -1;
             $principleRemaining -= $principlePayment;
             // principle needs to be 0 after the last payment, don't let floating point screw it up
@@ -1452,9 +1452,9 @@ 
         if (!is_array($values)) {
             return Functions::VALUE();
         }
-        $values                = Functions::flattenArray($values);
-        $finance_rate        = Functions::flattenSingleValue($finance_rate);
-        $reinvestment_rate    = Functions::flattenSingleValue($reinvestment_rate);
+        $values = Functions::flattenArray($values);
+        $finance_rate = Functions::flattenSingleValue($finance_rate);
+        $reinvestment_rate = Functions::flattenSingleValue($reinvestment_rate);
         $n = count($values);
 
         $rr = 1.0 + $reinvestment_rate;
@@ -1491,8 +1491,8 @@ 
      */
     public static function NOMINAL($effect_rate = 0, $npery = 0)
     {
-        $effect_rate    = Functions::flattenSingleValue($effect_rate);
-        $npery            = (int)Functions::flattenSingleValue($npery);
+        $effect_rate = Functions::flattenSingleValue($effect_rate);
+        $npery = (int) Functions::flattenSingleValue($npery);
 
         // Validate parameters
         if ($effect_rate <= 0 || $npery < 1) {
@@ -1518,11 +1518,11 @@ 
      */
     public static function NPER($rate = 0, $pmt = 0, $pv = 0, $fv = 0, $type = 0)
     {
-        $rate    = Functions::flattenSingleValue($rate);
-        $pmt    = Functions::flattenSingleValue($pmt);
+        $rate = Functions::flattenSingleValue($rate);
+        $pmt = Functions::flattenSingleValue($pmt);
         $pv        = Functions::flattenSingleValue($pv);
         $fv        = Functions::flattenSingleValue($fv);
-        $type    = Functions::flattenSingleValue($type);
+        $type = Functions::flattenSingleValue($type);
 
         // Validate parameters
         if ($type != 0 && $type != 1) {
@@ -1539,7 +1539,7 @@ 
         if ($pmt == 0) {
             return Functions::NAN();
         }
-        return (-$pv -$fv) / $pmt;
+        return (-$pv - $fv) / $pmt;
     }
 
     /**
@@ -1619,7 +1619,7 @@ 
     public static function PPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0)
     {
         $rate    = Functions::flattenSingleValue($rate);
-        $per    = (int) Functions::flattenSingleValue($per);
+        $per = (int) Functions::flattenSingleValue($per);
         $nper    = (int) Functions::flattenSingleValue($nper);
         $pv        = Functions::flattenSingleValue($pv);
         $fv        = Functions::flattenSingleValue($fv);
@@ -1641,13 +1641,13 @@ 
 
     public static function PRICE($settlement, $maturity, $rate, $yield, $redemption, $frequency, $basis = 0)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
+        $settlement = Functions::flattenSingleValue($settlement);
         $maturity    = Functions::flattenSingleValue($maturity);
         $rate        = (float) Functions::flattenSingleValue($rate);
         $yield        = (float) Functions::flattenSingleValue($yield);
-        $redemption    = (float) Functions::flattenSingleValue($redemption);
+        $redemption = (float) Functions::flattenSingleValue($redemption);
         $frequency    = (int) Functions::flattenSingleValue($frequency);
-        $basis        = (is_null($basis))    ? 0 :    (int) Functions::flattenSingleValue($basis);
+        $basis        = (is_null($basis)) ? 0 : (int) Functions::flattenSingleValue($basis);
 
         if (is_string($settlement = DateTime::getDateValue($settlement))) {
             return Functions::VALUE();
@@ -1667,9 +1667,9 @@ 
         $n = self::COUPNUM($settlement, $maturity, $frequency, $basis);
         $a = self::COUPDAYBS($settlement, $maturity, $frequency, $basis);
 
-        $baseYF    = 1.0 + ($yield / $frequency);
+        $baseYF = 1.0 + ($yield / $frequency);
         $rfp    = 100 * ($rate / $frequency);
-        $de    = $dsc / $e;
+        $de = $dsc / $e;
 
         $result = $redemption / pow($baseYF, (--$n + $de));
         for ($k = 0; $k <= $n; ++$k) {
@@ -1706,7 +1706,7 @@ 
         $maturity    = Functions::flattenSingleValue($maturity);
         $discount    = (float) Functions::flattenSingleValue($discount);
         $redemption    = (float) Functions::flattenSingleValue($redemption);
-        $basis        = (int) Functions::flattenSingleValue($basis);
+        $basis = (int) Functions::flattenSingleValue($basis);
 
         //    Validate
         if ((is_numeric($discount)) && (is_numeric($redemption)) && (is_numeric($basis))) {
@@ -1747,7 +1747,7 @@ 
      */
     public static function PRICEMAT($settlement, $maturity, $issue, $rate, $yield, $basis = 0)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
+        $settlement = Functions::flattenSingleValue($settlement);
         $maturity    = Functions::flattenSingleValue($maturity);
         $issue        = Functions::flattenSingleValue($issue);
         $rate        = Functions::flattenSingleValue($rate);
@@ -1806,8 +1806,8 @@ 
     {
         $rate    = Functions::flattenSingleValue($rate);
         $nper    = Functions::flattenSingleValue($nper);
-        $pmt    = Functions::flattenSingleValue($pmt);
-        $fv        = Functions::flattenSingleValue($fv);
+        $pmt = Functions::flattenSingleValue($pmt);
+        $fv = Functions::flattenSingleValue($fv);
         $type    = Functions::flattenSingleValue($type);
 
         // Validate parameters
@@ -1855,12 +1855,12 @@ 
      **/
     public static function RATE($nper, $pmt, $pv, $fv = 0.0, $type = 0, $guess = 0.1)
     {
-        $nper    = (int) Functions::flattenSingleValue($nper);
-        $pmt    = Functions::flattenSingleValue($pmt);
+        $nper = (int) Functions::flattenSingleValue($nper);
+        $pmt = Functions::flattenSingleValue($pmt);
         $pv        = Functions::flattenSingleValue($pv);
-        $fv        = (is_null($fv))    ? 0.0    :    Functions::flattenSingleValue($fv);
-        $type    = (is_null($type))    ? 0        :    (int) Functions::flattenSingleValue($type);
-        $guess    = (is_null($guess))    ? 0.1    :    Functions::flattenSingleValue($guess);
+        $fv        = (is_null($fv)) ? 0.0 : Functions::flattenSingleValue($fv);
+        $type = (is_null($type)) ? 0 : (int) Functions::flattenSingleValue($type);
+        $guess = (is_null($guess)) ? 0.1 : Functions::flattenSingleValue($guess);
 
         $rate = $guess;
         if (abs($rate) < FINANCIAL_PRECISION) {
@@ -1922,7 +1922,7 @@ 
         $maturity    = Functions::flattenSingleValue($maturity);
         $investment    = (float) Functions::flattenSingleValue($investment);
         $discount    = (float) Functions::flattenSingleValue($discount);
-        $basis        = (int) Functions::flattenSingleValue($basis);
+        $basis = (int) Functions::flattenSingleValue($basis);
 
         //    Validate
         if ((is_numeric($investment)) && (is_numeric($discount)) && (is_numeric($basis))) {
@@ -1935,7 +1935,7 @@ 
                 return $daysBetweenSettlementAndMaturity;
             }
 
-            return $investment / ( 1 - ($discount * $daysBetweenSettlementAndMaturity));
+            return $investment / (1 - ($discount * $daysBetweenSettlementAndMaturity));
         }
         return Functions::VALUE();
     }
@@ -1954,7 +1954,7 @@ 
     public static function SLN($cost, $salvage, $life)
     {
         $cost        = Functions::flattenSingleValue($cost);
-        $salvage    = Functions::flattenSingleValue($salvage);
+        $salvage = Functions::flattenSingleValue($salvage);
         $life        = Functions::flattenSingleValue($life);
 
         // Calculate
@@ -1982,9 +1982,9 @@ 
     public static function SYD($cost, $salvage, $life, $period)
     {
         $cost        = Functions::flattenSingleValue($cost);
-        $salvage    = Functions::flattenSingleValue($salvage);
+        $salvage = Functions::flattenSingleValue($salvage);
         $life        = Functions::flattenSingleValue($life);
-        $period        = Functions::flattenSingleValue($period);
+        $period = Functions::flattenSingleValue($period);
 
         // Calculate
         if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period))) {
@@ -2011,7 +2011,7 @@ 
      */
     public static function TBILLEQ($settlement, $maturity, $discount)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
+        $settlement = Functions::flattenSingleValue($settlement);
         $maturity    = Functions::flattenSingleValue($maturity);
         $discount    = Functions::flattenSingleValue($discount);
 
@@ -2050,7 +2050,7 @@ 
      */
     public static function TBILLPRICE($settlement, $maturity, $discount)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
+        $settlement = Functions::flattenSingleValue($settlement);
         $maturity    = Functions::flattenSingleValue($maturity);
         $discount    = Functions::flattenSingleValue($discount);
 
@@ -2103,9 +2103,9 @@ 
      */
     public static function TBILLYIELD($settlement, $maturity, $price)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
-        $price        = Functions::flattenSingleValue($price);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $price = Functions::flattenSingleValue($price);
 
         //    Validate
         if (is_numeric($price)) {
@@ -2216,7 +2216,7 @@ 
         if ((!is_array($values)) || (!is_array($dates))) {
             return Functions::VALUE();
         }
-        $values    = Functions::flattenArray($values);
+        $values = Functions::flattenArray($values);
         $dates    = Functions::flattenArray($dates);
         $valCount = count($values);
         if ($valCount != count($dates)) {
@@ -2259,7 +2259,7 @@ 
     public static function YIELDDISC($settlement, $maturity, $price, $redemption, $basis = 0)
     {
         $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
+        $maturity = Functions::flattenSingleValue($maturity);
         $price        = Functions::flattenSingleValue($price);
         $redemption    = Functions::flattenSingleValue($redemption);
         $basis        = (int) Functions::flattenSingleValue($basis);
@@ -2308,7 +2308,7 @@ 
      */
     public static function YIELDMAT($settlement, $maturity, $issue, $rate, $price, $basis = 0)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
+        $settlement = Functions::flattenSingleValue($settlement);
         $maturity    = Functions::flattenSingleValue($maturity);
         $issue        = Functions::flattenSingleValue($issue);
         $rate        = Functions::flattenSingleValue($rate);

src/PhpSpreadsheet/Calculation/FormulaParser.php

Doc Comments +2 added lines, -2 removed lines

@@ -116,7 +116,7 @@ 
      * Get Token
      *
      * @param     int        $pId    Token id
-     * @return    string
+     * @return    FormulaToken
      * @throws  Exception
      */
     public function getToken($pId = 0)
@@ -131,7 +131,7 @@ 
     /**
      * Get Token count
      *
-     * @return string
+     * @return integer
      */
     public function getTokenCount()
     {

Indentation +2 added lines, -2 removed lines

@@ -500,7 +500,7 @@ 
                     (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
-                  ) ) {
+                    ) ) {
                 continue;
             }
 
@@ -512,7 +512,7 @@ 
                     (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) ||
                     (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) ||
                     ($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
-                  ) ) {
+                    ) ) {
                 continue;
             }
 

Spacing +13 added lines, -13 removed lines

@@ -65,9 +65,9 @@ 
     const COMMA         = ',';
     const ERROR_START   = '#';
 
-    const OPERATORS_SN             = "+-";
-    const OPERATORS_INFIX         = "+-*/^&=><";
-    const OPERATORS_POSTFIX     = "%";
+    const OPERATORS_SN = "+-";
+    const OPERATORS_INFIX = "+-*/^&=><";
+    const OPERATORS_POSTFIX = "%";
 
     /**
      * Formula
@@ -163,15 +163,15 @@ 
         }
 
         // Helper variables
-        $tokens1    = $tokens2     = $stack = array();
-        $inString    = $inPath     = $inRange     = $inError = false;
-        $token        = $previousToken    = $nextToken    = null;
+        $tokens1 = $tokens2     = $stack = array();
+        $inString = $inPath     = $inRange = $inError = false;
+        $token = $previousToken = $nextToken = null;
 
         $index    = 1;
         $value    = '';
 
-        $ERRORS             = array("#NULL!", "#DIV/0!", "#VALUE!", "#REF!", "#NAME?", "#NUM!", "#N/A");
-        $COMPARATORS_MULTI     = array(">=", "<=", "<>");
+        $ERRORS = array("#NULL!", "#DIV/0!", "#VALUE!", "#REF!", "#NAME?", "#NUM!", "#N/A");
+        $COMPARATORS_MULTI = array(">=", "<=", "<>");
 
         while ($index < $formulaLength) {
             // state-dependent character evaluation (order is important)
@@ -386,7 +386,7 @@ 
             // standard infix operators
             if (strpos(self::OPERATORS_INFIX, $this->formula{$index}) !== false) {
                 if (strlen($value) > 0) {
-                    $tokens1[] =new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
+                    $tokens1[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = "";
                 }
                 $tokens1[] = new FormulaToken($this->formula{$index}, FormulaToken::TOKEN_TYPE_OPERATORINFIX);
@@ -496,11 +496,11 @@ 
                 continue;
             }
 
-            if (! (
+            if (!(
                     (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
-                  ) ) {
+                  )) {
                 continue;
             }
 
@@ -508,11 +508,11 @@ 
                 continue;
             }
 
-            if (! (
+            if (!(
                     (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) ||
                     (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) ||
                     ($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
-                  ) ) {
+                  )) {
                 continue;
             }
 

src/PhpSpreadsheet/Calculation/Functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -418,7 +418,7 @@ 
      * IS_EVEN
      *
      * @param    mixed $value Value to check
-     * @return    boolean
+     * @return    string|boolean
      */
     public static function isEven($value = null)
     {
@@ -438,7 +438,7 @@ 
      * IS_ODD
      *
      * @param    mixed $value Value to check
-     * @return    boolean
+     * @return    string|boolean
      */
     public static function isOdd($value = null)
     {

Spacing +4 added lines, -4 removed lines

@@ -549,7 +549,7 @@ 
             case 'integer':
                 return $value;
             case 'boolean':
-                return (integer)$value;
+                return (integer) $value;
             case 'string':
                 //    Errors
                 if ((strlen($value) > 0) && ($value{0} == '#')) {
@@ -620,7 +620,7 @@ 
     public static function flattenArray($array)
     {
         if (!is_array($array)) {
-            return (array)$array;
+            return (array) $array;
         }
 
         $arrayValues = array();
@@ -653,7 +653,7 @@ 
     public static function flattenArrayIndexed($array)
     {
         if (!is_array($array)) {
-            return (array)$array;
+            return (array) $array;
         }
 
         $arrayValues = array();
@@ -738,7 +738,7 @@ 
             return $ret;
         }
 
-        foreach ((array)$search as $key => $s) {
+        foreach ((array) $search as $key => $s) {
             if ($s == '' && $s !== 0) {
                 continue;
             }

src/PhpSpreadsheet/Calculation/Logical.php

Doc Comments +5 added lines, -7 removed lines

@@ -83,8 +83,7 @@ 
      *
      * @access    public
      * @category Logical Functions
-     * @param    mixed        $arg,...        Data values
-     * @return    boolean        The logical AND of the arguments.
+     * @return    string|boolean        The logical AND of the arguments.
      */
     public static function logicalAnd()
     {
@@ -139,8 +138,7 @@ 
      *
      * @access    public
      * @category Logical Functions
-     * @param    mixed        $arg,...        Data values
-     * @return    boolean        The logical OR of the arguments.
+     * @return    string|boolean        The logical OR of the arguments.
      */
     public static function logicalOr()
     {
@@ -195,7 +193,7 @@ 
      * @access    public
      * @category Logical Functions
      * @param    mixed        $logical    A value or expression that can be evaluated to TRUE or FALSE
-     * @return    boolean        The boolean inverse of the argument.
+     * @return    boolean|string        The boolean inverse of the argument.
      */
     public static function NOT($logical = false)
     {
@@ -241,8 +239,8 @@ 
      *
      * @access    public
      * @category Logical Functions
-     * @param    mixed    $condition        Condition to evaluate
-     * @param    mixed    $returnIfTrue    Value to return when condition is true
+     * @param    boolean    $condition        Condition to evaluate
+     * @param    integer    $returnIfTrue    Value to return when condition is true
      * @param    mixed    $returnIfFalse    Optional value to return when condition is false
      * @return    mixed    The value of returnIfTrue or returnIfFalse determined by condition
      */

Spacing +2 added lines, -2 removed lines

@@ -248,8 +248,8 @@
      */
     public static function statementIf($condition = true, $returnIfTrue = 0, $returnIfFalse = false)
     {
-        $condition     = (is_null($condition))     ? true :  (boolean) Functions::flattenSingleValue($condition);
-        $returnIfTrue  = (is_null($returnIfTrue))  ? 0 :     Functions::flattenSingleValue($returnIfTrue);
+        $condition     = (is_null($condition)) ? true : (boolean) Functions::flattenSingleValue($condition);
+        $returnIfTrue  = (is_null($returnIfTrue)) ? 0 : Functions::flattenSingleValue($returnIfTrue);
         $returnIfFalse = (is_null($returnIfFalse)) ? false : Functions::flattenSingleValue($returnIfFalse);
 
         return ($condition) ? $returnIfTrue : $returnIfFalse;

src/PhpSpreadsheet/Calculation/LookupRef.php

Doc Comments +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
      *
      * @param    row                Row number to use in the cell reference
      * @param    column            Column number to use in the cell reference
-     * @param    relativity        Flag indicating the type of reference to return
+     * @param    relativity        integer indicating the type of reference to return
      *                                1 or omitted    Absolute
      *                                2                Absolute row; relative column
      *                                3                Relative row; absolute column
@@ -352,7 +352,7 @@ 
      *
      * @param    cellAddress        The reference from which you want to base the offset. Reference must refer to a cell or
      *                                range of adjacent cells; otherwise, OFFSET returns the #VALUE! error value.
-     * @param    rows            The number of rows, up or down, that you want the upper-left cell to refer to.
+     * @param    rows            integer number of rows, up or down, that you want the upper-left cell to refer to.
      *                                Using 5 as the rows argument specifies that the upper-left cell in the reference is
      *                                five rows below reference. Rows can be positive (which means below the starting reference)
      *                                or negative (which means above the starting reference).
@@ -490,7 +490,7 @@ 
      *
      * @param    lookup_value    The value that you want to match in lookup_array
      * @param    lookup_array    The range of cells being searched
-     * @param    match_type        The number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below. If match_type is 1 or -1, the list has to be ordered.
+     * @param    match_type        integer number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below. If match_type is 1 or -1, the list has to be ordered.
      * @return    integer            The relative position of the found item
      */
     public static function MATCH($lookup_value, $lookup_array, $match_type = 1)
@@ -680,7 +680,7 @@ 
      * The VLOOKUP function searches for value in the left-most column of lookup_array and returns the value in the same row based on the index_number.
      * @param    lookup_value    The value that you want to match in lookup_array
      * @param    lookup_array    The range of cells being searched
-     * @param    index_number    The column number in table_array from which the matching value must be returned. The first column is 1.
+     * @param    index_number    integer column number in table_array from which the matching value must be returned. The first column is 1.
      * @param    not_exact_match    Determines if you are looking for an exact match based on lookup_value.
      * @return    mixed            The value of the found cell
      */

Spacing +19 added lines, -19 removed lines

@@ -63,28 +63,28 @@ 
 
         if ($sheetText > '') {
             if (strpos($sheetText, ' ') !== false) {
-                $sheetText = "'".$sheetText."'";
+                $sheetText = "'" . $sheetText . "'";
             }
-            $sheetText .='!';
+            $sheetText .= '!';
         }
         if ((!is_bool($referenceStyle)) || $referenceStyle) {
             $rowRelative = $columnRelative = '$';
-            $column = \PHPExcel\Cell::stringFromColumnIndex($column-1);
+            $column = \PHPExcel\Cell::stringFromColumnIndex($column - 1);
             if (($relativity == 2) || ($relativity == 4)) {
                 $columnRelative = '';
             }
             if (($relativity == 3) || ($relativity == 4)) {
                 $rowRelative = '';
             }
-            return $sheetText.$columnRelative.$column.$rowRelative.$row;
+            return $sheetText . $columnRelative . $column . $rowRelative . $row;
         } else {
             if (($relativity == 2) || ($relativity == 4)) {
-                $column = '['.$column.']';
+                $column = '[' . $column . ']';
             }
             if (($relativity == 3) || ($relativity == 4)) {
-                $row = '['.$row.']';
+                $row = '[' . $row . ']';
             }
-            return $sheetText.'R'.$row.'C'.$column;
+            return $sheetText . 'R' . $row . 'C' . $column;
         }
     }
 
@@ -262,7 +262,7 @@ 
         $args = func_get_args();
         $pCell = array_pop($args);
 
-        $linkURL     = (is_null($linkURL))     ? '' : Functions::flattenSingleValue($linkURL);
+        $linkURL     = (is_null($linkURL)) ? '' : Functions::flattenSingleValue($linkURL);
         $displayName = (is_null($displayName)) ? '' : Functions::flattenSingleValue($displayName);
 
         if ((!is_object($pCell)) || (trim($linkURL) == '')) {
@@ -300,7 +300,7 @@ 
      */
     public static function INDIRECT($cellAddress = null, \PHPExcel\Cell $pCell = null)
     {
-        $cellAddress    = Functions::flattenSingleValue($cellAddress);
+        $cellAddress = Functions::flattenSingleValue($cellAddress);
         if (is_null($cellAddress) || $cellAddress === '') {
             return Functions::REF();
         }
@@ -311,9 +311,9 @@ 
             list($cellAddress1, $cellAddress2) = explode(':', $cellAddress);
         }
 
-        if ((!preg_match('/^'.\PHPExcel\Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress1, $matches)) ||
-            ((!is_null($cellAddress2)) && (!preg_match('/^'.\PHPExcel\Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress2, $matches)))) {
-            if (!preg_match('/^'.\PHPExcel\Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $cellAddress1, $matches)) {
+        if ((!preg_match('/^' . \PHPExcel\Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress1, $matches)) ||
+            ((!is_null($cellAddress2)) && (!preg_match('/^' . \PHPExcel\Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress2, $matches)))) {
+            if (!preg_match('/^' . \PHPExcel\Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $cellAddress1, $matches)) {
                 return Functions::REF();
             }
 
@@ -420,9 +420,9 @@ 
         }
         $endCellColumn = \PHPExcel\Cell::stringFromColumnIndex($endCellColumn);
 
-        $cellAddress = $startCellColumn.$startCellRow;
+        $cellAddress = $startCellColumn . $startCellRow;
         if (($startCellColumn != $endCellColumn) || ($startCellRow != $endCellRow)) {
-            $cellAddress .= ':'.$endCellColumn.$endCellRow;
+            $cellAddress .= ':' . $endCellColumn . $endCellRow;
         }
 
         if ($sheetName !== null) {
@@ -497,7 +497,7 @@ 
     {
         $lookup_array = Functions::flattenArray($lookup_array);
         $lookup_value = Functions::flattenSingleValue($lookup_value);
-        $match_type    = (is_null($match_type)) ? 1 : (int) Functions::flattenSingleValue($match_type);
+        $match_type = (is_null($match_type)) ? 1 : (int) Functions::flattenSingleValue($match_type);
         //    MATCH is not case sensitive
         $lookup_value = strtolower($lookup_value);
 
@@ -529,7 +529,7 @@ 
                 $lookup_array[$i] = strtolower($lookupArrayValue);
             }
             if ((is_null($lookupArrayValue)) && (($match_type == 1) || ($match_type == -1))) {
-                $lookup_array = array_slice($lookup_array, 0, $i-1);
+                $lookup_array = array_slice($lookup_array, 0, $i - 1);
             }
         }
 
@@ -557,7 +557,7 @@ 
                     break;
                 } else {
                     // the previous cell was the match
-                    return $keySet[$i-1]+1;
+                    return $keySet[$i - 1] + 1;
                 }
             } elseif (($match_type == 1) && ($lookupArrayValue >= $lookup_value)) {
                 $i = array_search($i, $keySet);
@@ -567,7 +567,7 @@ 
                     break;
                 } else {
                     // the previous cell was the match
-                    return $keySet[$i-1]+1;
+                    return $keySet[$i - 1] + 1;
                 }
             }
         }
@@ -755,7 +755,7 @@ 
     {
         $lookup_value   = Functions::flattenSingleValue($lookup_value);
         $index_number   = Functions::flattenSingleValue($index_number);
-        $not_exact_match    = Functions::flattenSingleValue($not_exact_match);
+        $not_exact_match = Functions::flattenSingleValue($not_exact_match);
 
         // index_number must be greater than or equal to 1
         if ($index_number < 1) {