PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Worksheet/BaseDrawing.php

Spacing +1 added lines, -2 removed lines

@@ -137,8 +137,7 @@
         $this->rotation = 0;
         $this->shadow = new Drawing\Shadow();
 
-        // Set image index
-        ++self::$imageCounter;
+        // Set image index++self::$imageCounter;
         $this->imageIndex = self::$imageCounter;
     }
 

tests/data/Calculation/Calculation.php

Spacing +7 added lines, -7 removed lines

@@ -35,13 +35,13 @@
     $set6 = [0, $dataArray3, '=IF(A1+B1>3,C1,0)', 'E5'];
 
     $dataArray4 = [
-        ['noflag',    0, 0],
-        [127000,    0, 0],
-        [10000,  0.03, 0],
-        [20000,  0.06, 0],
-        [40000,  0.09, 0],
-        [70000,  0.12, 0],
-        [90000,  0.03, 0],
+        ['noflag', 0, 0],
+        [127000, 0, 0],
+        [10000, 0.03, 0],
+        [20000, 0.06, 0],
+        [40000, 0.09, 0],
+        [70000, 0.12, 0],
+        [90000, 0.03, 0],
     ];
     $formula2 = '=IF(A1="flag",IF(A2<10, 0) + IF(A3<10000, 0))';
     $set7 = [false, $dataArray4, $formula2, 'E5'];

tests/data/Calculation/MathTrig/MINVERSE.php

Spacing +22 added lines, -22 removed lines

@@ -3,9 +3,9 @@ 
 return [
     [
         [
-            [0.147222222222222,    -0.14444444444444399,   0.063888888888888898],
-            [-0.061111111111111102,  0.022222222222222199,  0.105555555555556],
-            [-0.0194444444444444,    0.18888888888888899,  -0.102777777777778],
+            [0.147222222222222, -0.14444444444444399, 0.063888888888888898],
+            [-0.061111111111111102, 0.022222222222222199, 0.105555555555556],
+            [-0.0194444444444444, 0.18888888888888899, -0.102777777777778],
         ],
         [
             [8, 1, 6],
@@ -16,7 +16,7 @@ 
     [
         [
             [4, -1],
-            [2,  0],
+            [2, 0],
         ],
         [
             [0.0, 0.5],
@@ -25,28 +25,28 @@ 
     ],
     [
         [
-            [1, 2,  1],
+            [1, 2, 1],
             [3, 4, -1],
-            [0, 2,  0],
+            [0, 2, 0],
         ],
         [
-            [0.25,  0.25, -0.75],
-            [0.00,  0.00,  0.50],
+            [0.25, 0.25, -0.75],
+            [0.00, 0.00, 0.50],
             [0.75, -0.25, -0.25],
         ],
     ],
     [
         [
-            [-0.4545454545455, 1.8181818181818,  0.2727272727273, -0.4545454545455],
+            [-0.4545454545455, 1.8181818181818, 0.2727272727273, -0.4545454545455],
             [-0.4545454545455, 1.8181818181818, -0.7272727272727, -0.4545454545455],
-            [0.9090909090909, 1.3636363636364,  0.4545454545455,  0.9090909090909],
-            [2.2727272727273, 0.9090909090909,  5.6363636363636,  3.2727272727273],
+            [0.9090909090909, 1.3636363636364, 0.4545454545455, 0.9090909090909],
+            [2.2727272727273, 0.9090909090909, 5.6363636363636, 3.2727272727273],
         ],
         [
-            [3.2, -4.8,  2.8, -1.0],
-            [0.2,  0.2,  0.2,  0.0],
-            [1.0, -1.0,  0.0,  0.0],
-            [-4.0,  5.0, -2.0,  1.0],
+            [3.2, -4.8, 2.8, -1.0],
+            [0.2, 0.2, 0.2, 0.0],
+            [1.0, -1.0, 0.0, 0.0],
+            [-4.0, 5.0, -2.0, 1.0],
         ],
     ],
     [
@@ -55,7 +55,7 @@ 
             [3, 4],
         ],
         [
-            [-2.0,  1.0],
+            [-2.0, 1.0],
             [1.5, -0.5],
         ],
     ],
@@ -67,8 +67,8 @@ 
         ],
         [
             [-2, 1, 0],
-            [1.3333333333333299,  -0.33333333333332998, -0.33333333333332998],
-            [0.33333333333332998, -0.33333333333332998,  0.66666666666666996],
+            [1.3333333333333299, -0.33333333333332998, -0.33333333333332998],
+            [0.33333333333332998, -0.33333333333332998, 0.66666666666666996],
         ],
     ],
     [
@@ -77,7 +77,7 @@ 
             [4, 5],
         ],
         [
-            [-2.5,  1.5],
+            [-2.5, 1.5],
             [2.0, -1.0],
         ],
     ],
@@ -87,7 +87,7 @@ 
             [7, 9],
         ],
         [
-            [-0.81818181818181801,  0.72727272727272696],
+            [-0.81818181818181801, 0.72727272727272696],
             [0.63636363636363602, -0.45454545454545497],
         ],
     ],
@@ -98,7 +98,7 @@ 
         ],
         [
             [0.054112554112554001, -0.084415584415584],
-            [-0.018398268398268001,  0.048701298701299002],
+            [-0.018398268398268001, 0.048701298701299002],
         ],
     ],
     [
@@ -107,7 +107,7 @@ 
             [2, 1],
         ],
         [
-            [-0.5,  1.0],
+            [-0.5, 1.0],
             [1.0, -1.0],
         ],
     ],

tests/data/Calculation/MathTrig/MDETERM.php

Spacing +9 added lines, -9 removed lines

@@ -51,7 +51,7 @@ 
     [
         1.81,
         [
-            [0.20,  1.0],
+            [0.20, 1.0],
             [0.35, 10.8],
         ],
     ],
@@ -73,17 +73,17 @@ 
     [
         88,
         [
-            [1, 3,  8, 5],
-            [1, 3,  6, 1],
-            [1, 1,  1, 0],
+            [1, 3, 8, 5],
+            [1, 3, 6, 1],
+            [1, 1, 1, 0],
             [7, 3, 10, 2],
         ],
     ],
     [
         1,
         [
-            [3,  6, 1],
-            [1,  1, 0],
+            [3, 6, 1],
+            [1, 1, 0],
             [3, 10, 2],
         ],
     ],
@@ -97,9 +97,9 @@ 
     [
         '#VALUE!',
         [
-            [0.20,  1.00, -0.90],
-            [0.35, 10.80,  4.00],
-            [-3.15,  5.00,  null],
+            [0.20, 1.00, -0.90],
+            [0.35, 10.80, 4.00],
+            [-3.15, 5.00, null],
         ],
     ],
     [

tests/data/Calculation/MathTrig/MMULT.php

Spacing +3 added lines, -3 removed lines

@@ -17,8 +17,8 @@ 
     ],
     [
         [
-            [30,  36,  42],
-            [66,  81,  96],
+            [30, 36, 42],
+            [66, 81, 96],
             [102, 126, 150],
         ],
         [
@@ -62,7 +62,7 @@ 
     ],
     [
         [
-            [62.00,  49.46],
+            [62.00, 49.46],
             [176.40, 144.50],
         ],
         [

tests/data/Calculation/LookupRef/LOOKUP.php

Spacing +5 added lines, -5 removed lines

@@ -2,7 +2,7 @@ 
 
 return [
 
-    [ // Office reference example #1
+    [// Office reference example #1
         'orange',
         4.19,
         [
@@ -20,7 +20,7 @@ 
             ['blue'],
         ],
     ],
-    [ // Office reference example #2
+    [// Office reference example #2
         'yellow',
         5.75,
         [
@@ -38,7 +38,7 @@ 
             ['blue'],
         ],
     ],
-    [ // Office reference example #3
+    [// Office reference example #3
         'blue',
         7.66,
         [
@@ -56,7 +56,7 @@ 
             ['blue'],
         ],
     ],
-    [ // Office reference example #4
+    [// Office reference example #4
         '#N/A',
         0,
         [
@@ -75,7 +75,7 @@ 
         ],
     ],
 
-    [ // Array form test
+    [// Array form test
         'orange',
         4.2,
         [

src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalFormattingRuleExtension.php

Spacing +17 added lines, -17 removed lines

@@ -60,7 +60,7 @@ 
             foreach ((count($extLstXml) > 0 ? $extLstXml : [$extLstXml]) as $extLst) {
                 //this uri is conditionalFormattings
                 //https://docs.microsoft.com/en-us/openspecs/office_standards/ms-xlsx/07d607af-5618-4ca2-b683-6a78dc0d9627
-                if (isset($extLst->ext['uri']) && (string)$extLst->ext['uri'] === '{78C0D931-6437-407d-A8EE-F0AAD7539E65}') {
+                if (isset($extLst->ext['uri']) && (string) $extLst->ext['uri'] === '{78C0D931-6437-407d-A8EE-F0AAD7539E65}') {
                     $conditionalFormattingRuleExtensionXml = $extLst->ext;
                 }
             }
@@ -70,8 +70,8 @@ 
 
                 foreach ($extFormattingsXml->children($ns['x14']) as $extFormattingXml) {
                     $extCfRuleXml = $extFormattingXml->cfRule;
-                    $extFormattingRuleObj = new self((string)$extCfRuleXml->attributes()->id);
-                    $extFormattingRuleObj->setSqref((string)$extFormattingXml->children($ns['xm'])->sqref);
+                    $extFormattingRuleObj = new self((string) $extCfRuleXml->attributes()->id);
+                    $extFormattingRuleObj->setSqref((string) $extFormattingXml->children($ns['xm'])->sqref);
                     $conditionalFormattingRuleExtensions[$extFormattingRuleObj->getId()] = $extFormattingRuleObj;
 
                     $extDataBarObj = new ConditionalDataBarExtension();
@@ -91,51 +91,51 @@ 
     {
         $dataBarAttribute = $dataBarXml->attributes();
         if ($dataBarAttribute->minLength) {
-            $extDataBarObj->setMinLength((int)$dataBarAttribute->minLength);
+            $extDataBarObj->setMinLength((int) $dataBarAttribute->minLength);
         }
         if ($dataBarAttribute->maxLength) {
-            $extDataBarObj->setMaxLength((int)$dataBarAttribute->maxLength);
+            $extDataBarObj->setMaxLength((int) $dataBarAttribute->maxLength);
         }
         if ($dataBarAttribute->border) {
-            $extDataBarObj->setBorder((bool)(string)$dataBarAttribute->border);
+            $extDataBarObj->setBorder((bool) (string) $dataBarAttribute->border);
         }
         if ($dataBarAttribute->gradient) {
-            $extDataBarObj->setGradient((bool)(string)$dataBarAttribute->gradient);
+            $extDataBarObj->setGradient((bool) (string) $dataBarAttribute->gradient);
         }
         if ($dataBarAttribute->direction) {
-            $extDataBarObj->setDirection((string)$dataBarAttribute->direction);
+            $extDataBarObj->setDirection((string) $dataBarAttribute->direction);
         }
         if ($dataBarAttribute->negativeBarBorderColorSameAsPositive) {
-            $extDataBarObj->setNegativeBarBorderColorSameAsPositive((bool)(string)$dataBarAttribute->negativeBarBorderColorSameAsPositive);
+            $extDataBarObj->setNegativeBarBorderColorSameAsPositive((bool) (string) $dataBarAttribute->negativeBarBorderColorSameAsPositive);
         }
         if ($dataBarAttribute->axisPosition) {
-            $extDataBarObj->setAxisPosition((string)$dataBarAttribute->axisPosition);
+            $extDataBarObj->setAxisPosition((string) $dataBarAttribute->axisPosition);
         }
     }
 
     private static function parseExtDataBarElementChildrenFromXml(ConditionalDataBarExtension $extDataBarObj, SimpleXMLElement $dataBarXml, $ns): void
     {
         if ($dataBarXml->borderColor) {
-            $extDataBarObj->setBorderColor((string)$dataBarXml->borderColor->attributes()['rgb']);
+            $extDataBarObj->setBorderColor((string) $dataBarXml->borderColor->attributes()['rgb']);
         }
         if ($dataBarXml->negativeFillColor) {
-            $extDataBarObj->setNegativeFillColor((string)$dataBarXml->negativeFillColor->attributes()['rgb']);
+            $extDataBarObj->setNegativeFillColor((string) $dataBarXml->negativeFillColor->attributes()['rgb']);
         }
         if ($dataBarXml->negativeBorderColor) {
-            $extDataBarObj->setNegativeBorderColor((string)$dataBarXml->negativeBorderColor->attributes()['rgb']);
+            $extDataBarObj->setNegativeBorderColor((string) $dataBarXml->negativeBorderColor->attributes()['rgb']);
         }
         if ($dataBarXml->axisColor) {
             $axisColorAttr = $dataBarXml->axisColor->attributes();
-            $extDataBarObj->setAxisColor((string)$axisColorAttr['rgb'], (string)$axisColorAttr['theme'], (string)$axisColorAttr['tint']);
+            $extDataBarObj->setAxisColor((string) $axisColorAttr['rgb'], (string) $axisColorAttr['theme'], (string) $axisColorAttr['tint']);
         }
         $cfvoIndex = 0;
         foreach ($dataBarXml->cfvo as $cfvo) {
-            $f = (string)$cfvo->children($ns['xm'])->f;
+            $f = (string) $cfvo->children($ns['xm'])->f;
             if ($cfvoIndex === 0) {
-                $extDataBarObj->setMinimumConditionalFormatValueObject(new ConditionalFormatValueObject((string)$cfvo->attributes()['type'], null, (empty($f) ? null : $f)));
+                $extDataBarObj->setMinimumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $cfvo->attributes()['type'], null, (empty($f) ? null : $f)));
             }
             if ($cfvoIndex === 1) {
-                $extDataBarObj->setMaximumConditionalFormatValueObject(new ConditionalFormatValueObject((string)$cfvo->attributes()['type'], null, (empty($f) ? null : $f)));
+                $extDataBarObj->setMaximumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $cfvo->attributes()['type'], null, (empty($f) ? null : $f)));
             }
             $cfvoIndex++;
         }

src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php

Spacing +24 added lines, -24 removed lines

@@ -40,17 +40,17 @@ 
         foreach ($xmlSheet->conditionalFormatting as $conditional) {
             foreach ($conditional->cfRule as $cfRule) {
                 if (
-                    ((string)$cfRule['type'] == Conditional::CONDITION_NONE
-                        || (string)$cfRule['type'] == Conditional::CONDITION_CELLIS
-                        || (string)$cfRule['type'] == Conditional::CONDITION_CONTAINSTEXT
-                        || (string)$cfRule['type'] == Conditional::CONDITION_CONTAINSBLANKS
-                        || (string)$cfRule['type'] == Conditional::CONDITION_NOTCONTAINSBLANKS
-                        || (string)$cfRule['type'] == Conditional::CONDITION_EXPRESSION)
-                    && isset($this->dxfs[(int)($cfRule['dxfId'])])
+                    ((string) $cfRule['type'] == Conditional::CONDITION_NONE
+                        || (string) $cfRule['type'] == Conditional::CONDITION_CELLIS
+                        || (string) $cfRule['type'] == Conditional::CONDITION_CONTAINSTEXT
+                        || (string) $cfRule['type'] == Conditional::CONDITION_CONTAINSBLANKS
+                        || (string) $cfRule['type'] == Conditional::CONDITION_NOTCONTAINSBLANKS
+                        || (string) $cfRule['type'] == Conditional::CONDITION_EXPRESSION)
+                    && isset($this->dxfs[(int) ($cfRule['dxfId'])])
                 ) {
-                    $conditionals[(string)$conditional['sqref']][(int)($cfRule['priority'])] = $cfRule;
-                } elseif ((string)$cfRule['type'] == Conditional::CONDITION_DATABAR) {
-                    $conditionals[(string)$conditional['sqref']][(int)($cfRule['priority'])] = $cfRule;
+                    $conditionals[(string) $conditional['sqref']][(int) ($cfRule['priority'])] = $cfRule;
+                } elseif ((string) $cfRule['type'] == Conditional::CONDITION_DATABAR) {
+                    $conditionals[(string) $conditional['sqref']][(int) ($cfRule['priority'])] = $cfRule;
                 }
             }
         }
@@ -78,29 +78,29 @@ 
         $conditionalStyles = [];
         foreach ($cfRules as $cfRule) {
             $objConditional = new Conditional();
-            $objConditional->setConditionType((string)$cfRule['type']);
-            $objConditional->setOperatorType((string)$cfRule['operator']);
+            $objConditional->setConditionType((string) $cfRule['type']);
+            $objConditional->setOperatorType((string) $cfRule['operator']);
 
-            if ((string)$cfRule['text'] != '') {
-                $objConditional->setText((string)$cfRule['text']);
+            if ((string) $cfRule['text'] != '') {
+                $objConditional->setText((string) $cfRule['text']);
             }
 
-            if (isset($cfRule['stopIfTrue']) && (int)$cfRule['stopIfTrue'] === 1) {
+            if (isset($cfRule['stopIfTrue']) && (int) $cfRule['stopIfTrue'] === 1) {
                 $objConditional->setStopIfTrue(true);
             }
 
             if (count($cfRule->formula) > 1) {
                 foreach ($cfRule->formula as $formula) {
-                    $objConditional->addCondition((string)$formula);
+                    $objConditional->addCondition((string) $formula);
                 }
             } else {
-                $objConditional->addCondition((string)$cfRule->formula);
+                $objConditional->addCondition((string) $cfRule->formula);
             }
 
             if (isset($cfRule->dataBar)) {
                 $objConditional->setDataBar($this->readDataBarOfConditionalRule($cfRule, $conditionalFormattingRuleExtensions));
             } else {
-                $objConditional->setStyle(clone $this->dxfs[(int)($cfRule['dxfId'])]);
+                $objConditional->setStyle(clone $this->dxfs[(int) ($cfRule['dxfId'])]);
             }
 
             $conditionalStyles[] = $objConditional;
@@ -114,7 +114,7 @@ 
         $dataBar = new ConditionalDataBar();
         //dataBar attribute
         if (isset($cfRule->dataBar['showValue'])) {
-            $dataBar->setShowValue((boolean)$cfRule->dataBar['showValue']);
+            $dataBar->setShowValue((boolean) $cfRule->dataBar['showValue']);
         }
 
         //dataBar children
@@ -123,24 +123,24 @@ 
         $cfvoIndex = 0;
         foreach ((count($cfvoXml) > 1 ? $cfvoXml : [$cfvoXml]) as $cfvo) {
             if ($cfvoIndex === 0) {
-                $dataBar->setMinimumConditionalFormatValueObject(new ConditionalFormatValueObject((string)$cfvo['type'], (string)$cfvo['val']));
+                $dataBar->setMinimumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $cfvo['type'], (string) $cfvo['val']));
             }
             if ($cfvoIndex === 1) {
-                $dataBar->setMaximumConditionalFormatValueObject(new ConditionalFormatValueObject((string)$cfvo['type'], (string)$cfvo['val']));
+                $dataBar->setMaximumConditionalFormatValueObject(new ConditionalFormatValueObject((string) $cfvo['type'], (string) $cfvo['val']));
             }
             $cfvoIndex++;
         }
 
         //color
         if (isset($cfRule->dataBar->color)) {
-            $dataBar->setColor((string)$cfRule->dataBar->color['rgb']);
+            $dataBar->setColor((string) $cfRule->dataBar->color['rgb']);
         }
         //extLst
         if (isset($cfRule->extLst)) {
             $ns = $cfRule->extLst->getNamespaces(true);
             foreach ((count($cfRule->extLst) > 0 ? $cfRule->extLst->ext : [$cfRule->extLst->ext]) as $ext) {
-                $extId = (string)$ext->children($ns['x14'])->id;
-                if (isset($conditionalFormattingRuleExtensions[$extId]) && (string)$ext['uri'] === '{B025F937-C7B1-47D3-B67F-A62EFF666E3E}') {
+                $extId = (string) $ext->children($ns['x14'])->id;
+                if (isset($conditionalFormattingRuleExtensions[$extId]) && (string) $ext['uri'] === '{B025F937-C7B1-47D3-B67F-A62EFF666E3E}') {
                     $dataBar->setConditionalFormattingRuleExt($conditionalFormattingRuleExtensions[$extId]);
                 }
             }

src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php

Spacing +9 added lines, -9 removed lines

@@ -323,8 +323,8 @@ 
 
         // Set Zero Height row
         if (
-            (string)$pSheet->getDefaultRowDimension()->getZeroHeight() === '1' ||
-            strtolower((string)$pSheet->getDefaultRowDimension()->getZeroHeight()) == 'true'
+            (string) $pSheet->getDefaultRowDimension()->getZeroHeight() === '1' ||
+            strtolower((string) $pSheet->getDefaultRowDimension()->getZeroHeight()) == 'true'
         ) {
             $objWriter->writeAttribute('zeroHeight', '1');
         }
@@ -341,7 +341,7 @@ 
                 $outlineLevelRow = $dimension->getOutlineLevel();
             }
         }
-        $objWriter->writeAttribute('outlineLevelRow', (int)$outlineLevelRow);
+        $objWriter->writeAttribute('outlineLevelRow', (int) $outlineLevelRow);
 
         // Outline level - column
         $outlineLevelCol = 0;
@@ -350,7 +350,7 @@ 
                 $outlineLevelCol = $dimension->getOutlineLevel();
             }
         }
-        $objWriter->writeAttribute('outlineLevelCol', (int)$outlineLevelCol);
+        $objWriter->writeAttribute('outlineLevelCol', (int) $outlineLevelCol);
 
         $objWriter->endElement();
     }
@@ -567,15 +567,15 @@ 
             $minCfvo = $dataBar->getMinimumConditionalFormatValueObject();
             if ($minCfvo) {
                 $objWriter->startElement('cfvo');
-                self::writeAttributeIf($objWriter, $minCfvo->getType(), 'type', (string)$minCfvo->getType());
-                self::writeAttributeIf($objWriter, $minCfvo->getValue(), 'val', (string)$minCfvo->getValue());
+                self::writeAttributeIf($objWriter, $minCfvo->getType(), 'type', (string) $minCfvo->getType());
+                self::writeAttributeIf($objWriter, $minCfvo->getValue(), 'val', (string) $minCfvo->getValue());
                 $objWriter->endElement();
             }
             $maxCfvo = $dataBar->getMaximumConditionalFormatValueObject();
             if ($maxCfvo) {
                 $objWriter->startElement('cfvo');
-                self::writeAttributeIf($objWriter, $maxCfvo->getType(), 'type', (string)$maxCfvo->getType());
-                self::writeAttributeIf($objWriter, $maxCfvo->getValue(), 'val', (string)$maxCfvo->getValue());
+                self::writeAttributeIf($objWriter, $maxCfvo->getType(), 'type', (string) $maxCfvo->getType());
+                self::writeAttributeIf($objWriter, $maxCfvo->getValue(), 'val', (string) $maxCfvo->getValue());
                 $objWriter->endElement();
             }
             if ($dataBar->getColor()) {
@@ -1197,7 +1197,7 @@ 
         //force a decimal to be written if the type is float
         if (is_float($cellValue)) {
             // force point as decimal separator in case current locale uses comma
-            $cellValue = str_replace(',', '.', (string)$cellValue);
+            $cellValue = str_replace(',', '.', (string) $cellValue);
             if (strpos($cellValue, '.') === false) {
                 $cellValue = $cellValue . '.0';
             }