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

PSR-2 : Fixes

This commit is contained in:
Progi1984 2015-05-12 14:01:22 +02:00
parent 2896d62e08
commit 5bb747f8cc
7 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Classes/PHPExcel/Cell/AdvancedValueBinder.php
View File

@ -113,9 +113,9 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
if (preg_match('/^'.preg_quote($currencyCode).' *(\d{1,3}('.preg_quote($thousandsSeparator).'\d{3})*|(\d+))('.preg_quote($decimalSeparator).'\d{2})?$/', $value)) { if (preg_match('/^'.preg_quote($currencyCode).' *(\d{1,3}('.preg_quote($thousandsSeparator).'\d{3})*|(\d+))('.preg_quote($decimalSeparator).'\d{2})?$/', $value)) {
// Convert value to number // Convert value to number
$value = (float) trim(str_replace(array($currencyCode, $thousandsSeparator, $decimalSeparator), array('', '', '.'), $value)); $value = (float) trim(str_replace(array($currencyCode, $thousandsSeparator, $decimalSeparator), array('', '', '.'), $value));
$cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC); $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
// Set style // Set style
$cell->getWorksheet()->getStyle( $cell->getCoordinate() ) $cell->getWorksheet()->getStyle($cell->getCoordinate())
->getNumberFormat()->setFormatCode( ->getNumberFormat()->setFormatCode(
str_replace('$', $currencyCode, PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE) str_replace('$', $currencyCode, PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE)
); );
@ -123,9 +123,9 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
} elseif (preg_match('/^\$ *(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?$/', $value)) { } elseif (preg_match('/^\$ *(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?$/', $value)) {
// Convert value to number // Convert value to number
$value = (float) trim(str_replace(array('$',','), '', $value)); $value = (float) trim(str_replace(array('$',','), '', $value));
$cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC); $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
// Set style // Set style
$cell->getWorksheet()->getStyle( $cell->getCoordinate() ) $cell->getWorksheet()->getStyle($cell->getCoordinate())
->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE); ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE);
return true; return true;
} }
@ -137,7 +137,7 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
$days = $h / 24 + $m / 1440; $days = $h / 24 + $m / 1440;
$cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC); $cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC);
// Set style // Set style
$cell->getWorksheet()->getStyle( $cell->getCoordinate() ) $cell->getWorksheet()->getStyle($cell->getCoordinate())
->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3); ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3);
return true; return true;
} }
@ -150,7 +150,7 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
// Convert value to number // Convert value to number
$cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC); $cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC);
// Set style // Set style
$cell->getWorksheet()->getStyle( $cell->getCoordinate() ) $cell->getWorksheet()->getStyle($cell->getCoordinate())
->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4); ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4);
return true; return true;
} }
@ -165,7 +165,7 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
} else { } else {
$formatCode = 'yyyy-mm-dd'; $formatCode = 'yyyy-mm-dd';
} }
$cell->getWorksheet()->getStyle( $cell->getCoordinate() ) $cell->getWorksheet()->getStyle($cell->getCoordinate())
->getNumberFormat()->setFormatCode($formatCode); ->getNumberFormat()->setFormatCode($formatCode);
return true; return true;
} }

3
Classes/PHPExcel/Cell/DataValidation.php
View File

@ -191,7 +191,8 @@ class PHPExcel_Cell_DataValidation
* *
* @return string * @return string
*/ */
public function getFormula2() { public function getFormula2()
{
return $this->formula2; return $this->formula2;
} }

36
Classes/PHPExcel/Chart/Axis.php
View File

@ -176,9 +176,7 @@ class PHPExcel_Chart_Axis extends PHPExcel_Chart_Properties
* @param string $minor_unit * @param string $minor_unit
* *
*/ */
public function setAxisOptionsProperties($axis_labels, $horizontal_crosses_value = null, $horizontal_crosses = null, public function setAxisOptionsProperties($axis_labels, $horizontal_crosses_value = null, $horizontal_crosses = null, $axis_orientation = null, $major_tmt = null, $minor_tmt = null, $minimum = null, $maximum = null, $major_unit = null, $minor_unit = null)
$axis_orientation = null, $major_tmt = null, $minor_tmt = null, $minimum = null, $maximum = null, $major_unit = null,
$minor_unit = null)
{ {
$this->_axis_options['axis_labels'] = (string) $axis_labels; $this->_axis_options['axis_labels'] = (string) $axis_labels;
($horizontal_crosses_value !== null) ($horizontal_crosses_value !== null)
@ -201,7 +199,8 @@ class PHPExcel_Chart_Axis extends PHPExcel_Chart_Properties
* *
* @return string * @return string
*/ */
public function getAxisOptionsProperty($property) { public function getAxisOptionsProperty($property)
{
return $this->_axis_options[$property]; return $this->_axis_options[$property];
} }
@ -211,7 +210,8 @@ class PHPExcel_Chart_Axis extends PHPExcel_Chart_Properties
* @param string $orientation * @param string $orientation
* *
*/ */
public function setAxisOrientation($orientation) { public function setAxisOrientation($orientation)
{
$this->orientation = (string) $orientation; $this->orientation = (string) $orientation;
} }
@ -223,7 +223,8 @@ class PHPExcel_Chart_Axis extends PHPExcel_Chart_Properties
* @param string $type * @param string $type
* *
*/ */
public function setFillParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB) { public function setFillParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB)
{
$this->_fill_properties = $this->setColorProperties($color, $alpha, $type); $this->_fill_properties = $this->setColorProperties($color, $alpha, $type);
} }
@ -235,7 +236,8 @@ class PHPExcel_Chart_Axis extends PHPExcel_Chart_Properties
* @param string $type * @param string $type
* *
*/ */
public function setLineParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB) { public function setLineParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB)
{
$this->_line_properties = $this->setColorProperties($color, $alpha, $type); $this->_line_properties = $this->setColorProperties($color, $alpha, $type);
} }
@ -246,7 +248,8 @@ class PHPExcel_Chart_Axis extends PHPExcel_Chart_Properties
* *
* @return string * @return string
*/ */
public function getFillProperty($property) { public function getFillProperty($property)
{
return $this->_fill_properties[$property]; return $this->_fill_properties[$property];
} }
@ -257,7 +260,8 @@ class PHPExcel_Chart_Axis extends PHPExcel_Chart_Properties
* *
* @return string * @return string
*/ */
public function getLineProperty($property) { public function getLineProperty($property)
{
return $this->_line_properties[$property]; return $this->_line_properties[$property];
} }
@ -276,10 +280,7 @@ class PHPExcel_Chart_Axis extends PHPExcel_Chart_Properties
* *
*/ */
public function setLineStyleProperties($line_width = null, $compound_type = null, public function setLineStyleProperties($line_width = null, $compound_type = null, $dash_type = null, $cap_type = null, $join_type = null, $head_arrow_type = null, $head_arrow_size = null, $end_arrow_type = null, $end_arrow_size = null) {
$dash_type = null, $cap_type = null, $join_type = null, $head_arrow_type = null,
$head_arrow_size = null, $end_arrow_type = null, $end_arrow_size = null) {
(!is_null($line_width)) ? $this->_line_style_properties['width'] = $this->getExcelPointsWidth((float) $line_width) (!is_null($line_width)) ? $this->_line_style_properties['width'] = $this->getExcelPointsWidth((float) $line_width)
: null; : null;
(!is_null($compound_type)) ? $this->_line_style_properties['compound'] = (string) $compound_type : null; (!is_null($compound_type)) ? $this->_line_style_properties['compound'] = (string) $compound_type : null;
@ -304,7 +305,8 @@ class PHPExcel_Chart_Axis extends PHPExcel_Chart_Properties
* @return string * @return string
*/ */
public function getLineStyleProperty($elements) { public function getLineStyleProperty($elements)
{
return $this->getArrayElementsValue($this->_line_style_properties, $elements); return $this->getArrayElementsValue($this->_line_style_properties, $elements);
} }
@ -316,7 +318,8 @@ class PHPExcel_Chart_Axis extends PHPExcel_Chart_Properties
* @return string * @return string
*/ */
public function getLineStyleArrowWidth($arrow) { public function getLineStyleArrowWidth($arrow)
{
return $this->getLineStyleArrowSize($this->_line_style_properties['arrow'][$arrow]['size'], 'w'); return $this->getLineStyleArrowSize($this->_line_style_properties['arrow'][$arrow]['size'], 'w');
} }
@ -328,7 +331,8 @@ class PHPExcel_Chart_Axis extends PHPExcel_Chart_Properties
* @return string * @return string
*/ */
public function getLineStyleArrowLength($arrow) { public function getLineStyleArrowLength($arrow)
{
return $this->getLineStyleArrowSize($this->_line_style_properties['arrow'][$arrow]['size'], 'len'); return $this->getLineStyleArrowSize($this->_line_style_properties['arrow'][$arrow]['size'], 'len');
} }

1
Classes/PHPExcel/IComparable.php
View File

@ -31,5 +31,4 @@ interface PHPExcel_IComparable
* @return string Hash code * @return string Hash code
*/ */
public function getHashCode(); public function getHashCode();
} }

64
Classes/PHPExcel/Writer/Excel5/Worksheet.php
View File

@ -432,8 +432,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// FONT Index // FONT Index
if ($element instanceof PHPExcel_RichText_Run) { if ($element instanceof PHPExcel_RichText_Run) {
$str_fontidx = $this->_fntHashIndex[$element->getFont()->getHashCode()]; $str_fontidx = $this->_fntHashIndex[$element->getFont()->getHashCode()];
} } else {
else {
$str_fontidx = 0; $str_fontidx = 0;
} }
$arrcRun[] = array('strlen' => $str_pos, 'fontidx' => $str_fontidx); $arrcRun[] = array('strlen' => $str_pos, 'fontidx' => $str_fontidx);
@ -573,12 +572,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$firstCellCoordinates = PHPExcel_Cell::coordinateFromString($firstCell); // e.g. array(0, 1) $firstCellCoordinates = PHPExcel_Cell::coordinateFromString($firstCell); // e.g. array(0, 1)
$lastCellCoordinates = PHPExcel_Cell::coordinateFromString($lastCell); // e.g. array(1, 6) $lastCellCoordinates = PHPExcel_Cell::coordinateFromString($lastCell); // e.g. array(1, 6)
return(pack('vvvv', return pack('vvvv', $firstCellCoordinates[1] - 1, $lastCellCoordinates[1] - 1, PHPExcel_Cell::columnIndexFromString($firstCellCoordinates[0]) - 1, PHPExcel_Cell::columnIndexFromString($lastCellCoordinates[0]) - 1);
$firstCellCoordinates[1] - 1,
$lastCellCoordinates[1] - 1,
PHPExcel_Cell::columnIndexFromString($firstCellCoordinates[0]) - 1,
PHPExcel_Cell::columnIndexFromString($lastCellCoordinates[0]) - 1
));
} }
/** /**
@ -632,7 +626,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
if ($this->_outline_on) { if ($this->_outline_on) {
$this->_outline_on = 1; $this->_outline_on = 1;
} }
} }
/** /**
* Write a double to the specified row and column (zero indexed). * Write a double to the specified row and column (zero indexed).
@ -907,7 +901,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// Strip the '=' or '@' sign at the beginning of the formula string // Strip the '=' or '@' sign at the beginning of the formula string
if ($formula{0} == '=') { if ($formula{0} == '=') {
$formula = substr($formula,1); $formula = substr($formula, 1);
} else { } else {
// Error handling // Error handling
$this->_writeString($row, $col, 'Unrecognised character for formula'); $this->_writeString($row, $col, 'Unrecognised character for formula');
@ -922,7 +916,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$formlen = strlen($formula); // Length of the binary string $formlen = strlen($formula); // Length of the binary string
$length = 0x16 + $formlen; // Length of the record data $length = 0x16 + $formlen; // Length of the record data
$header = pack("vv", $record, $length); $header = pack("vv", $record, $length);
$data = pack("vvv", $row, $col, $xfIndex) $data = pack("vvv", $row, $col, $xfIndex)
. $num . $num
@ -1048,7 +1042,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$length = 0x34 + strlen($url); $length = 0x34 + strlen($url);
// Pack the header data // Pack the header data
$header = pack("vv", $record, $length); $header = pack("vv", $record, $length);
$data = pack("vvvv", $row1, $row2, $col1, $col2); $data = pack("vvvv", $row1, $row2, $col1, $col2);
// Write the packed data // Write the packed data
@ -1097,7 +1091,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$length = 0x24 + strlen($url); $length = 0x24 + strlen($url);
// Pack the header data // Pack the header data
$header = pack("vv", $record, $length); $header = pack("vv", $record, $length);
$data = pack("vvvv", $row1, $row2, $col1, $col2); $data = pack("vvvv", $row1, $row2, $col1, $col2);
// Write the packed data // Write the packed data
@ -1173,15 +1167,15 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$dir_long = $dir_long . "\0"; $dir_long = $dir_long . "\0";
// Pack the lengths of the dir strings // Pack the lengths of the dir strings
$dir_short_len = pack("V", strlen($dir_short) ); $dir_short_len = pack("V", strlen($dir_short));
$dir_long_len = pack("V", strlen($dir_long) ); $dir_long_len = pack("V", strlen($dir_long));
$stream_len = pack("V", 0);//strlen($dir_long) + 0x06); $stream_len = pack("V", 0); //strlen($dir_long) + 0x06);
// Pack the undocumented parts of the hyperlink stream // Pack the undocumented parts of the hyperlink stream
$unknown1 = pack("H*",'D0C9EA79F9BACE118C8200AA004BA90B02000000' ); $unknown1 = pack("H*", 'D0C9EA79F9BACE118C8200AA004BA90B02000000');
$unknown2 = pack("H*",'0303000000000000C000000000000046' ); $unknown2 = pack("H*", '0303000000000000C000000000000046');
$unknown3 = pack("H*",'FFFFADDE000000000000000000000000000000000000000'); $unknown3 = pack("H*", 'FFFFADDE000000000000000000000000000000000000000');
$unknown4 = pack("v", 0x03 ); $unknown4 = pack("v", 0x03);
// Pack the main data stream // Pack the main data stream
$data = pack("vvvv", $row1, $row2, $col1, $col2) . $data = pack("vvvv", $row1, $row2, $col1, $col2) .
@ -1230,7 +1224,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$grbit = 0x0000; // Option flags $grbit = 0x0000; // Option flags
$ixfe = $xfIndex; $ixfe = $xfIndex;
if ($height < 0 ) { if ($height < 0) {
$height = null; $height = null;
} }
@ -1259,9 +1253,8 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
} }
$grbit |= 0x0100; $grbit |= 0x0100;
$header = pack("vv", $record, $length); $header = pack("vv", $record, $length);
$data = pack("vvvvvvvv", $row, $colMic, $colMac, $miyRw, $data = pack("vvvvvvvv", $row, $colMic, $colMac, $miyRw, $irwMac,$reserved, $grbit, $ixfe);
$irwMac,$reserved, $grbit, $ixfe);
$this->_append($header.$data); $this->_append($header.$data);
} }
@ -1325,7 +1318,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
// FIXME !!! // FIXME !!!
$rgbHdr = 0x0040; // Row/column heading and gridline color index $rgbHdr = 0x0040; // Row/column heading and gridline color index
$zoom_factor_page_break = ($fPageBreakPreview? $this->_phpSheet->getSheetView()->getZoomScale() : 0x0000); $zoom_factor_page_break = ($fPageBreakPreview ? $this->_phpSheet->getSheetView()->getZoomScale() : 0x0000);
$zoom_factor_normal = $this->_phpSheet->getSheetView()->getZoomScaleNormal(); $zoom_factor_normal = $this->_phpSheet->getSheetView()->getZoomScaleNormal();
$data .= pack("vvvvV", $rgbHdr, 0x0000, $zoom_factor_page_break, $zoom_factor_normal, 0x00000000); $data .= pack("vvvvV", $rgbHdr, 0x0000, $zoom_factor_page_break, $zoom_factor_normal, 0x00000000);
@ -1423,9 +1416,8 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$level = max(0, min($level, 7)); $level = max(0, min($level, 7));
$grbit |= $level << 8; $grbit |= $level << 8;
$header = pack("vv", $record, $length); $header = pack("vv", $record, $length);
$data = pack("vvvvvv", $colFirst, $colLast, $coldx, $data = pack("vvvvvv", $colFirst, $colLast, $coldx, $ixfe, $grbit, $reserved);
$ixfe, $grbit, $reserved);
$this->_append($header.$data); $this->_append($header.$data);
} }
@ -1554,14 +1546,14 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
} }
$recordData = pack( $recordData = pack(
'vvVVVvv' 'vvVVVvv',
, 0x0862 0x0862,
, 0x0000 // unused 0x0000, // unused
, 0x00000000 // unused 0x00000000, // unused
, 0x00000000 // unused 0x00000000, // unused
, 0x00000014 // size of record data 0x00000014, // size of record data
, $this->_colors[$this->_phpSheet->getTabColor()->getRGB()] // color index $this->_colors[$this->_phpSheet->getTabColor()->getRGB()], // color index
, 0x0000 // unused 0x0000 // unused
); );
$length = strlen($recordData); $length = strlen($recordData);

12
Classes/PHPExcel/Writer/Excel5/Xf.php
View File

@ -491,7 +491,8 @@ class PHPExcel_Writer_Excel5_Xf
* @param string $vAlign * @param string $vAlign
* @return int * @return int
*/ */
private static function _mapVAlign($vAlign) { private static function _mapVAlign($vAlign)
{
if (isset(self::$_mapVAlign[$vAlign])) { if (isset(self::$_mapVAlign[$vAlign])) {
return self::$_mapVAlign[$vAlign]; return self::$_mapVAlign[$vAlign];
} }
@ -504,7 +505,8 @@ class PHPExcel_Writer_Excel5_Xf
* @param int $textRotation * @param int $textRotation
* @return int * @return int
*/ */
private static function _mapTextRotation($textRotation) { private static function _mapTextRotation($textRotation)
{
if ($textRotation >= 0) { if ($textRotation >= 0) {
return $textRotation; return $textRotation;
} }
@ -522,7 +524,8 @@ class PHPExcel_Writer_Excel5_Xf
* @param string * @param string
* @return int * @return int
*/ */
private static function _mapLocked($locked) { private static function _mapLocked($locked)
{
switch ($locked) { switch ($locked) {
case PHPExcel_Style_Protection::PROTECTION_INHERIT: case PHPExcel_Style_Protection::PROTECTION_INHERIT:
return 1; return 1;
@ -541,7 +544,8 @@ class PHPExcel_Writer_Excel5_Xf
* @param string * @param string
* @return int * @return int
*/ */
private static function _mapHidden($hidden) { private static function _mapHidden($hidden)
{
switch ($hidden) { switch ($hidden) {
case PHPExcel_Style_Protection::PROTECTION_INHERIT: case PHPExcel_Style_Protection::PROTECTION_INHERIT:
return 0; return 0;

2
Classes/PHPExcel/Writer/HTML.php
View File

@ -944,7 +944,7 @@ class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_
$css['vertical-align'] = $this->_mapVAlign($pStyle->getVertical()); $css['vertical-align'] = $this->_mapVAlign($pStyle->getVertical());
if ($textAlign = $this->_mapHAlign($pStyle->getHorizontal())) { if ($textAlign = $this->_mapHAlign($pStyle->getHorizontal())) {
$css['text-align'] = $textAlign; $css['text-align'] = $textAlign;
if (in_array($textAlign,array('left', 'right'))) { if (in_array($textAlign, array('left', 'right'))) {
$css['padding-'.$textAlign] = (string)((int)$pStyle->getIndent() * 9).'px'; $css['padding-'.$textAlign] = (string)((int)$pStyle->getIndent() * 9).'px';
} }
} }