diff --git a/src/PhpSpreadsheet/Calculation.php b/src/PhpSpreadsheet/Calculation.php index 53128a4b..37f0fa57 100644 --- a/src/PhpSpreadsheet/Calculation.php +++ b/src/PhpSpreadsheet/Calculation.php @@ -291,7 +291,7 @@ class Calculation ), 'ADDRESS' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::CELL_ADDRESS', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::cellAddress', 'argumentCount' => '2-5' ), 'AMORDEGRC' => array( diff --git a/src/PhpSpreadsheet/Calculation/Functions.php b/src/PhpSpreadsheet/Calculation/Functions.php index 51fd2e45..a30e8290 100644 --- a/src/PhpSpreadsheet/Calculation/Functions.php +++ b/src/PhpSpreadsheet/Calculation/Functions.php @@ -379,7 +379,7 @@ class Functions { $value = self::flattenSingleValue($value); - return self::isError($value) && (!self::isNa(($value)); + return self::isError($value) && (!self::isNa(($value))); } diff --git a/src/PhpSpreadsheet/Calculation/LookupRef.php b/src/PhpSpreadsheet/Calculation/LookupRef.php index 22662835..f5553af4 100644 --- a/src/PhpSpreadsheet/Calculation/LookupRef.php +++ b/src/PhpSpreadsheet/Calculation/LookupRef.php @@ -50,7 +50,7 @@ class LookupRef * @param sheetText Optional Name of worksheet to use * @return string */ - public static function CELL_ADDRESS($row, $column, $relativity = 1, $referenceStyle = true, $sheetText = '') + public static function cellAddress($row, $column, $relativity = 1, $referenceStyle = true, $sheetText = '') { $row = Functions::flattenSingleValue($row); $column = Functions::flattenSingleValue($column); diff --git a/src/PhpSpreadsheet/Shared/Date.php b/src/PhpSpreadsheet/Shared/Date.php index 0cf94b89..3c1cdeba 100644 --- a/src/PhpSpreadsheet/Shared/Date.php +++ b/src/PhpSpreadsheet/Shared/Date.php @@ -191,7 +191,7 @@ class Date $retValue = false; if ((is_object($dateValue)) && ($dateValue instanceof \DateTime)) { - $dateValue->add(new DateInterval('PT' . $timezoneAdjustment . 'S')); + $dateValue->add(new \DateInterval('PT' . $timezoneAdjustment . 'S')); $retValue = self::formattedPHPToExcel($dateValue->format('Y'), $dateValue->format('m'), $dateValue->format('d'), $dateValue->format('H'), $dateValue->format('i'), $dateValue->format('s')); } elseif (is_numeric($dateValue)) { $dateValue += $timezoneAdjustment; diff --git a/unitTests/Classes/src/Calculation/DateTimeTest.php b/unitTests/Classes/src/Calculation/DateTimeTest.php index 60b1e579..8c6244b2 100644 --- a/unitTests/Classes/src/Calculation/DateTimeTest.php +++ b/unitTests/Classes/src/Calculation/DateTimeTest.php @@ -23,7 +23,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerDATE() { - return new \testDataFileIterator('rawTestData/Calculation/DateTime/DATE.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/DATE.data'); } public function testDATEtoPHP() @@ -76,7 +76,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerDATEVALUE() { - return new \testDataFileIterator('rawTestData/Calculation/DateTime/DATEVALUE.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/DATEVALUE.data'); } public function testDATEVALUEtoPHP() @@ -113,7 +113,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerYEAR() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \testDataFileIterator('rawTestData/Calculation/DateTime/TIME.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/TIME.data'); } public function testTIMEtoPHP() @@ -230,7 +230,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerTIMEVALUE() { - return new \testDataFileIterator('rawTestData/Calculation/DateTime/TIMEVALUE.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/TIMEVALUE.data'); } public function testTIMEVALUEtoPHP() @@ -267,7 +267,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerHOUR() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \testDataFileIterator('rawTestData/Calculation/DateTime/EDATE.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/EDATE.data'); } public function testEDATEtoPHP() @@ -384,7 +384,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerEOMONTH() { - return new \testDataFileIterator('rawTestData/Calculation/DateTime/EOMONTH.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/EOMONTH.data'); } public function testEOMONTHtoPHP() @@ -421,7 +421,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase public function providerDATEDIF() { - return new \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() { - return new \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() { - return new \testDataFileIterator('rawTestData/Calculation/DateTime/YEARFRAC.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/DateTime/YEARFRAC.data'); } } diff --git a/unitTests/Classes/src/Calculation/EngineeringTest.php b/unitTests/Classes/src/Calculation/EngineeringTest.php index 5d394f95..64beeebe 100644 --- a/unitTests/Classes/src/Calculation/EngineeringTest.php +++ b/unitTests/Classes/src/Calculation/EngineeringTest.php @@ -30,7 +30,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBESSELI() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/BESSELI.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BESSELI.data'); } /** @@ -46,7 +46,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBESSELJ() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/BESSELJ.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BESSELJ.data'); } /** @@ -62,7 +62,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBESSELK() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/BESSELK.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BESSELK.data'); } /** @@ -78,7 +78,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBESSELY() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/BESSELY.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BESSELY.data'); } /** @@ -94,7 +94,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerCOMPLEX() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/COMPLEX.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/COMPLEX.data'); } /** @@ -110,7 +110,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMAGINARY() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMAGINARY.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMAGINARY.data'); } /** @@ -126,7 +126,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMREAL() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMREAL.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMREAL.data'); } /** @@ -142,7 +142,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMABS() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMABS.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMABS.data'); } /** @@ -158,7 +158,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerIMARGUMENT() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMARGUMENT.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMARGUMENT.data'); } /** @@ -169,13 +169,13 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMCONJUGATE'), $args); - $complexAssert = new \complexAssert(); + $complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage()); } public function providerIMCONJUGATE() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMCONJUGATE.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMCONJUGATE.data'); } /** @@ -186,13 +186,13 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMCOS'), $args); - $complexAssert = new \complexAssert(); + $complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage()); } public function providerIMCOS() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMCOS.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMCOS.data'); } /** @@ -203,13 +203,13 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMDIV'), $args); - $complexAssert = new \complexAssert(); + $complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage()); } public function providerIMDIV() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMDIV.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMDIV.data'); } /** @@ -220,13 +220,13 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMEXP'), $args); - $complexAssert = new \complexAssert(); + $complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage()); } public function providerIMEXP() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMEXP.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMEXP.data'); } /** @@ -237,13 +237,13 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMLN'), $args); - $complexAssert = new \complexAssert(); + $complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage()); } public function providerIMLN() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMLN.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMLN.data'); } /** @@ -254,13 +254,13 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMLOG2'), $args); - $complexAssert = new \complexAssert(); + $complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage()); } public function providerIMLOG2() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMLOG2.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMLOG2.data'); } /** @@ -271,13 +271,13 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMLOG10'), $args); - $complexAssert = new \complexAssert(); + $complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage()); } public function providerIMLOG10() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMLOG10.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMLOG10.data'); } /** @@ -288,13 +288,13 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMPOWER'), $args); - $complexAssert = new \complexAssert(); + $complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage()); } public function providerIMPOWER() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMPOWER.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMPOWER.data'); } /** @@ -305,13 +305,13 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMPRODUCT'), $args); - $complexAssert = new \complexAssert(); + $complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage()); } public function providerIMPRODUCT() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMPRODUCT.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMPRODUCT.data'); } /** @@ -322,13 +322,13 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSIN'), $args); - $complexAssert = new \complexAssert(); + $complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage()); } public function providerIMSIN() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMSIN.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMSIN.data'); } /** @@ -339,13 +339,13 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSQRT'), $args); - $complexAssert = new \complexAssert(); + $complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage()); } public function providerIMSQRT() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMSQRT.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMSQRT.data'); } /** @@ -356,13 +356,13 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSUB'), $args); - $complexAssert = new \complexAssert(); + $complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage()); } public function providerIMSUB() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMSUB.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMSUB.data'); } /** @@ -373,13 +373,13 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase $args = func_get_args(); $expectedResult = array_pop($args); $result = call_user_func_array(array('\PHPExcel\Calculation\Engineering','IMSUM'), $args); - $complexAssert = new \complexAssert(); + $complexAssert = new \PhpSpreadhsheet\unitTests\custom\complexAssert(); $this->assertTrue($complexAssert->assertComplexEquals($expectedResult, $result, 1E-8), $complexAssert->getErrorMessage()); } public function providerIMSUM() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/IMSUM.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/IMSUM.data'); } /** @@ -395,7 +395,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerERF() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/ERF.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/ERF.data'); } /** @@ -411,7 +411,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerERFC() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/ERFC.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/ERFC.data'); } /** @@ -427,7 +427,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBIN2DEC() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/BIN2DEC.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BIN2DEC.data'); } /** @@ -443,7 +443,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBIN2HEX() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/BIN2HEX.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BIN2HEX.data'); } /** @@ -459,7 +459,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerBIN2OCT() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/BIN2OCT.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/BIN2OCT.data'); } /** @@ -475,7 +475,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerDEC2BIN() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/DEC2BIN.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/DEC2BIN.data'); } /** @@ -491,7 +491,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerDEC2HEX() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/DEC2HEX.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/DEC2HEX.data'); } /** @@ -507,7 +507,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerDEC2OCT() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/DEC2OCT.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/DEC2OCT.data'); } /** @@ -523,7 +523,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerHEX2BIN() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/HEX2BIN.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/HEX2BIN.data'); } /** @@ -539,7 +539,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerHEX2DEC() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/HEX2DEC.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/HEX2DEC.data'); } /** @@ -555,7 +555,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerHEX2OCT() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/HEX2OCT.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/HEX2OCT.data'); } /** @@ -571,7 +571,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerOCT2BIN() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/OCT2BIN.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/OCT2BIN.data'); } /** @@ -587,7 +587,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerOCT2DEC() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/OCT2DEC.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/OCT2DEC.data'); } /** @@ -603,7 +603,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerOCT2HEX() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/OCT2HEX.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/OCT2HEX.data'); } /** @@ -619,7 +619,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerDELTA() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/DELTA.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/DELTA.data'); } /** @@ -635,7 +635,7 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerGESTEP() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/GESTEP.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/GESTEP.data'); } public function testGetConversionGroups() @@ -675,6 +675,6 @@ class EngineeringTest extends \PHPUnit_Framework_TestCase public function providerCONVERTUOM() { - return new \testDataFileIterator('rawTestData/Calculation/Engineering/CONVERTUOM.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Engineering/CONVERTUOM.data'); } } diff --git a/unitTests/Classes/src/Calculation/FinancialTest.php b/unitTests/Classes/src/Calculation/FinancialTest.php index 4e6b02d7..a142e9b0 100644 --- a/unitTests/Classes/src/Calculation/FinancialTest.php +++ b/unitTests/Classes/src/Calculation/FinancialTest.php @@ -25,7 +25,7 @@ class FinancialTest extends \PHPUnit_Framework_TestCase public function providerACCRINT() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \testDataFileIterator('rawTestData/Calculation/Financial/XIRR.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Financial/XIRR.data'); } } diff --git a/unitTests/Classes/src/Calculation/FunctionsTest.php b/unitTests/Classes/src/Calculation/FunctionsTest.php index 126e368b..6ab38b78 100644 --- a/unitTests/Classes/src/Calculation/FunctionsTest.php +++ b/unitTests/Classes/src/Calculation/FunctionsTest.php @@ -61,9 +61,9 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase } /** - * @dataProvider providerIS_BLANK + * @dataProvider providerIsBlank */ - public function testIS_BLANK() + public function testIsBlank() { $args = func_get_args(); $expectedResult = array_pop($args); @@ -71,47 +71,47 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expectedResult, $result, null, 1E-8); } - public function providerIS_BLANK() + public function providerIsBlank() { - return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_BLANK.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_BLANK.data'); } /** - * @dataProvider providerIS_ERR + * @dataProvider providerIsErr */ - public function testIS_ERR() + public function testIsErr() { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array('\PHPExcel\Calculation\Functions','IS_ERR'), $args); + $result = call_user_func_array(array('\PHPExcel\Calculation\Functions','isErr'), $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } - public function providerIS_ERR() + public function providerIsErr() { - return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_ERR.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_ERR.data'); } /** - * @dataProvider providerIS_ERROR + * @dataProvider providerIsError */ - public function testIS_ERROR() + public function testIsError() { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array('\PHPExcel\Calculation\Functions','IS_ERROR'), $args); + $result = call_user_func_array(array('\PHPExcel\Calculation\Functions','isError'), $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } - public function providerIS_ERROR() + public function providerIsError() { - return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_ERROR.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_ERROR.data'); } /** - * @dataProvider providerERROR_TYPE + * @dataProvider providerErrorType */ - public function testERROR_TYPE() + public function testErrorType() { $args = func_get_args(); $expectedResult = array_pop($args); @@ -119,15 +119,15 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expectedResult, $result, null, 1E-8); } - public function providerERROR_TYPE() + public function providerErrorType() { - return new \testDataFileIterator('rawTestData/Calculation/Functions/ERROR_TYPE.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/ERROR_TYPE.data'); } /** - * @dataProvider providerIS_LOGICAL + * @dataProvider providerIsLogical */ - public function testIS_LOGICAL() + public function testIsLogical() { $args = func_get_args(); $expectedResult = array_pop($args); @@ -135,15 +135,15 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expectedResult, $result, null, 1E-8); } - public function providerIS_LOGICAL() + public function providerIsLogical() { - return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_LOGICAL.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_LOGICAL.data'); } /** - * @dataProvider providerIS_NA + * @dataProvider providerIsNa */ - public function testIS_NA() + public function testIsNa() { $args = func_get_args(); $expectedResult = array_pop($args); @@ -151,15 +151,15 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expectedResult, $result, null, 1E-8); } - public function providerIS_NA() + public function providerIsNa() { - return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_NA.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_NA.data'); } /** - * @dataProvider providerIS_NUMBER + * @dataProvider providerIsNumber */ - public function testIS_NUMBER() + public function testIsNumber() { $args = func_get_args(); $expectedResult = array_pop($args); @@ -167,15 +167,15 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expectedResult, $result, null, 1E-8); } - public function providerIS_NUMBER() + public function providerIsNumber() { - return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_NUMBER.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_NUMBER.data'); } /** - * @dataProvider providerIS_TEXT + * @dataProvider providerIsText */ - public function testIS_TEXT() + public function testIsText() { $args = func_get_args(); $expectedResult = array_pop($args); @@ -183,15 +183,15 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expectedResult, $result, null, 1E-8); } - public function providerIS_TEXT() + public function providerIsText() { - return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_TEXT.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_TEXT.data'); } /** - * @dataProvider providerIS_NONTEXT + * @dataProvider providerIsNonText */ - public function testIS_NONTEXT() + public function testIsNonText() { $args = func_get_args(); $expectedResult = array_pop($args); @@ -199,15 +199,15 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expectedResult, $result, null, 1E-8); } - public function providerIS_NONTEXT() + public function providerIsNonText() { - return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_NONTEXT.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_NONTEXT.data'); } /** - * @dataProvider providerIS_EVEN + * @dataProvider providerIsEven */ - public function testIS_EVEN() + public function testIsEven() { $args = func_get_args(); $expectedResult = array_pop($args); @@ -215,15 +215,15 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expectedResult, $result, null, 1E-8); } - public function providerIS_EVEN() + public function providerIsEven() { - return new \testDataFileIterator('rawTestData/Calculation/Functions/IS_EVEN.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/IS_EVEN.data'); } /** - * @dataProvider providerIS_ODD + * @dataProvider providerIsOdd */ - public function testIS_ODD() + public function testIsOdd() { $args = func_get_args(); $expectedResult = array_pop($args); @@ -231,9 +231,9 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expectedResult, $result, null, 1E-8); } - public function providerIS_ODD() + public function providerIsOdd() { - return new \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() { - return new \testDataFileIterator('rawTestData/Calculation/Functions/TYPE.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/TYPE.data'); } /** @@ -259,12 +259,12 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase { $args = func_get_args(); $expectedResult = array_pop($args); - $result = call_user_func_array(array('\PHPExcel\Calculation\Functions','N'), $args); + $result = call_user_func_array(array('\PHPExcel\Calculation\Functions','n'), $args); $this->assertEquals($expectedResult, $result, null, 1E-8); } public function providerN() { - return new \testDataFileIterator('rawTestData/Calculation/Functions/N.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Functions/N.data'); } } diff --git a/unitTests/Classes/src/Calculation/LogicalTest.php b/unitTests/Classes/src/Calculation/LogicalTest.php index c6ce35f9..4c53cdf8 100644 --- a/unitTests/Classes/src/Calculation/LogicalTest.php +++ b/unitTests/Classes/src/Calculation/LogicalTest.php @@ -37,7 +37,7 @@ class LogicalTest extends \PHPUnit_Framework_TestCase public function providerAND() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \testDataFileIterator('rawTestData/Calculation/Logical/IFERROR.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/Logical/IFERROR.data'); } } diff --git a/unitTests/Classes/src/Calculation/LookupRefTest.php b/unitTests/Classes/src/Calculation/LookupRefTest.php index 6d467f2e..6cf3b4e1 100644 --- a/unitTests/Classes/src/Calculation/LookupRefTest.php +++ b/unitTests/Classes/src/Calculation/LookupRefTest.php @@ -25,7 +25,7 @@ class LookupRefTest extends \PHPUnit_Framework_TestCase public function providerHLOOKUP() { - return new \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() { - return new \testDataFileIterator('rawTestData/Calculation/LookupRef/VLOOKUP.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/LookupRef/VLOOKUP.data'); } } diff --git a/unitTests/Classes/src/Calculation/MathTrigTest.php b/unitTests/Classes/src/Calculation/MathTrigTest.php index 517c741c..fa5c7ed2 100644 --- a/unitTests/Classes/src/Calculation/MathTrigTest.php +++ b/unitTests/Classes/src/Calculation/MathTrigTest.php @@ -25,7 +25,7 @@ class MathTrigTest extends \PHPUnit_Framework_TestCase public function providerATAN2() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \testDataFileIterator('rawTestData/Calculation/MathTrig/SQRTPI.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/MathTrig/SQRTPI.data'); } /** diff --git a/unitTests/Classes/src/Calculation/TextDataTest.php b/unitTests/Classes/src/Calculation/TextDataTest.php index 8bfadf7c..8463423d 100644 --- a/unitTests/Classes/src/Calculation/TextDataTest.php +++ b/unitTests/Classes/src/Calculation/TextDataTest.php @@ -25,7 +25,7 @@ class TextDataTest extends \PHPUnit_Framework_TestCase public function providerCHAR() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \testDataFileIterator('rawTestData/Calculation/TextData/VALUE.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Calculation/TextData/VALUE.data'); } } diff --git a/unitTests/Classes/src/CalculationTest.php b/unitTests/Classes/src/CalculationTest.php index dbd6802f..e81a60f6 100644 --- a/unitTests/Classes/src/CalculationTest.php +++ b/unitTests/Classes/src/CalculationTest.php @@ -27,6 +27,6 @@ class CalculationTest extends \PHPUnit_Framework_TestCase public function providerBinaryComparisonOperation() { - return new \testDataFileIterator('rawTestData/CalculationBinaryComparisonOperation.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CalculationBinaryComparisonOperation.data'); } } diff --git a/unitTests/Classes/src/Cell/DefaultValueBinderTest.php b/unitTests/Classes/src/Cell/DefaultValueBinderTest.php index 49ca2cfb..363c8a8f 100644 --- a/unitTests/Classes/src/Cell/DefaultValueBinderTest.php +++ b/unitTests/Classes/src/Cell/DefaultValueBinderTest.php @@ -70,7 +70,7 @@ class DefaultValueBinderTest extends \PHPUnit_Framework_TestCase public function providerDataTypeForValue() { - return new \testDataFileIteratorJson('rawTestData/Cell/DefaultValueBinder.json'); + return new \PhpSpreadhsheet\unitTests\testDataFileIteratorJson('rawTestData/Cell/DefaultValueBinder.json'); } public function testDataTypeForRichTextObject() diff --git a/unitTests/Classes/src/CellTest.php b/unitTests/Classes/src/CellTest.php index bda950ba..7f94a1fb 100644 --- a/unitTests/Classes/src/CellTest.php +++ b/unitTests/Classes/src/CellTest.php @@ -24,7 +24,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerColumnString() { - return new \testDataFileIterator('rawTestData/ColumnString.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/ColumnString.data'); } public function testColumnIndexFromStringTooLong() @@ -66,7 +66,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerColumnIndex() { - return new \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() { - return new \testDataFileIterator('rawTestData/CellCoordinates.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellCoordinates.data'); } public function testCoordinateFromStringWithRangeAddress() @@ -137,7 +137,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerAbsoluteCoordinates() { - return new \testDataFileIterator('rawTestData/CellAbsoluteCoordinate.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellAbsoluteCoordinate.data'); } public function testAbsoluteCoordinateFromStringWithRangeAddress() @@ -166,7 +166,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerAbsoluteReferences() { - return new \testDataFileIterator('rawTestData/CellAbsoluteReference.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellAbsoluteReference.data'); } public function testAbsoluteReferenceFromStringWithRangeAddress() @@ -201,7 +201,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerSplitRange() { - return new \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() { - return new \testDataFileIterator('rawTestData/CellBuildRange.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellBuildRange.data'); } public function testBuildRangeInvalid() @@ -246,7 +246,7 @@ class CellTest extends \PHPUnit_Framework_TestCase public function providerRangeBoundaries() { - return new \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() { - return new \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() { - return new \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() { - return new \testDataFileIterator('rawTestData/CellExtractAllCellReferencesInRange.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/CellExtractAllCellReferencesInRange.data'); } } diff --git a/unitTests/Classes/src/Shared/CodePageTest.php b/unitTests/Classes/src/Shared/CodePageTest.php index 38544366..1c3b45fd 100644 --- a/unitTests/Classes/src/Shared/CodePageTest.php +++ b/unitTests/Classes/src/Shared/CodePageTest.php @@ -19,7 +19,7 @@ class CodePageTest extends \PHPUnit_Framework_TestCase public function providerCodePage() { - return new \testDataFileIterator('rawTestData/Shared/CodePage.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/CodePage.data'); } public function testNumberToNameWithInvalidCodePage() diff --git a/unitTests/Classes/src/Shared/DateTest.php b/unitTests/Classes/src/Shared/DateTest.php index 86a81867..6526e4d1 100644 --- a/unitTests/Classes/src/Shared/DateTest.php +++ b/unitTests/Classes/src/Shared/DateTest.php @@ -47,7 +47,7 @@ class DateTest extends \PHPUnit_Framework_TestCase public function providerDateTimeExcelToPHP1900() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \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() { - return new \testDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/DateTimeExcelToPHP1900Timezone.data'); } } diff --git a/unitTests/Classes/src/Shared/FontTest.php b/unitTests/Classes/src/Shared/FontTest.php index d94062dd..233715e5 100644 --- a/unitTests/Classes/src/Shared/FontTest.php +++ b/unitTests/Classes/src/Shared/FontTest.php @@ -48,7 +48,7 @@ class FontTest extends \PHPUnit_Framework_TestCase public function providerFontSizeToPixels() { - return new \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() { - return new \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() { - return new \testDataFileIterator('rawTestData/Shared/CentimeterSizeToPixels.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/CentimeterSizeToPixels.data'); } } diff --git a/unitTests/Classes/src/Shared/PasswordHasherTest.php b/unitTests/Classes/src/Shared/PasswordHasherTest.php index b64b6d40..fb4ee600 100644 --- a/unitTests/Classes/src/Shared/PasswordHasherTest.php +++ b/unitTests/Classes/src/Shared/PasswordHasherTest.php @@ -19,6 +19,6 @@ class PasswordHasherTest extends \PHPUnit_Framework_TestCase public function providerHashPassword() { - return new \testDataFileIterator('rawTestData/Shared/PasswordHashes.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Shared/PasswordHashes.data'); } } diff --git a/unitTests/Classes/src/Style/ColorTest.php b/unitTests/Classes/src/Style/ColorTest.php index d01e1962..b17c4f57 100644 --- a/unitTests/Classes/src/Style/ColorTest.php +++ b/unitTests/Classes/src/Style/ColorTest.php @@ -20,7 +20,7 @@ class ColorTest extends \PHPUnit_Framework_TestCase public function providerColorGetRed() { - return new \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() { - return new \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() { - return new \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() { - return new \testDataFileIteratorJson('rawTestData/Style/ColorChangeBrightness.json'); + return new \PhpSpreadhsheet\unitTests\testDataFileIteratorJson('rawTestData/Style/ColorChangeBrightness.json'); } } diff --git a/unitTests/Classes/src/Style/NumberFormatDateTest.php b/unitTests/Classes/src/Style/NumberFormatDateTest.php index 1aec99c7..013fedd4 100644 --- a/unitTests/Classes/src/Style/NumberFormatDateTest.php +++ b/unitTests/Classes/src/Style/NumberFormatDateTest.php @@ -26,6 +26,6 @@ class NumberFormatDateTest extends \PHPUnit_Framework_TestCase public function providerNumberFormat() { - return new \testDataFileIterator('rawTestData/Style/NumberFormatDates.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Style/NumberFormatDates.data'); } } diff --git a/unitTests/Classes/src/Style/NumberFormatTest.php b/unitTests/Classes/src/Style/NumberFormatTest.php index 6b36fb7e..599fde15 100644 --- a/unitTests/Classes/src/Style/NumberFormatTest.php +++ b/unitTests/Classes/src/Style/NumberFormatTest.php @@ -26,6 +26,6 @@ class NumberFormatTest extends \PHPUnit_Framework_TestCase public function providerNumberFormat() { - return new \testDataFileIterator('rawTestData/Style/NumberFormat.data'); + return new \PhpSpreadhsheet\unitTests\testDataFileIterator('rawTestData/Style/NumberFormat.data'); } } diff --git a/unitTests/custom/Complex.php b/unitTests/custom/Complex.php index 0b22ddfd..d4896fe4 100644 --- a/unitTests/custom/Complex.php +++ b/unitTests/custom/Complex.php @@ -1,5 +1,7 @@