fixes UselessVariable and UnusedVariable from slevomat/coding-standard

src/PhpSpreadsheet/Calculation/Calculation.php

@@ -4786,8 +4786,6 @@ class Calculation
 
             return $value;
         }, $tokens);
-        $str = '[ ' . implode(' | ', $tokensStr) . ' ]';
+        return '[ ' . implode(' | ', $tokensStr) . ' ]';
-
-        return $str;
     }
 }

src/PhpSpreadsheet/Collection/CellsFactory.php

@@ -16,8 +16,6 @@ abstract class CellsFactory
      * */
     public static function getInstance(Worksheet $parent)
     {
-        $instance = new Cells($parent, Settings::getCache());
+        return new Cells($parent, Settings::getCache());
-
-        return $instance;
     }
 }

src/PhpSpreadsheet/IOFactory.php

@@ -52,9 +52,7 @@ abstract class IOFactory
 
         // Instantiate writer
         $className = self::$writers[$writerType];
-        $writer = new $className($spreadsheet);
+        return new $className($spreadsheet);
-
-        return $writer;
     }
 
     /**
@@ -74,9 +72,7 @@ abstract class IOFactory
 
         // Instantiate reader
         $className = self::$readers[$readerType];
-        $reader = new $className();
+        return new $className();
-
-        return $reader;
     }
 
     /**

src/PhpSpreadsheet/Reader/Xls.php

@@ -5279,12 +5279,10 @@ class Xls extends BaseReader
             $nextIdentifier = self::getUInt2d($this->data, $this->pos);
         } while ($nextIdentifier == self::XLS_TYPE_CONTINUE);
 
-        $splicedData = [
+        return [
             'recordData' => $data,
             'spliceOffsets' => $spliceOffsets,
         ];
-
-        return $splicedData;
     }
 
     /**

src/PhpSpreadsheet/Reader/Xml.php

@@ -285,9 +285,7 @@ class Xml extends BaseReader
     {
         $pixels = ($widthUnits / 256) * 7;
         $offsetWidthUnits = $widthUnits % 256;
-        $pixels += round($offsetWidthUnits / (256 / 7));
+        return $pixels + round($offsetWidthUnits / (256 / 7));
-
-        return $pixels;
     }
 
     protected static function hex2str($hex)

src/PhpSpreadsheet/Shared/Font.php

@@ -298,9 +298,7 @@ class Font
         $upperLeftCornerX = $textBox[6];
 
         // Consider the rotation when calculating the width
-        $textWidth = max($lowerRightCornerX - $upperLeftCornerX, $upperRightCornerX - $lowerLeftCornerX);
+        return max($lowerRightCornerX - $upperLeftCornerX, $upperRightCornerX - $lowerLeftCornerX);
-
-        return $textWidth;
     }
 
     /**

src/PhpSpreadsheet/Shared/StringHelper.php

@@ -430,9 +430,7 @@ class StringHelper
         // characters
         $chars = self::convertEncoding($value, 'UTF-16LE', 'UTF-8');
 
-        $data = pack('vC', $ln, 0x0001) . $chars;
+        return pack('vC', $ln, 0x0001) . $chars;
-
-        return $data;
     }
 
     /**

src/PhpSpreadsheet/Shared/Xls.php

@@ -269,7 +269,7 @@ class Xls
         $startCoordinates = Coordinate::stringFromColumnIndex($col_start) . ($row_start + 1);
         $endCoordinates = Coordinate::stringFromColumnIndex($col_end) . ($row_end + 1);
 
-        $twoAnchor = [
+        return [
             'startCoordinates' => $startCoordinates,
             'startOffsetX' => $x1,
             'startOffsetY' => $y1,
@@ -277,7 +277,5 @@ class Xls
             'endOffsetX' => $x2,
             'endOffsetY' => $y2,
         ];
-
-        return  $twoAnchor;
     }
 }

src/PhpSpreadsheet/Worksheet/Worksheet.php

@@ -2912,9 +2912,7 @@ class Worksheet implements IComparable
             $rangeSet = $rangeBoundaries[0][0] . $rangeBoundaries[0][1] . ':' . $rangeBoundaries[1][0] . $rangeBoundaries[1][1];
         }
         unset($rangeSet);
-        $stRange = implode(' ', $rangeBlocks);
+        return implode(' ', $rangeBlocks);
-
-        return $stRange;
     }
 
     /**
@@ -2961,9 +2959,7 @@ class Worksheet implements IComparable
      */
     public function copy()
     {
-        $copied = clone $this;
+        return clone $this;
-
-        return $copied;
     }
 
     /**

src/PhpSpreadsheet/Writer/Html.php

@@ -960,15 +960,12 @@ class Html extends BaseWriter
     private function createCSSStyle(Style $pStyle)
     {
         // Create CSS
-        $css = array_merge(
+        return array_merge(
             $this->createCSSStyleAlignment($pStyle->getAlignment()),
             $this->createCSSStyleBorders($pStyle->getBorders()),
             $this->createCSSStyleFont($pStyle->getFont()),
             $this->createCSSStyleFill($pStyle->getFill())
         );
-
-        // Return
-        return $css;
     }
 
     /**
@@ -1061,9 +1058,7 @@ class Html extends BaseWriter
     {
         //    Create CSS - add !important to non-none border styles for merged cells
         $borderStyle = $this->mapBorderStyle($pStyle->getBorderStyle());
-        $css = $borderStyle . ' #' . $pStyle->getColor()->getRGB() . (($borderStyle == 'none') ? '' : ' !important');
+        return $borderStyle . ' #' . $pStyle->getColor()->getRGB() . (($borderStyle == 'none') ? '' : ' !important');
-
-        return $css;
     }
 
     /**
@@ -1153,9 +1148,7 @@ class Html extends BaseWriter
      */
     private function generateTableFooter()
     {
-        $html = '    </table>' . PHP_EOL;
+        return '    </table>' . PHP_EOL;
-
-        return $html;
     }
 
     /**

src/PhpSpreadsheet/Writer/Xls/Parser.php

@@ -1161,17 +1161,13 @@ class Parser
             // catch "-" Term
             $this->advance();
             $result2 = $this->expression();
-            $result = $this->createTree('ptgUminus', $result2, '');
+            return $this->createTree('ptgUminus', $result2, '');
-
-            return $result;
         // If it's a positive value
         } elseif ($this->currentToken == '+') {
             // catch "+" Term
             $this->advance();
             $result2 = $this->expression();
-            $result = $this->createTree('ptgUplus', $result2, '');
+            return $this->createTree('ptgUplus', $result2, '');
-
-            return $result;
         }
         $result = $this->term();
         while (($this->currentToken == '+') or
@@ -1205,9 +1201,7 @@ class Parser
      */
     private function parenthesizedExpression()
     {
-        $result = $this->createTree('ptgParen', $this->expression(), '');
+        return $this->createTree('ptgParen', $this->expression(), '');
-
-        return $result;
     }
 
     /**
@@ -1309,9 +1303,7 @@ class Parser
             return $result;
         } elseif (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $this->currentToken)) {
             // if it's a function call
-            $result = $this->func();
+            return $this->func();
-
-            return $result;
         }
 
         throw new WriterException('Syntax error: ' . $this->currentToken . ', lookahead: ' . $this->lookAhead . ', current char: ' . $this->currentCharacter);
@@ -1439,8 +1431,6 @@ class Parser
         }
         $converted_tree = $this->convert($tree['value']);
 
-        $polish .= $converted_tree;
+        return $polish . $converted_tree;
-
-        return $polish;
     }
 }