alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply Scrutinizer patches for spacing

This commit is contained in:
Adrien Crivelli 2016-08-25 18:46:02 +09:00
parent 20ccfa0d59
commit a85f1bdbed
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
58 changed files with 1061 additions and 1067 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PhpSpreadsheet/Calculation/DateTime.php
View File

@ -1036,7 +1036,7 @@ class DateTime
$startDoW = self::DAYOFWEEK($startDate, 3); $startDoW = self::DAYOFWEEK($startDate, 3);
if (self::DAYOFWEEK($startDate, 3) >= 5) { if (self::DAYOFWEEK($startDate, 3) >= 5) {
$startDate += ($decrementing) ? -$startDoW + 4: 7 - $startDoW; $startDate += ($decrementing) ? -$startDoW + 4 : 7 - $startDoW;
($decrementing) ? $endDays++ : $endDays--; ($decrementing) ? $endDays++ : $endDays--;
} }
@ -1046,7 +1046,7 @@ class DateTime
// Adjust the calculated end date if it falls over a weekend // Adjust the calculated end date if it falls over a weekend
$endDoW = self::DAYOFWEEK($endDate, 3); $endDoW = self::DAYOFWEEK($endDate, 3);
if ($endDoW >= 5) { if ($endDoW >= 5) {
$endDate += ($decrementing) ? -$endDoW + 4: 7 - $endDoW; $endDate += ($decrementing) ? -$endDoW + 4 : 7 - $endDoW;
} }
// Test any extra holiday parameters // Test any extra holiday parameters

2
src/PhpSpreadsheet/Reader/CSV.php
View File

@ -260,7 +260,7 @@ class CSV extends BaseReader implements IReader
// Set our starting row based on whether we're in contiguous mode or not // Set our starting row based on whether we're in contiguous mode or not
$currentRow = 1; $currentRow = 1;
if ($this->contiguous) { if ($this->contiguous) {
$currentRow = ($this->contiguousRow == -1) ? $sheet->getHighestRow(): $this->contiguousRow; $currentRow = ($this->contiguousRow == -1) ? $sheet->getHighestRow() : $this->contiguousRow;
} }
// Loop through each line of the file in turn // Loop through each line of the file in turn

4
src/PhpSpreadsheet/Reader/Excel2007.php
View File

@ -541,7 +541,7 @@ class Excel2007 extends BaseReader implements IReader
} }
if (!is_null($macros)) { if (!is_null($macros)) {
$macrosCode = $this->getFromZipArchive($zip, 'xl/vbaProject.bin');//vbaProject.bin always in 'xl' dir and always named vbaProject.bin $macrosCode = $this->getFromZipArchive($zip, 'xl/vbaProject.bin'); //vbaProject.bin always in 'xl' dir and always named vbaProject.bin
if ($macrosCode !== false) { if ($macrosCode !== false) {
$excel->setMacrosCode($macrosCode); $excel->setMacrosCode($macrosCode);
$excel->setHasMacros(true); $excel->setHasMacros(true);
@ -1313,7 +1313,7 @@ class Excel2007 extends BaseReader implements IReader
foreach (\PhpSpreadsheet\Cell::extractAllCellReferencesInRange($hyperlink['ref']) as $cellReference) { foreach (\PhpSpreadsheet\Cell::extractAllCellReferencesInRange($hyperlink['ref']) as $cellReference) {
$cell = $docSheet->getCell($cellReference); $cell = $docSheet->getCell($cellReference);
if (isset($linkRel['id'])) { if (isset($linkRel['id'])) {
$hyperlinkUrl = $hyperlinks[ (string) $linkRel['id'] ]; $hyperlinkUrl = $hyperlinks[(string) $linkRel['id']];
if (isset($hyperlink['location'])) { if (isset($hyperlink['location'])) {
$hyperlinkUrl .= '#' . (string) $hyperlink['location']; $hyperlinkUrl .= '#' . (string) $hyperlink['location'];
} }

2
src/PhpSpreadsheet/Reader/Gnumeric.php
View File

@ -437,7 +437,7 @@ class Gnumeric extends BaseReader implements IReader
break; break;
case '20': // Boolean case '20': // Boolean
$type = \PhpSpreadsheet\Cell\DataType::TYPE_BOOL; $type = \PhpSpreadsheet\Cell\DataType::TYPE_BOOL;
$cell = ($cell == 'TRUE') ? true: false; $cell = ($cell == 'TRUE') ? true : false;
break; break;
case '30': // Integer case '30': // Integer
$cell = intval($cell); $cell = intval($cell);

12
src/PhpSpreadsheet/ReferenceHelper.php
View File

@ -169,8 +169,7 @@ class ReferenceHelper
{ {
$aBreaks = $pSheet->getBreaks(); $aBreaks = $pSheet->getBreaks();
($pNumCols > 0 || $pNumRows > 0) ? ($pNumCols > 0 || $pNumRows > 0) ?
uksort($aBreaks, ['self', 'cellReverseSort']) : uksort($aBreaks, ['self', 'cellReverseSort']) : uksort($aBreaks, ['self', 'cellSort']);
uksort($aBreaks, ['self', 'cellSort']);
foreach ($aBreaks as $key => $value) { foreach ($aBreaks as $key => $value) {
if (self::cellAddressInDeleteRange($key, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)) { if (self::cellAddressInDeleteRange($key, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)) {
@ -230,8 +229,7 @@ class ReferenceHelper
{ {
$aHyperlinkCollection = $pSheet->getHyperlinkCollection(); $aHyperlinkCollection = $pSheet->getHyperlinkCollection();
($pNumCols > 0 || $pNumRows > 0) ? ($pNumCols > 0 || $pNumRows > 0) ?
uksort($aHyperlinkCollection, ['self', 'cellReverseSort']) : uksort($aHyperlinkCollection, ['self', 'cellReverseSort']) : uksort($aHyperlinkCollection, ['self', 'cellSort']);
uksort($aHyperlinkCollection, ['self', 'cellSort']);
foreach ($aHyperlinkCollection as $key => $value) { foreach ($aHyperlinkCollection as $key => $value) {
$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows); $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
@ -256,8 +254,7 @@ class ReferenceHelper
{ {
$aDataValidationCollection = $pSheet->getDataValidationCollection(); $aDataValidationCollection = $pSheet->getDataValidationCollection();
($pNumCols > 0 || $pNumRows > 0) ? ($pNumCols > 0 || $pNumRows > 0) ?
uksort($aDataValidationCollection, ['self', 'cellReverseSort']) : uksort($aDataValidationCollection, ['self', 'cellReverseSort']) : uksort($aDataValidationCollection, ['self', 'cellSort']);
uksort($aDataValidationCollection, ['self', 'cellSort']);
foreach ($aDataValidationCollection as $key => $value) { foreach ($aDataValidationCollection as $key => $value) {
$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows); $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
@ -303,8 +300,7 @@ class ReferenceHelper
{ {
$aProtectedCells = $pSheet->getProtectedCells(); $aProtectedCells = $pSheet->getProtectedCells();
($pNumCols > 0 || $pNumRows > 0) ? ($pNumCols > 0 || $pNumRows > 0) ?
uksort($aProtectedCells, ['self', 'cellReverseSort']) : uksort($aProtectedCells, ['self', 'cellReverseSort']) : uksort($aProtectedCells, ['self', 'cellSort']);
uksort($aProtectedCells, ['self', 'cellSort']);
foreach ($aProtectedCells as $key => $value) { foreach ($aProtectedCells as $key => $value) {
$newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows); $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
if ($key != $newReference) { if ($key != $newReference) {

36
src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
View File

@ -63,11 +63,11 @@ class Root extends \PhpSpreadsheet\Shared\OLE\PPS
// Initial Setting for saving // Initial Setting for saving
$this->_BIG_BLOCK_SIZE = pow( $this->_BIG_BLOCK_SIZE = pow(
2, 2,
(isset($this->_BIG_BLOCK_SIZE))? self::adjust2($this->_BIG_BLOCK_SIZE) : 9 (isset($this->_BIG_BLOCK_SIZE)) ? self::adjust2($this->_BIG_BLOCK_SIZE) : 9
); );
$this->_SMALL_BLOCK_SIZE = pow( $this->_SMALL_BLOCK_SIZE = pow(
2, 2,
(isset($this->_SMALL_BLOCK_SIZE))? self::adjust2($this->_SMALL_BLOCK_SIZE) : 6 (isset($this->_SMALL_BLOCK_SIZE)) ? self::adjust2($this->_SMALL_BLOCK_SIZE) : 6
); );
if (is_resource($filename)) { if (is_resource($filename)) {
@ -130,21 +130,21 @@ class Root extends \PhpSpreadsheet\Shared\OLE\PPS
$raList[$i]->Size = $raList[$i]->getDataLen(); $raList[$i]->Size = $raList[$i]->getDataLen();
if ($raList[$i]->Size < \PhpSpreadsheet\Shared\OLE::OLE_DATA_SIZE_SMALL) { if ($raList[$i]->Size < \PhpSpreadsheet\Shared\OLE::OLE_DATA_SIZE_SMALL) {
$iSBcnt += floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE) $iSBcnt += floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
+ (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0); + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE) ? 1 : 0);
} else { } else {
$iBBcnt += (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) + $iBBcnt += (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
(($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0)); (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE) ? 1 : 0));
} }
} }
} }
$iSmallLen = $iSBcnt * $this->_SMALL_BLOCK_SIZE; $iSmallLen = $iSBcnt * $this->_SMALL_BLOCK_SIZE;
$iSlCnt = floor($this->_BIG_BLOCK_SIZE / \PhpSpreadsheet\Shared\OLE::OLE_LONG_INT_SIZE); $iSlCnt = floor($this->_BIG_BLOCK_SIZE / \PhpSpreadsheet\Shared\OLE::OLE_LONG_INT_SIZE);
$iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt)? 1:0); $iSBDcnt = floor($iSBcnt / $iSlCnt) + (($iSBcnt % $iSlCnt) ? 1 : 0);
$iBBcnt += (floor($iSmallLen / $this->_BIG_BLOCK_SIZE) + $iBBcnt += (floor($iSmallLen / $this->_BIG_BLOCK_SIZE) +
(($iSmallLen % $this->_BIG_BLOCK_SIZE)? 1: 0)); (($iSmallLen % $this->_BIG_BLOCK_SIZE) ? 1 : 0));
$iCnt = count($raList); $iCnt = count($raList);
$iBdCnt = $this->_BIG_BLOCK_SIZE / \PhpSpreadsheet\Shared\OLE::OLE_PPS_SIZE; $iBdCnt = $this->_BIG_BLOCK_SIZE / \PhpSpreadsheet\Shared\OLE::OLE_PPS_SIZE;
$iPPScnt = (floor($iCnt / $iBdCnt) + (($iCnt % $iBdCnt)? 1: 0)); $iPPScnt = (floor($iCnt / $iBdCnt) + (($iCnt % $iBdCnt) ? 1 : 0));
return [$iSBDcnt, $iBBcnt, $iPPScnt]; return [$iSBDcnt, $iBBcnt, $iPPScnt];
} }
@ -160,7 +160,7 @@ class Root extends \PhpSpreadsheet\Shared\OLE\PPS
{ {
$iWk = log($i2) / log(2); $iWk = log($i2) / log(2);
return ($iWk > floor($iWk))? floor($iWk) + 1:$iWk; return ($iWk > floor($iWk)) ? floor($iWk) + 1 : $iWk;
} }
/** /**
@ -181,16 +181,16 @@ class Root extends \PhpSpreadsheet\Shared\OLE\PPS
$iBdExL = 0; $iBdExL = 0;
$iAll = $iBBcnt + $iPPScnt + $iSBDcnt; $iAll = $iBBcnt + $iPPScnt + $iSBDcnt;
$iAllW = $iAll; $iAllW = $iAll;
$iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0); $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt) ? 1 : 0);
$iBdCnt = floor(($iAll + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt)? 1: 0); $iBdCnt = floor(($iAll + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt) ? 1 : 0);
// Calculate BD count // Calculate BD count
if ($iBdCnt > $i1stBdL) { if ($iBdCnt > $i1stBdL) {
while (1) { while (1) {
++$iBdExL; ++$iBdExL;
++$iAllW; ++$iAllW;
$iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt)? 1: 0); $iBdCntW = floor($iAllW / $iBlCnt) + (($iAllW % $iBlCnt) ? 1 : 0);
$iBdCnt = floor(($iAllW + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt)? 1: 0); $iBdCnt = floor(($iAllW + $iBdCntW) / $iBlCnt) + ((($iAllW + $iBdCntW) % $iBlCnt) ? 1 : 0);
if ($iBdCnt <= ($iBdExL * $iBlCnt + $i1stBdL)) { if ($iBdCnt <= ($iBdExL * $iBlCnt + $i1stBdL)) {
break; break;
} }
@ -278,7 +278,7 @@ class Root extends \PhpSpreadsheet\Shared\OLE\PPS
$raList[$i]->startBlock = $iStBlk; $raList[$i]->startBlock = $iStBlk;
$iStBlk += $iStBlk +=
(floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) + (floor($raList[$i]->Size / $this->_BIG_BLOCK_SIZE) +
(($raList[$i]->Size % $this->_BIG_BLOCK_SIZE)? 1: 0)); (($raList[$i]->Size % $this->_BIG_BLOCK_SIZE) ? 1 : 0));
} }
// Close file for each PPS, and unlink it // Close file for each PPS, and unlink it
//if (isset($raList[$i]->_PPS_FILE)) { //if (isset($raList[$i]->_PPS_FILE)) {
@ -310,7 +310,7 @@ class Root extends \PhpSpreadsheet\Shared\OLE\PPS
} }
if ($raList[$i]->Size < \PhpSpreadsheet\Shared\OLE::OLE_DATA_SIZE_SMALL) { if ($raList[$i]->Size < \PhpSpreadsheet\Shared\OLE::OLE_DATA_SIZE_SMALL) {
$iSmbCnt = floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE) $iSmbCnt = floor($raList[$i]->Size / $this->_SMALL_BLOCK_SIZE)
+ (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE)? 1: 0); + (($raList[$i]->Size % $this->_SMALL_BLOCK_SIZE) ? 1 : 0);
// Add to SBD // Add to SBD
$jB = $iSmbCnt - 1; $jB = $iSmbCnt - 1;
for ($j = 0; $j < $jB; ++$j) { for ($j = 0; $j < $jB; ++$j) {
@ -384,15 +384,15 @@ class Root extends \PhpSpreadsheet\Shared\OLE\PPS
$iBdExL = 0; $iBdExL = 0;
$iAll = $iBsize + $iPpsCnt + $iSbdSize; $iAll = $iBsize + $iPpsCnt + $iSbdSize;
$iAllW = $iAll; $iAllW = $iAll;
$iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0); $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt) ? 1 : 0);
$iBdCnt = floor(($iAll + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt)? 1: 0); $iBdCnt = floor(($iAll + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt) ? 1 : 0);
// Calculate BD count // Calculate BD count
if ($iBdCnt > $i1stBdL) { if ($iBdCnt > $i1stBdL) {
while (1) { while (1) {
++$iBdExL; ++$iBdExL;
++$iAllW; ++$iAllW;
$iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt)? 1: 0); $iBdCntW = floor($iAllW / $iBbCnt) + (($iAllW % $iBbCnt) ? 1 : 0);
$iBdCnt = floor(($iAllW + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt)? 1: 0); $iBdCnt = floor(($iAllW + $iBdCntW) / $iBbCnt) + ((($iAllW + $iBdCntW) % $iBbCnt) ? 1 : 0);
if ($iBdCnt <= ($iBdExL * $iBbCnt + $i1stBdL)) { if ($iBdCnt <= ($iBdExL * $iBbCnt + $i1stBdL)) {
break; break;
} }

2
src/PhpSpreadsheet/Shared/PCLZip/PclZip.php
View File

@ -4980,7 +4980,7 @@ function PclZipUtilPathReduction($p_dir)
if ($v_skip > 0) { if ($v_skip > 0) {
--$v_skip; --$v_skip;
} else { } else {
$v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1)?'/' . $v_result:''); $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? '/' . $v_result : '');
} }
} }
} }

4
src/PhpSpreadsheet/Worksheet.php
View File

@ -2962,7 +2962,7 @@ class Worksheet implements IComparable
if ($this->getCodeName() == $pValue) { if ($this->getCodeName() == $pValue) {
return $this; return $this;
} }
$pValue = str_replace(' ', '_', $pValue);//Excel does this automatically without flinching, we are doing the same $pValue = str_replace(' ', '_', $pValue); //Excel does this automatically without flinching, we are doing the same
// Syntax check // Syntax check
// throw an exception if not valid // throw an exception if not valid
self::checkSheetCodeName($pValue); self::checkSheetCodeName($pValue);
@ -2991,7 +2991,7 @@ class Worksheet implements IComparable
} }
} }
$pValue = $pValue . '_' . $i;// ok, we have a valid name $pValue = $pValue . '_' . $i; // ok, we have a valid name
//codeName is'nt used in formula : no need to call for an update //codeName is'nt used in formula : no need to call for an update
//return $this->setTitle($altTitle, $updateFormulaCellReferences); //return $this->setTitle($altTitle, $updateFormulaCellReferences);
} }

3
src/PhpSpreadsheet/Worksheet/BaseDrawing.php
View File

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

4
src/PhpSpreadsheet/Writer/Excel2007.php
View File

@ -237,7 +237,7 @@ class Excel2007 extends BaseWriter implements IWriter
$macrosCode = $this->spreadSheet->getMacrosCode(); $macrosCode = $this->spreadSheet->getMacrosCode();
if (!is_null($macrosCode)) { if (!is_null($macrosCode)) {
// we have the code ? // we have the code ?
$objZip->addFromString('xl/vbaProject.bin', $macrosCode);//allways in 'xl', allways named vbaProject.bin $objZip->addFromString('xl/vbaProject.bin', $macrosCode); //allways in 'xl', allways named vbaProject.bin
if ($this->spreadSheet->hasMacrosCertificate()) { if ($this->spreadSheet->hasMacrosCertificate()) {
//signed macros ? //signed macros ?
// Yes : add the certificate file and the related rels file // Yes : add the certificate file and the related rels file
@ -252,7 +252,7 @@ class Excel2007 extends BaseWriter implements IWriter
$objZip->addFromString($tmpRibbonTarget, $this->spreadSheet->getRibbonXMLData('data')); $objZip->addFromString($tmpRibbonTarget, $this->spreadSheet->getRibbonXMLData('data'));
if ($this->spreadSheet->hasRibbonBinObjects()) { if ($this->spreadSheet->hasRibbonBinObjects()) {
$tmpRootPath = dirname($tmpRibbonTarget) . '/'; $tmpRootPath = dirname($tmpRibbonTarget) . '/';
$ribbonBinObjects = $this->spreadSheet->getRibbonBinObjects('data');//the files to write $ribbonBinObjects = $this->spreadSheet->getRibbonBinObjects('data'); //the files to write
foreach ($ribbonBinObjects as $aPath => $aContent) { foreach ($ribbonBinObjects as $aPath => $aContent) {
$objZip->addFromString($tmpRootPath . $aPath, $aContent); $objZip->addFromString($tmpRootPath . $aPath, $aContent);
} }

2
src/PhpSpreadsheet/Writer/Excel2007/ContentTypes.php
View File

@ -157,7 +157,7 @@ class ContentTypes extends WriterPart
// we need to write "Extension" but not already write for media content // we need to write "Extension" but not already write for media content
$tabRibbonTypes = array_diff($spreadsheet->getRibbonBinObjects('types'), array_keys($aMediaContentTypes)); $tabRibbonTypes = array_diff($spreadsheet->getRibbonBinObjects('types'), array_keys($aMediaContentTypes));
foreach ($tabRibbonTypes as $aRibbonType) { foreach ($tabRibbonTypes as $aRibbonType) {
$mimeType = 'image/.' . $aRibbonType;//we wrote $mimeType like customUI Editor $mimeType = 'image/.' . $aRibbonType; //we wrote $mimeType like customUI Editor
$this->writeDefaultContentType($objWriter, $aRibbonType, $mimeType); $this->writeDefaultContentType($objWriter, $aRibbonType, $mimeType);
} }
} }

2
src/PhpSpreadsheet/Writer/Excel2007/Rels.php
View File

@ -166,7 +166,7 @@ class Rels extends WriterPart
'http://schemas.microsoft.com/office/2006/relationships/vbaProject', 'http://schemas.microsoft.com/office/2006/relationships/vbaProject',
'vbaProject.bin' 'vbaProject.bin'
); );
++$i;//increment i if needed for an another relation ++$i; //increment i if needed for an another relation
} }
$objWriter->endElement(); $objWriter->endElement();

8
src/PhpSpreadsheet/Writer/Excel2007/Style.php
View File

@ -621,7 +621,7 @@ class Style extends WriterPart
/** @var \PhpSpreadsheet\Style $style */ /** @var \PhpSpreadsheet\Style $style */
foreach ($aStyles as $style) { foreach ($aStyles as $style) {
if (!array_key_exists($style->getFill()->getHashCode(), $aFills)) { if (!array_key_exists($style->getFill()->getHashCode(), $aFills)) {
$aFills[ $style->getFill()->getHashCode() ] = $style->getFill(); $aFills[$style->getFill()->getHashCode()] = $style->getFill();
} }
} }
@ -644,7 +644,7 @@ class Style extends WriterPart
/** @var \PhpSpreadsheet\Style $style */ /** @var \PhpSpreadsheet\Style $style */
foreach ($aStyles as $style) { foreach ($aStyles as $style) {
if (!array_key_exists($style->getFont()->getHashCode(), $aFonts)) { if (!array_key_exists($style->getFont()->getHashCode(), $aFonts)) {
$aFonts[ $style->getFont()->getHashCode() ] = $style->getFont(); $aFonts[$style->getFont()->getHashCode()] = $style->getFont();
} }
} }
@ -667,7 +667,7 @@ class Style extends WriterPart
/** @var \PhpSpreadsheet\Style $style */ /** @var \PhpSpreadsheet\Style $style */
foreach ($aStyles as $style) { foreach ($aStyles as $style) {
if (!array_key_exists($style->getBorders()->getHashCode(), $aBorders)) { if (!array_key_exists($style->getBorders()->getHashCode(), $aBorders)) {
$aBorders[ $style->getBorders()->getHashCode() ] = $style->getBorders(); $aBorders[$style->getBorders()->getHashCode()] = $style->getBorders();
} }
} }
@ -690,7 +690,7 @@ class Style extends WriterPart
/** @var \PhpSpreadsheet\Style $style */ /** @var \PhpSpreadsheet\Style $style */
foreach ($aStyles as $style) { foreach ($aStyles as $style) {
if ($style->getNumberFormat()->getBuiltInFormatCode() === false && !array_key_exists($style->getNumberFormat()->getHashCode(), $aNumFmts)) { if ($style->getNumberFormat()->getBuiltInFormatCode() === false && !array_key_exists($style->getNumberFormat()->getHashCode(), $aNumFmts)) {
$aNumFmts[ $style->getNumberFormat()->getHashCode() ] = $style->getNumberFormat(); $aNumFmts[$style->getNumberFormat()->getHashCode()] = $style->getNumberFormat();
} }
} }

7
src/PhpSpreadsheet/Writer/Excel2007/Worksheet.php
View File

@ -707,7 +707,7 @@ class Worksheet extends WriterPart
// printOptions // printOptions
$objWriter->startElement('printOptions'); $objWriter->startElement('printOptions');
$objWriter->writeAttribute('gridLines', ($pSheet->getPrintGridlines() ? 'true': 'false')); $objWriter->writeAttribute('gridLines', ($pSheet->getPrintGridlines() ? 'true' : 'false'));
$objWriter->writeAttribute('gridLinesSet', 'true'); $objWriter->writeAttribute('gridLinesSet', 'true');
if ($pSheet->getPageSetup()->getHorizontalCentered()) { if ($pSheet->getPageSetup()->getHorizontalCentered()) {
@ -800,7 +800,7 @@ class Worksheet extends WriterPart
// Top 10 Filter Rule // Top 10 Filter Rule
$objWriter->writeAttribute('val', $rule->getValue()); $objWriter->writeAttribute('val', $rule->getValue());
$objWriter->writeAttribute('percent', (($rule->getOperator() === \PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) ? '1' : '0')); $objWriter->writeAttribute('percent', (($rule->getOperator() === \PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) ? '1' : '0'));
$objWriter->writeAttribute('top', (($rule->getGrouping() === \PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? '1': '0')); $objWriter->writeAttribute('top', (($rule->getGrouping() === \PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? '1' : '0'));
} else { } else {
// Filter, DateGroupItem or CustomFilter // Filter, DateGroupItem or CustomFilter
$objWriter->startElement($rule->getRuleType()); $objWriter->startElement($rule->getRuleType());
@ -1079,8 +1079,7 @@ class Worksheet extends WriterPart
break; break;
case 'f': // Formula case 'f': // Formula
$calculatedValue = ($this->getParentWriter()->getPreCalculateFormulas()) ? $calculatedValue = ($this->getParentWriter()->getPreCalculateFormulas()) ?
$pCell->getCalculatedValue() : $pCell->getCalculatedValue() : $cellValue;
$cellValue;
if (is_string($calculatedValue)) { if (is_string($calculatedValue)) {
$objWriter->writeAttribute('t', 'str'); $objWriter->writeAttribute('t', 'str');
} }

2
src/PhpSpreadsheet/Writer/Excel5/Worksheet.php
View File

@ -1158,7 +1158,7 @@ class Worksheet extends BIFFwriter
$dir_short_len . $dir_short_len .
$dir_short . $dir_short .
$unknown3 . $unknown3 .
$stream_len;/*. $stream_len; /*.
$dir_long_len . $dir_long_len .
$unknown4 . $unknown4 .
$dir_long . $dir_long .

8
src/PhpSpreadsheet/Writer/Excel5/Xf.php
View File

@ -167,16 +167,16 @@ class Xf
} }
// Flags to indicate if attributes have been set. // Flags to indicate if attributes have been set.
$atr_num = ($this->numberFormatIndex != 0)?1:0; $atr_num = ($this->numberFormatIndex != 0) ? 1 : 0;
$atr_fnt = ($this->fontIndex != 0)?1:0; $atr_fnt = ($this->fontIndex != 0) ? 1 : 0;
$atr_alc = ((int) $this->_style->getAlignment()->getWrapText()) ? 1 : 0; $atr_alc = ((int) $this->_style->getAlignment()->getWrapText()) ? 1 : 0;
$atr_bdr = (self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) || $atr_bdr = (self::mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) ||
self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) || self::mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) ||
self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()) || self::mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()) ||
self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()))?1:0; self::mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle())) ? 1 : 0;
$atr_pat = (($this->foregroundColor != 0x40) || $atr_pat = (($this->foregroundColor != 0x40) ||
($this->backgroundColor != 0x41) || ($this->backgroundColor != 0x41) ||
self::mapFillType($this->_style->getFill()->getFillType()))?1:0; self::mapFillType($this->_style->getFill()->getFillType())) ? 1 : 0;
$atr_prot = self::mapLocked($this->_style->getProtection()->getLocked()) $atr_prot = self::mapLocked($this->_style->getProtection()->getLocked())
| self::mapHidden($this->_style->getProtection()->getHidden()); | self::mapHidden($this->_style->getProtection()->getHidden());

2
src/PhpSpreadsheet/Writer/HTML.php
View File

@ -1580,7 +1580,7 @@ class HTML extends BaseWriter implements IWriter
if (!in_array($baseCell, $adjustedBaseCells)) { if (!in_array($baseCell, $adjustedBaseCells)) {
// subtract rowspan by 1 // subtract rowspan by 1
--$this->isBaseCell[$sheetIndex][ $baseCell[0] ][ $baseCell[1] ]['rowspan']; --$this->isBaseCell[$sheetIndex][$baseCell[0]][$baseCell[1]]['rowspan'];
$adjustedBaseCells[] = $baseCell; $adjustedBaseCells[] = $baseCell;
} }
} }