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

#401 : PHPCS Fixes & Some PHPUnit Fixes

This commit is contained in:
Progi1984 2016-05-18 13:37:00 +02:00
parent dffeb25a5f
commit 259ce457f3
30 changed files with 939 additions and 895 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -23,7 +23,7 @@ script:
## PHP_CodeSniffer ## PHP_CodeSniffer
- ./vendor/bin/phpcs --report-width=200 --report-summary --report-full src/ unitTests/ --standard=PSR2 -n - ./vendor/bin/phpcs --report-width=200 --report-summary --report-full src/ unitTests/ --standard=PSR2 -n
## PHPUnit ## PHPUnit
- phpunit -c ./unitTests/ - ./vendor/bin/phpunit -c ./unitTests/
notifications: notifications:
email: false email: false

177
src/PhpSpreadsheet/Calculation/Engineering.php
View File

@ -747,7 +747,7 @@ class Engineering
*/ */
public static function parseComplex($complexNumber) public static function parseComplex($complexNumber)
{ {
$workString = (string) $complexNumber; $workString = (string)$complexNumber;
$realNumber = $imaginary = 0; $realNumber = $imaginary = 0;
// Extract the suffix, if there is one // Extract the suffix, if there is one
@ -770,13 +770,13 @@ class Engineering
++$leadingSign; ++$leadingSign;
} }
$realNumber = substr($workString, 0, strlen($realNumber)+strlen($power)+$leadingSign); $realNumber = substr($workString, 0, strlen($realNumber) + strlen($power) + $leadingSign);
if ($suffix != '') { if ($suffix != '') {
$imaginary = substr($workString, strlen($realNumber)); $imaginary = substr($workString, strlen($realNumber));
if (($imaginary == '') && (($realNumber == '') || ($realNumber == '+') || ($realNumber == '-'))) { if (($imaginary == '') && (($realNumber == '') || ($realNumber == '+') || ($realNumber == '-'))) {
$imaginary = $realNumber.'1'; $imaginary = $realNumber . '1';
$realNumber = '0'; $realNumber = '0';
} elseif ($imaginary == '') { } elseif ($imaginary == '') {
$imaginary = $realNumber; $imaginary = $realNumber;
@ -809,7 +809,7 @@ class Engineering
$complexNumber = substr($complexNumber, 1); $complexNumber = substr($complexNumber, 1);
} }
if ($complexNumber{0} == '.') { if ($complexNumber{0} == '.') {
$complexNumber = '0'.$complexNumber; $complexNumber = '0' . $complexNumber;
} }
if ($complexNumber{0} == '+') { if ($complexNumber{0} == '+') {
$complexNumber = substr($complexNumber, 1); $complexNumber = substr($complexNumber, 1);
@ -827,6 +827,14 @@ class Engineering
private static function nbrConversionFormat($xVal, $places) private static function nbrConversionFormat($xVal, $places)
{ {
if (!is_null($places)) { if (!is_null($places)) {
if (is_numeric($places)) {
$places = (int)$places;
} else {
return Functions::VALUE();
}
if ($places < 0) {
return Functions::NAN();
}
if (strlen($xVal) <= $places) { if (strlen($xVal) <= $places) {
return substr(str_pad($xVal, $places, '0', STR_PAD_LEFT), -10); return substr(str_pad($xVal, $places, '0', STR_PAD_LEFT), -10);
} else { } else {
@ -1060,7 +1068,7 @@ class Engineering
(-0.4237922726e7 + $y * 0.8511937935e4))))); (-0.4237922726e7 + $y * 0.8511937935e4)))));
$f2 = 0.2499580570e14 + $y * (0.4244419664e12 + $y * (0.3733650367e10 + $y * (0.2245904002e8 + $y * $f2 = 0.2499580570e14 + $y * (0.4244419664e12 + $y * (0.3733650367e10 + $y * (0.2245904002e8 + $y *
(0.1020426050e6 + $y * (0.3549632885e3 + $y))))); (0.1020426050e6 + $y * (0.3549632885e3 + $y)))));
$fRet = $f1 / $f2 + 0.636619772 * ( self::BESSELJ($fNum, 1) * log($fNum) - 1 / $fNum); $fRet = $f1 / $f2 + 0.636619772 * (self::BESSELJ($fNum, 1) * log($fNum) - 1 / $fNum);
} else { } else {
$fRet = sqrt(0.636619772 / $fNum) * sin($fNum - 2.356194491); $fRet = sqrt(0.636619772 / $fNum) * sin($fNum - 2.356194491);
} }
@ -1141,7 +1149,7 @@ class Engineering
if (is_bool($x)) { if (is_bool($x)) {
if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) { if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
$x = (int) $x; $x = (int)$x;
} else { } else {
return Functions::VALUE(); return Functions::VALUE();
} }
@ -1149,7 +1157,7 @@ class Engineering
if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) { if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
$x = floor($x); $x = floor($x);
} }
$x = (string) $x; $x = (string)$x;
if (strlen($x) > preg_match_all('/[01]/', $x, $out)) { if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
return Functions::NAN(); return Functions::NAN();
} }
@ -1158,7 +1166,7 @@ class Engineering
} elseif (strlen($x) == 10) { } elseif (strlen($x) == 10) {
// Two's Complement // Two's Complement
$x = substr($x, -9); $x = substr($x, -9);
return '-'.(512-bindec($x)); return '-' . (512 - bindec($x));
} }
return bindec($x); return bindec($x);
} }
@ -1193,9 +1201,10 @@ class Engineering
$x = Functions::flattenSingleValue($x); $x = Functions::flattenSingleValue($x);
$places = Functions::flattenSingleValue($places); $places = Functions::flattenSingleValue($places);
// Argument X
if (is_bool($x)) { if (is_bool($x)) {
if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) { if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
$x = (int) $x; $x = (int)$x;
} else { } else {
return Functions::VALUE(); return Functions::VALUE();
} }
@ -1203,7 +1212,7 @@ class Engineering
if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) { if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
$x = floor($x); $x = floor($x);
} }
$x = (string) $x; $x = (string)$x;
if (strlen($x) > preg_match_all('/[01]/', $x, $out)) { if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
return Functions::NAN(); return Functions::NAN();
} }
@ -1211,9 +1220,9 @@ class Engineering
return Functions::NAN(); return Functions::NAN();
} elseif (strlen($x) == 10) { } elseif (strlen($x) == 10) {
// Two's Complement // Two's Complement
return str_repeat('F', 8).substr(strtoupper(dechex(bindec(substr($x, -9)))), -2); return str_repeat('F', 8) . substr(strtoupper(dechex(bindec(substr($x, -9)))), -2);
} }
$hexVal = (string) strtoupper(dechex(bindec($x))); $hexVal = (string)strtoupper(dechex(bindec($x)));
return self::nbrConversionFormat($hexVal, $places); return self::nbrConversionFormat($hexVal, $places);
} }
@ -1250,7 +1259,7 @@ class Engineering
if (is_bool($x)) { if (is_bool($x)) {
if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) { if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
$x = (int) $x; $x = (int)$x;
} else { } else {
return Functions::VALUE(); return Functions::VALUE();
} }
@ -1258,7 +1267,7 @@ class Engineering
if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) { if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
$x = floor($x); $x = floor($x);
} }
$x = (string) $x; $x = (string)$x;
if (strlen($x) > preg_match_all('/[01]/', $x, $out)) { if (strlen($x) > preg_match_all('/[01]/', $x, $out)) {
return Functions::NAN(); return Functions::NAN();
} }
@ -1266,9 +1275,9 @@ class Engineering
return Functions::NAN(); return Functions::NAN();
} elseif (strlen($x) == 10) { } elseif (strlen($x) == 10) {
// Two's Complement // Two's Complement
return str_repeat('7', 7).substr(strtoupper(decoct(bindec(substr($x, -9)))), -3); return str_repeat('7', 7) . substr(strtoupper(decoct(bindec(substr($x, -9)))), -3);
} }
$octVal = (string) decoct(bindec($x)); $octVal = (string)decoct(bindec($x));
return self::nbrConversionFormat($octVal, $places); return self::nbrConversionFormat($octVal, $places);
} }
@ -1309,21 +1318,21 @@ class Engineering
if (is_bool($x)) { if (is_bool($x)) {
if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) { if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
$x = (int) $x; $x = (int)$x;
} else { } else {
return Functions::VALUE(); return Functions::VALUE();
} }
} }
$x = (string) $x; $x = (string)$x;
if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) { if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
return Functions::VALUE(); return Functions::VALUE();
} }
$x = (string) floor($x); $x = (string)floor($x);
$r = decbin($x); $r = decbin($x);
if (strlen($r) == 32) { if (strlen($r) == 32) {
// Two's Complement // Two's Complement
$r = substr($r, -10); $r = substr($r, -10);
} elseif (strlen($r) > 11) { } elseif (strlen($r) >= 11) {
return Functions::NAN(); return Functions::NAN();
} }
@ -1366,20 +1375,20 @@ class Engineering
if (is_bool($x)) { if (is_bool($x)) {
if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) { if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
$x = (int) $x; $x = (int)$x;
} else { } else {
return Functions::VALUE(); return Functions::VALUE();
} }
} }
$x = (string) $x; $x = (string)$x;
if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) { if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
return Functions::VALUE(); return Functions::VALUE();
} }
$x = (string) floor($x); $x = (string)floor($x);
$r = strtoupper(dechex($x)); $r = strtoupper(dechex($x));
if (strlen($r) == 8) { if (strlen($r) == 8) {
// Two's Complement // Two's Complement
$r = 'FF'.$r; $r = 'FF' . $r;
} }
return self::nbrConversionFormat($r, $places); return self::nbrConversionFormat($r, $places);
@ -1416,21 +1425,22 @@ class Engineering
*/ */
public static function DECTOOCT($x, $places = null) public static function DECTOOCT($x, $places = null)
{ {
$xorig = $x;
$x = Functions::flattenSingleValue($x); $x = Functions::flattenSingleValue($x);
$places = Functions::flattenSingleValue($places); $places = Functions::flattenSingleValue($places);
if (is_bool($x)) { if (is_bool($x)) {
if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) { if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
$x = (int) $x; $x = (int)$x;
} else { } else {
return Functions::VALUE(); return Functions::VALUE();
} }
} }
$x = (string) $x; $x = (string)$x;
if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) { if (strlen($x) > preg_match_all('/[-0123456789.]/', $x, $out)) {
return Functions::VALUE(); return Functions::VALUE();
} }
$x = (string) floor($x); $x = (string)floor($x);
$r = decoct($x); $r = decoct($x);
if (strlen($r) == 11) { if (strlen($r) == 11) {
// Two's Complement // Two's Complement
@ -1451,19 +1461,16 @@ class Engineering
* *
* @access public * @access public
* @category Engineering Functions * @category Engineering Functions
* @param string $x the hexadecimal number you want to convert. Number cannot * @param string $x the hexadecimal number you want to convert.
* contain more than 10 characters. The most significant bit of * Number cannot contain more than 10 characters.
* number is the sign bit (40th bit from the right). The remaining * The most significant bit of number is the sign bit (40th bit from the right).
* 9 bits are magnitude bits. Negative numbers are represented * The remaining 9 bits are magnitude bits.
* using two's-complement notation. * Negative numbers are represented using two's-complement notation.
* If number is negative, HEX2BIN ignores places and returns a * If number is negative, HEX2BIN ignores places and returns a 10-character binary number.
* 10-character binary number. * If number is negative, it cannot be less than FFFFFFFE00,
* If number is negative, it cannot be less than FFFFFFFE00, and * and if number is positive, it cannot be greater than 1FF.
* if number is positive, it cannot be greater than 1FF. * If number is not a valid hexadecimal number, HEX2BIN returns the #NUM! error value.
* If number is not a valid hexadecimal number, HEX2BIN returns * If HEX2BIN requires more than places characters, it returns the #NUM! error value.
* the #NUM! error value.
* If HEX2BIN requires more than places characters, it returns
* the #NUM! error value.
* @param integer $places The number of characters to use. If places is omitted, * @param integer $places The number of characters to use. If places is omitted,
* HEX2BIN uses the minimum number of characters necessary. Places * HEX2BIN uses the minimum number of characters necessary. Places
* is useful for padding the return value with leading 0s (zeros). * is useful for padding the return value with leading 0s (zeros).
@ -1480,12 +1487,14 @@ class Engineering
if (is_bool($x)) { if (is_bool($x)) {
return Functions::VALUE(); return Functions::VALUE();
} }
$x = (string) $x; $x = (string)$x;
if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) { if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
return Functions::NAN(); return Functions::NAN();
} }
if (hexdec($x) > 0x1FF) {
return Functions::NAN();
}
$binVal = decbin(hexdec($x)); $binVal = decbin(hexdec($x));
return substr(self::nbrConversionFormat($binVal, $places), -10); return substr(self::nbrConversionFormat($binVal, $places), -10);
} }
@ -1516,11 +1525,21 @@ class Engineering
if (is_bool($x)) { if (is_bool($x)) {
return Functions::VALUE(); return Functions::VALUE();
} }
$x = (string) $x; $x = (string)$x;
if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) { if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
return Functions::NAN(); return Functions::NAN();
} }
return hexdec($x); $binX = '';
foreach (str_split($x) as $char) {
$binX .= str_pad(hex2bin($char), 3, '0', STR_PAD_LEFT);
}
if (strlen($binX) == 40 && $binX[0] == '1') {
for ($i = 0; $i < 40; $i++) {
$binX[$i] = ($binX[$i] == '1' ? '0' : '1');
}
return (bindec($binX) + 1) * -1;
}
return bindec($binX);
} }
@ -1564,14 +1583,14 @@ class Engineering
if (is_bool($x)) { if (is_bool($x)) {
return Functions::VALUE(); return Functions::VALUE();
} }
$x = (string) $x; $x = (string)$x;
if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) { if (strlen($x) > preg_match_all('/[0123456789ABCDEF]/', strtoupper($x), $out)) {
return Functions::NAN(); return Functions::NAN();
} }
$octVal = decoct(hexdec($x)); $octVal = decoct(hexdec($x));
return self::nbrConversionFormat($octVal, $places); return self::nbrConversionFormat($octVal, $places);
} // function HEXTOOCT() }
/** /**
@ -1616,7 +1635,7 @@ class Engineering
if (is_bool($x)) { if (is_bool($x)) {
return Functions::VALUE(); return Functions::VALUE();
} }
$x = (string) $x; $x = (string)$x;
if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) { if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
return Functions::NAN(); return Functions::NAN();
} }
@ -1652,13 +1671,22 @@ class Engineering
if (is_bool($x)) { if (is_bool($x)) {
return Functions::VALUE(); return Functions::VALUE();
} }
$x = (string) $x; $x = (string)$x;
if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) { if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
return Functions::NAN(); return Functions::NAN();
} }
return octdec($x); $binX = '';
foreach (str_split($x) as $char) {
$binX .= str_pad(decbin((int)$char), 3, '0', STR_PAD_LEFT);
}
if (strlen($binX) == 30 && $binX[0] == '1') {
for ($i = 0; $i < 30; $i++) {
$binX[$i] = ($binX[$i] == '1' ? '0' : '1');
}
return (bindec($binX) + 1) * -1;
}
return bindec($binX);
} }
/** /**
* OCTTOHEX * OCTTOHEX
@ -1697,11 +1725,11 @@ class Engineering
if (is_bool($x)) { if (is_bool($x)) {
return Functions::VALUE(); return Functions::VALUE();
} }
$x = (string) $x; $x = (string)$x;
if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) { if (preg_match_all('/[01234567]/', $x, $out) != strlen($x)) {
return Functions::NAN(); return Functions::NAN();
} }
$hexVal = strtoupper(dechex(octdec($x))); $hexVal = strtoupper(dechex(self::OCTTODEC($x)));
return self::nbrConversionFormat($hexVal, $places); return self::nbrConversionFormat($hexVal, $places);
} }
@ -1730,33 +1758,34 @@ class Engineering
$suffix = (is_null($suffix)) ? 'i' : Functions::flattenSingleValue($suffix); $suffix = (is_null($suffix)) ? 'i' : Functions::flattenSingleValue($suffix);
if (((is_numeric($realNumber)) && (is_numeric($imaginary))) && if (((is_numeric($realNumber)) && (is_numeric($imaginary))) &&
(($suffix == 'i') || ($suffix == 'j') || ($suffix == ''))) { (($suffix == 'i') || ($suffix == 'j') || ($suffix == ''))
$realNumber = (float) $realNumber; ) {
$imaginary = (float) $imaginary; $realNumber = (float)$realNumber;
$imaginary = (float)$imaginary;
if ($suffix == '') { if ($suffix == '') {
$suffix = 'i'; $suffix = 'i';
} }
if ($realNumber == 0.0) { if ($realNumber == 0.0) {
if ($imaginary == 0.0) { if ($imaginary == 0.0) {
return (string) '0'; return (string)'0';
} elseif ($imaginary == 1.0) { } elseif ($imaginary == 1.0) {
return (string) $suffix; return (string)$suffix;
} elseif ($imaginary == -1.0) { } elseif ($imaginary == -1.0) {
return (string) '-'.$suffix; return (string)'-' . $suffix;
} }
return (string) $imaginary.$suffix; return (string)$imaginary . $suffix;
} elseif ($imaginary == 0.0) { } elseif ($imaginary == 0.0) {
return (string) $realNumber; return (string)$realNumber;
} elseif ($imaginary == 1.0) { } elseif ($imaginary == 1.0) {
return (string) $realNumber.'+'.$suffix; return (string)$realNumber . '+' . $suffix;
} elseif ($imaginary == -1.0) { } elseif ($imaginary == -1.0) {
return (string) $realNumber.'-'.$suffix; return (string)$realNumber . '-' . $suffix;
} }
if ($imaginary > 0) { if ($imaginary > 0) {
$imaginary = (string) '+'.$imaginary; $imaginary = (string)'+' . $imaginary;
} }
return (string) $realNumber.$imaginary.$suffix; return (string)$realNumber . $imaginary . $suffix;
} }
return Functions::VALUE(); return Functions::VALUE();
@ -2165,7 +2194,8 @@ class Engineering
$parsedComplexDivisor = self::parseComplex($complexDivisor); $parsedComplexDivisor = self::parseComplex($complexDivisor);
if (($parsedComplexDividend['suffix'] != '') && ($parsedComplexDivisor['suffix'] != '') && if (($parsedComplexDividend['suffix'] != '') && ($parsedComplexDivisor['suffix'] != '') &&
($parsedComplexDividend['suffix'] != $parsedComplexDivisor['suffix'])) { ($parsedComplexDividend['suffix'] != $parsedComplexDivisor['suffix'])
) {
return Functions::NAN(); return Functions::NAN();
} }
if (($parsedComplexDividend['suffix'] != '') && ($parsedComplexDivisor['suffix'] == '')) { if (($parsedComplexDividend['suffix'] != '') && ($parsedComplexDivisor['suffix'] == '')) {
@ -2180,9 +2210,9 @@ class Engineering
$i = $d2 / $d3; $i = $d2 / $d3;
if ($i > 0.0) { if ($i > 0.0) {
return self::cleanComplex($r.'+'.$i.$parsedComplexDivisor['suffix']); return self::cleanComplex($r . '+' . $i . $parsedComplexDivisor['suffix']);
} elseif ($i < 0.0) { } elseif ($i < 0.0) {
return self::cleanComplex($r.$i.$parsedComplexDivisor['suffix']); return self::cleanComplex($r . $i . $parsedComplexDivisor['suffix']);
} else { } else {
return $r; return $r;
} }
@ -2210,7 +2240,8 @@ class Engineering
$parsedComplex2 = self::parseComplex($complexNumber2); $parsedComplex2 = self::parseComplex($complexNumber2);
if ((($parsedComplex1['suffix'] != '') && ($parsedComplex2['suffix'] != '')) && if ((($parsedComplex1['suffix'] != '') && ($parsedComplex2['suffix'] != '')) &&
($parsedComplex1['suffix'] != $parsedComplex2['suffix'])) { ($parsedComplex1['suffix'] != $parsedComplex2['suffix'])
) {
return Functions::NAN(); return Functions::NAN();
} elseif (($parsedComplex1['suffix'] == '') && ($parsedComplex2['suffix'] != '')) { } elseif (($parsedComplex1['suffix'] == '') && ($parsedComplex2['suffix'] != '')) {
$parsedComplex1['suffix'] = $parsedComplex2['suffix']; $parsedComplex1['suffix'] = $parsedComplex2['suffix'];
@ -2321,7 +2352,7 @@ class Engineering
$a = Functions::flattenSingleValue($a); $a = Functions::flattenSingleValue($a);
$b = Functions::flattenSingleValue($b); $b = Functions::flattenSingleValue($b);
return (int) ($a == $b); return (int)($a == $b);
} }
@ -2345,7 +2376,7 @@ class Engineering
$number = Functions::flattenSingleValue($number); $number = Functions::flattenSingleValue($number);
$step = Functions::flattenSingleValue($step); $step = Functions::flattenSingleValue($step);
return (int) ($number >= $step); return (int)($number >= $step);
} }
@ -2621,10 +2652,12 @@ class Engineering
return $value; return $value;
} }
} elseif ((($fromUOM == 'K') || ($fromUOM == 'kel')) && } elseif ((($fromUOM == 'K') || ($fromUOM == 'kel')) &&
(($toUOM == 'K') || ($toUOM == 'kel'))) { (($toUOM == 'K') || ($toUOM == 'kel'))
) {
return $value; return $value;
} elseif ((($fromUOM == 'C') || ($fromUOM == 'cel')) && } elseif ((($fromUOM == 'C') || ($fromUOM == 'cel')) &&
(($toUOM == 'C') || ($toUOM == 'cel'))) { (($toUOM == 'C') || ($toUOM == 'cel'))
) {
return $value; return $value;
} }
if (($toUOM == 'F') || ($toUOM == 'fah')) { if (($toUOM == 'F') || ($toUOM == 'fah')) {

3
src/PhpSpreadsheet/Calculation/TextData.php
View File

@ -375,6 +375,9 @@ class TextData
$value = ($value) ? \PHPExcel\Calculation::getTRUE() : \PHPExcel\Calculation::getFALSE(); $value = ($value) ? \PHPExcel\Calculation::getTRUE() : \PHPExcel\Calculation::getFALSE();
} }
if (empty($chars)) {
return '';
}
if (function_exists('mb_substr')) { if (function_exists('mb_substr')) {
return mb_substr($value, --$start, $chars, 'UTF-8'); return mb_substr($value, --$start, $chars, 'UTF-8');
} else { } else {

2
src/PhpSpreadsheet/Shared/Date.php
View File

@ -137,7 +137,7 @@ class Date
$hours = round($dateValue * 24); $hours = round($dateValue * 24);
$mins = round($dateValue * 1440) - round($hours * 60); $mins = round($dateValue * 1440) - round($hours * 60);
$secs = round($dateValue * 86400) - round($hours * 3600) - round($mins * 60); $secs = round($dateValue * 86400) - round($hours * 3600) - round($mins * 60);
$returnValue = (integer) gmmktime($hours, $mins, $secs); $returnValue = (integer) gmmktime($hours , $mins, $secs);
} }
$timezoneAdjustment = ($adjustToTimezone) ? $timezoneAdjustment = ($adjustToTimezone) ?

14
src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
View File

@ -64,7 +64,7 @@ class ChainedBlockStream
* @param string &$openedPath absolute path of the opened stream (out parameter) * @param string &$openedPath absolute path of the opened stream (out parameter)
* @return bool true on success * @return bool true on success
*/ */
public function stream_open($path, $mode, $options, &$openedPath) public function stream_open($path, $mode, $options, &$openedPath) // @codingStandardsIgnoreLine
{ {
if ($mode != 'r') { if ($mode != 'r') {
if ($options & STREAM_REPORT_ERRORS) { if ($options & STREAM_REPORT_ERRORS) {
@ -118,7 +118,7 @@ class ChainedBlockStream
* Implements support for fclose(). * Implements support for fclose().
* *
*/ */
public function stream_close() public function stream_close() // @codingStandardsIgnoreLine
{ {
$this->ole = null; $this->ole = null;
unset($GLOBALS['_OLE_INSTANCES']); unset($GLOBALS['_OLE_INSTANCES']);
@ -130,7 +130,7 @@ class ChainedBlockStream
* @param int $count maximum number of bytes to read * @param int $count maximum number of bytes to read
* @return string * @return string
*/ */
public function stream_read($count) public function stream_read($count) // @codingStandardsIgnoreLine
{ {
if ($this->stream_eof()) { if ($this->stream_eof()) {
return false; return false;
@ -145,7 +145,7 @@ class ChainedBlockStream
* *
* @return bool TRUE if the file pointer is at EOF; otherwise FALSE * @return bool TRUE if the file pointer is at EOF; otherwise FALSE
*/ */
public function stream_eof() public function stream_eof() // @codingStandardsIgnoreLine
{ {
return $this->pos >= strlen($this->data); return $this->pos >= strlen($this->data);
} }
@ -156,7 +156,7 @@ class ChainedBlockStream
* *
* @return int * @return int
*/ */
public function stream_tell() public function stream_tell() // @codingStandardsIgnoreLine
{ {
return $this->pos; return $this->pos;
} }
@ -168,7 +168,7 @@ class ChainedBlockStream
* @param int $whence SEEK_SET, SEEK_CUR or SEEK_END * @param int $whence SEEK_SET, SEEK_CUR or SEEK_END
* @return bool * @return bool
*/ */
public function stream_seek($offset, $whence) public function stream_seek($offset, $whence) // @codingStandardsIgnoreLine
{ {
if ($whence == SEEK_SET && $offset >= 0) { if ($whence == SEEK_SET && $offset >= 0) {
$this->pos = $offset; $this->pos = $offset;
@ -187,7 +187,7 @@ class ChainedBlockStream
* "size". * "size".
* @return array * @return array
*/ */
public function stream_stat() public function stream_stat() // @codingStandardsIgnoreLine
{ {
return array( return array(
'size' => strlen($this->data), 'size' => strlen($this->data),

19
src/PhpSpreadsheet/Shared/StringHelper.php
View File

@ -759,15 +759,18 @@ class StringHelper
*/ */
public static function getCurrencyCode() public static function getCurrencyCode()
{ {
if (!isset(self::$currencyCode)) { if (!empty(self::$currencyCode)) {
$localeconv = localeconv(); return self::$currencyCode;
self::$currencyCode = ($localeconv['currency_symbol'] != '')
? $localeconv['currency_symbol'] : $localeconv['int_curr_symbol'];
if (self::$currencyCode == '') {
// Default to $
self::$currencyCode = '$';
} }
self::$currencyCode = '$';
$localeconv = localeconv();
if (!empty($localeconv['currency_symbol'])) {
self::$currencyCode = $localeconv['currency_symbol'];
return self::$currencyCode;
}
if (!empty($localeconv['int_curr_symbol'])) {
self::$currencyCode = $localeconv['int_curr_symbol'];
return self::$currencyCode;
} }
return self::$currencyCode; return self::$currencyCode;
} }

14
src/PhpSpreadsheet/Shared/ZipStreamWrapper.php
View File

@ -76,7 +76,7 @@ class ZipStreamWrapper
* @return bool true on success * @return bool true on success
* @throws \PHPExcel\Reader\Exception * @throws \PHPExcel\Reader\Exception
*/ */
public function stream_open($path, $mode, $options, &$opened_path) public function stream_open($path, $mode, $options, &$opened_path) // @codingStandardsIgnoreLine
{ {
// Check for mode // Check for mode
if ($mode{0} != 'r') { if ($mode{0} != 'r') {
@ -113,7 +113,7 @@ class ZipStreamWrapper
* *
* @return boolean * @return boolean
*/ */
public function url_stat() public function url_stat() // @codingStandardsIgnoreLine
{ {
return $this->statName($this->fileNameInArchive); return $this->statName($this->fileNameInArchive);
} }
@ -123,7 +123,7 @@ class ZipStreamWrapper
* *
* @return boolean * @return boolean
*/ */
public function stream_stat() public function stream_stat() // @codingStandardsIgnoreLine
{ {
return $this->archive->statName($this->fileNameInArchive); return $this->archive->statName($this->fileNameInArchive);
} }
@ -134,7 +134,7 @@ class ZipStreamWrapper
* @param int $count maximum number of bytes to read * @param int $count maximum number of bytes to read
* @return string * @return string
*/ */
public function stream_read($count) public function stream_read($count) // @codingStandardsIgnoreLine
{ {
$ret = substr($this->data, $this->position, $count); $ret = substr($this->data, $this->position, $count);
$this->position += strlen($ret); $this->position += strlen($ret);
@ -147,7 +147,7 @@ class ZipStreamWrapper
* *
* @return int * @return int
*/ */
public function stream_tell() public function stream_tell() // @codingStandardsIgnoreLine
{ {
return $this->position; return $this->position;
} }
@ -157,7 +157,7 @@ class ZipStreamWrapper
* *
* @return bool * @return bool
*/ */
public function stream_eof() public function stream_eof() // @codingStandardsIgnoreLine
{ {
return $this->position >= strlen($this->data); return $this->position >= strlen($this->data);
} }
@ -169,7 +169,7 @@ class ZipStreamWrapper
* @param int $whence SEEK_SET, SEEK_CUR or SEEK_END * @param int $whence SEEK_SET, SEEK_CUR or SEEK_END
* @return bool * @return bool
*/ */
public function stream_seek($offset, $whence) public function stream_seek($offset, $whence) // @codingStandardsIgnoreLine
{ {
switch ($whence) { switch ($whence) {
case SEEK_SET: case SEEK_SET:

38
unitTests/Classes/src/Calculation/DateTimeTest.php
View File

@ -23,7 +23,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerDATE() public function providerDATE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/DATE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/DATE.data');
} }
public function testDATEtoPHP() public function testDATEtoPHP()
@ -76,7 +76,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerDATEVALUE() public function providerDATEVALUE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/DATEVALUE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/DATEVALUE.data');
} }
public function testDATEVALUEtoPHP() public function testDATEVALUEtoPHP()
@ -113,7 +113,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerYEAR() public function providerYEAR()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/YEAR.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/YEAR.data');
} }
/** /**
@ -129,7 +129,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerMONTH() public function providerMONTH()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/MONTH.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/MONTH.data');
} }
/** /**
@ -145,7 +145,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerWEEKNUM() public function providerWEEKNUM()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/WEEKNUM.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/WEEKNUM.data');
} }
/** /**
@ -161,7 +161,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerWEEKDAY() public function providerWEEKDAY()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/WEEKDAY.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/WEEKDAY.data');
} }
/** /**
@ -177,7 +177,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerDAY() public function providerDAY()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/DAY.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/DAY.data');
} }
/** /**
@ -193,7 +193,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerTIME() public function providerTIME()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/TIME.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/TIME.data');
} }
public function testTIMEtoPHP() public function testTIMEtoPHP()
@ -230,7 +230,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerTIMEVALUE() public function providerTIMEVALUE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/TIMEVALUE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/TIMEVALUE.data');
} }
public function testTIMEVALUEtoPHP() public function testTIMEVALUEtoPHP()
@ -267,7 +267,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerHOUR() public function providerHOUR()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/HOUR.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/HOUR.data');
} }
/** /**
@ -283,7 +283,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerMINUTE() public function providerMINUTE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/MINUTE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/MINUTE.data');
} }
/** /**
@ -299,7 +299,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerSECOND() public function providerSECOND()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/SECOND.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/SECOND.data');
} }
/** /**
@ -315,7 +315,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerNETWORKDAYS() public function providerNETWORKDAYS()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/NETWORKDAYS.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/NETWORKDAYS.data');
} }
/** /**
@ -331,7 +331,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerWORKDAY() public function providerWORKDAY()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/WORKDAY.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/WORKDAY.data');
} }
/** /**
@ -347,7 +347,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerEDATE() public function providerEDATE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/EDATE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/EDATE.data');
} }
public function testEDATEtoPHP() public function testEDATEtoPHP()
@ -384,7 +384,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerEOMONTH() public function providerEOMONTH()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/EOMONTH.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/EOMONTH.data');
} }
public function testEOMONTHtoPHP() public function testEOMONTHtoPHP()
@ -421,7 +421,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerDATEDIF() public function providerDATEDIF()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/DATEDIF.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/DATEDIF.data');
} }
/** /**
@ -437,7 +437,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerDAYS360() public function providerDAYS360()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/DAYS360.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/DAYS360.data');
} }
/** /**
@ -453,6 +453,6 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
public function providerYEARFRAC() public function providerYEARFRAC()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/YEARFRAC.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/DateTime/YEARFRAC.data');
} }
} }

128
unitTests/Classes/src/Calculation/EngineeringTest.php
View File

@ -12,11 +12,22 @@ require_once 'testDataFileIterator.php';
class EngineeringTest extends \PHPUnit_Framework_TestCase class EngineeringTest extends \PHPUnit_Framework_TestCase
{ {
/**
* @var \PhpSpreadhsheet\unitTests\custom\ComplexAssert
*/
protected $complexAssert;
public function setUp() public function setUp()
{ {
$this->complexAssert = new \PhpSpreadhsheet\unitTests\custom\ComplexAssert();
\PHPExcel\Calculation\Functions::setCompatibilityMode(\PHPExcel\Calculation\Functions::COMPATIBILITY_EXCEL); \PHPExcel\Calculation\Functions::setCompatibilityMode(\PHPExcel\Calculation\Functions::COMPATIBILITY_EXCEL);
} }
public function tearDown()
{
$this->complexAssert = null;
}
/** /**
* @dataProvider providerBESSELI * @dataProvider providerBESSELI
*/ */
@ -30,7 +41,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBESSELI() public function providerBESSELI()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BESSELI.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELI.data');
} }
/** /**
@ -46,7 +57,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBESSELJ() public function providerBESSELJ()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BESSELJ.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELJ.data');
} }
/** /**
@ -62,7 +73,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBESSELK() public function providerBESSELK()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BESSELK.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELK.data');
} }
/** /**
@ -78,7 +89,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBESSELY() public function providerBESSELY()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BESSELY.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BESSELY.data');
} }
/** /**
@ -94,7 +105,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerCOMPLEX() public function providerCOMPLEX()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/COMPLEX.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/COMPLEX.data');
} }
/** /**
@ -110,7 +121,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMAGINARY() public function providerIMAGINARY()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMAGINARY.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMAGINARY.data');
} }
/** /**
@ -126,7 +137,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMREAL() public function providerIMREAL()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMREAL.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMREAL.data');
} }
/** /**
@ -142,7 +153,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMABS() public function providerIMABS()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMABS.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMABS.data');
} }
/** /**
@ -158,7 +169,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerIMARGUMENT() public function providerIMARGUMENT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMARGUMENT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMARGUMENT.data');
} }
/** /**
@ -169,13 +180,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMCONJUGATE'), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMCONJUGATE'), $args);
$complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
} }
public function providerIMCONJUGATE() public function providerIMCONJUGATE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMCONJUGATE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMCONJUGATE.data');
} }
/** /**
@ -186,13 +196,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMCOS'), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMCOS'), $args);
$complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
} }
public function providerIMCOS() public function providerIMCOS()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMCOS.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMCOS.data');
} }
/** /**
@ -203,13 +212,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMDIV'), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMDIV'), $args);
$complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
} }
public function providerIMDIV() public function providerIMDIV()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMDIV.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMDIV.data');
} }
/** /**
@ -220,13 +228,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMEXP'), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMEXP'), $args);
$complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
} }
public function providerIMEXP() public function providerIMEXP()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMEXP.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMEXP.data');
} }
/** /**
@ -237,13 +244,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMLN'), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMLN'), $args);
$complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
} }
public function providerIMLN() public function providerIMLN()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMLN.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLN.data');
} }
/** /**
@ -254,13 +260,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMLOG2'), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMLOG2'), $args);
$complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
} }
public function providerIMLOG2() public function providerIMLOG2()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMLOG2.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLOG2.data');
} }
/** /**
@ -271,13 +276,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMLOG10'), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMLOG10'), $args);
$complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
} }
public function providerIMLOG10() public function providerIMLOG10()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMLOG10.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMLOG10.data');
} }
/** /**
@ -288,13 +292,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMPOWER'), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMPOWER'), $args);
$complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
} }
public function providerIMPOWER() public function providerIMPOWER()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMPOWER.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMPOWER.data');
} }
/** /**
@ -305,13 +308,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMPRODUCT'), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMPRODUCT'), $args);
$complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
} }
public function providerIMPRODUCT() public function providerIMPRODUCT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMPRODUCT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMPRODUCT.data');
} }
/** /**
@ -322,13 +324,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSIN'), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSIN'), $args);
$complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
} }
public function providerIMSIN() public function providerIMSIN()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMSIN.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSIN.data');
} }
/** /**
@ -339,13 +340,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSQRT'), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSQRT'), $args);
$complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
} }
public function providerIMSQRT() public function providerIMSQRT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMSQRT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSQRT.data');
} }
/** /**
@ -356,13 +356,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSUB'), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSUB'), $args);
$complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
} }
public function providerIMSUB() public function providerIMSUB()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMSUB.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSUB.data');
} }
/** /**
@ -373,13 +372,12 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSUM'), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSUM'), $args);
$complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($this->complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $this->complexAssert->getErrorMessage());
$this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage());
} }
public function providerIMSUM() public function providerIMSUM()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMSUM.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/IMSUM.data');
} }
/** /**
@ -395,7 +393,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerERF() public function providerERF()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/ERF.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/ERF.data');
} }
/** /**
@ -411,7 +409,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerERFC() public function providerERFC()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/ERFC.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/ERFC.data');
} }
/** /**
@ -427,7 +425,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBIN2DEC() public function providerBIN2DEC()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BIN2DEC.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2DEC.data');
} }
/** /**
@ -443,7 +441,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBIN2HEX() public function providerBIN2HEX()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BIN2HEX.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2HEX.data');
} }
/** /**
@ -459,7 +457,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerBIN2OCT() public function providerBIN2OCT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BIN2OCT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/BIN2OCT.data');
} }
/** /**
@ -475,7 +473,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerDEC2BIN() public function providerDEC2BIN()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/DEC2BIN.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2BIN.data');
} }
/** /**
@ -491,7 +489,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerDEC2HEX() public function providerDEC2HEX()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/DEC2HEX.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2HEX.data');
} }
/** /**
@ -507,7 +505,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerDEC2OCT() public function providerDEC2OCT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/DEC2OCT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/DEC2OCT.data');
} }
/** /**
@ -523,7 +521,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerHEX2BIN() public function providerHEX2BIN()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/HEX2BIN.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2BIN.data');
} }
/** /**
@ -539,7 +537,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerHEX2DEC() public function providerHEX2DEC()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/HEX2DEC.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2DEC.data');
} }
/** /**
@ -555,7 +553,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerHEX2OCT() public function providerHEX2OCT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/HEX2OCT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/HEX2OCT.data');
} }
/** /**
@ -571,7 +569,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerOCT2BIN() public function providerOCT2BIN()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/OCT2BIN.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2BIN.data');
} }
/** /**
@ -587,7 +585,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerOCT2DEC() public function providerOCT2DEC()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/OCT2DEC.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2DEC.data');
} }
/** /**
@ -603,7 +601,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerOCT2HEX() public function providerOCT2HEX()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/OCT2HEX.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/OCT2HEX.data');
} }
/** /**
@ -619,7 +617,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerDELTA() public function providerDELTA()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/DELTA.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/DELTA.data');
} }
/** /**
@ -635,7 +633,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerGESTEP() public function providerGESTEP()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/GESTEP.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/GESTEP.data');
} }
public function testGetConversionGroups() public function testGetConversionGroups()
@ -675,6 +673,6 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase
public function providerCONVERTUOM() public function providerCONVERTUOM()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/CONVERTUOM.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Engineering/CONVERTUOM.data');
} }
} }

62
unitTests/Classes/src/Calculation/FinancialTest.php
View File

@ -25,7 +25,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerACCRINT() public function providerACCRINT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/ACCRINT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/ACCRINT.data');
} }
/** /**
@ -41,7 +41,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerACCRINTM() public function providerACCRINTM()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/ACCRINTM.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/ACCRINTM.data');
} }
/** /**
@ -57,7 +57,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerAMORDEGRC() public function providerAMORDEGRC()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/AMORDEGRC.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/AMORDEGRC.data');
} }
/** /**
@ -73,7 +73,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerAMORLINC() public function providerAMORLINC()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/AMORLINC.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/AMORLINC.data');
} }
/** /**
@ -89,7 +89,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCOUPDAYBS() public function providerCOUPDAYBS()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/COUPDAYBS.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYBS.data');
} }
/** /**
@ -105,7 +105,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCOUPDAYS() public function providerCOUPDAYS()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/COUPDAYS.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYS.data');
} }
/** /**
@ -121,7 +121,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCOUPDAYSNC() public function providerCOUPDAYSNC()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/COUPDAYSNC.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPDAYSNC.data');
} }
/** /**
@ -137,7 +137,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCOUPNCD() public function providerCOUPNCD()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/COUPNCD.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPNCD.data');
} }
/** /**
@ -153,7 +153,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCOUPNUM() public function providerCOUPNUM()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/COUPNUM.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPNUM.data');
} }
/** /**
@ -169,7 +169,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCOUPPCD() public function providerCOUPPCD()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/COUPPCD.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/COUPPCD.data');
} }
/** /**
@ -185,7 +185,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCUMIPMT() public function providerCUMIPMT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/CUMIPMT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/CUMIPMT.data');
} }
/** /**
@ -201,7 +201,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerCUMPRINC() public function providerCUMPRINC()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/CUMPRINC.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/CUMPRINC.data');
} }
/** /**
@ -217,7 +217,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerDB() public function providerDB()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/DB.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DB.data');
} }
/** /**
@ -233,7 +233,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerDDB() public function providerDDB()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/DDB.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DDB.data');
} }
/** /**
@ -249,7 +249,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerDISC() public function providerDISC()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/DISC.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DISC.data');
} }
/** /**
@ -265,7 +265,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerDOLLARDE() public function providerDOLLARDE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/DOLLARDE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DOLLARDE.data');
} }
/** /**
@ -281,7 +281,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerDOLLARFR() public function providerDOLLARFR()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/DOLLARFR.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/DOLLARFR.data');
} }
/** /**
@ -297,7 +297,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerEFFECT() public function providerEFFECT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/EFFECT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/EFFECT.data');
} }
/** /**
@ -313,7 +313,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerFV() public function providerFV()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/FV.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/FV.data');
} }
/** /**
@ -329,7 +329,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerFVSCHEDULE() public function providerFVSCHEDULE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/FVSCHEDULE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/FVSCHEDULE.data');
} }
/** /**
@ -345,7 +345,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerINTRATE() public function providerINTRATE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/INTRATE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/INTRATE.data');
} }
/** /**
@ -361,7 +361,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerIPMT() public function providerIPMT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/IPMT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/IPMT.data');
} }
/** /**
@ -377,7 +377,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerIRR() public function providerIRR()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/IRR.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/IRR.data');
} }
/** /**
@ -393,7 +393,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerISPMT() public function providerISPMT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/ISPMT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/ISPMT.data');
} }
/** /**
@ -409,7 +409,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerMIRR() public function providerMIRR()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/MIRR.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/MIRR.data');
} }
/** /**
@ -425,7 +425,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerNOMINAL() public function providerNOMINAL()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/NOMINAL.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/NOMINAL.data');
} }
/** /**
@ -441,7 +441,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerNPER() public function providerNPER()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/NPER.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/NPER.data');
} }
/** /**
@ -457,7 +457,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerNPV() public function providerNPV()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/NPV.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/NPV.data');
} }
/** /**
@ -473,7 +473,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerPRICE() public function providerPRICE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/PRICE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/PRICE.data');
} }
/** /**
@ -489,7 +489,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerRATE() public function providerRATE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/RATE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/RATE.data');
} }
/** /**
@ -505,6 +505,6 @@ class FinancialTest extends \PHPUnit_Framework_TestCase
public function providerXIRR() public function providerXIRR()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/XIRR.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Financial/XIRR.data');
} }
} }

28
unitTests/Classes/src/Calculation/FunctionsTest.php
View File

@ -73,7 +73,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsBlank() public function providerIsBlank()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_BLANK.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_BLANK.data');
} }
/** /**
@ -89,7 +89,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsErr() public function providerIsErr()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_ERR.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ERR.data');
} }
/** /**
@ -105,7 +105,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsError() public function providerIsError()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_ERROR.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ERROR.data');
} }
/** /**
@ -121,7 +121,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerErrorType() public function providerErrorType()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/ERROR_TYPE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/ERROR_TYPE.data');
} }
/** /**
@ -137,7 +137,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsLogical() public function providerIsLogical()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_LOGICAL.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_LOGICAL.data');
} }
/** /**
@ -147,13 +147,13 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
{ {
$args = func_get_args(); $args = func_get_args();
$expectedResult = array_pop($args); $expectedResult = array_pop($args);
$result = call_user_func_array(array('\PHPExcel\Calculation\Functions','isError('), $args); $result = call_user_func_array(array('\PHPExcel\Calculation\Functions','isNa'), $args);
$this->assertEquals($expectedResult, $result, null, 1E-8); $this->assertEquals($expectedResult, $result, null, 1E-8);
} }
public function providerIsNa() public function providerIsNa()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_NA.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NA.data');
} }
/** /**
@ -169,7 +169,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsNumber() public function providerIsNumber()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_NUMBER.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NUMBER.data');
} }
/** /**
@ -185,7 +185,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsText() public function providerIsText()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_TEXT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_TEXT.data');
} }
/** /**
@ -201,7 +201,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsNonText() public function providerIsNonText()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_NONTEXT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_NONTEXT.data');
} }
/** /**
@ -217,7 +217,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsEven() public function providerIsEven()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_EVEN.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_EVEN.data');
} }
/** /**
@ -233,7 +233,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerIsOdd() public function providerIsOdd()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_ODD.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/IS_ODD.data');
} }
/** /**
@ -249,7 +249,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerTYPE() public function providerTYPE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/TYPE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/TYPE.data');
} }
/** /**
@ -265,6 +265,6 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase
public function providerN() public function providerN()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/N.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Functions/N.data');
} }
} }

10
unitTests/Classes/src/Calculation/LogicalTest.php
View File

@ -37,7 +37,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
public function providerAND() public function providerAND()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Logical/AND.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/AND.data');
} }
/** /**
@ -53,7 +53,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
public function providerOR() public function providerOR()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Logical/OR.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/OR.data');
} }
/** /**
@ -69,7 +69,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
public function providerNOT() public function providerNOT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Logical/NOT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/NOT.data');
} }
/** /**
@ -85,7 +85,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
public function providerIF() public function providerIF()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Logical/IF.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/IF.data');
} }
/** /**
@ -101,6 +101,6 @@ class LogicalTest extends \PHPUnit_Framework_TestCase
public function providerIFERROR() public function providerIFERROR()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Logical/IFERROR.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/Logical/IFERROR.data');
} }
} }

4
unitTests/Classes/src/Calculation/LookupRefTest.php
View File

@ -25,7 +25,7 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase
public function providerHLOOKUP() public function providerHLOOKUP()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/LookupRef/HLOOKUP.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/LookupRef/HLOOKUP.data');
} }
/** /**
@ -41,6 +41,6 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase
public function providerVLOOKUP() public function providerVLOOKUP()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/LookupRef/VLOOKUP.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/LookupRef/VLOOKUP.data');
} }
} }

58
unitTests/Classes/src/Calculation/MathTrigTest.php
View File

@ -25,7 +25,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerATAN2() public function providerATAN2()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/ATAN2.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ATAN2.data');
} }
/** /**
@ -41,7 +41,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerCEILING() public function providerCEILING()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/CEILING.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/CEILING.data');
} }
/** /**
@ -57,7 +57,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerCOMBIN() public function providerCOMBIN()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/COMBIN.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/COMBIN.data');
} }
/** /**
@ -73,7 +73,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerEVEN() public function providerEVEN()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/EVEN.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/EVEN.data');
} }
/** /**
@ -89,7 +89,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerODD() public function providerODD()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/ODD.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ODD.data');
} }
/** /**
@ -105,7 +105,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerFACT() public function providerFACT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/FACT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FACT.data');
} }
/** /**
@ -121,7 +121,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerFACTDOUBLE() public function providerFACTDOUBLE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/FACTDOUBLE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FACTDOUBLE.data');
} }
/** /**
@ -137,7 +137,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerFLOOR() public function providerFLOOR()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/FLOOR.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/FLOOR.data');
} }
/** /**
@ -153,7 +153,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerGCD() public function providerGCD()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/GCD.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/GCD.data');
} }
/** /**
@ -169,7 +169,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerLCM() public function providerLCM()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/LCM.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/LCM.data');
} }
/** /**
@ -185,7 +185,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerINT() public function providerINT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/INT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/INT.data');
} }
/** /**
@ -201,7 +201,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerSIGN() public function providerSIGN()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/SIGN.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SIGN.data');
} }
/** /**
@ -217,7 +217,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerPOWER() public function providerPOWER()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/POWER.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/POWER.data');
} }
/** /**
@ -233,7 +233,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerLOG() public function providerLOG()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/LOG.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/LOG.data');
} }
/** /**
@ -249,7 +249,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerMOD() public function providerMOD()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/MOD.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MOD.data');
} }
/** /**
@ -265,7 +265,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerMDETERM() public function providerMDETERM()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/MDETERM.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MDETERM.data');
} }
/** /**
@ -281,7 +281,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerMINVERSE() public function providerMINVERSE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/MINVERSE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MINVERSE.data');
} }
/** /**
@ -297,7 +297,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerMMULT() public function providerMMULT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/MMULT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MMULT.data');
} }
/** /**
@ -313,7 +313,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerMULTINOMIAL() public function providerMULTINOMIAL()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/MULTINOMIAL.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MULTINOMIAL.data');
} }
/** /**
@ -331,7 +331,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerMROUND() public function providerMROUND()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/MROUND.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/MROUND.data');
} }
/** /**
@ -347,7 +347,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerPRODUCT() public function providerPRODUCT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/PRODUCT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/PRODUCT.data');
} }
/** /**
@ -363,7 +363,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerQUOTIENT() public function providerQUOTIENT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/QUOTIENT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/QUOTIENT.data');
} }
/** /**
@ -379,7 +379,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerROUNDUP() public function providerROUNDUP()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDUP.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDUP.data');
} }
/** /**
@ -395,7 +395,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerROUNDDOWN() public function providerROUNDDOWN()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDDOWN.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROUNDDOWN.data');
} }
/** /**
@ -411,7 +411,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerSERIESSUM() public function providerSERIESSUM()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/SERIESSUM.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SERIESSUM.data');
} }
/** /**
@ -427,7 +427,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerSUMSQ() public function providerSUMSQ()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/SUMSQ.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SUMSQ.data');
} }
/** /**
@ -443,7 +443,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerTRUNC() public function providerTRUNC()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/TRUNC.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/TRUNC.data');
} }
/** /**
@ -459,7 +459,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerROMAN() public function providerROMAN()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/ROMAN.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/ROMAN.data');
} }
/** /**
@ -475,7 +475,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase
public function providerSQRTPI() public function providerSQRTPI()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/SQRTPI.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/MathTrig/SQRTPI.data');
} }
/** /**

42
unitTests/Classes/src/Calculation/TextDataTest.php
View File

@ -25,7 +25,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerCHAR() public function providerCHAR()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/CHAR.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/CHAR.data');
} }
/** /**
@ -41,7 +41,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerCODE() public function providerCODE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/CODE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/CODE.data');
} }
/** /**
@ -57,7 +57,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerCONCATENATE() public function providerCONCATENATE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/CONCATENATE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/CONCATENATE.data');
} }
/** /**
@ -73,7 +73,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerLEFT() public function providerLEFT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/LEFT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/LEFT.data');
} }
/** /**
@ -89,7 +89,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerMID() public function providerMID()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/MID.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/MID.data');
} }
/** /**
@ -105,7 +105,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerRIGHT() public function providerRIGHT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/RIGHT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/RIGHT.data');
} }
/** /**
@ -121,7 +121,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerLOWER() public function providerLOWER()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/LOWER.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/LOWER.data');
} }
/** /**
@ -137,7 +137,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerUPPER() public function providerUPPER()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/UPPER.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/UPPER.data');
} }
/** /**
@ -153,7 +153,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerPROPER() public function providerPROPER()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/PROPER.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/PROPER.data');
} }
/** /**
@ -169,7 +169,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerLEN() public function providerLEN()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/LEN.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/LEN.data');
} }
/** /**
@ -185,7 +185,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerSEARCH() public function providerSEARCH()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/SEARCH.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/SEARCH.data');
} }
/** /**
@ -201,7 +201,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerFIND() public function providerFIND()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/FIND.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/FIND.data');
} }
/** /**
@ -217,7 +217,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerREPLACE() public function providerREPLACE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/REPLACE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/REPLACE.data');
} }
/** /**
@ -233,7 +233,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerSUBSTITUTE() public function providerSUBSTITUTE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/SUBSTITUTE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/SUBSTITUTE.data');
} }
/** /**
@ -249,7 +249,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerTRIM() public function providerTRIM()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/TRIM.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/TRIM.data');
} }
/** /**
@ -265,7 +265,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerCLEAN() public function providerCLEAN()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/CLEAN.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/CLEAN.data');
} }
/** /**
@ -281,7 +281,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerDOLLAR() public function providerDOLLAR()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/DOLLAR.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/DOLLAR.data');
} }
/** /**
@ -297,7 +297,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerFIXED() public function providerFIXED()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/FIXED.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/FIXED.data');
} }
/** /**
@ -313,7 +313,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerT() public function providerT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/T.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/T.data');
} }
/** /**
@ -334,7 +334,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerTEXT() public function providerTEXT()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/TEXT.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/TEXT.data');
} }
/** /**
@ -354,6 +354,6 @@ class TextDataTest extends \PHPUnit_Framework_TestCase
public function providerVALUE() public function providerVALUE()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/VALUE.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Calculation/TextData/VALUE.data');
} }
} }

2
unitTests/Classes/src/CalculationTest.php
View File

@ -27,6 +27,6 @@ class CalculationTest extends \PHPUnit_Framework_TestCase
public function providerBinaryComparisonOperation() public function providerBinaryComparisonOperation()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CalculationBinaryComparisonOperation.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CalculationBinaryComparisonOperation.data');
} }
} }

2
unitTests/Classes/src/Cell/DefaultValueBinderTest.php
View File

@ -70,7 +70,7 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase
public function providerDataTypeForValue() public function providerDataTypeForValue()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIteratorJson('rawTestData/Cell/DefaultValueBinder.json'); return new \PhpSpreadhsheet\unitTests\TestDataFileIteratorJson('rawTestData/Cell/DefaultValueBinder.json');
} }
public function testDataTypeForRichTextObject() public function testDataTypeForRichTextObject()

22
unitTests/Classes/src/CellTest.php
View File

@ -24,7 +24,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerColumnString() public function providerColumnString()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/ColumnString.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/ColumnString.data');
} }
public function testColumnIndexFromStringTooLong() public function testColumnIndexFromStringTooLong()
@ -66,7 +66,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerColumnIndex() public function providerColumnIndex()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/ColumnIndex.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/ColumnIndex.data');
} }
/** /**
@ -82,7 +82,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerCoordinates() public function providerCoordinates()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellCoordinates.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellCoordinates.data');
} }
public function testCoordinateFromStringWithRangeAddress() public function testCoordinateFromStringWithRangeAddress()
@ -137,7 +137,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerAbsoluteCoordinates() public function providerAbsoluteCoordinates()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellAbsoluteCoordinate.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellAbsoluteCoordinate.data');
} }
public function testAbsoluteCoordinateFromStringWithRangeAddress() public function testAbsoluteCoordinateFromStringWithRangeAddress()
@ -166,7 +166,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerAbsoluteReferences() public function providerAbsoluteReferences()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellAbsoluteReference.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellAbsoluteReference.data');
} }
public function testAbsoluteReferenceFromStringWithRangeAddress() public function testAbsoluteReferenceFromStringWithRangeAddress()
@ -201,7 +201,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerSplitRange() public function providerSplitRange()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellSplitRange.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellSplitRange.data');
} }
/** /**
@ -217,7 +217,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerBuildRange() public function providerBuildRange()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellBuildRange.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellBuildRange.data');
} }
public function testBuildRangeInvalid() public function testBuildRangeInvalid()
@ -246,7 +246,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerRangeBoundaries() public function providerRangeBoundaries()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellRangeBoundaries.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellRangeBoundaries.data');
} }
/** /**
@ -262,7 +262,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerRangeDimension() public function providerRangeDimension()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellRangeDimension.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellRangeDimension.data');
} }
/** /**
@ -278,7 +278,7 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerGetRangeBoundaries() public function providerGetRangeBoundaries()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellGetRangeBoundaries.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellGetRangeBoundaries.data');
} }
/** /**
@ -294,6 +294,6 @@ class CellTest extends \PHPUnit_Framework_TestCase
public function providerExtractAllCellReferencesInRange() public function providerExtractAllCellReferencesInRange()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellExtractAllCellReferencesInRange.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/CellExtractAllCellReferencesInRange.data');
} }
} }

2
unitTests/Classes/src/Shared/CodePageTest.php
View File

@ -19,7 +19,7 @@ class CodePageTest extends \PHPUnit_Framework_TestCase
public function providerCodePage() public function providerCodePage()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/CodePage.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/CodePage.data');
} }
public function testNumberToNameWithInvalidCodePage() public function testNumberToNameWithInvalidCodePage()

14
unitTests/Classes/src/Shared/DateTest.php
View File

@ -47,7 +47,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerDateTimeExcelToPHP1900() public function providerDateTimeExcelToPHP1900()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900.data');
} }
/** /**
@ -68,7 +68,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerDateTimePHPToExcel1900() public function providerDateTimePHPToExcel1900()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1900.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1900.data');
} }
/** /**
@ -89,7 +89,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerDateTimeFormattedPHPToExcel1900() public function providerDateTimeFormattedPHPToExcel1900()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/DateTimeFormattedPHPToExcel1900.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeFormattedPHPToExcel1900.data');
} }
/** /**
@ -113,7 +113,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerDateTimeExcelToPHP1904() public function providerDateTimeExcelToPHP1904()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1904.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1904.data');
} }
/** /**
@ -134,7 +134,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerDateTimePHPToExcel1904() public function providerDateTimePHPToExcel1904()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1904.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimePHPToExcel1904.data');
} }
/** /**
@ -150,7 +150,7 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerIsDateTimeFormatCode() public function providerIsDateTimeFormatCode()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/DateTimeFormatCodes.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeFormatCodes.data');
} }
/** /**
@ -174,6 +174,6 @@ class DateTest extends \PHPUnit_Framework_TestCase
public function providerDateTimeExcelToPHP1900Timezone() public function providerDateTimeExcelToPHP1900Timezone()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data');
} }
} }

6
unitTests/Classes/src/Shared/FontTest.php
View File

@ -48,7 +48,7 @@ class FontTest extends \PHPUnit_Framework_TestCase
public function providerFontSizeToPixels() public function providerFontSizeToPixels()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/FontSizeToPixels.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/FontSizeToPixels.data');
} }
/** /**
@ -64,7 +64,7 @@ class FontTest extends \PHPUnit_Framework_TestCase
public function providerInchSizeToPixels() public function providerInchSizeToPixels()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/InchSizeToPixels.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/InchSizeToPixels.data');
} }
/** /**
@ -80,6 +80,6 @@ class FontTest extends \PHPUnit_Framework_TestCase
public function providerCentimeterSizeToPixels() public function providerCentimeterSizeToPixels()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/CentimeterSizeToPixels.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/CentimeterSizeToPixels.data');
} }
} }

2
unitTests/Classes/src/Shared/PasswordHasherTest.php
View File

@ -19,6 +19,6 @@ class PasswordHasherTest extends \PHPUnit_Framework_TestCase
public function providerHashPassword() public function providerHashPassword()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/PasswordHashes.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Shared/PasswordHashes.data');
} }
} }

17
unitTests/Classes/src/Shared/StringTest.php
View File

@ -6,6 +6,14 @@ require_once 'testDataFileIterator.php';
class StringTest extends \PHPUnit_Framework_TestCase class StringTest extends \PHPUnit_Framework_TestCase
{ {
public function setUp()
{
parent::setUp();
// Reset Currency Code
call_user_func(array('\PHPExcel\Shared\StringHelper','setCurrencyCode'), null);
}
public function testGetIsMbStringEnabled() public function testGetIsMbStringEnabled()
{ {
$result = call_user_func(array('\PHPExcel\Shared\StringHelper','getIsMbstringEnabled')); $result = call_user_func(array('\PHPExcel\Shared\StringHelper','getIsMbstringEnabled'));
@ -30,7 +38,7 @@ class StringTest extends \PHPUnit_Framework_TestCase
public function testSetDecimalSeparator() public function testSetDecimalSeparator()
{ {
$expectedResult = ','; $expectedResult = ',';
$result = call_user_func(array('\PHPExcel\Shared\StringHelper','setDecimalSeparator'), $expectedResult); call_user_func(array('\PHPExcel\Shared\StringHelper','setDecimalSeparator'), $expectedResult);
$result = call_user_func(array('\PHPExcel\Shared\StringHelper','getDecimalSeparator')); $result = call_user_func(array('\PHPExcel\Shared\StringHelper','getDecimalSeparator'));
$this->assertEquals($expectedResult, $result); $this->assertEquals($expectedResult, $result);
@ -48,7 +56,7 @@ class StringTest extends \PHPUnit_Framework_TestCase
public function testSetThousandsSeparator() public function testSetThousandsSeparator()
{ {
$expectedResult = ' '; $expectedResult = ' ';
$result = call_user_func(array('\PHPExcel\Shared\StringHelper','setThousandsSeparator'), $expectedResult); call_user_func(array('\PHPExcel\Shared\StringHelper','setThousandsSeparator'), $expectedResult);
$result = call_user_func(array('\PHPExcel\Shared\StringHelper','getThousandsSeparator')); $result = call_user_func(array('\PHPExcel\Shared\StringHelper','getThousandsSeparator'));
$this->assertEquals($expectedResult, $result); $this->assertEquals($expectedResult, $result);
@ -57,8 +65,7 @@ class StringTest extends \PHPUnit_Framework_TestCase
public function testGetCurrencyCode() public function testGetCurrencyCode()
{ {
$localeconv = localeconv(); $localeconv = localeconv();
$expectedResult = (!empty($localeconv['currency_symbol']) ? $localeconv['currency_symbol'] : (!empty($localeconv['int_curr_symbol']) ? $localeconv['int_curr_symbol']: '$'));
$expectedResult = (!empty($localeconv['currency_symbol'])) ? $localeconv['currency_symbol'] : '$';
$result = call_user_func(array('\PHPExcel\Shared\StringHelper','getCurrencyCode')); $result = call_user_func(array('\PHPExcel\Shared\StringHelper','getCurrencyCode'));
$this->assertEquals($expectedResult, $result); $this->assertEquals($expectedResult, $result);
} }
@ -66,7 +73,7 @@ class StringTest extends \PHPUnit_Framework_TestCase
public function testSetCurrencyCode() public function testSetCurrencyCode()
{ {
$expectedResult = '£'; $expectedResult = '£';
$result = call_user_func(array('\PHPExcel\Shared\StringHelper','setCurrencyCode'), $expectedResult); call_user_func(array('\PHPExcel\Shared\StringHelper','setCurrencyCode'), $expectedResult);
$result = call_user_func(array('\PHPExcel\Shared\StringHelper','getCurrencyCode')); $result = call_user_func(array('\PHPExcel\Shared\StringHelper','getCurrencyCode'));
$this->assertEquals($expectedResult, $result); $this->assertEquals($expectedResult, $result);

8
unitTests/Classes/src/Style/ColorTest.php
View File

@ -20,7 +20,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase
public function providerColorGetRed() public function providerColorGetRed()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Style/ColorGetRed.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/ColorGetRed.data');
} }
/** /**
@ -36,7 +36,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase
public function providerColorGetGreen() public function providerColorGetGreen()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Style/ColorGetGreen.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/ColorGetGreen.data');
} }
/** /**
@ -52,7 +52,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase
public function providerColorGetBlue() public function providerColorGetBlue()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Style/ColorGetBlue.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/ColorGetBlue.data');
} }
/** /**
@ -67,6 +67,6 @@ class ColorTest extends \PHPUnit_Framework_TestCase
public function providerColorChangeBrightness() public function providerColorChangeBrightness()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIteratorJson('rawTestData/Style/ColorChangeBrightness.json'); return new \PhpSpreadhsheet\unitTests\TestDataFileIteratorJson('rawTestData/Style/ColorChangeBrightness.json');
} }
} }

2
unitTests/Classes/src/Style/NumberFormatDateTest.php
View File

@ -26,6 +26,6 @@ class NumberFormatDateTest extends \PHPUnit_Framework_TestCase
public function providerNumberFormat() public function providerNumberFormat()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Style/NumberFormatDates.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/NumberFormatDates.data');
} }
} }

2
unitTests/Classes/src/Style/NumberFormatTest.php
View File

@ -26,6 +26,6 @@ class NumberFormatTest extends \PHPUnit_Framework_TestCase
public function providerNumberFormat() public function providerNumberFormat()
{ {
return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Style/NumberFormat.data'); return new \PhpSpreadhsheet\unitTests\TestDataFileIterator('rawTestData/Style/NumberFormat.data');
} }
} }

2
unitTests/custom/complexAssert.php
View File

@ -4,7 +4,7 @@ namespace PhpSpreadhsheet\unitTests\custom;
include_once dirname(__FILE__).'/Complex.php'; include_once dirname(__FILE__).'/Complex.php';
class complexAssert class ComplexAssert
{ {
private $_errorMessage = ''; private $_errorMessage = '';

2
unitTests/rawTestData/Calculation/Engineering/DEC2OCT.data
View File

@ -4,7 +4,7 @@
"12345", "30071" "12345", "30071"
"123456789", "726746425" "123456789", "726746425"
"123.45", "173" "123.45", "173"
"58, 3, "072" "58", 3, "072"
"0", "0" "0", "0"
"3579A", "#VALUE!" // Invalid decimal "3579A", "#VALUE!" // Invalid decimal
TRUE, "#VALUE!" // Non string TRUE, "#VALUE!" // Non string

2
unitTests/testDataFileIterator.php
View File

@ -2,7 +2,7 @@
namespace PhpSpreadhsheet\unitTests; namespace PhpSpreadhsheet\unitTests;
class testDataFileIterator implements \Iterator class TestDataFileIterator implements \Iterator
{ {
protected $file; protected $file;
protected $key = 0; protected $key = 0;

2
unitTests/testDataFileIteratorJson.php
View File

@ -2,7 +2,7 @@
namespace PhpSpreadhsheet\unitTests; namespace PhpSpreadhsheet\unitTests;
class testDataFileIteratorJson implements \Iterator class TestDataFileIteratorJson implements \Iterator
{ {
protected $file; protected $file;
protected $key = 0; protected $key = 0;