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

Fix some PHPCS errors

This commit is contained in:
Progi1984 2016-03-22 10:08:48 +01:00
parent 03f053bf77
commit 114fc00763
26 changed files with 103 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/PhpSpreadsheet/Calculation/MathTrig.php
View File

@ -1212,27 +1212,28 @@ class MathTrig
return $returnValue; return $returnValue;
} }
/** /**
* SUMIFS * SUMIFS
* *
* Counts the number of cells that contain numbers within the list of arguments * Counts the number of cells that contain numbers within the list of arguments
* *
* Excel Function: * Excel Function:
* SUMIFS(value1[,value2[, ...]],condition) * SUMIFS(value1[,value2[, ...]],condition)
* *
* @access public * @access public
* @category Mathematical and Trigonometric Functions * @category Mathematical and Trigonometric Functions
* @param mixed $arg,... Data values * @param mixed $arg,... Data values
* @param string $condition The criteria that defines which cells will be summed. * @param string $condition The criteria that defines which cells will be summed.
* @return float * @return float
*/ */
public static function SUMIFS() { public static function SUMIFS()
$arrayList = func_get_args(); {
$arrayList = func_get_args();
// Return value // Return value
$returnValue = 0; $returnValue = 0;
$sumArgs = Functions::flattenArray(array_shift($arrayList)); $sumArgs = Functions::flattenArray(array_shift($arrayList));
while (count($arrayList) > 0) { while (count($arrayList) > 0) {
$aArgsArray[] = Functions::flattenArray(array_shift($arrayList)); $aArgsArray[] = Functions::flattenArray(array_shift($arrayList));
@ -1256,9 +1257,9 @@ class MathTrig
} }
} }
// Return // Return
return $returnValue; return $returnValue;
} }
/** /**
* SUMPRODUCT * SUMPRODUCT

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

@ -634,7 +634,7 @@ class HTML
protected function cleanWhitespace() protected function cleanWhitespace()
{ {
foreach($this->richTextObject->getRichTextElements() as $key => $element) { foreach ($this->richTextObject->getRichTextElements() as $key => $element) {
$text = $element->getText(); $text = $element->getText();
// Trim any leading spaces on the first run // Trim any leading spaces on the first run
if ($key == 0) { if ($key == 0) {

32
src/PhpSpreadsheet/Reader/Excel5/Style/Border.php
View File

@ -2,25 +2,25 @@
namespace PHPExcel\Reader\Excel5\Style; namespace PHPExcel\Reader\Excel5\Style;
use \PHPExcel\Style\Border; use \PHPExcel\Style\Border as StyleBorder;
class Border class Border
{ {
protected static $map = array( protected static $map = array(
0x00 => Border::BORDER_NONE, 0x00 => StyleBorder::BORDER_NONE,
0x01 => Border::BORDER_THIN, 0x01 => StyleBorder::BORDER_THIN,
0x02 => Border::BORDER_MEDIUM, 0x02 => StyleBorder::BORDER_MEDIUM,
0x03 => Border::BORDER_DASHED, 0x03 => StyleBorder::BORDER_DASHED,
0x04 => Border::BORDER_DOTTED, 0x04 => StyleBorder::BORDER_DOTTED,
0x05 => Border::BORDER_THICK, 0x05 => StyleBorder::BORDER_THICK,
0x06 => Border::BORDER_DOUBLE, 0x06 => StyleBorder::BORDER_DOUBLE,
0x07 => Border::BORDER_HAIR, 0x07 => StyleBorder::BORDER_HAIR,
0x08 => Border::BORDER_MEDIUMDASHED, 0x08 => StyleBorder::BORDER_MEDIUMDASHED,
0x09 => Border::BORDER_DASHDOT, 0x09 => StyleBorder::BORDER_DASHDOT,
0x0A => Border::BORDER_MEDIUMDASHDOT, 0x0A => StyleBorder::BORDER_MEDIUMDASHDOT,
0x0B => Border::BORDER_DASHDOTDOT, 0x0B => StyleBorder::BORDER_DASHDOTDOT,
0x0C => Border::BORDER_MEDIUMDASHDOTDOT, 0x0C => StyleBorder::BORDER_MEDIUMDASHDOTDOT,
0x0D => Border::BORDER_SLANTDASHDOT, 0x0D => StyleBorder::BORDER_SLANTDASHDOT,
); );
/** /**
@ -35,6 +35,6 @@ class Border
if (isset(self::$map[$index])) { if (isset(self::$map[$index])) {
return self::$map[$index]; return self::$map[$index];
} }
return Border::BORDER_NONE; return StyleBorder::BORDER_NONE;
} }
} }

12
src/PhpSpreadsheet/Shared/CodePage.php
View File

@ -119,9 +119,9 @@ class CodePage
case 10003: case 10003:
return 'CP1361'; // Macintosh Korean return 'CP1361'; // Macintosh Korean
case 10004: case 10004:
return 'MACARABIC'; // Apple Arabic return 'MACARABIC'; // Apple Arabic
case 10005: case 10005:
return 'MACHEBREW'; // Apple Hebrew return 'MACHEBREW'; // Apple Hebrew
case 10006: case 10006:
return 'MACGREEK'; // Macintosh Greek return 'MACGREEK'; // Macintosh Greek
case 10007: case 10007:
@ -129,11 +129,11 @@ class CodePage
case 10008: case 10008:
return 'CP936'; // Macintosh - Simplified Chinese (GB 2312) return 'CP936'; // Macintosh - Simplified Chinese (GB 2312)
case 10010: case 10010:
return 'MACROMANIA'; // Macintosh Romania return 'MACROMANIA'; // Macintosh Romania
case 10017: case 10017:
return 'MACUKRAINE'; // Macintosh Ukraine return 'MACUKRAINE'; // Macintosh Ukraine
case 10021: case 10021:
return 'MACTHAI'; // Macintosh Thai return 'MACTHAI'; // Macintosh Thai
case 10029: case 10029:
return 'MACCENTRALEUROPE'; // Macintosh Central Europe return 'MACCENTRALEUROPE'; // Macintosh Central Europe
case 10079: case 10079:
@ -141,7 +141,7 @@ class CodePage
case 10081: case 10081:
return 'MACTURKISH'; // Macintosh Turkish return 'MACTURKISH'; // Macintosh Turkish
case 10082: case 10082:
return 'MACCROATIAN'; // Macintosh Croatian return 'MACCROATIAN'; // Macintosh Croatian
case 21010: case 21010:
return 'UTF-16LE'; // UTF-16 (BIFF8) This isn't correct, but some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE return 'UTF-16LE'; // UTF-16 (BIFF8) This isn't correct, but some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE
case 32768: case 32768:

3
src/PhpSpreadsheet/Shared/ZipArchive.php
View File

@ -154,7 +154,8 @@ class ZipArchive
return $contents; return $contents;
} }
public function getFromIndex($index) { public function getFromIndex($index)
{
$extracted = $this->zip->extractByIndex($index, PCLZIP_OPT_EXTRACT_AS_STRING); $extracted = $this->zip->extractByIndex($index, PCLZIP_OPT_EXTRACT_AS_STRING);
$contents = ''; $contents = '';
if ((is_array($extracted)) && ($extracted != 0)) { if ((is_array($extracted)) && ($extracted != 0)) {

4
src/PhpSpreadsheet/Spreadsheet.php
View File

@ -238,7 +238,7 @@ class Spreadsheet
{ {
$returnData = null; $returnData = null;
$what = strtolower($what); $what = strtolower($what);
switch ($what){ switch ($what) {
case 'all': case 'all':
$returnData = $this->ribbonXMLData; $returnData = $this->ribbonXMLData;
break; break;
@ -282,7 +282,7 @@ class Spreadsheet
{ {
$ReturnData = null; $ReturnData = null;
$What = strtolower($What); $What = strtolower($What);
switch($What) { switch ($What) {
case 'all': case 'all':
return $this->ribbonBinObjects; return $this->ribbonBinObjects;
break; break;

8
src/PhpSpreadsheet/Style/NumberFormat.php
View File

@ -447,11 +447,13 @@ class NumberFormat extends Supervisor implements \PHPExcel\IComparable
'h' => 'g' 'h' => 'g'
); );
private static function setLowercaseCallback($matches) { private static function setLowercaseCallback($matches)
{
return mb_strtolower($matches[0]); return mb_strtolower($matches[0]);
} }
private static function escapeQuotesCallback($matches) { private static function escapeQuotesCallback($matches)
{
return '\\' . implode('\\', str_split($matches[1])); return '\\' . implode('\\', str_split($matches[1]));
} }
@ -468,7 +470,7 @@ class NumberFormat extends Supervisor implements \PHPExcel\IComparable
// Only process the non-quoted blocks for date format characters // Only process the non-quoted blocks for date format characters
$blocks = explode('"', $format); $blocks = explode('"', $format);
foreach($blocks as $key => &$block) { foreach ($blocks as $key => &$block) {
if ($key % 2 == 0) { if ($key % 2 == 0) {
$block = strtr($block, self::$dateFormatReplacements); $block = strtr($block, self::$dateFormatReplacements);
if (!strpos($block, 'A')) { if (!strpos($block, 'A')) {

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

@ -146,7 +146,7 @@ class ContentTypes extends WriterPart
$mimeType = $this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType(); $mimeType = $this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType();
} }
if (!isset( $aMediaContentTypes[$extension])) { if (!isset($aMediaContentTypes[$extension])) {
$aMediaContentTypes[$extension] = $mimeType; $aMediaContentTypes[$extension] = $mimeType;
$this->writeDefaultContentType($objWriter, $extension, $mimeType); $this->writeDefaultContentType($objWriter, $extension, $mimeType);
@ -165,7 +165,7 @@ class ContentTypes extends WriterPart
for ($i = 0; $i < $sheetCount; ++$i) { for ($i = 0; $i < $sheetCount; ++$i) {
if (count($pPHPExcel->getSheet()->getHeaderFooter()->getImages()) > 0) { if (count($pPHPExcel->getSheet()->getHeaderFooter()->getImages()) > 0) {
foreach ($pPHPExcel->getSheet()->getHeaderFooter()->getImages() as $image) { foreach ($pPHPExcel->getSheet()->getHeaderFooter()->getImages() as $image) {
if (!isset( $aMediaContentTypes[strtolower($image->getExtension())])) { if (!isset($aMediaContentTypes[strtolower($image->getExtension())])) {
$aMediaContentTypes[strtolower($image->getExtension())] = $this->getImageMimeType($image->getPath()); $aMediaContentTypes[strtolower($image->getExtension())] = $this->getImageMimeType($image->getPath());
$this->writeDefaultContentType($objWriter, strtolower($image->getExtension()), $aMediaContentTypes[strtolower($image->getExtension())]); $this->writeDefaultContentType($objWriter, strtolower($image->getExtension()), $aMediaContentTypes[strtolower($image->getExtension())]);

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

@ -1,5 +1,7 @@
<?php <?php
namespace PHPExcel\Writer\Excel2007; namespace PHPExcel\Writer\Excel2007;
/** /**
* PHPExcel * PHPExcel
* *

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

@ -1,5 +1,6 @@
<?php <?php
namespace PHPExcel\Writer\Excel2007; namespace PHPExcel\Writer\Excel2007;
/** /**
* PHPExcel * PHPExcel
* *

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

@ -3233,7 +3233,8 @@ class Worksheet extends BIFFwriter
$dataBlockFont .= pack('C', 0x21); $dataBlockFont .= pack('C', 0x21);
$fontUnderline = 0; $fontUnderline = 0;
break; break;
default: $dataBlockFont .= pack('C', 0x00); default:
$dataBlockFont .= pack('C', 0x00);
$fontUnderline = 1; $fontUnderline = 1;
break; break;
} }

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

@ -1,5 +1,7 @@
<?php <?php
namespace PHPExcel\Writer;
/** /**
* PHPExcel_Writer_HTML * PHPExcel_Writer_HTML
* *
@ -25,7 +27,7 @@
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE## * @version ##VERSION##, ##DATE##
*/ */
class PHPExcel_Writer_HTML extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter class HTML extends BaseWriter implements IWriter
{ {
/** /**
* PHPExcel object * PHPExcel object

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

@ -1,5 +1,7 @@
<?php <?php
namespace PHPExcel\Writer;
/** /**
* PHPExcel_Writer_OpenDocument * PHPExcel_Writer_OpenDocument
* *
@ -25,7 +27,7 @@
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE## * @version ##VERSION##, ##DATE##
*/ */
class PHPExcel_Writer_OpenDocument extends PHPExcel_Writer_Abstract implements PHPExcel_Writer_IWriter class OpenDocument extends BaseWriter implements IWriter
{ {
/** /**
* Private writer parts * Private writer parts

5
src/PhpSpreadsheet/Writer/OpenDocument/Cell/Comment.php
View File

@ -1,4 +1,7 @@
<?php <?php
namespace PHPExcel\Writer\OpenDocument\Cell;
/** /**
* PHPExcel * PHPExcel
* *
@ -34,7 +37,7 @@
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @author Alexander Pervakov <frost-nzcr4@jagmort.com> * @author Alexander Pervakov <frost-nzcr4@jagmort.com>
*/ */
class PHPExcel_Writer_OpenDocument_Cell_Comment class Comment
{ {
public static function write(PHPExcel_Shared_XMLWriter $objWriter, PHPExcel_Cell $cell) public static function write(PHPExcel_Shared_XMLWriter $objWriter, PHPExcel_Cell $cell)
{ {

5
src/PhpSpreadsheet/Writer/OpenDocument/Content.php
View File

@ -1,4 +1,7 @@
<?php <?php
namespace PHPExcel\Writer\OpenDocument;
/** /**
* PHPExcel * PHPExcel
* *
@ -34,7 +37,7 @@
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @author Alexander Pervakov <frost-nzcr4@jagmort.com> * @author Alexander Pervakov <frost-nzcr4@jagmort.com>
*/ */
class PHPExcel_Writer_OpenDocument_Content extends PHPExcel_Writer_OpenDocument_WriterPart class Content extends WriterPart
{ {
const NUMBER_COLS_REPEATED_MAX = 1024; const NUMBER_COLS_REPEATED_MAX = 1024;
const NUMBER_ROWS_REPEATED_MAX = 1048576; const NUMBER_ROWS_REPEATED_MAX = 1048576;

4
src/PhpSpreadsheet/Writer/OpenDocument/Meta.php
View File

@ -1,5 +1,7 @@
<?php <?php
namespace PHPExcel\Writer\OpenDocument;
/** /**
* PHPExcel_Writer_OpenDocument_Meta * PHPExcel_Writer_OpenDocument_Meta
* *
@ -25,7 +27,7 @@
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE## * @version ##VERSION##, ##DATE##
*/ */
class PHPExcel_Writer_OpenDocument_Meta extends PHPExcel_Writer_OpenDocument_WriterPart class Meta extends WriterPart
{ {
/** /**
* Write meta.xml to XML format * Write meta.xml to XML format

4
src/PhpSpreadsheet/Writer/OpenDocument/MetaInf.php
View File

@ -1,5 +1,7 @@
<?php <?php
namespace PHPExcel\Writer\OpenDocument;
/** /**
* PHPExcel_Writer_OpenDocument_MetaInf * PHPExcel_Writer_OpenDocument_MetaInf
* *
@ -25,7 +27,7 @@
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE## * @version ##VERSION##, ##DATE##
*/ */
class PHPExcel_Writer_OpenDocument_MetaInf extends PHPExcel_Writer_OpenDocument_WriterPart class MetaInf extends WriterPart
{ {
/** /**
* Write META-INF/manifest.xml to XML format * Write META-INF/manifest.xml to XML format

4
src/PhpSpreadsheet/Writer/OpenDocument/Mimetype.php
View File

@ -1,5 +1,7 @@
<?php <?php
namespace PHPExcel\Writer\OpenDocument;
/** /**
* PHPExcel * PHPExcel
* *
@ -25,7 +27,7 @@
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE## * @version ##VERSION##, ##DATE##
*/ */
class PHPExcel_Writer_OpenDocument_Mimetype extends PHPExcel_Writer_OpenDocument_WriterPart class Mimetype extends WriterPart
{ {
/** /**
* Write mimetype to plain text format * Write mimetype to plain text format

4
src/PhpSpreadsheet/Writer/OpenDocument/Settings.php
View File

@ -1,5 +1,7 @@
<?php <?php
namespace PHPExcel\Writer\OpenDocument;
/** /**
* PHPExcel_Writer_OpenDocument_Settings * PHPExcel_Writer_OpenDocument_Settings
* *
@ -25,7 +27,7 @@
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE## * @version ##VERSION##, ##DATE##
*/ */
class PHPExcel_Writer_OpenDocument_Settings extends PHPExcel_Writer_OpenDocument_WriterPart class Settings extends WriterPart
{ {
/** /**
* Write settings.xml to XML format * Write settings.xml to XML format

4
src/PhpSpreadsheet/Writer/OpenDocument/Styles.php
View File

@ -1,5 +1,7 @@
<?php <?php
namespace PHPExcel\Writer\OpenDocument;
/** /**
* PHPExcel_Writer_OpenDocument_Styles * PHPExcel_Writer_OpenDocument_Styles
* *
@ -25,7 +27,7 @@
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE## * @version ##VERSION##, ##DATE##
*/ */
class PHPExcel_Writer_OpenDocument_Styles extends PHPExcel_Writer_OpenDocument_WriterPart class Styles extends WriterPart
{ {
/** /**
* Write styles.xml to XML format * Write styles.xml to XML format

4
src/PhpSpreadsheet/Writer/OpenDocument/Thumbnails.php
View File

@ -1,5 +1,7 @@
<?php <?php
namespace PHPExcel\Writer\OpenDocument;
/** /**
* PHPExcel_Writer_OpenDocument_Thumbnails * PHPExcel_Writer_OpenDocument_Thumbnails
* *
@ -25,7 +27,7 @@
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE## * @version ##VERSION##, ##DATE##
*/ */
class PHPExcel_Writer_OpenDocument_Thumbnails extends PHPExcel_Writer_OpenDocument_WriterPart class Thumbnails extends WriterPart
{ {
/** /**
* Write Thumbnails/thumbnail.png to PNG format * Write Thumbnails/thumbnail.png to PNG format

4
src/PhpSpreadsheet/Writer/OpenDocument/WriterPart.php
View File

@ -1,5 +1,7 @@
<?php <?php
namespace PHPExcel\Writer\OpenDocument;
/** /**
* PHPExcel_Writer_OpenDocument_WriterPart * PHPExcel_Writer_OpenDocument_WriterPart
* *
@ -25,6 +27,6 @@
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE## * @version ##VERSION##, ##DATE##
*/ */
abstract class PHPExcel_Writer_OpenDocument_WriterPart extends \PHPExcel\Writer\Excel2007\WriterPart abstract class WriterPart extends \PHPExcel\Writer\Excel2007\WriterPart
{ {
} }