PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Reader/CSV.php

Doc Comments +1 added lines, -1 removed lines

@@ -392,7 +392,7 @@
     /**
      * Get Contiguous
      *
-     * @return boolean
+     * @return integer
      */
     public function getContiguous()
     {

Indentation +2 added lines, -2 removed lines

@@ -262,8 +262,8 @@
         $sheet = $objPHPExcel->setActiveSheetIndex($this->sheetIndex);
 
         $escapeEnclosures = array( "\\" . $this->enclosure,
-                                   $this->enclosure . $this->enclosure
-                                 );
+                                    $this->enclosure . $this->enclosure
+                                    );
 
         // Set our starting row based on whether we're in contiguous mode or not
         $currentRow = 1;

Spacing +3 added lines, -3 removed lines

@@ -190,7 +190,7 @@ 
         $this->skipBOM();
         $this->checkSeparator();
 
-        $escapeEnclosures = array( "\\" . $this->enclosure, $this->enclosure . $this->enclosure );
+        $escapeEnclosures = array("\\" . $this->enclosure, $this->enclosure . $this->enclosure);
 
         $worksheetInfo = array();
         $worksheetInfo[0]['worksheetName'] = 'Worksheet';
@@ -261,14 +261,14 @@ 
         }
         $sheet = $objPHPExcel->setActiveSheetIndex($this->sheetIndex);
 
-        $escapeEnclosures = array( "\\" . $this->enclosure,
+        $escapeEnclosures = array("\\" . $this->enclosure,
                                    $this->enclosure . $this->enclosure
                                  );
 
         // Set our starting row based on whether we're in contiguous mode or not
         $currentRow = 1;
         if ($this->contiguous) {
-            $currentRow = ($this->contiguousRow == -1) ? $sheet->getHighestRow(): $this->contiguousRow;
+            $currentRow = ($this->contiguousRow == -1) ? $sheet->getHighestRow() : $this->contiguousRow;
         }
 
         // Loop through each line of the file in turn

src/PhpSpreadsheet/Reader/Excel2003XML.php

Doc Comments +6 added lines

@@ -231,6 +231,9 @@ 
         return $this->loadIntoExisting($pFilename, $objPHPExcel);
     }
 
+    /**
+     * @param string $styleAttributeValue
+     */
     protected static function identifyFixedStyleValue($styleList, &$styleAttributeValue)
     {
         $styleAttributeValue = strtolower($styleAttributeValue);
@@ -786,6 +789,9 @@ 
     }
 
 
+    /**
+     * @param string $charset
+     */
     protected static function convertStringEncoding($string, $charset)
     {
         if ($charset != 'UTF-8') {

Spacing +16 added lines, -16 removed lines

@@ -285,20 +285,20 @@ 
         $fromFormats    = array('\-', '\ ');
         $toFormats      = array('-', ' ');
 
-        $underlineStyles = array (
+        $underlineStyles = array(
             \PhpSpreadsheet\Style\Font::UNDERLINE_NONE,
             \PhpSpreadsheet\Style\Font::UNDERLINE_DOUBLE,
             \PhpSpreadsheet\Style\Font::UNDERLINE_DOUBLEACCOUNTING,
             \PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE,
             \PhpSpreadsheet\Style\Font::UNDERLINE_SINGLEACCOUNTING
         );
-        $verticalAlignmentStyles = array (
+        $verticalAlignmentStyles = array(
             \PhpSpreadsheet\Style\Alignment::VERTICAL_BOTTOM,
             \PhpSpreadsheet\Style\Alignment::VERTICAL_TOP,
             \PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER,
             \PhpSpreadsheet\Style\Alignment::VERTICAL_JUSTIFY
         );
-        $horizontalAlignmentStyles = array (
+        $horizontalAlignmentStyles = array(
             \PhpSpreadsheet\Style\Alignment::HORIZONTAL_GENERAL,
             \PhpSpreadsheet\Style\Alignment::HORIZONTAL_LEFT,
             \PhpSpreadsheet\Style\Alignment::HORIZONTAL_RIGHT,
@@ -552,7 +552,7 @@ 
                 foreach ($worksheet->Table->Column as $columnData) {
                     $columnData_ss = $columnData->attributes($namespaces['ss']);
                     if (isset($columnData_ss['Index'])) {
-                        $columnID = \PhpSpreadsheet\Cell::stringFromColumnIndex($columnData_ss['Index']-1);
+                        $columnID = \PhpSpreadsheet\Cell::stringFromColumnIndex($columnData_ss['Index'] - 1);
                     }
                     if (isset($columnData_ss['Width'])) {
                         $columnWidth = $columnData_ss['Width'];
@@ -578,9 +578,9 @@ 
                     foreach ($rowData->Cell as $cell) {
                         $cell_ss = $cell->attributes($namespaces['ss']);
                         if (isset($cell_ss['Index'])) {
-                            $columnID = \PhpSpreadsheet\Cell::stringFromColumnIndex($cell_ss['Index']-1);
+                            $columnID = \PhpSpreadsheet\Cell::stringFromColumnIndex($cell_ss['Index'] - 1);
                         }
-                        $cellRange = $columnID.$rowID;
+                        $cellRange = $columnID . $rowID;
 
                         if ($this->getReadFilter() !== null) {
                             if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
@@ -591,14 +591,14 @@ 
                         if ((isset($cell_ss['MergeAcross'])) || (isset($cell_ss['MergeDown']))) {
                             $columnTo = $columnID;
                             if (isset($cell_ss['MergeAcross'])) {
-                                $additionalMergedCells += (int)$cell_ss['MergeAcross'];
-                                $columnTo = \PhpSpreadsheet\Cell::stringFromColumnIndex(\PhpSpreadsheet\Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] -1);
+                                $additionalMergedCells += (int) $cell_ss['MergeAcross'];
+                                $columnTo = \PhpSpreadsheet\Cell::stringFromColumnIndex(\PhpSpreadsheet\Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] - 1);
                             }
                             $rowTo = $rowID;
                             if (isset($cell_ss['MergeDown'])) {
                                 $rowTo = $rowTo + $cell_ss['MergeDown'];
                             }
-                            $cellRange .= ':'.$columnTo.$rowTo;
+                            $cellRange .= ':' . $columnTo . $rowTo;
                             $spreadsheet->getActiveSheet()->mergeCells($cellRange);
                         }
 
@@ -703,7 +703,7 @@ 
                                                 if ($columnReference{0} == '[') {
                                                     $columnReference = $columnNumber + trim($columnReference, '[]');
                                                 }
-                                                $A1CellReference = \PhpSpreadsheet\Cell::stringFromColumnIndex($columnReference-1).$rowReference;
+                                                $A1CellReference = \PhpSpreadsheet\Cell::stringFromColumnIndex($columnReference - 1) . $rowReference;
                                                 $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
                                             }
                                         }
@@ -717,10 +717,10 @@ 
 
 //                            echo 'Cell '.$columnID.$rowID.' is a '.$type.' with a value of '.(($hasCalculatedValue) ? $cellDataFormula : $cellValue).'<br />';
 //
-                            $spreadsheet->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue), $type);
+                            $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue), $type);
                             if ($hasCalculatedValue) {
 //                                echo 'Formula result is '.$cellValue.'<br />';
-                                $spreadsheet->getActiveSheet()->getCell($columnID.$rowID)->setCalculatedValue($cellValue);
+                                $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setCalculatedValue($cellValue);
                             }
                             $cellIsSet = $rowHasData = true;
                         }
@@ -730,7 +730,7 @@ 
                             $commentAttributes = $cell->Comment->attributes($namespaces['ss']);
                             $author = 'unknown';
                             if (isset($commentAttributes->Author)) {
-                                $author = (string)$commentAttributes->Author;
+                                $author = (string) $commentAttributes->Author;
 //                                echo 'Author: ', $author,'<br />';
                             }
                             $node = $cell->Comment->Data->asXML();
@@ -738,7 +738,7 @@ 
 //                            echo $annotation,'<br />';
                             $annotation = strip_tags($node);
 //                            echo 'Annotation: ', $annotation,'<br />';
-                            $spreadsheet->getActiveSheet()->getComment($columnID.$rowID)->setAuthor(self::convertStringEncoding($author, $this->charSet))->setText($this->parseRichText($annotation));
+                            $spreadsheet->getActiveSheet()->getComment($columnID . $rowID)->setAuthor(self::convertStringEncoding($author, $this->charSet))->setText($this->parseRichText($annotation));
                         }
 
                         if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
@@ -748,8 +748,8 @@ 
 //                                echo 'Cell '.$columnID.$rowID.'<br />';
 //                                print_r($this->styles[$style]);
 //                                echo '<br />';
-                                if (!$spreadsheet->getActiveSheet()->cellExists($columnID.$rowID)) {
-                                    $spreadsheet->getActiveSheet()->getCell($columnID.$rowID)->setValue(null);
+                                if (!$spreadsheet->getActiveSheet()->cellExists($columnID . $rowID)) {
+                                    $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValue(null);
                                 }
                                 $spreadsheet->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styles[$style]);
                             }

src/PhpSpreadsheet/Reader/Excel5.php

Doc Comments +16 added lines, -7 removed lines

@@ -1211,7 +1211,7 @@ 
      *
      * @param string $data   Data stream to read from
      * @param int    $pos    Position to start reading from
-     * @param int    $length Record data length
+     * @param integer $len
      *
      * @return string Record data
      */
@@ -1754,6 +1754,7 @@ 
      * @var int    $block      Block for which to create decrypto
      * @var string $valContext MD5 context state
      *
+     * @param string $valContext
      * @return Excel5\RC4
      */
     private function makeKey($block, $valContext)
@@ -1788,6 +1789,11 @@ 
      * @var string $hashedsalt_data Hashed salt data
      * @var string &$valContext     Set to the MD5 context of the value
      *
+     * @param string $password
+     * @param string $docid
+     * @param string $salt_data
+     * @param string $hashedsalt_data
+     * @param string $valContext
      * @return bool Success
      */
     private function verifyPassword($password, $docid, $salt_data, $hashedsalt_data, &$valContext)
@@ -5227,7 +5233,7 @@ 
      * is in one piece.
      * Moves to next current position in data stream to start of next record different from a CONtINUE record
      *
-     * @return array
+     * @return integer|null
      */
     private function getSplicedRecordData()
     {
@@ -5331,8 +5337,7 @@ 
      * Take array of tokens together with additional data for formula and return human readable formula
      *
      * @param array $tokens
-     * @param array $additionalData Additional binary data going with the formula
-     * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
+     * @param string $additionalData Additional binary data going with the formula
      * @return string Human readable formula
      */
     private function createFormulaFromTokens($tokens, $additionalData)
@@ -5496,7 +5501,8 @@ 
      *
      * @param string Formula data
      * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
-     * @return array
+     * @param string $formulaData
+     * @return string
      * @throws Exception
      */
     private function getNextToken($formulaData, $baseCell = 'A1')
@@ -7070,7 +7076,7 @@ 
      * section 2.5.15
      *
      * @param string $subData
-     * @return array
+     * @return string
      */
     private function readBIFF8CellRangeAddressList($subData)
     {
@@ -7463,6 +7469,9 @@ 
     }
 
 
+    /**
+     * @param integer $rknum
+     */
     private static function getIEEE754($rknum)
     {
         if (($rknum & 0x02) != 0) {
@@ -7493,7 +7502,7 @@ 
      * Get UTF-8 string from (compressed or uncompressed) UTF-16 string
      *
      * @param string $string
-     * @param bool $compressed
+     * @param string|boolean $compressed
      * @return string
      */
     private static function encodeUTF16($string, $compressed = '')

Spacing +24 added lines, -24 removed lines

@@ -456,8 +456,8 @@ 
         // total byte size of Excel data (workbook global substream + sheet substreams)
         $this->dataSize = strlen($this->data);
 
-        $this->pos        = 0;
-        $this->sheets    = array();
+        $this->pos = 0;
+        $this->sheets = array();
 
         // Parse Workbook Global Substream
         while ($this->pos < $this->dataSize) {
@@ -1123,7 +1123,7 @@ 
                             // $range should look like one of these
                             //        Foo!$C$7:$J$66
                             //        Bar!$A$1:$IV$2
-                            $explodes = explode('!', $range);    // FIXME: what if sheetname contains exclamation mark?
+                            $explodes = explode('!', $range); // FIXME: what if sheetname contains exclamation mark?
                             $sheetName = trim($explodes[0], "'");
                             if (count($explodes) == 2) {
                                 if (strpos($explodes[1], ':') === false) {
@@ -1306,7 +1306,7 @@ 
         $secLength = self::getInt4d($this->summaryInformation, $secOffset);
 
         // offset: $secOffset+4; size: 4; property count
-        $countProperties = self::getInt4d($this->summaryInformation, $secOffset+4);
+        $countProperties = self::getInt4d($this->summaryInformation, $secOffset + 4);
 
         // initialize code page (used to resolve string values)
         $codePage = 'CP1252';
@@ -1315,11 +1315,11 @@ 
         // loop through property decarations and properties
         for ($i = 0; $i < $countProperties; ++$i) {
             // offset: ($secOffset+8) + (8 * $i); size: 4; property ID
-            $id = self::getInt4d($this->summaryInformation, ($secOffset+8) + (8 * $i));
+            $id = self::getInt4d($this->summaryInformation, ($secOffset + 8) + (8 * $i));
 
             // Use value of property id as appropriate
             // offset: ($secOffset+12) + (8 * $i); size: 4; offset from beginning of section (48)
-            $offset = self::getInt4d($this->summaryInformation, ($secOffset+12) + (8 * $i));
+            $offset = self::getInt4d($this->summaryInformation, ($secOffset + 12) + (8 * $i));
 
             $type = self::getInt4d($this->summaryInformation, $secOffset + $offset);
 
@@ -1444,7 +1444,7 @@ 
 //        echo '$secLength = ', $secLength,'<br />';
 
         //    offset: $secOffset+4;    size: 4;    property count
-        $countProperties = self::getInt4d($this->documentSummaryInformation, $secOffset+4);
+        $countProperties = self::getInt4d($this->documentSummaryInformation, $secOffset + 4);
 //        echo '$countProperties = ', $countProperties,'<br />';
 
         // initialize code page (used to resolve string values)
@@ -1455,12 +1455,12 @@ 
         for ($i = 0; $i < $countProperties; ++$i) {
 //            echo 'Property ', $i,'<br />';
             //    offset: ($secOffset+8) + (8 * $i);    size: 4;    property ID
-            $id = self::getInt4d($this->documentSummaryInformation, ($secOffset+8) + (8 * $i));
+            $id = self::getInt4d($this->documentSummaryInformation, ($secOffset + 8) + (8 * $i));
 //            echo 'ID is ', $id,'<br />';
 
             // Use value of property id as appropriate
             // offset: 60 + 8 * $i;    size: 4;    offset from beginning of section (48)
-            $offset = self::getInt4d($this->documentSummaryInformation, ($secOffset+12) + (8 * $i));
+            $offset = self::getInt4d($this->documentSummaryInformation, ($secOffset + 12) + (8 * $i));
 
             $type = self::getInt4d($this->documentSummaryInformation, $secOffset + $offset);
 //            echo 'Type is ', $type,', ';
@@ -1618,7 +1618,7 @@ 
                 //    Concatenate this extension with the currently set comment for the cell
                 $comment = $this->phpSheet->getComment($cellAddress);
                 $commentText = $comment->getText()->getPlainText();
-                $comment->setText($this->parseRichText($commentText.$noteText));
+                $comment->setText($this->parseRichText($commentText . $noteText));
             } else {
                 //    Set comment for the cell
                 $this->phpSheet->getComment($cellAddress)->setText($this->parseRichText($noteText));
@@ -1656,7 +1656,7 @@ 
         $text       = $this->getSplicedRecordData();
 
         $this->textObjects[$this->textObjRef] = array(
-            'text'      => substr($text["recordData"], $text["spliceOffsets"][0]+1, $cchText),
+            'text'      => substr($text["recordData"], $text["spliceOffsets"][0] + 1, $cchText),
             'format'    => substr($text["recordData"], $text["spliceOffsets"][1], $cbRuns),
             'alignment' => $grbitOpts,
             'rotation'  => $rot
@@ -2871,7 +2871,7 @@ 
             ++$pos;
 
             // bit: 0; mask: 0x01; 0 = compressed; 1 = uncompressed
-            $isCompressed = (($optionFlags & 0x01) == 0) ;
+            $isCompressed = (($optionFlags & 0x01) == 0);
 
             // bit: 2; mask: 0x02; 0 = ordinary; 1 = Asian phonetic
             $hasAsian = (($optionFlags & 0x04) != 0);
@@ -3385,7 +3385,7 @@ 
 
         // bit 0, mask 0x01; 1 = sheet is protected
         $bool = (0x01 & self::getInt2d($recordData, 0)) >> 0;
-        $this->phpSheet->getProtection()->setSheet((bool)$bool);
+        $this->phpSheet->getProtection()->setSheet((bool) $bool);
     }
 
 
@@ -3409,7 +3409,7 @@ 
         // bit: 0, mask 0x01; 1 = scenarios are protected
         $bool = (0x01 & self::getInt2d($recordData, 0)) >> 0;
 
-        $this->phpSheet->getProtection()->setScenarios((bool)$bool);
+        $this->phpSheet->getProtection()->setScenarios((bool) $bool);
     }
 
 
@@ -3433,7 +3433,7 @@ 
         // bit: 0, mask 0x01; 1 = objects are protected
         $bool = (0x01 & self::getInt2d($recordData, 0)) >> 0;
 
-        $this->phpSheet->getProtection()->setObjects((bool)$bool);
+        $this->phpSheet->getProtection()->setObjects((bool) $bool);
     }
 
 
@@ -3869,7 +3869,7 @@ 
             // get the base cell, grab tExp token
             $baseRow = self::getInt2d($formulaStructure, 3);
             $baseCol = self::getInt2d($formulaStructure, 5);
-            $this->_baseCell = \PhpSpreadsheet\Cell::stringFromColumnIndex($baseCol). ($baseRow + 1);
+            $this->_baseCell = \PhpSpreadsheet\Cell::stringFromColumnIndex($baseCol) . ($baseRow + 1);
         }
 
         // Read cell?
@@ -4298,7 +4298,7 @@ 
         $this->frozen = (bool) ((0x0008 & $options) >> 3);
 
         // bit: 6; mask: 0x0040; 0 = columns from left to right, 1 = columns from right to left
-        $this->phpSheet->setRightToLeft((bool)((0x0040 & $options) >> 6));
+        $this->phpSheet->setRightToLeft((bool) ((0x0040 & $options) >> 6));
 
         // bit: 10; mask: 0x0400; 0 = sheet not active, 1 = sheet active
         $isActive = (bool) ((0x0400 & $options) >> 10);
@@ -4873,9 +4873,9 @@ 
                 $objValidation = $this->phpSheet->getCell($coordinate)->getDataValidation();
                 $objValidation->setType($type);
                 $objValidation->setErrorStyle($errorStyle);
-                $objValidation->setAllowBlank((bool)$allowBlank);
-                $objValidation->setShowInputMessage((bool)$showInputMessage);
-                $objValidation->setShowErrorMessage((bool)$showErrorMessage);
+                $objValidation->setAllowBlank((bool) $allowBlank);
+                $objValidation->setShowInputMessage((bool) $showInputMessage);
+                $objValidation->setShowErrorMessage((bool) $showErrorMessage);
                 $objValidation->setShowDropDown(!$suppressDropDown);
                 $objValidation->setOperator($operator);
                 $objValidation->setErrorTitle($errorTitle);
@@ -5700,7 +5700,7 @@ 
                 $name = 'tNum';
                 $size = 9;
                 $data = self::extractNumber(substr($formulaData, 1));
-                $data = str_replace(',', '.', (string)$data); // in case non-English locale
+                $data = str_replace(',', '.', (string) $data); // in case non-English locale
                 break;
             case 0x20:    //    array constant
             case 0x40:
@@ -7470,7 +7470,7 @@ 
             $sign = ($rknum & 0x80000000) >> 31;
             $exp = ($rknum & 0x7ff00000) >> 20;
             $mantissa = (0x100000 | ($rknum & 0x000ffffc));
-            $value = $mantissa / pow(2, (20- ($exp - 1023)));
+            $value = $mantissa / pow(2, (20 - ($exp - 1023)));
             if ($sign) {
                 $value = -1 * $value;
             }
@@ -7539,7 +7539,7 @@ 
      */
     public static function getInt2d($data, $pos)
     {
-        return ord($data[$pos]) | (ord($data[$pos+1]) << 8);
+        return ord($data[$pos]) | (ord($data[$pos + 1]) << 8);
     }
 
 
@@ -7562,7 +7562,7 @@ 
         } else {
             $_ord_24 = ($_or_24 & 127) << 24;
         }
-        return ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | $_ord_24;
+        return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | $_ord_24;
     }
 
 

src/PhpSpreadsheet/Reader/Excel5/Color.php

Doc Comments +1 added lines

@@ -9,6 +9,7 @@
      *
      * @param int $color Indexed color
      * @param array $palette Color palette
+     * @param integer $version
      * @return array RGB color value, example: array('rgb' => 'FF0000')
      */
     public static function map($color, $palette, $version)

src/PhpSpreadsheet/Reader/Excel5/MD5.php

Doc Comments +5 added lines

@@ -190,6 +190,11 @@
         return ($Y ^ ($X | (~ $Z))) ; // Y XOR (X OR NOT Z)
     }
 
+    /**
+     * @param string[] $func
+     * @param integer $s
+     * @param integer $t
+     */
     private static function step($func, &$A, $B, $C, $D, $M, $s, $t)
     {
         $A = ($A + call_user_func($func, $B, $C, $D) + $M + $t) & 0xffffffff;

Spacing +6 added lines, -6 removed lines

@@ -87,10 +87,10 @@ 
         $C = $this->c;
         $D = $this->d;
 
-        $F = ['self','f'];
-        $G = ['self','g'];
-        $H = ['self','h'];
-        $I = ['self','i'];
+        $F = ['self', 'f'];
+        $G = ['self', 'g'];
+        $H = ['self', 'h'];
+        $I = ['self', 'i'];
 
         /* ROUND 1 */
         self::step($F, $A, $B, $C, $D, $words[0], 7, 0xd76aa478);
@@ -187,7 +187,7 @@ 
 
     private static function i($X, $Y, $Z)
     {
-        return ($Y ^ ($X | (~ $Z))) ; // Y XOR (X OR NOT Z)
+        return ($Y ^ ($X | (~ $Z))); // Y XOR (X OR NOT Z)
     }
 
     private static function step($func, &$A, $B, $C, $D, $M, $s, $t)
@@ -200,6 +200,6 @@ 
     private static function rotate($decimal, $bits)
     {
         $binary = str_pad(decbin($decimal), 32, "0", STR_PAD_LEFT);
-        return bindec(substr($binary, $bits).substr($binary, 0, $bits));
+        return bindec(substr($binary, $bits) . substr($binary, 0, $bits));
     }
 }

src/PhpSpreadsheet/Shared/Drawing.php

Doc Comments +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
      * Convert pixels to EMU
      *
      * @param     int $pValue    Value in pixels
-     * @return     int            Value in EMU
+     * @return     double            Value in EMU
      */
     public static function pixelsToEMU($pValue = 0)
     {
@@ -114,7 +114,7 @@ 
      * Convert pixels to points
      *
      * @param     int $pValue    Value in pixels
-     * @return     int            Value in points
+     * @return     double            Value in points
      */
     public static function pixelsToPoints($pValue = 0)
     {
@@ -166,7 +166,7 @@ 
      * Create a new image from file. By alexander at alexauto dot nl
      *
      * @link http://www.php.net/manual/en/function.imagecreatefromwbmp.php#86214
-     * @param string $filename Path to Windows DIB (BMP) image
+     * @param string $p_sFile
      * @return resource
      */
     public static function imagecreatefrombmp($p_sFile)

Spacing +13 added lines, -13 removed lines

@@ -144,7 +144,7 @@ 
      */
     public static function degreesToAngle($pValue = 0)
     {
-        return (int)round($pValue * 60000);
+        return (int) round($pValue * 60000);
     }
 
     /**
@@ -174,7 +174,7 @@ 
         //    Load the image into a string
         $file = fopen($p_sFile, "rb");
         $read = fread($file, 10);
-        while (!feof($file) && ($read<>"")) {
+        while (!feof($file) && ($read <> "")) {
             $read .= fread($file, 1024);
         }
 
@@ -184,15 +184,15 @@ 
 
         //    Process the header
         //    Structure: http://www.fastgraph.com/help/bmp_header_format.html
-        if (substr($header, 0, 4)=="424d") {
+        if (substr($header, 0, 4) == "424d") {
             //    Cut it in parts of 2 bytes
             $header_parts = str_split($header, 2);
 
             //    Get the width        4 bytes
-            $width = hexdec($header_parts[19].$header_parts[18]);
+            $width = hexdec($header_parts[19] . $header_parts[18]);
 
             //    Get the height        4 bytes
-            $height = hexdec($header_parts[23].$header_parts[22]);
+            $height = hexdec($header_parts[23] . $header_parts[22]);
 
             //    Unset the header params
             unset($header_parts);
@@ -211,11 +211,11 @@ 
         //    Calculate if padding at the end-line is needed
         //    Divided by two to keep overview.
         //    1 byte = 2 HEX-chars
-        $body_size = (strlen($body)/2);
-        $header_size = ($width*$height);
+        $body_size = (strlen($body) / 2);
+        $header_size = ($width * $height);
 
         //    Use end-line padding? Only when needed
-        $usePadding = ($body_size>($header_size*3)+4);
+        $usePadding = ($body_size > ($header_size * 3) + 4);
 
         //    Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption
         //    Calculate the next DWORD-position in the body
@@ -225,7 +225,7 @@ 
                 // If padding needed, ignore image-padding
                 // Shift i to the ending of the current 32-bit-block
                 if ($usePadding) {
-                    $i += $width%4;
+                    $i += $width % 4;
                 }
 
                 //    Reset horizontal position
@@ -243,13 +243,13 @@ 
             // Calculation of the RGB-pixel (defined as BGR in image-data)
             // Define $i_pos as absolute position in the body
             $i_pos    = $i * 2;
-            $r        = hexdec($body[$i_pos+4].$body[$i_pos+5]);
-            $g        = hexdec($body[$i_pos+2].$body[$i_pos+3]);
-            $b        = hexdec($body[$i_pos].$body[$i_pos+1]);
+            $r        = hexdec($body[$i_pos + 4] . $body[$i_pos + 5]);
+            $g        = hexdec($body[$i_pos + 2] . $body[$i_pos + 3]);
+            $b        = hexdec($body[$i_pos] . $body[$i_pos + 1]);
 
             // Calculate and draw the pixel
             $color    = imagecolorallocate($image, $r, $g, $b);
-            imagesetpixel($image, $x, $height-$y, $color);
+            imagesetpixel($image, $x, $height - $y, $color);
 
             // Raise the horizontal position
             $x++;

src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php

Doc Comments +2 added lines, -3 removed lines

@@ -206,7 +206,7 @@ 
     /**
      * Get the shape index
      *
-     * @return int
+     * @return boolean
      */
     public function getSpId()
     {
@@ -217,7 +217,7 @@ 
      * Set an option for the Shape Group Container
      *
      * @param int $property The number specifies the option
-     * @param mixed $value
+     * @param integer $value
      */
     public function setOPT($property, $value)
     {
@@ -331,7 +331,6 @@ 
     /**
      * Set offset in x-direction of bottom-right corner of shape measured in 1/1024 of column width
      *
-     * @param int $startOffsetX
      */
     public function setEndOffsetX($endOffsetX = 0)
     {

src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php

Doc Comments +2 added lines, -2 removed lines

@@ -816,7 +816,7 @@ 
      *    Return the eigenvector matrix
      *
      *    @access public
-     *    @return V
+     *    @return Matrix
      */
     public function getV()
     {
@@ -849,7 +849,7 @@ 
      *    Return the block diagonal eigenvalue matrix
      *
      *    @access public
-     *    @return D
+     *    @return Matrix
      */
     public function getD()
     {

Indentation +9 added lines, -9 removed lines

@@ -52,21 +52,21 @@
     private $V = array();
 
     /**
-    *    Array for internal storage of nonsymmetric Hessenberg form.
-    *    @var array
-    */
+     *    Array for internal storage of nonsymmetric Hessenberg form.
+     *    @var array
+     */
     private $H = array();
 
     /**
-    *    Working storage for nonsymmetric algorithm.
-    *    @var array
-    */
+     *    Working storage for nonsymmetric algorithm.
+     *    @var array
+     */
     private $ort;
 
     /**
-    *    Used for complex scalar division.
-    *    @var float
-    */
+     *    Used for complex scalar division.
+     *    @var float
+     */
     private $cdivr;
     private $cdivi;
 

Spacing +115 added lines, -115 removed lines

@@ -81,10 +81,10 @@ 
         //  Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
         //  Auto. Comp., Vol.ii-Linear Algebra, and the corresponding
         //  Fortran subroutine in EISPACK.
-        $this->d = $this->V[$this->n-1];
+        $this->d = $this->V[$this->n - 1];
         // Householder reduction to tridiagonal form.
-        for ($i = $this->n-1; $i > 0; --$i) {
-            $i_ = $i -1;
+        for ($i = $this->n - 1; $i > 0; --$i) {
+            $i_ = $i - 1;
             // Scale to avoid under/overflow.
             $h = $scale = 0.0;
             $scale += array_sum(array_map(abs, $this->d));
@@ -116,7 +116,7 @@ 
                     $f = $this->d[$j];
                     $this->V[$j][$i] = $f;
                     $g = $this->e[$j] + $this->V[$j][$j] * $f;
-                    for ($k = $j+1; $k <= $i_; ++$k) {
+                    for ($k = $j + 1; $k <= $i_; ++$k) {
                         $g += $this->V[$k][$j] * $this->d[$k];
                         $this->e[$k] += $this->V[$k][$j] * $f;
                     }
@@ -128,7 +128,7 @@ 
                     $f += $this->e[$j] * $this->d[$j];
                 }
                 $hh = $f / (2 * $h);
-                for ($j=0; $j < $i; ++$j) {
+                for ($j = 0; $j < $i; ++$j) {
                     $this->e[$j] -= $hh * $this->d[$j];
                 }
                 for ($j = 0; $j < $i; ++$j) {
@@ -137,7 +137,7 @@ 
                     for ($k = $j; $k <= $i_; ++$k) {
                         $this->V[$k][$j] -= ($f * $this->e[$k] + $g * $this->d[$k]);
                     }
-                    $this->d[$j] = $this->V[$i-1][$j];
+                    $this->d[$j] = $this->V[$i - 1][$j];
                     $this->V[$i][$j] = 0.0;
                 }
             }
@@ -145,18 +145,18 @@ 
         }
 
         // Accumulate transformations.
-        for ($i = 0; $i < $this->n-1; ++$i) {
-            $this->V[$this->n-1][$i] = $this->V[$i][$i];
+        for ($i = 0; $i < $this->n - 1; ++$i) {
+            $this->V[$this->n - 1][$i] = $this->V[$i][$i];
             $this->V[$i][$i] = 1.0;
-            $h = $this->d[$i+1];
+            $h = $this->d[$i + 1];
             if ($h != 0.0) {
                 for ($k = 0; $k <= $i; ++$k) {
-                    $this->d[$k] = $this->V[$k][$i+1] / $h;
+                    $this->d[$k] = $this->V[$k][$i + 1] / $h;
                 }
                 for ($j = 0; $j <= $i; ++$j) {
                     $g = 0.0;
                     for ($k = 0; $k <= $i; ++$k) {
-                        $g += $this->V[$k][$i+1] * $this->V[$k][$j];
+                        $g += $this->V[$k][$i + 1] * $this->V[$k][$j];
                     }
                     for ($k = 0; $k <= $i; ++$k) {
                         $this->V[$k][$j] -= $g * $this->d[$k];
@@ -164,13 +164,13 @@ 
                 }
             }
             for ($k = 0; $k <= $i; ++$k) {
-                $this->V[$k][$i+1] = 0.0;
+                $this->V[$k][$i + 1] = 0.0;
             }
         }
 
-        $this->d = $this->V[$this->n-1];
-        $this->V[$this->n-1] = array_fill(0, $j, 0.0);
-        $this->V[$this->n-1][$this->n-1] = 1.0;
+        $this->d = $this->V[$this->n - 1];
+        $this->V[$this->n - 1] = array_fill(0, $j, 0.0);
+        $this->V[$this->n - 1][$this->n - 1] = 1.0;
         $this->e[0] = 0.0;
     }
 
@@ -187,9 +187,9 @@ 
     private function tql2()
     {
         for ($i = 1; $i < $this->n; ++$i) {
-            $this->e[$i-1] = $this->e[$i];
+            $this->e[$i - 1] = $this->e[$i];
         }
-        $this->e[$this->n-1] = 0.0;
+        $this->e[$this->n - 1] = 0.0;
         $f = 0.0;
         $tst1 = 0.0;
         $eps  = pow(2.0, -52.0);
@@ -213,14 +213,14 @@ 
                     $iter += 1;
                     // Compute implicit shift
                     $g = $this->d[$l];
-                    $p = ($this->d[$l+1] - $g) / (2.0 * $this->e[$l]);
+                    $p = ($this->d[$l + 1] - $g) / (2.0 * $this->e[$l]);
                     $r = hypo($p, 1.0);
                     if ($p < 0) {
                         $r *= -1;
                     }
                     $this->d[$l] = $this->e[$l] / ($p + $r);
-                    $this->d[$l+1] = $this->e[$l] * ($p + $r);
-                    $dl1 = $this->d[$l+1];
+                    $this->d[$l + 1] = $this->e[$l] * ($p + $r);
+                    $dl1 = $this->d[$l + 1];
                     $h = $g - $this->d[$l];
                     for ($i = $l + 2; $i < $this->n; ++$i) {
                         $this->d[$i] -= $h;
@@ -232,22 +232,22 @@ 
                     $c2 = $c3 = $c;
                     $el1 = $this->e[$l + 1];
                     $s = $s2 = 0.0;
-                    for ($i = $m-1; $i >= $l; --$i) {
+                    for ($i = $m - 1; $i >= $l; --$i) {
                         $c3 = $c2;
                         $c2 = $c;
                         $s2 = $s;
                         $g  = $c * $this->e[$i];
                         $h  = $c * $p;
                         $r  = hypo($p, $this->e[$i]);
-                        $this->e[$i+1] = $s * $r;
+                        $this->e[$i + 1] = $s * $r;
                         $s = $this->e[$i] / $r;
                         $c = $p / $r;
                         $p = $c * $this->d[$i] - $s * $g;
-                        $this->d[$i+1] = $h + $s * ($c * $g + $s * $this->d[$i]);
+                        $this->d[$i + 1] = $h + $s * ($c * $g + $s * $this->d[$i]);
                         // Accumulate transformation.
                         for ($k = 0; $k < $this->n; ++$k) {
-                            $h = $this->V[$k][$i+1];
-                            $this->V[$k][$i+1] = $s * $this->V[$k][$i] + $c * $h;
+                            $h = $this->V[$k][$i + 1];
+                            $this->V[$k][$i + 1] = $s * $this->V[$k][$i] + $c * $h;
                             $this->V[$k][$i] = $c * $this->V[$k][$i] - $s * $h;
                         }
                     }
@@ -265,7 +265,7 @@ 
         for ($i = 0; $i < $this->n - 1; ++$i) {
             $k = $i;
             $p = $this->d[$i];
-            for ($j = $i+1; $j < $this->n; ++$j) {
+            for ($j = $i + 1; $j < $this->n; ++$j) {
                 if ($this->d[$j] < $p) {
                     $k = $j;
                     $p = $this->d[$j];
@@ -296,19 +296,19 @@ 
     private function orthes()
     {
         $low  = 0;
-        $high = $this->n-1;
+        $high = $this->n - 1;
 
-        for ($m = $low+1; $m <= $high-1; ++$m) {
+        for ($m = $low + 1; $m <= $high - 1; ++$m) {
             // Scale column.
             $scale = 0.0;
             for ($i = $m; $i <= $high; ++$i) {
-                $scale = $scale + abs($this->H[$i][$m-1]);
+                $scale = $scale + abs($this->H[$i][$m - 1]);
             }
             if ($scale != 0.0) {
                 // Compute Householder transformation.
                 $h = 0.0;
                 for ($i = $high; $i >= $m; --$i) {
-                    $this->ort[$i] = $this->H[$i][$m-1] / $scale;
+                    $this->ort[$i] = $this->H[$i][$m - 1] / $scale;
                     $h += $this->ort[$i] * $this->ort[$i];
                 }
                 $g = sqrt($h);
@@ -340,7 +340,7 @@ 
                     }
                 }
                 $this->ort[$m] = $scale * $this->ort[$m];
-                $this->H[$m][$m-1] = $scale * $g;
+                $this->H[$m][$m - 1] = $scale * $g;
             }
         }
 
@@ -350,10 +350,10 @@ 
                 $this->V[$i][$j] = ($i == $j ? 1.0 : 0.0);
             }
         }
-        for ($m = $high-1; $m >= $low+1; --$m) {
-            if ($this->H[$m][$m-1] != 0.0) {
-                for ($i = $m+1; $i <= $high; ++$i) {
-                    $this->ort[$i] = $this->H[$i][$m-1];
+        for ($m = $high - 1; $m >= $low + 1; --$m) {
+            if ($this->H[$m][$m - 1] != 0.0) {
+                for ($i = $m + 1; $i <= $high; ++$i) {
+                    $this->ort[$i] = $this->H[$i][$m - 1];
                 }
                 for ($j = $m; $j <= $high; ++$j) {
                     $g = 0.0;
@@ -361,7 +361,7 @@ 
                         $g += $this->ort[$i] * $this->V[$i][$j];
                     }
                     // Double division avoids possible underflow
-                    $g = ($g / $this->ort[$m]) / $this->H[$m][$m-1];
+                    $g = ($g / $this->ort[$m]) / $this->H[$m][$m - 1];
                     for ($i = $m; $i <= $high; ++$i) {
                         $this->V[$i][$j] += $g * $this->ort[$i];
                     }
@@ -418,7 +418,7 @@ 
                 $this->d[$i] = $this->H[$i][$i];
                 $this->e[$i] = 0.0;
             }
-            for ($j = max($i-1, 0); $j < $nn; ++$j) {
+            for ($j = max($i - 1, 0); $j < $nn; ++$j) {
                 $norm = $norm + abs($this->H[$i][$j]);
             }
         }
@@ -429,11 +429,11 @@ 
             // Look for single small sub-diagonal element
             $l = $n;
             while ($l > $low) {
-                $s = abs($this->H[$l-1][$l-1]) + abs($this->H[$l][$l]);
+                $s = abs($this->H[$l - 1][$l - 1]) + abs($this->H[$l][$l]);
                 if ($s == 0.0) {
                     $s = $norm;
                 }
-                if (abs($this->H[$l][$l-1]) < $eps * $s) {
+                if (abs($this->H[$l][$l - 1]) < $eps * $s) {
                     break;
                 }
                 --$l;
@@ -447,13 +447,13 @@ 
                 --$n;
                 $iter = 0;
             // Two roots found
-            } elseif ($l == $n-1) {
-                $w = $this->H[$n][$n-1] * $this->H[$n-1][$n];
-                $p = ($this->H[$n-1][$n-1] - $this->H[$n][$n]) / 2.0;
+            } elseif ($l == $n - 1) {
+                $w = $this->H[$n][$n - 1] * $this->H[$n - 1][$n];
+                $p = ($this->H[$n - 1][$n - 1] - $this->H[$n][$n]) / 2.0;
                 $q = $p * $p + $w;
                 $z = sqrt(abs($q));
                 $this->H[$n][$n] = $this->H[$n][$n] + $exshift;
-                $this->H[$n-1][$n-1] = $this->H[$n-1][$n-1] + $exshift;
+                $this->H[$n - 1][$n - 1] = $this->H[$n - 1][$n - 1] + $exshift;
                 $x = $this->H[$n][$n];
                 // Real pair
                 if ($q >= 0) {
@@ -462,14 +462,14 @@ 
                     } else {
                         $z = $p - $z;
                     }
-                    $this->d[$n-1] = $x + $z;
-                    $this->d[$n] = $this->d[$n-1];
+                    $this->d[$n - 1] = $x + $z;
+                    $this->d[$n] = $this->d[$n - 1];
                     if ($z != 0.0) {
                         $this->d[$n] = $x - $w / $z;
                     }
-                    $this->e[$n-1] = 0.0;
+                    $this->e[$n - 1] = 0.0;
                     $this->e[$n] = 0.0;
-                    $x = $this->H[$n][$n-1];
+                    $x = $this->H[$n][$n - 1];
                     $s = abs($x) + abs($z);
                     $p = $x / $s;
                     $q = $z / $s;
@@ -477,28 +477,28 @@ 
                     $p = $p / $r;
                     $q = $q / $r;
                     // Row modification
-                    for ($j = $n-1; $j < $nn; ++$j) {
-                        $z = $this->H[$n-1][$j];
-                        $this->H[$n-1][$j] = $q * $z + $p * $this->H[$n][$j];
+                    for ($j = $n - 1; $j < $nn; ++$j) {
+                        $z = $this->H[$n - 1][$j];
+                        $this->H[$n - 1][$j] = $q * $z + $p * $this->H[$n][$j];
                         $this->H[$n][$j] = $q * $this->H[$n][$j] - $p * $z;
                     }
                     // Column modification
                     for ($i = 0; $i <= $n; ++$i) {
-                        $z = $this->H[$i][$n-1];
-                        $this->H[$i][$n-1] = $q * $z + $p * $this->H[$i][$n];
+                        $z = $this->H[$i][$n - 1];
+                        $this->H[$i][$n - 1] = $q * $z + $p * $this->H[$i][$n];
                         $this->H[$i][$n] = $q * $this->H[$i][$n] - $p * $z;
                     }
                     // Accumulate transformations
                     for ($i = $low; $i <= $high; ++$i) {
-                        $z = $this->V[$i][$n-1];
-                        $this->V[$i][$n-1] = $q * $z + $p * $this->V[$i][$n];
+                        $z = $this->V[$i][$n - 1];
+                        $this->V[$i][$n - 1] = $q * $z + $p * $this->V[$i][$n];
                         $this->V[$i][$n] = $q * $this->V[$i][$n] - $p * $z;
                     }
                 // Complex pair
                 } else {
-                    $this->d[$n-1] = $x + $p;
+                    $this->d[$n - 1] = $x + $p;
                     $this->d[$n] = $x + $p;
-                    $this->e[$n-1] = $z;
+                    $this->e[$n - 1] = $z;
                     $this->e[$n] = -$z;
                 }
                 $n = $n - 2;
@@ -510,8 +510,8 @@ 
                 $y = 0.0;
                 $w = 0.0;
                 if ($l < $n) {
-                    $y = $this->H[$n-1][$n-1];
-                    $w = $this->H[$n][$n-1] * $this->H[$n-1][$n];
+                    $y = $this->H[$n - 1][$n - 1];
+                    $w = $this->H[$n][$n - 1] * $this->H[$n - 1][$n];
                 }
                 // Wilkinson's original ad hoc shift
                 if ($iter == 10) {
@@ -519,7 +519,7 @@ 
                     for ($i = $low; $i <= $n; ++$i) {
                         $this->H[$i][$i] -= $x;
                     }
-                    $s = abs($this->H[$n][$n-1]) + abs($this->H[$n-1][$n-2]);
+                    $s = abs($this->H[$n][$n - 1]) + abs($this->H[$n - 1][$n - 2]);
                     $x = $y = 0.75 * $s;
                     $w = -0.4375 * $s * $s;
                 }
@@ -548,9 +548,9 @@ 
                     $z = $this->H[$m][$m];
                     $r = $x - $z;
                     $s = $y - $z;
-                    $p = ($r * $s - $w) / $this->H[$m+1][$m] + $this->H[$m][$m+1];
-                    $q = $this->H[$m+1][$m+1] - $z - $r - $s;
-                    $r = $this->H[$m+2][$m+1];
+                    $p = ($r * $s - $w) / $this->H[$m + 1][$m] + $this->H[$m][$m + 1];
+                    $q = $this->H[$m + 1][$m + 1] - $z - $r - $s;
+                    $r = $this->H[$m + 2][$m + 1];
                     $s = abs($p) + abs($q) + abs($r);
                     $p = $p / $s;
                     $q = $q / $s;
@@ -558,25 +558,25 @@ 
                     if ($m == $l) {
                         break;
                     }
-                    if (abs($this->H[$m][$m-1]) * (abs($q) + abs($r)) <
-                        $eps * (abs($p) * (abs($this->H[$m-1][$m-1]) + abs($z) + abs($this->H[$m+1][$m+1])))) {
+                    if (abs($this->H[$m][$m - 1]) * (abs($q) + abs($r)) <
+                        $eps * (abs($p) * (abs($this->H[$m - 1][$m - 1]) + abs($z) + abs($this->H[$m + 1][$m + 1])))) {
                         break;
                     }
                     --$m;
                 }
                 for ($i = $m + 2; $i <= $n; ++$i) {
-                    $this->H[$i][$i-2] = 0.0;
-                    if ($i > $m+2) {
-                        $this->H[$i][$i-3] = 0.0;
+                    $this->H[$i][$i - 2] = 0.0;
+                    if ($i > $m + 2) {
+                        $this->H[$i][$i - 3] = 0.0;
                     }
                 }
                 // Double QR step involving rows l:n and columns m:n
-                for ($k = $m; $k <= $n-1; ++$k) {
-                    $notlast = ($k != $n-1);
+                for ($k = $m; $k <= $n - 1; ++$k) {
+                    $notlast = ($k != $n - 1);
                     if ($k != $m) {
-                        $p = $this->H[$k][$k-1];
-                        $q = $this->H[$k+1][$k-1];
-                        $r = ($notlast ? $this->H[$k+2][$k-1] : 0.0);
+                        $p = $this->H[$k][$k - 1];
+                        $q = $this->H[$k + 1][$k - 1];
+                        $r = ($notlast ? $this->H[$k + 2][$k - 1] : 0.0);
                         $x = abs($p) + abs($q) + abs($r);
                         if ($x != 0.0) {
                             $p = $p / $x;
@@ -593,9 +593,9 @@ 
                     }
                     if ($s != 0) {
                         if ($k != $m) {
-                            $this->H[$k][$k-1] = -$s * $x;
+                            $this->H[$k][$k - 1] = -$s * $x;
                         } elseif ($l != $m) {
-                            $this->H[$k][$k-1] = -$this->H[$k][$k-1];
+                            $this->H[$k][$k - 1] = -$this->H[$k][$k - 1];
                         }
                         $p = $p + $s;
                         $x = $p / $s;
@@ -605,33 +605,33 @@ 
                         $r = $r / $p;
                         // Row modification
                         for ($j = $k; $j < $nn; ++$j) {
-                            $p = $this->H[$k][$j] + $q * $this->H[$k+1][$j];
+                            $p = $this->H[$k][$j] + $q * $this->H[$k + 1][$j];
                             if ($notlast) {
-                                $p = $p + $r * $this->H[$k+2][$j];
-                                $this->H[$k+2][$j] = $this->H[$k+2][$j] - $p * $z;
+                                $p = $p + $r * $this->H[$k + 2][$j];
+                                $this->H[$k + 2][$j] = $this->H[$k + 2][$j] - $p * $z;
                             }
                             $this->H[$k][$j] = $this->H[$k][$j] - $p * $x;
-                            $this->H[$k+1][$j] = $this->H[$k+1][$j] - $p * $y;
+                            $this->H[$k + 1][$j] = $this->H[$k + 1][$j] - $p * $y;
                         }
                         // Column modification
-                        for ($i = 0; $i <= min($n, $k+3); ++$i) {
-                            $p = $x * $this->H[$i][$k] + $y * $this->H[$i][$k+1];
+                        for ($i = 0; $i <= min($n, $k + 3); ++$i) {
+                            $p = $x * $this->H[$i][$k] + $y * $this->H[$i][$k + 1];
                             if ($notlast) {
-                                $p = $p + $z * $this->H[$i][$k+2];
-                                $this->H[$i][$k+2] = $this->H[$i][$k+2] - $p * $r;
+                                $p = $p + $z * $this->H[$i][$k + 2];
+                                $this->H[$i][$k + 2] = $this->H[$i][$k + 2] - $p * $r;
                             }
                             $this->H[$i][$k] = $this->H[$i][$k] - $p;
-                            $this->H[$i][$k+1] = $this->H[$i][$k+1] - $p * $q;
+                            $this->H[$i][$k + 1] = $this->H[$i][$k + 1] - $p * $q;
                         }
                         // Accumulate transformations
                         for ($i = $low; $i <= $high; ++$i) {
-                            $p = $x * $this->V[$i][$k] + $y * $this->V[$i][$k+1];
+                            $p = $x * $this->V[$i][$k] + $y * $this->V[$i][$k + 1];
                             if ($notlast) {
-                                $p = $p + $z * $this->V[$i][$k+2];
-                                $this->V[$i][$k+2] = $this->V[$i][$k+2] - $p * $r;
+                                $p = $p + $z * $this->V[$i][$k + 2];
+                                $this->V[$i][$k + 2] = $this->V[$i][$k + 2] - $p * $r;
                             }
                             $this->V[$i][$k] = $this->V[$i][$k] - $p;
-                            $this->V[$i][$k+1] = $this->V[$i][$k+1] - $p * $q;
+                            $this->V[$i][$k + 1] = $this->V[$i][$k + 1] - $p * $q;
                         }
                     }  // ($s != 0)
                 }  // k loop
@@ -643,14 +643,14 @@ 
             return;
         }
 
-        for ($n = $nn-1; $n >= 0; --$n) {
+        for ($n = $nn - 1; $n >= 0; --$n) {
             $p = $this->d[$n];
             $q = $this->e[$n];
             // Real vector
             if ($q == 0) {
                 $l = $n;
                 $this->H[$n][$n] = 1.0;
-                for ($i = $n-1; $i >= 0; --$i) {
+                for ($i = $n - 1; $i >= 0; --$i) {
                     $w = $this->H[$i][$i] - $p;
                     $r = 0.0;
                     for ($j = $l; $j <= $n; ++$j) {
@@ -669,15 +669,15 @@ 
                             }
                         // Solve real equations
                         } else {
-                            $x = $this->H[$i][$i+1];
-                            $y = $this->H[$i+1][$i];
+                            $x = $this->H[$i][$i + 1];
+                            $y = $this->H[$i + 1][$i];
                             $q = ($this->d[$i] - $p) * ($this->d[$i] - $p) + $this->e[$i] * $this->e[$i];
                             $t = ($x * $s - $z * $r) / $q;
                             $this->H[$i][$n] = $t;
                             if (abs($x) > abs($z)) {
-                                $this->H[$i+1][$n] = (-$r - $w * $t) / $x;
+                                $this->H[$i + 1][$n] = (-$r - $w * $t) / $x;
                             } else {
-                                $this->H[$i+1][$n] = (-$s - $y * $t) / $z;
+                                $this->H[$i + 1][$n] = (-$s - $y * $t) / $z;
                             }
                         }
                         // Overflow control
@@ -691,24 +691,24 @@ 
                 }
             // Complex vector
             } elseif ($q < 0) {
-                $l = $n-1;
+                $l = $n - 1;
                 // Last vector component imaginary so matrix is triangular
-                if (abs($this->H[$n][$n-1]) > abs($this->H[$n-1][$n])) {
-                    $this->H[$n-1][$n-1] = $q / $this->H[$n][$n-1];
-                    $this->H[$n-1][$n] = -($this->H[$n][$n] - $p) / $this->H[$n][$n-1];
+                if (abs($this->H[$n][$n - 1]) > abs($this->H[$n - 1][$n])) {
+                    $this->H[$n - 1][$n - 1] = $q / $this->H[$n][$n - 1];
+                    $this->H[$n - 1][$n] = -($this->H[$n][$n] - $p) / $this->H[$n][$n - 1];
                 } else {
-                    $this->cdiv(0.0, -$this->H[$n-1][$n], $this->H[$n-1][$n-1] - $p, $q);
-                    $this->H[$n-1][$n-1] = $this->cdivr;
-                    $this->H[$n-1][$n]   = $this->cdivi;
+                    $this->cdiv(0.0, -$this->H[$n - 1][$n], $this->H[$n - 1][$n - 1] - $p, $q);
+                    $this->H[$n - 1][$n - 1] = $this->cdivr;
+                    $this->H[$n - 1][$n]   = $this->cdivi;
                 }
-                $this->H[$n][$n-1] = 0.0;
+                $this->H[$n][$n - 1] = 0.0;
                 $this->H[$n][$n] = 1.0;
-                for ($i = $n-2; $i >= 0; --$i) {
+                for ($i = $n - 2; $i >= 0; --$i) {
                     // double ra,sa,vr,vi;
                     $ra = 0.0;
                     $sa = 0.0;
                     for ($j = $l; $j <= $n; ++$j) {
-                        $ra = $ra + $this->H[$i][$j] * $this->H[$j][$n-1];
+                        $ra = $ra + $this->H[$i][$j] * $this->H[$j][$n - 1];
                         $sa = $sa + $this->H[$i][$j] * $this->H[$j][$n];
                     }
                     $w = $this->H[$i][$i] - $p;
@@ -720,34 +720,34 @@ 
                         $l = $i;
                         if ($this->e[$i] == 0) {
                             $this->cdiv(-$ra, -$sa, $w, $q);
-                            $this->H[$i][$n-1] = $this->cdivr;
+                            $this->H[$i][$n - 1] = $this->cdivr;
                             $this->H[$i][$n]   = $this->cdivi;
                         } else {
                             // Solve complex equations
-                            $x = $this->H[$i][$i+1];
-                            $y = $this->H[$i+1][$i];
+                            $x = $this->H[$i][$i + 1];
+                            $y = $this->H[$i + 1][$i];
                             $vr = ($this->d[$i] - $p) * ($this->d[$i] - $p) + $this->e[$i] * $this->e[$i] - $q * $q;
                             $vi = ($this->d[$i] - $p) * 2.0 * $q;
                             if ($vr == 0.0 & $vi == 0.0) {
                                 $vr = $eps * $norm * (abs($w) + abs($q) + abs($x) + abs($y) + abs($z));
                             }
                             $this->cdiv($x * $r - $z * $ra + $q * $sa, $x * $s - $z * $sa - $q * $ra, $vr, $vi);
-                            $this->H[$i][$n-1] = $this->cdivr;
+                            $this->H[$i][$n - 1] = $this->cdivr;
                             $this->H[$i][$n]   = $this->cdivi;
                             if (abs($x) > (abs($z) + abs($q))) {
-                                $this->H[$i+1][$n-1] = (-$ra - $w * $this->H[$i][$n-1] + $q * $this->H[$i][$n]) / $x;
-                                $this->H[$i+1][$n] = (-$sa - $w * $this->H[$i][$n] - $q * $this->H[$i][$n-1]) / $x;
+                                $this->H[$i + 1][$n - 1] = (-$ra - $w * $this->H[$i][$n - 1] + $q * $this->H[$i][$n]) / $x;
+                                $this->H[$i + 1][$n] = (-$sa - $w * $this->H[$i][$n] - $q * $this->H[$i][$n - 1]) / $x;
                             } else {
-                                $this->cdiv(-$r - $y * $this->H[$i][$n-1], -$s - $y * $this->H[$i][$n], $z, $q);
-                                $this->H[$i+1][$n-1] = $this->cdivr;
-                                $this->H[$i+1][$n]   = $this->cdivi;
+                                $this->cdiv(-$r - $y * $this->H[$i][$n - 1], -$s - $y * $this->H[$i][$n], $z, $q);
+                                $this->H[$i + 1][$n - 1] = $this->cdivr;
+                                $this->H[$i + 1][$n]   = $this->cdivi;
                             }
                         }
                         // Overflow control
-                        $t = max(abs($this->H[$i][$n-1]), abs($this->H[$i][$n]));
+                        $t = max(abs($this->H[$i][$n - 1]), abs($this->H[$i][$n]));
                         if (($eps * $t) * $t > 1) {
                             for ($j = $i; $j <= $n; ++$j) {
-                                $this->H[$j][$n-1] = $this->H[$j][$n-1] / $t;
+                                $this->H[$j][$n - 1] = $this->H[$j][$n - 1] / $t;
                                 $this->H[$j][$n]   = $this->H[$j][$n] / $t;
                             }
                         }
@@ -766,7 +766,7 @@ 
         }
 
         // Back transformation to get eigenvectors of original matrix
-        for ($j = $nn-1; $j >= $low; --$j) {
+        for ($j = $nn - 1; $j >= $low; --$j) {
             for ($i = $low; $i <= $high; ++$i) {
                 $z = 0.0;
                 for ($k = $low; $k <= min($j, $high); ++$k) {

src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php

Doc Comments +5 added lines, -5 removed lines

@@ -59,7 +59,7 @@ 
     /**
      *    LU Decomposition constructor.
      *
-     *    @param $A Rectangular matrix
+     *    @param Matrix $A Rectangular matrix
      *    @return Structure to access L, U and piv.
      */
     public function __construct($A)
@@ -125,7 +125,7 @@ 
     /**
      *    Get lower triangular factor.
      *
-     *    @return array Lower triangular factor
+     *    @return Matrix Lower triangular factor
      */
     public function getL()
     {
@@ -146,7 +146,7 @@ 
     /**
      *    Get upper triangular factor.
      *
-     *    @return array Upper triangular factor
+     *    @return Matrix Upper triangular factor
      */
     public function getU()
     {
@@ -185,7 +185,7 @@ 
     /**
      *    Is the matrix nonsingular?
      *
-     *    @return true if U, and hence A, is nonsingular.
+     *    @return boolean if U, and hence A, is nonsingular.
      */
     public function isNonsingular()
     {
@@ -218,7 +218,7 @@ 
     /**
      *    Solve A*X = B
      *
-     *    @param  $B  A Matrix with as many rows as A and any number of columns.
+     *    @param  Matrix $B  A Matrix with as many rows as A and any number of columns.
      *    @return  X so that L*U*X = B(piv,:)
      *    @\PHPExcel\Calculation\Exception  IllegalArgumentException Matrix row dimensions must agree.
      *    @\PHPExcel\Calculation\Exception  RuntimeException  Matrix is singular.

Spacing +5 added lines, -5 removed lines

@@ -94,7 +94,7 @@ 
                 }
                 // Find pivot and exchange if necessary.
                 $p = $j;
-                for ($i = $j+1; $i < $this->m; ++$i) {
+                for ($i = $j + 1; $i < $this->m; ++$i) {
                     if (abs($LUcolj[$i]) > abs($LUcolj[$p])) {
                         $p = $i;
                     }
@@ -112,7 +112,7 @@ 
                 }
                 // Compute multipliers.
                 if (($j < $this->m) && ($this->LU[$j][$j] != 0.0)) {
-                    for ($i = $j+1; $i < $this->m; ++$i) {
+                    for ($i = $j + 1; $i < $this->m; ++$i) {
                         $this->LU[$i][$j] /= $this->LU[$j][$j];
                     }
                 }
@@ -229,17 +229,17 @@ 
             if ($this->isNonsingular()) {
                 // Copy right hand side with pivoting
                 $nx = $B->getColumnDimension();
-                $X  = $B->getMatrix($this->piv, 0, $nx-1);
+                $X  = $B->getMatrix($this->piv, 0, $nx - 1);
                 // Solve L*Y = B(piv,:)
                 for ($k = 0; $k < $this->n; ++$k) {
-                    for ($i = $k+1; $i < $this->n; ++$i) {
+                    for ($i = $k + 1; $i < $this->n; ++$i) {
                         for ($j = 0; $j < $nx; ++$j) {
                             $X->A[$i][$j] -= $X->A[$k][$j] * $this->LU[$i][$k];
                         }
                     }
                 }
                 // Solve U*X = Y;
-                for ($k = $this->n-1; $k >= 0; --$k) {
+                for ($k = $this->n - 1; $k >= 0; --$k) {
                     for ($j = 0; $j < $nx; ++$j) {
                         $X->A[$k][$j] /= $this->LU[$k][$k];
                     }