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

PSR2 Fixes

This commit is contained in:
Progi1984 2015-05-17 18:10:35 +02:00
parent 09352e3e80
commit 576effef30
7 changed files with 8379 additions and 8382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Classes/PHPExcel/Reader/Excel5.php
View File

@ -1764,7 +1764,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
// move stream pointer to next record // move stream pointer to next record
$this->_pos += 4 + $length; $this->_pos += 4 + $length;
if (!$this->_verifyPassword('VelvetSweatshop', substr($recordData, 6, 16), substr($recordData, 22, 16), substr($recordData, 38, 16), $this->_md5Ctxt)) { if (!$this->_verifyPassword('VelvetSweatshop', substr($recordData, 6, 16), substr($recordData, 22, 16), substr($recordData, 38, 16), $this->_md5Ctxt)) {
throw new PHPExcel_Reader_Exception('Decryption password incorrect'); throw new PHPExcel_Reader_Exception('Decryption password incorrect');
} }
@ -1960,19 +1960,19 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
$objFont->setSize($size / 20); $objFont->setSize($size / 20);
// offset: 2; size: 2; option flags // offset: 2; size: 2; option flags
// bit: 0; mask 0x0001; bold (redundant in BIFF5-BIFF8) // bit: 0; mask 0x0001; bold (redundant in BIFF5-BIFF8)
// bit: 1; mask 0x0002; italic // bit: 1; mask 0x0002; italic
$isItalic = (0x0002 & self::_GetInt2d($recordData, 2)) >> 1; $isItalic = (0x0002 & self::_GetInt2d($recordData, 2)) >> 1;
if ($isItalic) { if ($isItalic) {
$objFont->setItalic(true); $objFont->setItalic(true);
} }
// bit: 2; mask 0x0004; underlined (redundant in BIFF5-BIFF8) // bit: 2; mask 0x0004; underlined (redundant in BIFF5-BIFF8)
// bit: 3; mask 0x0008; strike // bit: 3; mask 0x0008; strike
$isStrike = (0x0008 & self::_GetInt2d($recordData, 2)) >> 3; $isStrike = (0x0008 & self::_GetInt2d($recordData, 2)) >> 3;
if ($isStrike) { if ($isStrike) {
$objFont->setStrikethrough(true); $objFont->setStrikethrough(true);
} }
// offset: 4; size: 2; colour index // offset: 4; size: 2; colour index
$colorIndex = self::_GetInt2d($recordData, 4); $colorIndex = self::_GetInt2d($recordData, 4);
@ -5184,7 +5184,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
break; break;
case 0x02: // Windows metafile or Macintosh PICT format case 0x02: // Windows metafile or Macintosh PICT format
case 0x0e: // native format case 0x0e: // native format
default; default:
break; break;
} }
@ -7471,10 +7471,10 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce
$value = $mantissa / pow(2, (20 - $exp)); $value = $mantissa / pow(2, (20 - $exp));
if ($mantissalow1 != 0) { if ($mantissalow1 != 0) {
$value += 1 / pow (2, (21 - $exp)); $value += 1 / pow(2, (21 - $exp));
} }
$value += $mantissalow2 / pow (2, (52 - $exp)); $value += $mantissalow2 / pow(2, (52 - $exp));
if ($sign) { if ($sign) {
$value *= -1; $value *= -1;
} }

6
Classes/PHPExcel/Reader/OOCalc.php
View File

@ -557,9 +557,9 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
} }
break; break;
case 'boolean': case 'boolean':
$type = PHPExcel_Cell_DataType::TYPE_BOOL; $type = PHPExcel_Cell_DataType::TYPE_BOOL;
$dataValue = ($allCellDataText == 'TRUE') ? true : false; $dataValue = ($allCellDataText == 'TRUE') ? true : false;
break; break;
case 'percentage': case 'percentage':
$type = PHPExcel_Cell_DataType::TYPE_NUMERIC; $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
$dataValue = (float) $cellDataOfficeAttributes['value']; $dataValue = (float) $cellDataOfficeAttributes['value'];

8
Classes/PHPExcel/Shared/JAMA/Matrix.php
View File

@ -198,10 +198,14 @@ class PHPExcel_Shared_JAMA_Matrix
case 'integer,integer,integer,integer': case 'integer,integer,integer,integer':
list($i0, $iF, $j0, $jF) = $args; list($i0, $iF, $j0, $jF) = $args;
if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) { if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) {
$m = $iF - $i0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); $m = $iF - $i0;
} else {
throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException);
} }
if (($jF > $j0) && ($this->n >= $jF) && ($j0 >= 0)) { if (($jF > $j0) && ($this->n >= $jF) && ($j0 >= 0)) {
$n = $jF - $j0; } else { throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException); $n = $jF - $j0;
} else {
throw new PHPExcel_Calculation_Exception(self::ArgumentBoundsException);
} }
$R = new PHPExcel_Shared_JAMA_Matrix($m+1, $n+1); $R = new PHPExcel_Shared_JAMA_Matrix($m+1, $n+1);
for ($i = $i0; $i <= $iF; ++$i) { for ($i = $i0; $i <= $iF; ++$i) {

20
unitTests/bootstrap.php
View File

@ -17,21 +17,21 @@ date_default_timezone_set('Europe/London');
// Define path to application directory // Define path to application directory
defined('APPLICATION_PATH') defined('APPLICATION_PATH')
|| define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../Classes')); || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../Classes'));
// Define path to application tests directory // Define path to application tests directory
defined('APPLICATION_TESTS_PATH') defined('APPLICATION_TESTS_PATH')
|| define('APPLICATION_TESTS_PATH', realpath(dirname(__FILE__) )); || define('APPLICATION_TESTS_PATH', realpath(dirname(__FILE__)));
// Define application environment // Define application environment
defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'ci'); defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'ci');
// Ensure library/ is on include_path // Ensure library/ is on include_path
set_include_path(implode(PATH_SEPARATOR, array( set_include_path(implode(PATH_SEPARATOR, array(
realpath(APPLICATION_PATH . '/../Classes'), realpath(APPLICATION_PATH . '/../Classes'),
'./', './',
dirname(__FILE__), dirname(__FILE__),
get_include_path(), get_include_path(),
))); )));
@ -41,9 +41,9 @@ set_include_path(implode(PATH_SEPARATOR, array(
*/ */
echo "PHPExcel tests beginning\n"; echo "PHPExcel tests beginning\n";
if(extension_loaded('xdebug')) { if (extension_loaded('xdebug')) {
echo "Xdebug extension loaded and running\n"; echo "Xdebug extension loaded and running\n";
xdebug_enable(); xdebug_enable();
} else { } else {
echo 'Xdebug not found, you should run the following at the command line: echo "zend_extension=/usr/lib64/php/modules/xdebug.so" > /etc/php.d/xdebug.ini' . "\n"; echo 'Xdebug not found, you should run the following at the command line: echo "zend_extension=/usr/lib64/php/modules/xdebug.so" > /etc/php.d/xdebug.ini' . "\n";
} }

195
unitTests/custom/Complex.php
View File

@ -1,114 +1,115 @@
<?php <?php
class Complex { class Complex
{
private $realPart = 0;
private $imaginaryPart = 0;
private $suffix = null;
private $realPart = 0; public static function _parseComplex($complexNumber)
private $imaginaryPart = 0; {
private $suffix = NULL; // Test for real number, with no imaginary part
if (is_numeric($complexNumber)) {
return array($complexNumber, 0, null);
}
public static function _parseComplex($complexNumber) // Fix silly human errors
{ if (strpos($complexNumber, '+-') !== false) {
// Test for real number, with no imaginary part $complexNumber = str_replace('+-', '-', $complexNumber);
if (is_numeric($complexNumber)) }
return array( $complexNumber, 0, NULL ); if (strpos($complexNumber, '++') !== false) {
$complexNumber = str_replace('++', '+', $complexNumber);
}
if (strpos($complexNumber, '--') !== false) {
$complexNumber = str_replace('--', '-', $complexNumber);
}
// Fix silly human errors // Basic validation of string, to parse out real and imaginary parts, and any suffix
if (strpos($complexNumber,'+-') !== FALSE) $validComplex = preg_match('/^([\-\+]?(\d+\.?\d*|\d*\.?\d+)([Ee][\-\+]?[0-2]?\d{1,3})?)([\-\+]?(\d+\.?\d*|\d*\.?\d+)([Ee][\-\+]?[0-2]?\d{1,3})?)?(([\-\+]?)([ij]?))$/ui', $complexNumber, $complexParts);
$complexNumber = str_replace('+-','-',$complexNumber);
if (strpos($complexNumber,'++') !== FALSE)
$complexNumber = str_replace('++','+',$complexNumber);
if (strpos($complexNumber,'--') !== FALSE)
$complexNumber = str_replace('--','-',$complexNumber);
// Basic validation of string, to parse out real and imaginary parts, and any suffix if (!$validComplex) {
$validComplex = preg_match('/^([\-\+]?(\d+\.?\d*|\d*\.?\d+)([Ee][\-\+]?[0-2]?\d{1,3})?)([\-\+]?(\d+\.?\d*|\d*\.?\d+)([Ee][\-\+]?[0-2]?\d{1,3})?)?(([\-\+]?)([ij]?))$/ui',$complexNumber,$complexParts); // Neither real nor imaginary part, so test to see if we actually have a suffix
$validComplex = preg_match('/^([\-\+]?)([ij])$/ui', $complexNumber, $complexParts);
if (!$validComplex) {
throw new Exception('COMPLEX: Invalid complex number');
}
// We have a suffix, so set the real to 0, the imaginary to either 1 or -1 (as defined by the sign)
$imaginary = 1;
if ($complexParts[1] === '-') {
$imaginary = 0 - $imaginary;
}
return array(0, $imaginary, $complexParts[2]);
}
if (!$validComplex) { // If we don't have an imaginary part, identify whether it should be +1 or -1...
// Neither real nor imaginary part, so test to see if we actually have a suffix if (($complexParts[4] === '') && ($complexParts[9] !== '')) {
$validComplex = preg_match('/^([\-\+]?)([ij])$/ui',$complexNumber,$complexParts); if ($complexParts[7] !== $complexParts[9]) {
if (!$validComplex) { $complexParts[4] = 1;
throw new Exception('COMPLEX: Invalid complex number'); if ($complexParts[8] === '-') {
} $complexParts[4] = -1;
// We have a suffix, so set the real to 0, the imaginary to either 1 or -1 (as defined by the sign) }
$imaginary = 1; // ... or if we have only the real and no imaginary part (in which case our real should be the imaginary)
if ($complexParts[1] === '-') { } else {
$imaginary = 0 - $imaginary; $complexParts[4] = $complexParts[1];
} $complexParts[1] = 0;
return array(0, $imaginary, $complexParts[2]); }
} }
// If we don't have an imaginary part, identify whether it should be +1 or -1... // Return real and imaginary parts and suffix as an array, and set a default suffix if user input lazily
if (($complexParts[4] === '') && ($complexParts[9] !== '')) { return array($complexParts[1], $complexParts[4], !empty($complexParts[9]) ? $complexParts[9] : 'i');
if ($complexParts[7] !== $complexParts[9]) { } // function _parseComplex()
$complexParts[4] = 1;
if ($complexParts[8] === '-') {
$complexParts[4] = -1;
}
// ... or if we have only the real and no imaginary part (in which case our real should be the imaginary)
} else {
$complexParts[4] = $complexParts[1];
$complexParts[1] = 0;
}
}
// Return real and imaginary parts and suffix as an array, and set a default suffix if user input lazily
return array( $complexParts[1],
$complexParts[4],
!empty($complexParts[9]) ? $complexParts[9] : 'i'
);
} // function _parseComplex()
public function __construct($realPart, $imaginaryPart = null, $suffix = 'i') public function __construct($realPart, $imaginaryPart = null, $suffix = 'i')
{ {
if ($imaginaryPart === null) { if ($imaginaryPart === null) {
if (is_array($realPart)) { if (is_array($realPart)) {
// We have an array of (potentially) real and imaginary parts, and any suffix // We have an array of (potentially) real and imaginary parts, and any suffix
list ($realPart, $imaginaryPart, $suffix) = array_values($realPart) + array(0.0, 0.0, 'i'); list ($realPart, $imaginaryPart, $suffix) = array_values($realPart) + array(0.0, 0.0, 'i');
} elseif((is_string($realPart)) || (is_numeric($realPart))) { } elseif((is_string($realPart)) || (is_numeric($realPart))) {
// We've been given a string to parse to extract the real and imaginary parts, and any suffix // We've been given a string to parse to extract the real and imaginary parts, and any suffix
list ($realPart, $imaginaryPart, $suffix) = self::_parseComplex($realPart); list ($realPart, $imaginaryPart, $suffix) = self::_parseComplex($realPart);
} }
} }
// Set parsed values in our properties // Set parsed values in our properties
$this->realPart = (float) $realPart; $this->realPart = (float) $realPart;
$this->imaginaryPart = (float) $imaginaryPart; $this->imaginaryPart = (float) $imaginaryPart;
$this->suffix = strtolower($suffix); $this->suffix = strtolower($suffix);
} }
public function getReal() public function getReal()
{ {
return $this->realPart; return $this->realPart;
} }
public function getImaginary() public function getImaginary()
{ {
return $this->imaginaryPart; return $this->imaginaryPart;
} }
public function getSuffix() public function getSuffix()
{ {
return $this->suffix; return $this->suffix;
} }
public function __toString() { public function __toString() {
$str = ""; $str = "";
if ($this->imaginaryPart != 0.0) { if ($this->imaginaryPart != 0.0) {
if (abs($this->imaginaryPart) != 1.0) { if (abs($this->imaginaryPart) != 1.0) {
$str .= $this->imaginaryPart . $this->suffix; $str .= $this->imaginaryPart . $this->suffix;
} else { } else {
$str .= (($this->imaginaryPart < 0.0) ? '-' : ''). $this->suffix; $str .= (($this->imaginaryPart < 0.0) ? '-' : ''). $this->suffix;
} }
} }
if ($this->realPart != 0.0) { if ($this->realPart != 0.0) {
if (($str) && ($this->imaginaryPart > 0.0)) if (($str) && ($this->imaginaryPart > 0.0))
$str = "+" . $str; $str = "+" . $str;
$str = $this->realPart . $str; $str = $this->realPart . $str;
} }
if (!$str) if (!$str)
$str = "0.0"; $str = "0.0";
return $str; return $str;
} }
} }

67
unitTests/custom/complexAssert.php
View File

@ -2,61 +2,54 @@
include_once dirname(__FILE__).'/Complex.php'; include_once dirname(__FILE__).'/Complex.php';
class complexAssert
class complexAssert { {
private $_errorMessage = '';
private $_errorMessage = '';
public function assertComplexEquals($expected, $actual, $delta = 0) public function assertComplexEquals($expected, $actual, $delta = 0)
{ {
if ($expected{0} === '#') { if ($expected{0} === '#') {
// Expecting an error, so we do a straight string comparison // Expecting an error, so we do a straight string comparison
if ($expected === $actual) { if ($expected === $actual) {
return TRUE; return true;
} }
$this->_errorMessage = 'Expected Error: ' . $this->_errorMessage = 'Expected Error: ' . $actual . ' !== ' . $expected;
$actual . ' !== ' . $expected; return false;
return FALSE; }
}
$expectedComplex = new Complex($expected); $expectedComplex = new Complex($expected);
$actualComplex = new Complex($actual); $actualComplex = new Complex($actual);
if (!is_numeric($actualComplex->getReal()) || !is_numeric($expectedComplex->getReal())) { if (!is_numeric($actualComplex->getReal()) || !is_numeric($expectedComplex->getReal())) {
if ($actualComplex->getReal() !== $expectedComplex->getReal()) { if ($actualComplex->getReal() !== $expectedComplex->getReal()) {
$this->_errorMessage = 'Mismatched String: ' . $this->_errorMessage = 'Mismatched String: ' . $actualComplex->getReal() . ' !== ' . $expectedComplex->getReal();
$actualComplex->getReal() . ' !== ' . $expectedComplex->getReal(); return false;
return FALSE; }
} return true;
return TRUE; }
}
if ($actualComplex->getReal() < ($expectedComplex->getReal() - $delta) || if ($actualComplex->getReal() < ($expectedComplex->getReal() - $delta) ||
$actualComplex->getReal() > ($expectedComplex->getReal() + $delta)) { $actualComplex->getReal() > ($expectedComplex->getReal() + $delta)) {
$this->_errorMessage = 'Mismatched Real part: ' . $this->_errorMessage = 'Mismatched Real part: ' . $actualComplex->getReal() . ' != ' . $expectedComplex->getReal();
$actualComplex->getReal() . ' != ' . $expectedComplex->getReal(); return false;
return FALSE;
} }
if ($actualComplex->getImaginary() < ($expectedComplex->getImaginary() - $delta) || if ($actualComplex->getImaginary() < ($expectedComplex->getImaginary() - $delta) ||
$actualComplex->getImaginary() > ($expectedComplex->getImaginary() + $delta)) { $actualComplex->getImaginary() > ($expectedComplex->getImaginary() + $delta)) {
$this->_errorMessage = 'Mismatched Imaginary part: ' . $this->_errorMessage = 'Mismatched Imaginary part: ' . $actualComplex->getImaginary() . ' != ' . $expectedComplex->getImaginary();
$actualComplex->getImaginary() . ' != ' . $expectedComplex->getImaginary(); return false;
return FALSE;
} }
if ($actualComplex->getSuffix() !== $actualComplex->getSuffix()) { if ($actualComplex->getSuffix() !== $actualComplex->getSuffix()) {
$this->_errorMessage = 'Mismatched Suffix: ' . $this->_errorMessage = 'Mismatched Suffix: ' . $actualComplex->getSuffix() . ' != ' . $expectedComplex->getSuffix();
$actualComplex->getSuffix() . ' != ' . $expectedComplex->getSuffix(); return false;
return FALSE; }
}
return TRUE; return true;
} }
public function getErrorMessage()
public function getErrorMessage() { {
return $this->_errorMessage; return $this->_errorMessage;
} }
} }

1
unitTests/testDataFileIterator.php
View File

@ -2,7 +2,6 @@
class testDataFileIterator implements Iterator class testDataFileIterator implements Iterator
{ {
protected $file; protected $file;
protected $key = 0; protected $key = 0;
protected $current; protected $current;