Skip to content

Commit

Permalink
Fix code style
Browse files Browse the repository at this point in the history
  • Loading branch information
PowerKiKi committed Nov 17, 2019
1 parent 157b6e7 commit 5ec0e33
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/PhpSpreadsheet/Calculation/Calculation.php
Original file line number Diff line number Diff line change
Expand Up @@ -4786,6 +4786,7 @@ private function getTokensAsString($tokens)

return $value;
}, $tokens);

return '[ ' . implode(' | ', $tokensStr) . ' ]';
}
}
2 changes: 2 additions & 0 deletions src/PhpSpreadsheet/IOFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public static function createWriter(Spreadsheet $spreadsheet, $writerType)

// Instantiate writer
$className = self::$writers[$writerType];

return new $className($spreadsheet);
}

Expand All @@ -72,6 +73,7 @@ public static function createReader($readerType)

// Instantiate reader
$className = self::$readers[$readerType];

return new $className();
}

Expand Down
1 change: 1 addition & 0 deletions src/PhpSpreadsheet/Reader/Xml.php
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ protected static function widthUnits2Pixel($widthUnits)
{
$pixels = ($widthUnits / 256) * 7;
$offsetWidthUnits = $widthUnits % 256;

return $pixels + round($offsetWidthUnits / (256 / 7));
}

Expand Down
1 change: 1 addition & 0 deletions src/PhpSpreadsheet/Worksheet/Worksheet.php
Original file line number Diff line number Diff line change
Expand Up @@ -2912,6 +2912,7 @@ public function shrinkRangeToFit($range)
$rangeSet = $rangeBoundaries[0][0] . $rangeBoundaries[0][1] . ':' . $rangeBoundaries[1][0] . $rangeBoundaries[1][1];
}
unset($rangeSet);

return implode(' ', $rangeBlocks);
}

Expand Down
1 change: 1 addition & 0 deletions src/PhpSpreadsheet/Writer/Html.php
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,7 @@ private function createCSSStyleBorder(Border $pStyle)
{
// Create CSS - add !important to non-none border styles for merged cells
$borderStyle = $this->mapBorderStyle($pStyle->getBorderStyle());

return $borderStyle . ' #' . $pStyle->getColor()->getRGB() . (($borderStyle == 'none') ? '' : ' !important');
}

Expand Down
2 changes: 2 additions & 0 deletions src/PhpSpreadsheet/Writer/Xls/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -1161,12 +1161,14 @@ private function expression()
// catch "-" Term
$this->advance();
$result2 = $this->expression();

return $this->createTree('ptgUminus', $result2, '');
// If it's a positive value
} elseif ($this->currentToken == '+') {
// catch "+" Term
$this->advance();
$result2 = $this->expression();

return $this->createTree('ptgUplus', $result2, '');
}
$result = $this->term();
Expand Down

0 comments on commit 5ec0e33

Please sign in to comment.