PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Reader/HTML.php

Doc Comments +5 added lines

@@ -220,6 +220,11 @@
         $cellContent = (string) '';
     }
 
+    /**
+     * @param integer $row
+     * @param string $column
+     * @param string $cellContent
+     */
     protected function processDomElement(DOMNode $element, $sheet, &$row, &$column, &$cellContent, $format = null)
     {
         foreach ($element->childNodes as $child) {

src/PhpSpreadsheet/ReferenceHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -802,7 +802,7 @@
     /**
      * Update named formulas (i.e. containing worksheet references / named ranges)
      *
-     * @param PHPExcel $pPhpExcel    Object to update
+     * @param Spreadsheet $pPhpExcel    Object to update
      * @param string $oldName        Old name (name to replace)
      * @param string $newName        New name
      */

Indentation +1 added lines, -1 removed lines

@@ -450,7 +450,7 @@
                 if ($cell->getDataType() == Cell\DataType::TYPE_FORMULA) {
                     // Formula should be adjusted
                     $pSheet->getCell($newCoordinates)
-                           ->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
+                            ->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
                 } else {
                     // Formula should not be adjusted
                     $pSheet->getCell($newCoordinates)->setValue($cell->getValue());

Spacing +53 added lines, -57 removed lines

@@ -169,8 +169,7 @@ 
     {
         $aBreaks = $pSheet->getBreaks();
         ($pNumCols > 0 || $pNumRows > 0) ?
-            uksort($aBreaks, array('self','cellReverseSort')) :
-            uksort($aBreaks, array('self','cellSort'));
+            uksort($aBreaks, array('self', 'cellReverseSort')) : uksort($aBreaks, array('self', 'cellSort'));
 
         foreach ($aBreaks as $key => $value) {
             if (self::cellAddressInDeleteRange($key, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)) {
@@ -230,8 +229,7 @@ 
     {
         $aHyperlinkCollection = $pSheet->getHyperlinkCollection();
         ($pNumCols > 0 || $pNumRows > 0) ?
-            uksort($aHyperlinkCollection, array('self','cellReverseSort')) :
-            uksort($aHyperlinkCollection, array('self','cellSort'));
+            uksort($aHyperlinkCollection, array('self', 'cellReverseSort')) : uksort($aHyperlinkCollection, array('self', 'cellSort'));
 
         foreach ($aHyperlinkCollection as $key => $value) {
             $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
@@ -256,8 +254,7 @@ 
     {
         $aDataValidationCollection = $pSheet->getDataValidationCollection();
         ($pNumCols > 0 || $pNumRows > 0) ?
-            uksort($aDataValidationCollection, array('self','cellReverseSort')) :
-            uksort($aDataValidationCollection, array('self','cellSort'));
+            uksort($aDataValidationCollection, array('self', 'cellReverseSort')) : uksort($aDataValidationCollection, array('self', 'cellSort'));
         
         foreach ($aDataValidationCollection as $key => $value) {
             $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
@@ -303,8 +300,7 @@ 
     {
         $aProtectedCells = $pSheet->getProtectedCells();
         ($pNumCols > 0 || $pNumRows > 0) ?
-            uksort($aProtectedCells, array('self','cellReverseSort')) :
-            uksort($aProtectedCells, array('self','cellSort'));
+            uksort($aProtectedCells, array('self', 'cellReverseSort')) : uksort($aProtectedCells, array('self', 'cellSort'));
         foreach ($aProtectedCells as $key => $value) {
             $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
             if ($key != $newReference) {
@@ -389,13 +385,13 @@ 
 
         // Get coordinates of $pBefore
         $beforeColumn    = 'A';
-        $beforeRow        = 1;
+        $beforeRow = 1;
         list($beforeColumn, $beforeRow) = Cell::coordinateFromString($pBefore);
         $beforeColumnIndex = Cell::columnIndexFromString($beforeColumn);
 
         // Clear cells if we are removing columns or rows
-        $highestColumn    = $pSheet->getHighestColumn();
-        $highestRow    = $pSheet->getHighestRow();
+        $highestColumn = $pSheet->getHighestColumn();
+        $highestRow = $pSheet->getHighestRow();
 
         // 1. Clear column strips if we are removing columns
         if ($pNumCols < 0 && $beforeColumnIndex - 2 + $pNumCols > 0) {
@@ -434,12 +430,12 @@ 
             $cell = $pSheet->getCell($cellID);
             $cellIndex = Cell::columnIndexFromString($cell->getColumn());
 
-            if ($cellIndex-1 + $pNumCols < 0) {
+            if ($cellIndex - 1 + $pNumCols < 0) {
                 continue;
             }
 
             // New coordinates
-            $newCoordinates = Cell::stringFromColumnIndex($cellIndex-1 + $pNumCols) . ($cell->getRow() + $pNumRows);
+            $newCoordinates = Cell::stringFromColumnIndex($cellIndex - 1 + $pNumCols) . ($cell->getRow() + $pNumRows);
 
             // Should the cell be updated? Move value and cellXf index from one cell to another.
             if (($cellIndex >= $beforeColumnIndex) && ($cell->getRow() >= $beforeRow)) {
@@ -469,8 +465,8 @@ 
         }
 
         // Duplicate styles for the newly inserted cells
-        $highestColumn    = $pSheet->getHighestColumn();
-        $highestRow    = $pSheet->getHighestRow();
+        $highestColumn = $pSheet->getHighestColumn();
+        $highestRow = $pSheet->getHighestRow();
 
         if ($pNumCols > 0 && $beforeColumnIndex - 2 > 0) {
             for ($i = $beforeRow; $i <= $highestRow - 1; ++$i) {
@@ -568,23 +564,23 @@ 
                         //    Shuffle columns in autofilter range
                         if ($pNumCols > 0) {
                             //    For insert, we shuffle from end to beginning to avoid overwriting
-                            $startColID = Cell::stringFromColumnIndex($startCol-1);
-                            $toColID = Cell::stringFromColumnIndex($startCol+$pNumCols-1);
+                            $startColID = Cell::stringFromColumnIndex($startCol - 1);
+                            $toColID = Cell::stringFromColumnIndex($startCol + $pNumCols - 1);
                             $endColID = Cell::stringFromColumnIndex($rangeEnd[0]);
 
                             $startColRef = $startCol;
                             $endColRef = $rangeEnd[0];
-                            $toColRef = $rangeEnd[0]+$pNumCols;
+                            $toColRef = $rangeEnd[0] + $pNumCols;
 
                             do {
-                                $autoFilter->shiftColumn(Cell::stringFromColumnIndex($endColRef-1), Cell::stringFromColumnIndex($toColRef-1));
+                                $autoFilter->shiftColumn(Cell::stringFromColumnIndex($endColRef - 1), Cell::stringFromColumnIndex($toColRef - 1));
                                 --$endColRef;
                                 --$toColRef;
                             } while ($startColRef <= $endColRef);
                         } else {
                             //    For delete, we shuffle from beginning to end to avoid overwriting
-                            $startColID = Cell::stringFromColumnIndex($startCol-1);
-                            $toColID = Cell::stringFromColumnIndex($startCol+$pNumCols-1);
+                            $startColID = Cell::stringFromColumnIndex($startCol - 1);
+                            $toColID = Cell::stringFromColumnIndex($startCol + $pNumCols - 1);
                             $endColID = Cell::stringFromColumnIndex($rangeEnd[0]);
                             do {
                                 $autoFilter->shiftColumn($startColID, $toColID);
@@ -652,93 +648,93 @@ 
                 $adjustCount = 0;
                 $newCellTokens = $cellTokens = array();
                 //    Search for row ranges (e.g. 'Sheet1'!3:5 or 3:5) with or without $ absolutes (e.g. $3:5)
-                $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_ROWRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_ROWRANGE . '/i', ' ' . $formulaBlock . ' ', $matches, PREG_SET_ORDER);
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
-                        $fromString = ($match[2] > '') ? $match[2].'!' : '';
-                        $fromString .= $match[3].':'.$match[4];
-                        $modified3 = substr($this->updateCellReference('$A'.$match[3], $pBefore, $pNumCols, $pNumRows), 2);
-                        $modified4 = substr($this->updateCellReference('$A'.$match[4], $pBefore, $pNumCols, $pNumRows), 2);
+                        $fromString = ($match[2] > '') ? $match[2] . '!' : '';
+                        $fromString .= $match[3] . ':' . $match[4];
+                        $modified3 = substr($this->updateCellReference('$A' . $match[3], $pBefore, $pNumCols, $pNumRows), 2);
+                        $modified4 = substr($this->updateCellReference('$A' . $match[4], $pBefore, $pNumCols, $pNumRows), 2);
 
-                        if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) {
+                        if ($match[3] . ':' . $match[4] !== $modified3 . ':' . $modified4) {
                             if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
-                                $toString = ($match[2] > '') ? $match[2].'!' : '';
-                                $toString .= $modified3.':'.$modified4;
+                                $toString = ($match[2] > '') ? $match[2] . '!' : '';
+                                $toString .= $modified3 . ':' . $modified4;
                                 //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
                                 $column = 100000;
                                 $row = 10000000 + trim($match[3], '$');
-                                $cellIndex = $column.$row;
+                                $cellIndex = $column . $row;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString);
-                                $cellTokens[$cellIndex] = '/(?<!\d\$\!)'.preg_quote($fromString).'(?!\d)/i';
+                                $cellTokens[$cellIndex] = '/(?<!\d\$\!)' . preg_quote($fromString) . '(?!\d)/i';
                                 ++$adjustCount;
                             }
                         }
                     }
                 }
                 //    Search for column ranges (e.g. 'Sheet1'!C:E or C:E) with or without $ absolutes (e.g. $C:E)
-                $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_COLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_COLRANGE . '/i', ' ' . $formulaBlock . ' ', $matches, PREG_SET_ORDER);
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
-                        $fromString = ($match[2] > '') ? $match[2].'!' : '';
-                        $fromString .= $match[3].':'.$match[4];
-                        $modified3 = substr($this->updateCellReference($match[3].'$1', $pBefore, $pNumCols, $pNumRows), 0, -2);
-                        $modified4 = substr($this->updateCellReference($match[4].'$1', $pBefore, $pNumCols, $pNumRows), 0, -2);
+                        $fromString = ($match[2] > '') ? $match[2] . '!' : '';
+                        $fromString .= $match[3] . ':' . $match[4];
+                        $modified3 = substr($this->updateCellReference($match[3] . '$1', $pBefore, $pNumCols, $pNumRows), 0, -2);
+                        $modified4 = substr($this->updateCellReference($match[4] . '$1', $pBefore, $pNumCols, $pNumRows), 0, -2);
 
-                        if ($match[3].':'.$match[4] !== $modified3.':'.$modified4) {
+                        if ($match[3] . ':' . $match[4] !== $modified3 . ':' . $modified4) {
                             if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
-                                $toString = ($match[2] > '') ? $match[2].'!' : '';
-                                $toString .= $modified3.':'.$modified4;
+                                $toString = ($match[2] > '') ? $match[2] . '!' : '';
+                                $toString .= $modified3 . ':' . $modified4;
                                 //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
                                 $column = Cell::columnIndexFromString(trim($match[3], '$')) + 100000;
                                 $row = 10000000;
-                                $cellIndex = $column.$row;
+                                $cellIndex = $column . $row;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString);
-                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])'.preg_quote($fromString).'(?![A-Z])/i';
+                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])' . preg_quote($fromString) . '(?![A-Z])/i';
                                 ++$adjustCount;
                             }
                         }
                     }
                 }
                 //    Search for cell ranges (e.g. 'Sheet1'!A3:C5 or A3:C5) with or without $ absolutes (e.g. $A1:C$5)
-                $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLRANGE.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_CELLRANGE . '/i', ' ' . $formulaBlock . ' ', $matches, PREG_SET_ORDER);
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
-                        $fromString = ($match[2] > '') ? $match[2].'!' : '';
-                        $fromString .= $match[3].':'.$match[4];
+                        $fromString = ($match[2] > '') ? $match[2] . '!' : '';
+                        $fromString .= $match[3] . ':' . $match[4];
                         $modified3 = $this->updateCellReference($match[3], $pBefore, $pNumCols, $pNumRows);
                         $modified4 = $this->updateCellReference($match[4], $pBefore, $pNumCols, $pNumRows);
 
-                        if ($match[3].$match[4] !== $modified3.$modified4) {
+                        if ($match[3] . $match[4] !== $modified3 . $modified4) {
                             if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
-                                $toString = ($match[2] > '') ? $match[2].'!' : '';
-                                $toString .= $modified3.':'.$modified4;
+                                $toString = ($match[2] > '') ? $match[2] . '!' : '';
+                                $toString .= $modified3 . ':' . $modified4;
                                 list($column, $row) = Cell::coordinateFromString($match[3]);
                                 //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
                                 $column = Cell::columnIndexFromString(trim($column, '$')) + 100000;
                                 $row = trim($row, '$') + 10000000;
-                                $cellIndex = $column.$row;
+                                $cellIndex = $column . $row;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString);
-                                $cellTokens[$cellIndex] = '/(?<![A-Z]\$\!)'.preg_quote($fromString).'(?!\d)/i';
+                                $cellTokens[$cellIndex] = '/(?<![A-Z]\$\!)' . preg_quote($fromString) . '(?!\d)/i';
                                 ++$adjustCount;
                             }
                         }
                     }
                 }
                 //    Search for cell references (e.g. 'Sheet1'!A3 or C5) with or without $ absolutes (e.g. $A1 or C$5)
-                $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLREF.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
+                $matchCount = preg_match_all('/' . self::REFHELPER_REGEXP_CELLREF . '/i', ' ' . $formulaBlock . ' ', $matches, PREG_SET_ORDER);
 
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
-                        $fromString = ($match[2] > '') ? $match[2].'!' : '';
+                        $fromString = ($match[2] > '') ? $match[2] . '!' : '';
                         $fromString .= $match[3];
 
                         $modified3 = $this->updateCellReference($match[3], $pBefore, $pNumCols, $pNumRows);
                         if ($match[3] !== $modified3) {
                             if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
-                                $toString = ($match[2] > '') ? $match[2].'!' : '';
+                                $toString = ($match[2] > '') ? $match[2] . '!' : '';
                                 $toString .= $modified3;
                                 list($column, $row) = Cell::coordinateFromString($match[3]);
                                 //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
@@ -747,7 +743,7 @@ 
                                 $cellIndex = $row . $column;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString);
-                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])'.preg_quote($fromString).'(?!\d)/i';
+                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])' . preg_quote($fromString) . '(?!\d)/i';
                                 ++$adjustCount;
                             }
                         }
@@ -847,10 +843,10 @@ 
                 $jc = count($range[$i]);
                 for ($j = 0; $j < $jc; ++$j) {
                     if (ctype_alpha($range[$i][$j])) {
-                        $r = Cell::coordinateFromString($this->updateSingleCellReference($range[$i][$j].'1', $pBefore, $pNumCols, $pNumRows));
+                        $r = Cell::coordinateFromString($this->updateSingleCellReference($range[$i][$j] . '1', $pBefore, $pNumCols, $pNumRows));
                         $range[$i][$j] = $r[0];
                     } elseif (ctype_digit($range[$i][$j])) {
-                        $r = Cell::coordinateFromString($this->updateSingleCellReference('A'.$range[$i][$j], $pBefore, $pNumCols, $pNumRows));
+                        $r = Cell::coordinateFromString($this->updateSingleCellReference('A' . $range[$i][$j], $pBefore, $pNumCols, $pNumRows));
                         $range[$i][$j] = $r[1];
                     } else {
                         $range[$i][$j] = $this->updateSingleCellReference($range[$i][$j], $pBefore, $pNumCols, $pNumRows);
@@ -890,12 +886,12 @@ 
 
             // Create new column reference
             if ($updateColumn) {
-                $newColumn    = Cell::stringFromColumnIndex(Cell::columnIndexFromString($newColumn) - 1 + $pNumCols);
+                $newColumn = Cell::stringFromColumnIndex(Cell::columnIndexFromString($newColumn) - 1 + $pNumCols);
             }
 
             // Create new row reference
             if ($updateRow) {
-                $newRow    = $newRow + $pNumRows;
+                $newRow = $newRow + $pNumRows;
             }
 
             // Return new reference

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/Font.php

Doc Comments +3 added lines, -2 removed lines

@@ -238,7 +238,7 @@ 
      * Calculate an (approximate) OpenXML column width, based on font size and text contained
      *
      * @param     \PHPExcel\Style\Font            $font            Font object
-     * @param     \PHPExcel\RichText|string    $cellText        Text to calculate width
+     * @param     string    $cellText        Text to calculate width
      * @param     integer                        $rotation        Rotation angle
      * @param     \PHPExcel\Style\Font|NULL    $defaultFont    Font object
      * @return     integer        Column width
@@ -407,7 +407,7 @@ 
      * Calculate an (approximate) pixel size, based on centimeter size
      *
      * @param     int        $sizeInCm    Font size (in centimeters)
-     * @return     int        Size (in pixels)
+     * @return     double        Size (in pixels)
      */
     public static function centimeterSizeToPixels($sizeInCm = 1)
     {
@@ -418,6 +418,7 @@ 
      * Returns the font path given the font
      *
      * @param \PHPExcel\Style\Font
+     * @param \PHPExcel\Style\Font $font
      * @return string Path to TrueType font file
      */
     public static function getTrueTypeFontFileFromFont($font)

Indentation +27 added lines, -27 removed lines

@@ -144,40 +144,40 @@
      */
     public static $defaultColumnWidths = array(
         'Arial' => array(
-             1 => array('px' => 24, 'width' => 12.00000000),
-             2 => array('px' => 24, 'width' => 12.00000000),
-             3 => array('px' => 32, 'width' => 10.66406250),
-             4 => array('px' => 32, 'width' => 10.66406250),
-             5 => array('px' => 40, 'width' => 10.00000000),
-             6 => array('px' => 48, 'width' =>  9.59765625),
-             7 => array('px' => 48, 'width' =>  9.59765625),
-             8 => array('px' => 56, 'width' =>  9.33203125),
-             9 => array('px' => 64, 'width' =>  9.14062500),
+                1 => array('px' => 24, 'width' => 12.00000000),
+                2 => array('px' => 24, 'width' => 12.00000000),
+                3 => array('px' => 32, 'width' => 10.66406250),
+                4 => array('px' => 32, 'width' => 10.66406250),
+                5 => array('px' => 40, 'width' => 10.00000000),
+                6 => array('px' => 48, 'width' =>  9.59765625),
+                7 => array('px' => 48, 'width' =>  9.59765625),
+                8 => array('px' => 56, 'width' =>  9.33203125),
+                9 => array('px' => 64, 'width' =>  9.14062500),
             10 => array('px' => 64, 'width' =>  9.14062500),
         ),
         'Calibri' => array(
-             1 => array('px' => 24, 'width' => 12.00000000),
-             2 => array('px' => 24, 'width' => 12.00000000),
-             3 => array('px' => 32, 'width' => 10.66406250),
-             4 => array('px' => 32, 'width' => 10.66406250),
-             5 => array('px' => 40, 'width' => 10.00000000),
-             6 => array('px' => 48, 'width' =>  9.59765625),
-             7 => array('px' => 48, 'width' =>  9.59765625),
-             8 => array('px' => 56, 'width' =>  9.33203125),
-             9 => array('px' => 56, 'width' =>  9.33203125),
+                1 => array('px' => 24, 'width' => 12.00000000),
+                2 => array('px' => 24, 'width' => 12.00000000),
+                3 => array('px' => 32, 'width' => 10.66406250),
+                4 => array('px' => 32, 'width' => 10.66406250),
+                5 => array('px' => 40, 'width' => 10.00000000),
+                6 => array('px' => 48, 'width' =>  9.59765625),
+                7 => array('px' => 48, 'width' =>  9.59765625),
+                8 => array('px' => 56, 'width' =>  9.33203125),
+                9 => array('px' => 56, 'width' =>  9.33203125),
             10 => array('px' => 64, 'width' =>  9.14062500),
             11 => array('px' => 64, 'width' =>  9.14062500),
         ),
         'Verdana' => array(
-             1 => array('px' => 24, 'width' => 12.00000000),
-             2 => array('px' => 24, 'width' => 12.00000000),
-             3 => array('px' => 32, 'width' => 10.66406250),
-             4 => array('px' => 32, 'width' => 10.66406250),
-             5 => array('px' => 40, 'width' => 10.00000000),
-             6 => array('px' => 48, 'width' =>  9.59765625),
-             7 => array('px' => 48, 'width' =>  9.59765625),
-             8 => array('px' => 64, 'width' =>  9.14062500),
-             9 => array('px' => 72, 'width' =>  9.00000000),
+                1 => array('px' => 24, 'width' => 12.00000000),
+                2 => array('px' => 24, 'width' => 12.00000000),
+                3 => array('px' => 32, 'width' => 10.66406250),
+                4 => array('px' => 32, 'width' => 10.66406250),
+                5 => array('px' => 40, 'width' => 10.00000000),
+                6 => array('px' => 48, 'width' =>  9.59765625),
+                7 => array('px' => 48, 'width' =>  9.59765625),
+                8 => array('px' => 64, 'width' =>  9.14062500),
+                9 => array('px' => 72, 'width' =>  9.00000000),
             10 => array('px' => 72, 'width' =>  9.00000000),
         ),
     );

Spacing +3 added lines, -3 removed lines

@@ -46,8 +46,8 @@ 
     const CHARSET_ANSI_JAPANESE_SHIFTJIS    = 0x80;
     const CHARSET_ANSI_KOREAN_HANGUL        = 0x81;
     const CHARSET_ANSI_KOREAN_JOHAB         = 0x82;
-    const CHARSET_ANSI_CHINESE_SIMIPLIFIED  = 0x86;        //    gb2312
-    const CHARSET_ANSI_CHINESE_TRADITIONAL  = 0x88;        //    big5
+    const CHARSET_ANSI_CHINESE_SIMIPLIFIED  = 0x86; //    gb2312
+    const CHARSET_ANSI_CHINESE_TRADITIONAL  = 0x88; //    big5
     const CHARSET_ANSI_GREEK                = 0xA1;
     const CHARSET_ANSI_TURKISH              = 0xA2;
     const CHARSET_ANSI_VIETNAMESE           = 0xA3;
@@ -512,7 +512,7 @@ 
                 );
                 break;
             default:
-                throw new \PHPExcel\Exception('Unknown font name "'. $name .'". Cannot map to TrueType font file');
+                throw new \PHPExcel\Exception('Unknown font name "' . $name . '". Cannot map to TrueType font file');
                 break;
         }
 

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];
                     }

src/PhpSpreadsheet/Shared/JAMA/Matrix.php

Doc Comments +2 added lines, -36 removed lines

@@ -149,11 +149,6 @@ 
      *    getMatrix
      *
      *    Get a submatrix
-     *    @param int $i0 Initial row index
-     *    @param int $iF Final row index
-     *    @param int $j0 Initial column index
-     *    @param int $jF Final column index
-     *    @return Matrix Submatrix
      */
     public function getMatrix()
     {
@@ -351,7 +346,7 @@ 
      *    Generate a diagonal matrix
      *    @param int $m Row dimension
      *    @param int $n Column dimension
-     *    @param mixed $c Diagonal value
+     *    @param integer $c Diagonal value
      *    @return Matrix Diagonal matrix
      */
     public function diagonal($m = null, $n = null, $c = 1)
@@ -388,9 +383,6 @@ 
      *    getMatrixByCol
      *
      *    Get a submatrix by column index/range
-     *    @param int $i0 Initial column index
-     *    @param int $iF Final column index
-     *    @return Matrix Submatrix
      */
     public function getMatrixByCol($j0 = null, $jF = null)
     {
@@ -426,7 +418,7 @@ 
      *    trace
      *
      *    Sum of diagonal elements
-     *    @return float Sum of diagonal elements
+     *    @return integer Sum of diagonal elements
      */
     public function trace()
     {
@@ -452,8 +444,6 @@ 
      *    plus
      *
      *    A + B
-     *    @param mixed $B Matrix/Array
-     *    @return Matrix Sum
      */
     public function plus()
     {
@@ -492,8 +482,6 @@ 
      *    plusEquals
      *
      *    A = A + B
-     *    @param mixed $B Matrix/Array
-     *    @return Matrix Sum
      */
     public function plusEquals()
     {
@@ -546,8 +534,6 @@ 
      *    minus
      *
      *    A - B
-     *    @param mixed $B Matrix/Array
-     *    @return Matrix Sum
      */
     public function minus()
     {
@@ -586,8 +572,6 @@ 
      *    minusEquals
      *
      *    A = A - B
-     *    @param mixed $B Matrix/Array
-     *    @return Matrix Sum
      */
     public function minusEquals()
     {
@@ -641,8 +625,6 @@ 
      *
      *    Element-by-element multiplication
      *    Cij = Aij * Bij
-     *    @param mixed $B Matrix/Array
-     *    @return Matrix Matrix Cij
      */
     public function arrayTimes()
     {
@@ -682,8 +664,6 @@ 
      *
      *    Element-by-element multiplication
      *    Aij = Aij * Bij
-     *    @param mixed $B Matrix/Array
-     *    @return Matrix Matrix Aij
      */
     public function arrayTimesEquals()
     {
@@ -737,8 +717,6 @@ 
      *
      *    Element-by-element right division
      *    A / B
-     *    @param Matrix $B Matrix B
-     *    @return Matrix Division result
      */
     public function arrayRightDivide()
     {
@@ -798,8 +776,6 @@ 
      *
      *    Element-by-element right division
      *    Aij = Aij / Bij
-     *    @param mixed $B Matrix/Array
-     *    @return Matrix Matrix Aij
      */
     public function arrayRightDivideEquals()
     {
@@ -840,8 +816,6 @@ 
      *
      *    Element-by-element Left division
      *    A / B
-     *    @param Matrix $B Matrix B
-     *    @return Matrix Division result
      */
     public function arrayLeftDivide()
     {
@@ -882,8 +856,6 @@ 
      *
      *    Element-by-element Left division
      *    Aij = Aij / Bij
-     *    @param mixed $B Matrix/Array
-     *    @return Matrix Matrix Aij
      */
     public function arrayLeftDivideEquals()
     {
@@ -923,8 +895,6 @@ 
      *    times
      *
      *    Matrix multiplication
-     *    @param mixed $n Matrix/Array/Scalar
-     *    @return Matrix Product
      */
     public function times()
     {
@@ -1018,8 +988,6 @@ 
      *    power
      *
      *    A = A ^ B
-     *    @param mixed $B Matrix/Array
-     *    @return Matrix Sum
      */
     public function power()
     {
@@ -1072,8 +1040,6 @@ 
      *    concat
      *
      *    A = A & B
-     *    @param mixed $B Matrix/Array
-     *    @return Matrix Sum
      */
     public function concat()
     {

Spacing +3 added lines, -3 removed lines

@@ -196,7 +196,7 @@ 
                     } else {
                         throw new \PHPExcel\Calculation\Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
                     }
-                    $R = new Matrix($m+1, $n+1);
+                    $R = new Matrix($m + 1, $n + 1);
                     for ($i = $i0; $i <= $iF; ++$i) {
                         for ($j = $j0; $j <= $jF; ++$j) {
                             $R->set($i - $i0, $j - $j0, $this->A[$i][$j]);
@@ -280,7 +280,7 @@ 
                     } else {
                         throw new \PHPExcel\Calculation\Exception(self::ARGUMENT_BOUNDS_EXCEPTION);
                     }
-                    $R = new Matrix($m, $n+1);
+                    $R = new Matrix($m, $n + 1);
                     for ($i = 0; $i < $m; ++$i) {
                         for ($j = $j0; $j <= $jF; ++$j) {
                             $R->set($i, $j - $j0, $this->A[$RL[$i]][$j]);
@@ -1099,7 +1099,7 @@ 
             $this->checkMatrixDimensions($M);
             for ($i = 0; $i < $this->m; ++$i) {
                 for ($j = 0; $j < $this->n; ++$j) {
-                    $this->A[$i][$j] = trim($this->A[$i][$j], '"').trim($M->get($i, $j), '"');
+                    $this->A[$i][$j] = trim($this->A[$i][$j], '"') . trim($M->get($i, $j), '"');
                 }
             }
             return $this;

src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php

Doc Comments +3 added lines, -3 removed lines

@@ -436,7 +436,7 @@ 
      *    Return the left singular vectors
      *
      *    @access public
-     *    @return U
+     *    @return Matrix
      */
     public function getU()
     {
@@ -448,7 +448,7 @@ 
      *    Return the right singular vectors
      *
      *    @access public
-     *    @return V
+     *    @return Matrix
      */
     public function getV()
     {
@@ -472,7 +472,7 @@ 
      *    Return the diagonal matrix of singular values
      *
      *    @access public
-     *    @return S
+     *    @return Matrix
      */
     public function getS()
     {

Spacing +54 added lines, -54 removed lines

@@ -131,27 +131,27 @@ 
                     $e[$k] = hypo($e[$k], $e[$i]);
                 }
                 if ($e[$k] != 0.0) {
-                    if ($e[$k+1] < 0.0) {
+                    if ($e[$k + 1] < 0.0) {
                         $e[$k] = -$e[$k];
                     }
                     for ($i = $k + 1; $i < $this->n; ++$i) {
                         $e[$i] /= $e[$k];
                     }
-                    $e[$k+1] += 1.0;
+                    $e[$k + 1] += 1.0;
                 }
                 $e[$k] = -$e[$k];
-                if (($k+1 < $this->m) and ($e[$k] != 0.0)) {
+                if (($k + 1 < $this->m) and ($e[$k] != 0.0)) {
                     // Apply the transformation.
-                    for ($i = $k+1; $i < $this->m; ++$i) {
+                    for ($i = $k + 1; $i < $this->m; ++$i) {
                         $work[$i] = 0.0;
                     }
-                    for ($j = $k+1; $j < $this->n; ++$j) {
-                        for ($i = $k+1; $i < $this->m; ++$i) {
+                    for ($j = $k + 1; $j < $this->n; ++$j) {
+                        for ($i = $k + 1; $i < $this->m; ++$i) {
                             $work[$i] += $e[$j] * $A[$i][$j];
                         }
                     }
                     for ($j = $k + 1; $j < $this->n; ++$j) {
-                        $t = -$e[$j] / $e[$k+1];
+                        $t = -$e[$j] / $e[$k + 1];
                         for ($i = $k + 1; $i < $this->m; ++$i) {
                             $A[$i][$j] += $t * $work[$i];
                         }
@@ -173,12 +173,12 @@ 
             $this->s[$nct] = $A[$nct][$nct];
         }
         if ($this->m < $p) {
-            $this->s[$p-1] = 0.0;
+            $this->s[$p - 1] = 0.0;
         }
         if ($nrt + 1 < $p) {
-            $e[$nrt] = $A[$nrt][$p-1];
+            $e[$nrt] = $A[$nrt][$p - 1];
         }
-        $e[$p-1] = 0.0;
+        $e[$p - 1] = 0.0;
         // If required, generate U.
         if ($wantu) {
             for ($j = $nct; $j < $nu; ++$j) {
@@ -222,9 +222,9 @@ 
                     for ($j = $k + 1; $j < $nu; ++$j) {
                         $t = 0;
                         for ($i = $k + 1; $i < $this->n; ++$i) {
-                            $t += $this->V[$i][$k]* $this->V[$i][$j];
+                            $t += $this->V[$i][$k] * $this->V[$i][$j];
                         }
-                        $t = -$t / $this->V[$k+1][$k];
+                        $t = -$t / $this->V[$k + 1][$k];
                         for ($i = $k + 1; $i < $this->n; ++$i) {
                             $this->V[$i][$j] += $t * $this->V[$i][$k];
                         }
@@ -256,7 +256,7 @@ 
                 if ($k == -1) {
                     break;
                 }
-                if (abs($e[$k]) <= $eps * (abs($this->s[$k]) + abs($this->s[$k+1]))) {
+                if (abs($e[$k]) <= $eps * (abs($this->s[$k]) + abs($this->s[$k + 1]))) {
                     $e[$k] = 0.0;
                     break;
                 }
@@ -268,7 +268,7 @@ 
                     if ($ks == $k) {
                         break;
                     }
-                    $t = ($ks != $p ? abs($e[$ks]) : 0.) + ($ks != $k + 1 ? abs($e[$ks-1]) : 0.);
+                    $t = ($ks != $p ? abs($e[$ks]) : 0.) + ($ks != $k + 1 ? abs($e[$ks - 1]) : 0.);
                     if (abs($this->s[$ks]) <= $eps * $t) {
                         $this->s[$ks] = 0.0;
                         break;
@@ -276,7 +276,7 @@ 
                 }
                 if ($ks == $k) {
                     $kase = 3;
-                } elseif ($ks == $p-1) {
+                } elseif ($ks == $p - 1) {
                     $kase = 1;
                 } else {
                     $kase = 2;
@@ -289,21 +289,21 @@ 
             switch ($kase) {
                 // Deflate negligible s(p).
                 case 1:
-                    $f = $e[$p-2];
-                    $e[$p-2] = 0.0;
+                    $f = $e[$p - 2];
+                    $e[$p - 2] = 0.0;
                     for ($j = $p - 2; $j >= $k; --$j) {
                         $t  = hypo($this->s[$j], $f);
                         $cs = $this->s[$j] / $t;
                         $sn = $f / $t;
                         $this->s[$j] = $t;
                         if ($j != $k) {
-                            $f = -$sn * $e[$j-1];
-                            $e[$j-1] = $cs * $e[$j-1];
+                            $f = -$sn * $e[$j - 1];
+                            $e[$j - 1] = $cs * $e[$j - 1];
                         }
                         if ($wantv) {
                             for ($i = 0; $i < $this->n; ++$i) {
-                                $t = $cs * $this->V[$i][$j] + $sn * $this->V[$i][$p-1];
-                                $this->V[$i][$p-1] = -$sn * $this->V[$i][$j] + $cs * $this->V[$i][$p-1];
+                                $t = $cs * $this->V[$i][$j] + $sn * $this->V[$i][$p - 1];
+                                $this->V[$i][$p - 1] = -$sn * $this->V[$i][$j] + $cs * $this->V[$i][$p - 1];
                                 $this->V[$i][$j] = $t;
                             }
                         }
@@ -311,8 +311,8 @@ 
                     break;
                 // Split at negligible s(k).
                 case 2:
-                    $f = $e[$k-1];
-                    $e[$k-1] = 0.0;
+                    $f = $e[$k - 1];
+                    $e[$k - 1] = 0.0;
                     for ($j = $k; $j < $p; ++$j) {
                         $t = hypo($this->s[$j], $f);
                         $cs = $this->s[$j] / $t;
@@ -322,8 +322,8 @@ 
                         $e[$j] = $cs * $e[$j];
                         if ($wantu) {
                             for ($i = 0; $i < $this->m; ++$i) {
-                                $t = $cs * $this->U[$i][$j] + $sn * $this->U[$i][$k-1];
-                                $this->U[$i][$k-1] = -$sn * $this->U[$i][$j] + $cs * $this->U[$i][$k-1];
+                                $t = $cs * $this->U[$i][$j] + $sn * $this->U[$i][$k - 1];
+                                $this->U[$i][$k - 1] = -$sn * $this->U[$i][$j] + $cs * $this->U[$i][$k - 1];
                                 $this->U[$i][$j] = $t;
                             }
                         }
@@ -332,10 +332,10 @@ 
                 // Perform one qr step.
                 case 3:
                     // Calculate the shift.
-                    $scale = max(max(max(max(abs($this->s[$p-1]), abs($this->s[$p-2])), abs($e[$p-2])), abs($this->s[$k])), abs($e[$k]));
-                    $sp   = $this->s[$p-1] / $scale;
-                    $spm1 = $this->s[$p-2] / $scale;
-                    $epm1 = $e[$p-2] / $scale;
+                    $scale = max(max(max(max(abs($this->s[$p - 1]), abs($this->s[$p - 2])), abs($e[$p - 2])), abs($this->s[$k])), abs($e[$k]));
+                    $sp   = $this->s[$p - 1] / $scale;
+                    $spm1 = $this->s[$p - 2] / $scale;
+                    $epm1 = $e[$p - 2] / $scale;
                     $sk   = $this->s[$k] / $scale;
                     $ek   = $e[$k] / $scale;
                     $b    = (($spm1 + $sp) * ($spm1 - $sp) + $epm1 * $epm1) / 2.0;
@@ -351,41 +351,41 @@ 
                     $f = ($sk + $sp) * ($sk - $sp) + $shift;
                     $g = $sk * $ek;
                     // Chase zeros.
-                    for ($j = $k; $j < $p-1; ++$j) {
+                    for ($j = $k; $j < $p - 1; ++$j) {
                         $t  = hypo($f, $g);
-                        $cs = $f/$t;
-                        $sn = $g/$t;
+                        $cs = $f / $t;
+                        $sn = $g / $t;
                         if ($j != $k) {
-                            $e[$j-1] = $t;
+                            $e[$j - 1] = $t;
                         }
                         $f = $cs * $this->s[$j] + $sn * $e[$j];
                         $e[$j] = $cs * $e[$j] - $sn * $this->s[$j];
-                        $g = $sn * $this->s[$j+1];
-                        $this->s[$j+1] = $cs * $this->s[$j+1];
+                        $g = $sn * $this->s[$j + 1];
+                        $this->s[$j + 1] = $cs * $this->s[$j + 1];
                         if ($wantv) {
                             for ($i = 0; $i < $this->n; ++$i) {
-                                $t = $cs * $this->V[$i][$j] + $sn * $this->V[$i][$j+1];
-                                $this->V[$i][$j+1] = -$sn * $this->V[$i][$j] + $cs * $this->V[$i][$j+1];
+                                $t = $cs * $this->V[$i][$j] + $sn * $this->V[$i][$j + 1];
+                                $this->V[$i][$j + 1] = -$sn * $this->V[$i][$j] + $cs * $this->V[$i][$j + 1];
                                 $this->V[$i][$j] = $t;
                             }
                         }
                         $t = hypo($f, $g);
-                        $cs = $f/$t;
-                        $sn = $g/$t;
+                        $cs = $f / $t;
+                        $sn = $g / $t;
                         $this->s[$j] = $t;
-                        $f = $cs * $e[$j] + $sn * $this->s[$j+1];
-                        $this->s[$j+1] = -$sn * $e[$j] + $cs * $this->s[$j+1];
-                        $g = $sn * $e[$j+1];
-                        $e[$j+1] = $cs * $e[$j+1];
+                        $f = $cs * $e[$j] + $sn * $this->s[$j + 1];
+                        $this->s[$j + 1] = -$sn * $e[$j] + $cs * $this->s[$j + 1];
+                        $g = $sn * $e[$j + 1];
+                        $e[$j + 1] = $cs * $e[$j + 1];
                         if ($wantu && ($j < $this->m - 1)) {
                             for ($i = 0; $i < $this->m; ++$i) {
-                                $t = $cs * $this->U[$i][$j] + $sn * $this->U[$i][$j+1];
-                                $this->U[$i][$j+1] = -$sn * $this->U[$i][$j] + $cs * $this->U[$i][$j+1];
+                                $t = $cs * $this->U[$i][$j] + $sn * $this->U[$i][$j + 1];
+                                $this->U[$i][$j + 1] = -$sn * $this->U[$i][$j] + $cs * $this->U[$i][$j + 1];
                                 $this->U[$i][$j] = $t;
                             }
                         }
                     }
-                    $e[$p-2] = $f;
+                    $e[$p - 2] = $f;
                     $iter = $iter + 1;
                     break;
                 // Convergence.
@@ -401,23 +401,23 @@ 
                     }
                     // Order the singular values.
                     while ($k < $pp) {
-                        if ($this->s[$k] >= $this->s[$k+1]) {
+                        if ($this->s[$k] >= $this->s[$k + 1]) {
                             break;
                         }
                         $t = $this->s[$k];
-                        $this->s[$k] = $this->s[$k+1];
-                        $this->s[$k+1] = $t;
+                        $this->s[$k] = $this->s[$k + 1];
+                        $this->s[$k + 1] = $t;
                         if ($wantv and ($k < $this->n - 1)) {
                             for ($i = 0; $i < $this->n; ++$i) {
-                                $t = $this->V[$i][$k+1];
-                                $this->V[$i][$k+1] = $this->V[$i][$k];
+                                $t = $this->V[$i][$k + 1];
+                                $this->V[$i][$k + 1] = $this->V[$i][$k];
                                 $this->V[$i][$k] = $t;
                             }
                         }
-                        if ($wantu and ($k < $this->m-1)) {
+                        if ($wantu and ($k < $this->m - 1)) {
                             for ($i = 0; $i < $this->m; ++$i) {
-                                $t = $this->U[$i][$k+1];
-                                $this->U[$i][$k+1] = $this->U[$i][$k];
+                                $t = $this->U[$i][$k + 1];
+                                $this->U[$i][$k + 1] = $this->U[$i][$k];
                                 $this->U[$i][$k] = $t;
                             }
                         }