Fix code before applying PHP CS Fixer

src/Spout/Reader/ODS/Helper/CellValueFormatter.php

@@ -127,8 +127,8 @@ class CellValueFormatter
     {
         $nodeValue = $node->getAttribute(self::XML_ATTRIBUTE_VALUE);
         $nodeIntValue = intval($nodeValue);
-        // The "==" is intentionally not a "===" because only the value matters, not the type
-        $cellValue = ($nodeIntValue == $nodeValue) ? $nodeIntValue : floatval($nodeValue);
+        $nodeFloatValue = (float) $nodeValue;
+        $cellValue = ((float) $nodeIntValue === $nodeFloatValue) ? $nodeIntValue : $nodeFloatValue;
         return $cellValue;
     }
 
@@ -141,9 +141,7 @@ class CellValueFormatter
     protected function formatBooleanCellValue($node)
     {
         $nodeValue = $node->getAttribute(self::XML_ATTRIBUTE_BOOLEAN_VALUE);
-        // !! is similar to boolval()
-        $cellValue = !!$nodeValue;
-        return $cellValue;
+        return (bool) $nodeValue;
     }
 
     /**
@@ -162,16 +160,18 @@ class CellValueFormatter
         if ($this->shouldFormatDates) {
             // The date is already formatted in the "p" tag
             $nodeWithValueAlreadyFormatted = $node->getElementsByTagName(self::XML_NODE_P)->item(0);
-            return $nodeWithValueAlreadyFormatted->nodeValue;
+            $cellValue = $nodeWithValueAlreadyFormatted->nodeValue;
         } else {
             // otherwise, get it from the "date-value" attribute
             try {
                 $nodeValue = $node->getAttribute(self::XML_ATTRIBUTE_DATE_VALUE);
-                return new \DateTime($nodeValue);
+                $cellValue = new \DateTime($nodeValue);
             } catch (\Exception $e) {
-                return null;
+                $cellValue = null;
             }
         }
+
+        return $cellValue;
     }
 
     /**
@@ -190,16 +190,18 @@ class CellValueFormatter
         if ($this->shouldFormatDates) {
             // The date is already formatted in the "p" tag
             $nodeWithValueAlreadyFormatted = $node->getElementsByTagName(self::XML_NODE_P)->item(0);
-            return $nodeWithValueAlreadyFormatted->nodeValue;
+            $cellValue = $nodeWithValueAlreadyFormatted->nodeValue;
         } else {
             // otherwise, get it from the "time-value" attribute
             try {
                 $nodeValue = $node->getAttribute(self::XML_ATTRIBUTE_TIME_VALUE);
-                return new \DateInterval($nodeValue);
+                $cellValue = new \DateInterval($nodeValue);
             } catch (\Exception $e) {
-                return null;
+                $cellValue = null;
             }
         }
+
+        return $cellValue;
     }
 
     /**

src/Spout/Reader/ODS/RowIterator.php

@@ -311,7 +311,7 @@ class RowIterator implements IteratorInterface
      * row data yet (as we still need to apply the "num-columns-repeated" attribute).
      *
      * @param array $rowData
-     * @param string|int|float|bool|\DateTime|\DateInterval|null The value of the last read cell
+     * @param string|int|float|bool|\DateTime|\DateInterval|null $lastReadCellValue The value of the last read cell
      * @return bool Whether the row is empty
      */
     protected function isEmptyRow($rowData, $lastReadCellValue)

src/Spout/Reader/ODS/SheetIterator.php

@@ -136,7 +136,7 @@ class SheetIterator implements IteratorInterface
      *
      * @param string $sheetName Name of the current sheet
      * @param int $sheetIndex Index of the current sheet
-     * @param string|null Name of the sheet that was defined as active or NULL if none defined
+     * @param string|null $activeSheetName Name of the sheet that was defined as active or NULL if none defined
      * @return bool Whether the current sheet was defined as the active one
      */
     private function isActiveSheet($sheetName, $sheetIndex, $activeSheetName)

src/Spout/Reader/Wrapper/XMLReader.php

@@ -115,7 +115,7 @@ class XMLReader extends \XMLReader
      * Move cursor to next node skipping all subtrees
      * @see \XMLReader::next
      *
-     * @param string|void $localName The name of the next node to move to
+     * @param string|null $localName The name of the next node to move to
      * @return bool TRUE on success or FALSE on failure
      * @throws \Box\Spout\Reader\Exception\XMLProcessingException If an error/warning occurred
      */

src/Spout/Reader/XLSX/Helper/CellHelper.php

@@ -26,7 +26,7 @@ class CellHelper
      * Calling fillMissingArrayIndexes($dataArray, 'FILL') will return this array: ['FILL', 1, 'FILL', 3]
      *
      * @param array $dataArray The array to fill
-     * @param string|void $fillValue optional
+     * @param string $fillValue optional
      * @return array
      */
     public static function fillMissingArrayIndexes($dataArray, $fillValue = '')

src/Spout/Reader/XLSX/Helper/CellValueFormatter.php

@@ -175,11 +175,14 @@ class CellValueFormatter
         $shouldFormatAsDate = $this->styleManager->shouldFormatNumericValueAsDate($cellStyleId);
 
         if ($shouldFormatAsDate) {
-            return $this->formatExcelTimestampValue(floatval($nodeValue), $cellStyleId);
+            $cellValue = $this->formatExcelTimestampValue(floatval($nodeValue), $cellStyleId);
         } else {
             $nodeIntValue = intval($nodeValue);
-            return ($nodeIntValue == $nodeValue) ? $nodeIntValue : floatval($nodeValue);
+            $nodeFloatValue = (float) $nodeValue;
+            $cellValue = ((float) $nodeIntValue === $nodeFloatValue) ? $nodeIntValue : $nodeFloatValue;
         }
+
+        return $cellValue;
     }
 
     /**
@@ -200,14 +203,16 @@ class CellValueFormatter
 
         if ($nodeValue >= 1) {
             // Values greater than 1 represent "dates". The value 1.0 representing the "base" date: 1900-01-01.
-            return $this->formatExcelTimestampValueAsDateValue($nodeValue, $cellStyleId);
+            $cellValue = $this->formatExcelTimestampValueAsDateValue($nodeValue, $cellStyleId);
         } else if ($nodeValue >= 0) {
             // Values between 0 and 1 represent "times".
-            return $this->formatExcelTimestampValueAsTimeValue($nodeValue, $cellStyleId);
+            $cellValue = $this->formatExcelTimestampValueAsTimeValue($nodeValue, $cellStyleId);
         } else {
             // invalid date
-            return null;
+            $cellValue = null;
         }
+
+        return $cellValue;
     }
 
     /**
@@ -232,10 +237,12 @@ class CellValueFormatter
         if ($this->shouldFormatDates) {
             $styleNumberFormatCode = $this->styleManager->getNumberFormatCode($cellStyleId);
             $phpDateFormat = DateFormatHelper::toPHPDateFormat($styleNumberFormatCode);
-            return $dateObj->format($phpDateFormat);
+            $cellValue = $dateObj->format($phpDateFormat);
         } else {
-            return $dateObj;
+            $cellValue = $dateObj;
         }
+
+        return $cellValue;
     }
 
     /**
@@ -261,13 +268,15 @@ class CellValueFormatter
             if ($this->shouldFormatDates) {
                 $styleNumberFormatCode = $this->styleManager->getNumberFormatCode($cellStyleId);
                 $phpDateFormat = DateFormatHelper::toPHPDateFormat($styleNumberFormatCode);
-                return $dateObj->format($phpDateFormat);
+                $cellValue = $dateObj->format($phpDateFormat);
             } else {
-                return $dateObj;
+                $cellValue = $dateObj;
             }
         } catch (\Exception $e) {
-            return null;
+            $cellValue = null;
         }
+
+        return $cellValue;
     }
 
     /**
@@ -278,9 +287,7 @@ class CellValueFormatter
      */
     protected function formatBooleanCellValue($nodeValue)
     {
-        // !! is similar to boolval()
-        $cellValue = !!$nodeValue;
-        return $cellValue;
+        return (bool) $nodeValue;
     }
 
     /**
@@ -294,9 +301,11 @@ class CellValueFormatter
     {
         // Mitigate thrown Exception on invalid date-time format (http://php.net/manual/en/datetime.construct.php)
         try {
-            return ($this->shouldFormatDates) ? $nodeValue : new \DateTime($nodeValue);
+            $cellValue = ($this->shouldFormatDates) ? $nodeValue : new \DateTime($nodeValue);
         } catch (\Exception $e) {
-            return null;
+            $cellValue = null;
         }
+
+        return $cellValue;
     }
 }

src/Spout/Reader/XLSX/Manager/SharedStringsCaching/CachingStrategyFactory.php

@@ -89,11 +89,13 @@ class CachingStrategyFactory
 
         if ($memoryAvailable === -1) {
             // if cannot get memory limit or if memory limit set as unlimited, don't trust and play safe
-            return ($sharedStringsUniqueCount < self::MAX_NUM_STRINGS_PER_TEMP_FILE);
+            $isInMemoryStrategyUsageSafe = ($sharedStringsUniqueCount < self::MAX_NUM_STRINGS_PER_TEMP_FILE);
         } else {
             $memoryNeeded = $sharedStringsUniqueCount * self::AMOUNT_MEMORY_NEEDED_PER_STRING_IN_KB;
-            return ($memoryAvailable > $memoryNeeded);
+            $isInMemoryStrategyUsageSafe = ($memoryAvailable > $memoryNeeded);
         }
+
+        return $isInMemoryStrategyUsageSafe;
     }
 
     /**

src/Spout/Reader/XLSX/Manager/SheetManager.php

@@ -52,7 +52,7 @@ class SheetManager
     /**
      * @param string $filePath Path of the XLSX file being read
      * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
-     * @param \Box\Spout\Reader\XLSX\Manager\SharedStringsManager Manages shared strings
+     * @param \Box\Spout\Reader\XLSX\Manager\SharedStringsManager $sharedStringsManager Manages shared strings
      * @param \Box\Spout\Common\Helper\Escaper\XLSX $escaper Used to unescape XML data
      * @param EntityFactory $entityFactory Factory to create entities
      */