From c86a72ac1a3d83269c2111052f979eee802be532 Mon Sep 17 00:00:00 2001 From: MarkBaker Date: Mon, 1 Jun 2015 21:08:48 +0100 Subject: [PATCH] Another chunk of namespacing work --- src/PhpSpreadsheet/Calculation.php | 838 ++++++++++----------- src/PhpSpreadsheet/Chart.php | 104 +-- src/PhpSpreadsheet/Comment.php | 40 +- src/PhpSpreadsheet/HashTable.php | 8 +- src/PhpSpreadsheet/IOFactory.php | 44 +- src/PhpSpreadsheet/NamedRange.php | 44 +- src/PhpSpreadsheet/Reader/Excel2003XML.php | 124 +-- src/PhpSpreadsheet/Reader/Excel2007.php | 4 +- src/PhpSpreadsheet/Reader/Excel5/RC4.php | 4 +- src/PhpSpreadsheet/Reader/OOCalc.php | 16 +- src/PhpSpreadsheet/Settings.php | 42 +- src/PhpSpreadsheet/Spreadsheet.php | 16 +- 12 files changed, 649 insertions(+), 635 deletions(-) diff --git a/src/PhpSpreadsheet/Calculation.php b/src/PhpSpreadsheet/Calculation.php index 51bb0252..0cc9b1c7 100644 --- a/src/PhpSpreadsheet/Calculation.php +++ b/src/PhpSpreadsheet/Calculation.php @@ -276,7 +276,7 @@ class Calculation ), 'ACCRINTM' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::ACCRINTM', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::ACCRINTM', 'argumentCount' => '3-5' ), 'ACOS' => array( @@ -291,32 +291,32 @@ class Calculation ), 'ADDRESS' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::CELL_ADDRESS', + 'functionCall' => '\\PHPExcel\\Calculation\\LookupRef::CELL_ADDRESS', 'argumentCount' => '2-5' ), 'AMORDEGRC' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::AMORDEGRC', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::AMORDEGRC', 'argumentCount' => '6,7' ), 'AMORLINC' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::AMORLINC', + 'functionCall' => '\\PHPExcel\\Calculation\\Financial::AMORLINC', 'argumentCount' => '6,7' ), 'AND' => array( 'category' => Calculation\Categories::CATEGORY_LOGICAL, - 'functionCall' => 'PHPExcel_Calculation_Logical::LOGICAL_AND', + 'functionCall' => '\\PHPExcel\\Calculation\\Logical::LOGICAL_AND', 'argumentCount' => '1+' ), 'AREAS' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '1' ), 'ASC' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '1' ), 'ASIN' => array( @@ -336,7 +336,7 @@ class Calculation ), 'ATAN2' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::ATAN2', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::ATAN2', 'argumentCount' => '2' ), 'ATANH' => array( @@ -346,168 +346,168 @@ class Calculation ), 'AVEDEV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::AVEDEV', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::AVEDEV', 'argumentCount' => '1+' ), 'AVERAGE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::AVERAGE', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::AVERAGE', 'argumentCount' => '1+' ), 'AVERAGEA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::AVERAGEA', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::AVERAGEA', 'argumentCount' => '1+' ), 'AVERAGEIF' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::AVERAGEIF', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::AVERAGEIF', 'argumentCount' => '2,3' ), 'AVERAGEIFS' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '3+' ), 'BAHTTEXT' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '1' ), 'BESSELI' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::BESSELI', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BESSELI', 'argumentCount' => '2' ), 'BESSELJ' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::BESSELJ', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BESSELJ', 'argumentCount' => '2' ), 'BESSELK' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::BESSELK', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BESSELK', 'argumentCount' => '2' ), 'BESSELY' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::BESSELY', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BESSELY', 'argumentCount' => '2' ), 'BETADIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::BETADIST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::BETADIST', 'argumentCount' => '3-5' ), 'BETAINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::BETAINV', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::BETAINV', 'argumentCount' => '3-5' ), 'BIN2DEC' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::BINTODEC', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BINTODEC', 'argumentCount' => '1' ), 'BIN2HEX' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::BINTOHEX', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BINTOHEX', 'argumentCount' => '1,2' ), 'BIN2OCT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::BINTOOCT', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::BINTOOCT', 'argumentCount' => '1,2' ), 'BINOMDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::BINOMDIST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::BINOMDIST', 'argumentCount' => '4' ), 'CEILING' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::CEILING', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::CEILING', 'argumentCount' => '2' ), 'CELL' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '1,2' ), 'CHAR' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::CHARACTER', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::CHARACTER', 'argumentCount' => '1' ), 'CHIDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::CHIDIST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::CHIDIST', 'argumentCount' => '2' ), 'CHIINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::CHIINV', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::CHIINV', 'argumentCount' => '2' ), 'CHITEST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '2' ), 'CHOOSE' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::CHOOSE', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::CHOOSE', 'argumentCount' => '2+' ), 'CLEAN' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::TRIMNONPRINTABLE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::TRIMNONPRINTABLE', 'argumentCount' => '1' ), 'CODE' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::ASCIICODE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::ASCIICODE', 'argumentCount' => '1' ), 'COLUMN' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::COLUMN', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::COLUMN', 'argumentCount' => '-1', 'passByReference' => array(true) ), 'COLUMNS' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::COLUMNS', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::COLUMNS', 'argumentCount' => '1' ), 'COMBIN' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::COMBIN', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::COMBIN', 'argumentCount' => '2' ), 'COMPLEX' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::COMPLEX', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::COMPLEX', 'argumentCount' => '2,3' ), 'CONCATENATE' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::CONCATENATE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::CONCATENATE', 'argumentCount' => '1+' ), 'CONFIDENCE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::CONFIDENCE', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::CONFIDENCE', 'argumentCount' => '3' ), 'CONVERT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::CONVERTUOM', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::CONVERTUOM', 'argumentCount' => '3' ), 'CORREL' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::CORREL', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::CORREL', 'argumentCount' => '2' ), 'COS' => array( @@ -522,177 +522,177 @@ class Calculation ), 'COUNT' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::COUNT', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::COUNT', 'argumentCount' => '1+' ), 'COUNTA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::COUNTA', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::COUNTA', 'argumentCount' => '1+' ), 'COUNTBLANK' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::COUNTBLANK', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::COUNTBLANK', 'argumentCount' => '1' ), 'COUNTIF' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::COUNTIF', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::COUNTIF', 'argumentCount' => '2' ), 'COUNTIFS' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '2' ), 'COUPDAYBS' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::COUPDAYBS', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::COUPDAYBS', 'argumentCount' => '3,4' ), 'COUPDAYS' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::COUPDAYS', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::COUPDAYS', 'argumentCount' => '3,4' ), 'COUPDAYSNC' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::COUPDAYSNC', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::COUPDAYSNC', 'argumentCount' => '3,4' ), 'COUPNCD' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::COUPNCD', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::COUPNCD', 'argumentCount' => '3,4' ), 'COUPNUM' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::COUPNUM', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::COUPNUM', 'argumentCount' => '3,4' ), 'COUPPCD' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::COUPPCD', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::COUPPCD', 'argumentCount' => '3,4' ), 'COVAR' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::COVAR', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::COVAR', 'argumentCount' => '2' ), 'CRITBINOM' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::CRITBINOM', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::CRITBINOM', 'argumentCount' => '3' ), 'CUBEKPIMEMBER' => array( 'category' => Calculation\Categories::CATEGORY_CUBE, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '?' ), 'CUBEMEMBER' => array( 'category' => Calculation\Categories::CATEGORY_CUBE, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '?' ), 'CUBEMEMBERPROPERTY' => array( 'category' => Calculation\Categories::CATEGORY_CUBE, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '?' ), 'CUBERANKEDMEMBER' => array( 'category' => Calculation\Categories::CATEGORY_CUBE, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '?' ), 'CUBESET' => array( 'category' => Calculation\Categories::CATEGORY_CUBE, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '?' ), 'CUBESETCOUNT' => array( 'category' => Calculation\Categories::CATEGORY_CUBE, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '?' ), 'CUBEVALUE' => array( 'category' => Calculation\Categories::CATEGORY_CUBE, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '?' ), 'CUMIPMT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::CUMIPMT', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::CUMIPMT', 'argumentCount' => '6' ), 'CUMPRINC' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::CUMPRINC', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::CUMPRINC', 'argumentCount' => '6' ), 'DATE' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::DATE', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DATE', 'argumentCount' => '3' ), 'DATEDIF' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::DATEDIF', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DATEDIF', 'argumentCount' => '2,3' ), 'DATEVALUE' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::DATEVALUE', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DATEVALUE', 'argumentCount' => '1' ), 'DAVERAGE' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => 'PHPExcel_Calculation_Database::DAVERAGE', + 'functionCall' => \\PHPExcel\\Calculation\\Database::DAVERAGE', 'argumentCount' => '3' ), 'DAY' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::DAYOFMONTH', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DAYOFMONTH', 'argumentCount' => '1' ), 'DAYS360' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::DAYS360', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DAYS360', 'argumentCount' => '2,3' ), 'DB' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::DB', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::DB', 'argumentCount' => '4,5' ), 'DCOUNT' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => 'PHPExcel_Calculation_Database::DCOUNT', + 'functionCall' => \\PHPExcel\\Calculation\\Database::DCOUNT', 'argumentCount' => '3' ), 'DCOUNTA' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => 'PHPExcel_Calculation_Database::DCOUNTA', + 'functionCall' => \\PHPExcel\\Calculation\\Database::DCOUNTA', 'argumentCount' => '3' ), 'DDB' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::DDB', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::DDB', 'argumentCount' => '4,5' ), 'DEC2BIN' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::DECTOBIN', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::DECTOBIN', 'argumentCount' => '1,2' ), 'DEC2HEX' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::DECTOHEX', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::DECTOHEX', 'argumentCount' => '1,2' ), 'DEC2OCT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::DECTOOCT', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::DECTOOCT', 'argumentCount' => '1,2' ), 'DEGREES' => array( @@ -702,122 +702,122 @@ class Calculation ), 'DELTA' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::DELTA', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::DELTA', 'argumentCount' => '1,2' ), 'DEVSQ' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::DEVSQ', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::DEVSQ', 'argumentCount' => '1+' ), 'DGET' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => 'PHPExcel_Calculation_Database::DGET', + 'functionCall' => \\PHPExcel\\Calculation\\Database::DGET', 'argumentCount' => '3' ), 'DISC' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::DISC', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::DISC', 'argumentCount' => '4,5' ), 'DMAX' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => 'PHPExcel_Calculation_Database::DMAX', + 'functionCall' => \\PHPExcel\\Calculation\\Database::DMAX', 'argumentCount' => '3' ), 'DMIN' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => 'PHPExcel_Calculation_Database::DMIN', + 'functionCall' => \\PHPExcel\\Calculation\\Database::DMIN', 'argumentCount' => '3' ), 'DOLLAR' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::DOLLAR', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::DOLLAR', 'argumentCount' => '1,2' ), 'DOLLARDE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::DOLLARDE', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::DOLLARDE', 'argumentCount' => '2' ), 'DOLLARFR' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::DOLLARFR', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::DOLLARFR', 'argumentCount' => '2' ), 'DPRODUCT' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => 'PHPExcel_Calculation_Database::DPRODUCT', + 'functionCall' => \\PHPExcel\\Calculation\\Database::DPRODUCT', 'argumentCount' => '3' ), 'DSTDEV' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => 'PHPExcel_Calculation_Database::DSTDEV', + 'functionCall' => \\PHPExcel\\Calculation\\Database::DSTDEV', 'argumentCount' => '3' ), 'DSTDEVP' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => 'PHPExcel_Calculation_Database::DSTDEVP', + 'functionCall' => \\PHPExcel\\Calculation\\Database::DSTDEVP', 'argumentCount' => '3' ), 'DSUM' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => 'PHPExcel_Calculation_Database::DSUM', + 'functionCall' => \\PHPExcel\\Calculation\\Database::DSUM', 'argumentCount' => '3' ), 'DURATION' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '5,6' ), 'DVAR' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => 'PHPExcel_Calculation_Database::DVAR', + 'functionCall' => \\PHPExcel\\Calculation\\Database::DVAR', 'argumentCount' => '3' ), 'DVARP' => array( 'category' => Calculation\Categories::CATEGORY_DATABASE, - 'functionCall' => 'PHPExcel_Calculation_Database::DVARP', + 'functionCall' => \\PHPExcel\\Calculation\\Database::DVARP', 'argumentCount' => '3' ), 'EDATE' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::EDATE', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::EDATE', 'argumentCount' => '2' ), 'EFFECT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::EFFECT', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::EFFECT', 'argumentCount' => '2' ), 'EOMONTH' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::EOMONTH', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::EOMONTH', 'argumentCount' => '2' ), 'ERF' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::ERF', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::ERF', 'argumentCount' => '1,2' ), 'ERFC' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::ERFC', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::ERFC', 'argumentCount' => '1' ), 'ERROR.TYPE' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::ERROR_TYPE', + 'functionCall' => 'Calculation\Categories::ERROR_TYPE', 'argumentCount' => '1' ), 'EVEN' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::EVEN', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::EVEN', 'argumentCount' => '1' ), 'EXACT' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '2' ), 'EXP' => array( @@ -827,409 +827,409 @@ class Calculation ), 'EXPONDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::EXPONDIST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::EXPONDIST', 'argumentCount' => '3' ), 'FACT' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::FACT', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::FACT', 'argumentCount' => '1' ), 'FACTDOUBLE' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::FACTDOUBLE', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::FACTDOUBLE', 'argumentCount' => '1' ), 'FALSE' => array( 'category' => Calculation\Categories::CATEGORY_LOGICAL, - 'functionCall' => 'PHPExcel_Calculation_Logical::FALSE', + 'functionCall' => \\PHPExcel\\Calculation\\Logical::FALSE', 'argumentCount' => '0' ), 'FDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '3' ), 'FIND' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::SEARCHSENSITIVE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::SEARCHSENSITIVE', 'argumentCount' => '2,3' ), 'FINDB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::SEARCHSENSITIVE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::SEARCHSENSITIVE', 'argumentCount' => '2,3' ), 'FINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '3' ), 'FISHER' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::FISHER', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::FISHER', 'argumentCount' => '1' ), 'FISHERINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::FISHERINV', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::FISHERINV', 'argumentCount' => '1' ), 'FIXED' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::FIXEDFORMAT', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::FIXEDFORMAT', 'argumentCount' => '1-3' ), 'FLOOR' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::FLOOR', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::FLOOR', 'argumentCount' => '2' ), 'FORECAST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::FORECAST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::FORECAST', 'argumentCount' => '3' ), 'FREQUENCY' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '2' ), 'FTEST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '2' ), 'FV' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::FV', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::FV', 'argumentCount' => '3-5' ), 'FVSCHEDULE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::FVSCHEDULE', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::FVSCHEDULE', 'argumentCount' => '2' ), 'GAMMADIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::GAMMADIST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::GAMMADIST', 'argumentCount' => '4' ), 'GAMMAINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::GAMMAINV', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::GAMMAINV', 'argumentCount' => '3' ), 'GAMMALN' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::GAMMALN', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::GAMMALN', 'argumentCount' => '1' ), 'GCD' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::GCD', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::GCD', 'argumentCount' => '1+' ), 'GEOMEAN' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::GEOMEAN', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::GEOMEAN', 'argumentCount' => '1+' ), 'GESTEP' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::GESTEP', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::GESTEP', 'argumentCount' => '1,2' ), 'GETPIVOTDATA' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '2+' ), 'GROWTH' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::GROWTH', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::GROWTH', 'argumentCount' => '1-4' ), 'HARMEAN' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::HARMEAN', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::HARMEAN', 'argumentCount' => '1+' ), 'HEX2BIN' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::HEXTOBIN', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::HEXTOBIN', 'argumentCount' => '1,2' ), 'HEX2DEC' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::HEXTODEC', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::HEXTODEC', 'argumentCount' => '1' ), 'HEX2OCT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::HEXTOOCT', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::HEXTOOCT', 'argumentCount' => '1,2' ), 'HLOOKUP' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::HLOOKUP', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::HLOOKUP', 'argumentCount' => '3,4' ), 'HOUR' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::HOUROFDAY', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::HOUROFDAY', 'argumentCount' => '1' ), 'HYPERLINK' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::HYPERLINK', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::HYPERLINK', 'argumentCount' => '1,2', 'passCellReference' => true ), 'HYPGEOMDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::HYPGEOMDIST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::HYPGEOMDIST', 'argumentCount' => '4' ), 'IF' => array( 'category' => Calculation\Categories::CATEGORY_LOGICAL, - 'functionCall' => 'PHPExcel_Calculation_Logical::STATEMENT_IF', + 'functionCall' => \\PHPExcel\\Calculation\\Logical::STATEMENT_IF', 'argumentCount' => '1-3' ), 'IFERROR' => array( 'category' => Calculation\Categories::CATEGORY_LOGICAL, - 'functionCall' => 'PHPExcel_Calculation_Logical::IFERROR', + 'functionCall' => \\PHPExcel\\Calculation\\Logical::IFERROR', 'argumentCount' => '2' ), 'IMABS' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMABS', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMABS', 'argumentCount' => '1' ), 'IMAGINARY' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMAGINARY', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMAGINARY', 'argumentCount' => '1' ), 'IMARGUMENT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMARGUMENT', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMARGUMENT', 'argumentCount' => '1' ), 'IMCONJUGATE' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMCONJUGATE', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMCONJUGATE', 'argumentCount' => '1' ), 'IMCOS' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMCOS', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMCOS', 'argumentCount' => '1' ), 'IMDIV' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMDIV', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMDIV', 'argumentCount' => '2' ), 'IMEXP' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMEXP', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMEXP', 'argumentCount' => '1' ), 'IMLN' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMLN', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMLN', 'argumentCount' => '1' ), 'IMLOG10' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMLOG10', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMLOG10', 'argumentCount' => '1' ), 'IMLOG2' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMLOG2', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMLOG2', 'argumentCount' => '1' ), 'IMPOWER' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMPOWER', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMPOWER', 'argumentCount' => '2' ), 'IMPRODUCT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMPRODUCT', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMPRODUCT', 'argumentCount' => '1+' ), 'IMREAL' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMREAL', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMREAL', 'argumentCount' => '1' ), 'IMSIN' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMSIN', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMSIN', 'argumentCount' => '1' ), 'IMSQRT' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMSQRT', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMSQRT', 'argumentCount' => '1' ), 'IMSUB' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMSUB', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMSUB', 'argumentCount' => '2' ), 'IMSUM' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::IMSUM', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::IMSUM', 'argumentCount' => '1+' ), 'INDEX' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::INDEX', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::INDEX', 'argumentCount' => '1-4' ), 'INDIRECT' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::INDIRECT', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::INDIRECT', 'argumentCount' => '1,2', 'passCellReference' => true ), 'INFO' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '1' ), 'INT' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::INT', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::INT', 'argumentCount' => '1' ), 'INTERCEPT' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::INTERCEPT', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::INTERCEPT', 'argumentCount' => '2' ), 'INTRATE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::INTRATE', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::INTRATE', 'argumentCount' => '4,5' ), 'IPMT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::IPMT', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::IPMT', 'argumentCount' => '4-6' ), 'IRR' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::IRR', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::IRR', 'argumentCount' => '1,2' ), 'ISBLANK' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::IS_BLANK', + 'functionCall' => 'Calculation\Categories::IS_BLANK', 'argumentCount' => '1' ), 'ISERR' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::IS_ERR', + 'functionCall' => 'Calculation\Categories::IS_ERR', 'argumentCount' => '1' ), 'ISERROR' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::IS_ERROR', + 'functionCall' => 'Calculation\Categories::IS_ERROR', 'argumentCount' => '1' ), 'ISEVEN' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::IS_EVEN', + 'functionCall' => 'Calculation\Categories::IS_EVEN', 'argumentCount' => '1' ), 'ISLOGICAL' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::IS_LOGICAL', + 'functionCall' => 'Calculation\Categories::IS_LOGICAL', 'argumentCount' => '1' ), 'ISNA' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::IS_NA', + 'functionCall' => 'Calculation\Categories::IS_NA', 'argumentCount' => '1' ), 'ISNONTEXT' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::IS_NONTEXT', + 'functionCall' => 'Calculation\Categories::IS_NONTEXT', 'argumentCount' => '1' ), 'ISNUMBER' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::IS_NUMBER', + 'functionCall' => 'Calculation\Categories::IS_NUMBER', 'argumentCount' => '1' ), 'ISODD' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::IS_ODD', + 'functionCall' => 'Calculation\Categories::IS_ODD', 'argumentCount' => '1' ), 'ISPMT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::ISPMT', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::ISPMT', 'argumentCount' => '4' ), 'ISREF' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '1' ), 'ISTEXT' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::IS_TEXT', + 'functionCall' => 'Calculation\Categories::IS_TEXT', 'argumentCount' => '1' ), 'JIS' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '1' ), 'KURT' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::KURT', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::KURT', 'argumentCount' => '1+' ), 'LARGE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::LARGE', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::LARGE', 'argumentCount' => '2' ), 'LCM' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::LCM', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::LCM', 'argumentCount' => '1+' ), 'LEFT' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::LEFT', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::LEFT', 'argumentCount' => '1,2' ), 'LEFTB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::LEFT', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::LEFT', 'argumentCount' => '1,2' ), 'LEN' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::STRINGLENGTH', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::STRINGLENGTH', 'argumentCount' => '1' ), 'LENB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::STRINGLENGTH', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::STRINGLENGTH', 'argumentCount' => '1' ), 'LINEST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::LINEST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::LINEST', 'argumentCount' => '1-4' ), 'LN' => array( @@ -1239,7 +1239,7 @@ class Calculation ), 'LOG' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::LOG_BASE', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::LOG_BASE', 'argumentCount' => '1,2' ), 'LOG10' => array( @@ -1249,279 +1249,279 @@ class Calculation ), 'LOGEST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::LOGEST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::LOGEST', 'argumentCount' => '1-4' ), 'LOGINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::LOGINV', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::LOGINV', 'argumentCount' => '3' ), 'LOGNORMDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::LOGNORMDIST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::LOGNORMDIST', 'argumentCount' => '3' ), 'LOOKUP' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::LOOKUP', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::LOOKUP', 'argumentCount' => '2,3' ), 'LOWER' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::LOWERCASE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::LOWERCASE', 'argumentCount' => '1' ), 'MATCH' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::MATCH', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::MATCH', 'argumentCount' => '2,3' ), 'MAX' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::MAX', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MAX', 'argumentCount' => '1+' ), 'MAXA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::MAXA', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MAXA', 'argumentCount' => '1+' ), 'MAXIF' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::MAXIF', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MAXIF', 'argumentCount' => '2+' ), 'MDETERM' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::MDETERM', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::MDETERM', 'argumentCount' => '1' ), 'MDURATION' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '5,6' ), 'MEDIAN' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::MEDIAN', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MEDIAN', 'argumentCount' => '1+' ), 'MEDIANIF' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '2+' ), 'MID' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::MID', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::MID', 'argumentCount' => '3' ), 'MIDB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::MID', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::MID', 'argumentCount' => '3' ), 'MIN' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::MIN', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MIN', 'argumentCount' => '1+' ), 'MINA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::MINA', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MINA', 'argumentCount' => '1+' ), 'MINIF' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::MINIF', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MINIF', 'argumentCount' => '2+' ), 'MINUTE' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::MINUTEOFHOUR', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::MINUTEOFHOUR', 'argumentCount' => '1' ), 'MINVERSE' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::MINVERSE', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::MINVERSE', 'argumentCount' => '1' ), 'MIRR' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::MIRR', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::MIRR', 'argumentCount' => '3' ), 'MMULT' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::MMULT', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::MMULT', 'argumentCount' => '2' ), 'MOD' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::MOD', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::MOD', 'argumentCount' => '2' ), 'MODE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::MODE', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::MODE', 'argumentCount' => '1+' ), 'MONTH' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::MONTHOFYEAR', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::MONTHOFYEAR', 'argumentCount' => '1' ), 'MROUND' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::MROUND', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::MROUND', 'argumentCount' => '2' ), 'MULTINOMIAL' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::MULTINOMIAL', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::MULTINOMIAL', 'argumentCount' => '1+' ), 'N' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::N', + 'functionCall' => 'Calculation\Categories::N', 'argumentCount' => '1' ), 'NA' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::NA', + 'functionCall' => 'Calculation\Categories::NA', 'argumentCount' => '0' ), 'NEGBINOMDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::NEGBINOMDIST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::NEGBINOMDIST', 'argumentCount' => '3' ), 'NETWORKDAYS' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::NETWORKDAYS', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::NETWORKDAYS', 'argumentCount' => '2+' ), 'NOMINAL' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::NOMINAL', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::NOMINAL', 'argumentCount' => '2' ), 'NORMDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::NORMDIST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::NORMDIST', 'argumentCount' => '4' ), 'NORMINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::NORMINV', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::NORMINV', 'argumentCount' => '3' ), 'NORMSDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::NORMSDIST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::NORMSDIST', 'argumentCount' => '1' ), 'NORMSINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::NORMSINV', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::NORMSINV', 'argumentCount' => '1' ), 'NOT' => array( 'category' => Calculation\Categories::CATEGORY_LOGICAL, - 'functionCall' => 'PHPExcel_Calculation_Logical::NOT', + 'functionCall' => \\PHPExcel\\Calculation\\Logical::NOT', 'argumentCount' => '1' ), 'NOW' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::DATETIMENOW', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DATETIMENOW', 'argumentCount' => '0' ), 'NPER' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::NPER', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::NPER', 'argumentCount' => '3-5' ), 'NPV' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::NPV', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::NPV', 'argumentCount' => '2+' ), 'OCT2BIN' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::OCTTOBIN', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::OCTTOBIN', 'argumentCount' => '1,2' ), 'OCT2DEC' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::OCTTODEC', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::OCTTODEC', 'argumentCount' => '1' ), 'OCT2HEX' => array( 'category' => Calculation\Categories::CATEGORY_ENGINEERING, - 'functionCall' => 'PHPExcel_Calculation_Engineering::OCTTOHEX', + 'functionCall' => \\PHPExcel\\Calculation\\Engineering::OCTTOHEX', 'argumentCount' => '1,2' ), 'ODD' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::ODD', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::ODD', 'argumentCount' => '1' ), 'ODDFPRICE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '8,9' ), 'ODDFYIELD' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '8,9' ), 'ODDLPRICE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '7,8' ), 'ODDLYIELD' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '7,8' ), 'OFFSET' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::OFFSET', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::OFFSET', 'argumentCount' => '3,5', 'passCellReference' => true, 'passByReference' => array(true) ), 'OR' => array( 'category' => Calculation\Categories::CATEGORY_LOGICAL, - 'functionCall' => 'PHPExcel_Calculation_Logical::LOGICAL_OR', + 'functionCall' => \\PHPExcel\\Calculation\\Logical::LOGICAL_OR', 'argumentCount' => '1+' ), 'PEARSON' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::CORREL', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::CORREL', 'argumentCount' => '2' ), 'PERCENTILE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::PERCENTILE', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::PERCENTILE', 'argumentCount' => '2' ), 'PERCENTRANK' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::PERCENTRANK', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::PERCENTRANK', 'argumentCount' => '2,3' ), 'PERMUT' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::PERMUT', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::PERMUT', 'argumentCount' => '2' ), 'PHONETIC' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '1' ), 'PI' => array( @@ -1531,67 +1531,67 @@ class Calculation ), 'PMT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::PMT', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::PMT', 'argumentCount' => '3-5' ), 'POISSON' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::POISSON', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::POISSON', 'argumentCount' => '3' ), 'POWER' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::POWER', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::POWER', 'argumentCount' => '2' ), 'PPMT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::PPMT', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::PPMT', 'argumentCount' => '4-6' ), 'PRICE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::PRICE', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::PRICE', 'argumentCount' => '6,7' ), 'PRICEDISC' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::PRICEDISC', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::PRICEDISC', 'argumentCount' => '4,5' ), 'PRICEMAT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::PRICEMAT', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::PRICEMAT', 'argumentCount' => '5,6' ), 'PROB' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '3,4' ), 'PRODUCT' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::PRODUCT', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::PRODUCT', 'argumentCount' => '1+' ), 'PROPER' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::PROPERCASE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::PROPERCASE', 'argumentCount' => '1' ), 'PV' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::PV', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::PV', 'argumentCount' => '3-5' ), 'QUARTILE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::QUARTILE', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::QUARTILE', 'argumentCount' => '2' ), 'QUOTIENT' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::QUOTIENT', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::QUOTIENT', 'argumentCount' => '2' ), 'RADIANS' => array( @@ -1601,37 +1601,37 @@ class Calculation ), 'RAND' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::RAND', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::RAND', 'argumentCount' => '0' ), 'RANDBETWEEN' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::RAND', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::RAND', 'argumentCount' => '2' ), 'RANK' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::RANK', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::RANK', 'argumentCount' => '2,3' ), 'RATE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::RATE', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::RATE', 'argumentCount' => '3-6' ), 'RECEIVED' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::RECEIVED', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::RECEIVED', 'argumentCount' => '4-5' ), 'REPLACE' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::REPLACE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::REPLACE', 'argumentCount' => '4' ), 'REPLACEB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::REPLACE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::REPLACE', 'argumentCount' => '4' ), 'REPT' => array( @@ -1641,17 +1641,17 @@ class Calculation ), 'RIGHT' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::RIGHT', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::RIGHT', 'argumentCount' => '1,2' ), 'RIGHTB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::RIGHT', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::RIGHT', 'argumentCount' => '1,2' ), 'ROMAN' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::ROMAN', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::ROMAN', 'argumentCount' => '1,2' ), 'ROUND' => array( @@ -1661,58 +1661,58 @@ class Calculation ), 'ROUNDDOWN' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::ROUNDDOWN', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::ROUNDDOWN', 'argumentCount' => '2' ), 'ROUNDUP' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::ROUNDUP', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::ROUNDUP', 'argumentCount' => '2' ), 'ROW' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::ROW', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::ROW', 'argumentCount' => '-1', 'passByReference' => array(true) ), 'ROWS' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::ROWS', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::ROWS', 'argumentCount' => '1' ), 'RSQ' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::RSQ', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::RSQ', 'argumentCount' => '2' ), 'RTD' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '1+' ), 'SEARCH' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::SEARCHINSENSITIVE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::SEARCHINSENSITIVE', 'argumentCount' => '2,3' ), 'SEARCHB' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::SEARCHINSENSITIVE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::SEARCHINSENSITIVE', 'argumentCount' => '2,3' ), 'SECOND' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::SECONDOFMINUTE', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::SECONDOFMINUTE', 'argumentCount' => '1' ), 'SERIESSUM' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::SERIESSUM', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SERIESSUM', 'argumentCount' => '4' ), 'SIGN' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::SIGN', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SIGN', 'argumentCount' => '1' ), 'SIN' => array( @@ -1727,22 +1727,22 @@ class Calculation ), 'SKEW' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::SKEW', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::SKEW', 'argumentCount' => '1+' ), 'SLN' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::SLN', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::SLN', 'argumentCount' => '3' ), 'SLOPE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::SLOPE', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::SLOPE', 'argumentCount' => '2' ), 'SMALL' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::SMALL', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::SMALL', 'argumentCount' => '2' ), 'SQRT' => array( @@ -1752,97 +1752,97 @@ class Calculation ), 'SQRTPI' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::SQRTPI', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SQRTPI', 'argumentCount' => '1' ), 'STANDARDIZE' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::STANDARDIZE', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::STANDARDIZE', 'argumentCount' => '3' ), 'STDEV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::STDEV', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::STDEV', 'argumentCount' => '1+' ), 'STDEVA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::STDEVA', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::STDEVA', 'argumentCount' => '1+' ), 'STDEVP' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::STDEVP', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::STDEVP', 'argumentCount' => '1+' ), 'STDEVPA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::STDEVPA', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::STDEVPA', 'argumentCount' => '1+' ), 'STEYX' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::STEYX', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::STEYX', 'argumentCount' => '2' ), 'SUBSTITUTE' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::SUBSTITUTE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::SUBSTITUTE', 'argumentCount' => '3,4' ), 'SUBTOTAL' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::SUBTOTAL', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUBTOTAL', 'argumentCount' => '2+' ), 'SUM' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::SUM', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUM', 'argumentCount' => '1+' ), 'SUMIF' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::SUMIF', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUMIF', 'argumentCount' => '2,3' ), 'SUMIFS' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '?' ), 'SUMPRODUCT' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::SUMPRODUCT', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUMPRODUCT', 'argumentCount' => '1+' ), 'SUMSQ' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::SUMSQ', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUMSQ', 'argumentCount' => '1+' ), 'SUMX2MY2' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::SUMX2MY2', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUMX2MY2', 'argumentCount' => '2' ), 'SUMX2PY2' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::SUMX2PY2', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUMX2PY2', 'argumentCount' => '2' ), 'SUMXMY2' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::SUMXMY2', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::SUMXMY2', 'argumentCount' => '2' ), 'SYD' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::SYD', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::SYD', 'argumentCount' => '4' ), 'T' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::RETURNSTRING', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::RETURNSTRING', 'argumentCount' => '1' ), 'TAN' => array( @@ -1857,197 +1857,197 @@ class Calculation ), 'TBILLEQ' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::TBILLEQ', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::TBILLEQ', 'argumentCount' => '3' ), 'TBILLPRICE' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::TBILLPRICE', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::TBILLPRICE', 'argumentCount' => '3' ), 'TBILLYIELD' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::TBILLYIELD', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::TBILLYIELD', 'argumentCount' => '3' ), 'TDIST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::TDIST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::TDIST', 'argumentCount' => '3' ), 'TEXT' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::TEXTFORMAT', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::TEXTFORMAT', 'argumentCount' => '2' ), 'TIME' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::TIME', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::TIME', 'argumentCount' => '3' ), 'TIMEVALUE' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::TIMEVALUE', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::TIMEVALUE', 'argumentCount' => '1' ), 'TINV' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::TINV', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::TINV', 'argumentCount' => '2' ), 'TODAY' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::DATENOW', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DATENOW', 'argumentCount' => '0' ), 'TRANSPOSE' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::TRANSPOSE', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::TRANSPOSE', 'argumentCount' => '1' ), 'TREND' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::TREND', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::TREND', 'argumentCount' => '1-4' ), 'TRIM' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::TRIMSPACES', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::TRIMSPACES', 'argumentCount' => '1' ), 'TRIMMEAN' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::TRIMMEAN', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::TRIMMEAN', 'argumentCount' => '2' ), 'TRUE' => array( 'category' => Calculation\Categories::CATEGORY_LOGICAL, - 'functionCall' => 'PHPExcel_Calculation_Logical::TRUE', + 'functionCall' => \\PHPExcel\\Calculation\\Logical::TRUE', 'argumentCount' => '0' ), 'TRUNC' => array( 'category' => Calculation\Categories::CATEGORY_MATH_AND_TRIG, - 'functionCall' => 'PHPExcel_Calculation_MathTrig::TRUNC', + 'functionCall' => \\PHPExcel\\Calculation\\MathTrig::TRUNC', 'argumentCount' => '1,2' ), 'TTEST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '4' ), 'TYPE' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::TYPE', + 'functionCall' => 'Calculation\Categories::TYPE', 'argumentCount' => '1' ), 'UPPER' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::UPPERCASE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::UPPERCASE', 'argumentCount' => '1' ), 'USDOLLAR' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '2' ), 'VALUE' => array( 'category' => Calculation\Categories::CATEGORY_TEXT_AND_DATA, - 'functionCall' => 'PHPExcel_Calculation_TextData::VALUE', + 'functionCall' => \\PHPExcel\\Calculation\\TextData::VALUE', 'argumentCount' => '1' ), 'VAR' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::VARFunc', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::VARFunc', 'argumentCount' => '1+' ), 'VARA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::VARA', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::VARA', 'argumentCount' => '1+' ), 'VARP' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::VARP', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::VARP', 'argumentCount' => '1+' ), 'VARPA' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::VARPA', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::VARPA', 'argumentCount' => '1+' ), 'VDB' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '5-7' ), 'VERSION' => array( 'category' => Calculation\Categories::CATEGORY_INFORMATION, - 'functionCall' => 'Calculation\Categoriess::VERSION', + 'functionCall' => 'Calculation\Categories::VERSION', 'argumentCount' => '0' ), 'VLOOKUP' => array( 'category' => Calculation\Categories::CATEGORY_LOOKUP_AND_REFERENCE, - 'functionCall' => 'PHPExcel_Calculation_LookupRef::VLOOKUP', + 'functionCall' => \\PHPExcel\\Calculation\\LookupRef::VLOOKUP', 'argumentCount' => '3,4' ), 'WEEKDAY' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::DAYOFWEEK', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::DAYOFWEEK', 'argumentCount' => '1,2' ), 'WEEKNUM' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::WEEKOFYEAR', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::WEEKOFYEAR', 'argumentCount' => '1,2' ), 'WEIBULL' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::WEIBULL', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::WEIBULL', 'argumentCount' => '4' ), 'WORKDAY' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::WORKDAY', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::WORKDAY', 'argumentCount' => '2+' ), 'XIRR' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::XIRR', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::XIRR', 'argumentCount' => '2,3' ), 'XNPV' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::XNPV', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::XNPV', 'argumentCount' => '3' ), 'YEAR' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::YEAR', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::YEAR', 'argumentCount' => '1' ), 'YEARFRAC' => array( 'category' => Calculation\Categories::CATEGORY_DATE_AND_TIME, - 'functionCall' => 'PHPExcel_Calculation_DateTime::YEARFRAC', + 'functionCall' => \\PHPExcel\\Calculation\\DateTime::YEARFRAC', 'argumentCount' => '2,3' ), 'YIELD' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'Calculation\Categoriess::DUMMY', + 'functionCall' => 'Calculation\Categories::DUMMY', 'argumentCount' => '6,7' ), 'YIELDDISC' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::YIELDDISC', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::YIELDDISC', 'argumentCount' => '4,5' ), 'YIELDMAT' => array( 'category' => Calculation\Categories::CATEGORY_FINANCIAL, - 'functionCall' => 'PHPExcel_Calculation_Financial::YIELDMAT', + 'functionCall' => \\PHPExcel\\Calculation\\Financial::YIELDMAT', 'argumentCount' => '5,6' ), 'ZTEST' => array( 'category' => Calculation\Categories::CATEGORY_STATISTICAL, - 'functionCall' => 'PHPExcel_Calculation_Statistical::ZTEST', + 'functionCall' => \\PHPExcel\\Calculation\\Statistical::ZTEST', 'argumentCount' => '2-3' ) ); @@ -2104,7 +2104,7 @@ class Calculation * @access public * @param PHPExcel $spreadsheet Injected spreadsheet for working with a PHPExcel object, * or NULL to create a standalone claculation engine - * @return PHPExcel_Calculation + * @return Calculation */ public static function getInstance(Spreadsheet $spreadsheet = null) { @@ -2139,7 +2139,7 @@ class Calculation /** * Flush the calculation cache for any existing instance of this class - * but only if a PHPExcel_Calculation instance exists + * but only if a \PHPExcel\Calculation instance exists * * @access public * @return null @@ -2154,7 +2154,7 @@ class Calculation * Get the debuglog for this claculation engine instance * * @access public - * @return PHPExcel_CalcEngine_Logger + * @return CalcEngine\Logger */ public function getDebugLog() { @@ -2165,11 +2165,11 @@ class Calculation * __clone implementation. Cloning should not be allowed in a Singleton! * * @access public - * @throws PHPExcel_Calculation_Exception + * @throws Calculation\Exception */ final public function __clone() { - throw new PHPExcel_Calculation_Exception('Cloning the calculation engine is not allowed!'); + throw new Calculation\Exception('Cloning the calculation engine is not allowed!'); } @@ -2547,7 +2547,7 @@ class Calculation return '"'.$value.'"'; // Convert numeric errors to NaN error } elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) { - return Calculation\Categoriess::NaN(); + return Calculation\Categories::NaN(); } return $value; @@ -2568,7 +2568,7 @@ class Calculation } // Convert numeric errors to NaN error } elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) { - return Calculation\Categoriess::NaN(); + return Calculation\Categories::NaN(); } return $value; } @@ -2581,16 +2581,16 @@ class Calculation * Retained for backward compatibility * * @access public - * @param PHPExcel_Cell $pCell Cell to calculate + * @param Cell $pCell Cell to calculate * @return mixed - * @throws PHPExcel_Calculation_Exception + * @throws Calculation\Exception */ - public function calculate(PHPExcel_Cell $pCell = null) + public function calculate(Cell $pCell = null) { try { return $this->calculateCellValue($pCell); - } catch (PHPExcel_Exception $e) { - throw new PHPExcel_Calculation_Exception($e->getMessage()); + } catch (Exception $e) { + throw new Calculation\Exception($e->getMessage()); } } @@ -2599,12 +2599,12 @@ class Calculation * Calculate the value of a cell formula * * @access public - * @param PHPExcel_Cell $pCell Cell to calculate + * @param Cell $pCell Cell to calculate * @param Boolean $resetLog Flag indicating whether the debug log should be reset or not * @return mixed - * @throws PHPExcel_Calculation_Exception + * @throws Calculation\Exception */ - public function calculateCellValue(PHPExcel_Cell $pCell = null, $resetLog = true) + public function calculateCellValue(Cell $pCell = null, $resetLog = true) { if ($pCell === null) { return null; @@ -2630,17 +2630,17 @@ class Calculation $result = self::unwrapResult($this->_calculateFormulaValue($pCell->getValue(), $pCell->getCoordinate(), $pCell)); $cellAddress = array_pop($this->cellStack); $this->spreadsheet->getSheetByName($cellAddress['sheet'])->getCell($cellAddress['cell']); - } catch (PHPExcel_Exception $e) { + } catch (Exception $e) { $cellAddress = array_pop($this->cellStack); $this->spreadsheet->getSheetByName($cellAddress['sheet'])->getCell($cellAddress['cell']); - throw new PHPExcel_Calculation_Exception($e->getMessage()); + throw new Calculation\Exception($e->getMessage()); } if ((is_array($result)) && (self::$returnArrayAsType != self::RETURN_ARRAY_AS_ARRAY)) { self::$returnArrayAsType = $returnArrayAsType; - $testResult = Calculation\Categoriess::flattenArray($result); + $testResult = Calculation\Categories::flattenArray($result); if (self::$returnArrayAsType == self::RETURN_ARRAY_AS_ERROR) { - return Calculation\Categoriess::VALUE(); + return Calculation\Categories::VALUE(); } // If there's only a single cell in the array, then we allow it if (count($testResult) != 1) { @@ -2648,13 +2648,13 @@ class Calculation $r = array_keys($result); $r = array_shift($r); if (!is_numeric($r)) { - return Calculation\Categoriess::VALUE(); + return Calculation\Categories::VALUE(); } if (is_array($result[$r])) { $c = array_keys($result[$r]); $c = array_shift($c); if (!is_numeric($c)) { - return Calculation\Categoriess::VALUE(); + return Calculation\Categories::VALUE(); } } } @@ -2666,7 +2666,7 @@ class Calculation if ($result === null) { return 0; } elseif ((is_float($result)) && ((is_nan($result)) || (is_infinite($result)))) { - return Calculation\Categoriess::NaN(); + return Calculation\Categories::NaN(); } return $result; } @@ -2677,7 +2677,7 @@ class Calculation * * @param string $formula Formula to parse * @return array - * @throws PHPExcel_Calculation_Exception + * @throws Calculation\Exception */ public function parseFormula($formula) { @@ -2702,11 +2702,11 @@ class Calculation * * @param string $formula Formula to parse * @param string $cellID Address of the cell to calculate - * @param PHPExcel_Cell $pCell Cell to calculate + * @param Cell $pCell Cell to calculate * @return mixed - * @throws PHPExcel_Calculation_Exception + * @throws Calculation\Exception */ - public function calculateFormula($formula, $cellID = null, PHPExcel_Cell $pCell = null) + public function calculateFormula($formula, $cellID = null, Cell $pCell = null) { // Initialise the logging settings $this->formulaError = null; @@ -2720,8 +2720,8 @@ class Calculation // Execute the calculation try { $result = self::unwrapResult($this->_calculateFormulaValue($formula, $cellID, $pCell)); - } catch (PHPExcel_Exception $e) { - throw new PHPExcel_Calculation_Exception($e->getMessage()); + } catch (Exception $e) { + throw new Calculation\Exception($e->getMessage()); } // Reset calculation cacheing to its previous state @@ -2757,11 +2757,11 @@ class Calculation * * @param string $formula The formula to parse and calculate * @param string $cellID The ID (e.g. A3) of the cell that we are calculating - * @param PHPExcel_Cell $pCell Cell to calculate - * @return mixed - * @throws PHPExcel_Calculation_Exception + * @param Cell $pCell Cell to calculate + * @return mixed + * @throws Calculation\Exception */ - public function _calculateFormulaValue($formula, $cellID = null, PHPExcel_Cell $pCell = null) + public function _calculateFormulaValue($formula, $cellID = null, Cell $pCell = null) { $cellValue = null; @@ -2984,7 +2984,7 @@ class Calculation private function showValue($value) { if ($this->_debugLog->getWriteDebugLog()) { - $testArray = Calculation\Categoriess::flattenArray($value); + $testArray = Calculation\Categories::flattenArray($value); if (count($testArray) == 1) { $value = array_pop($testArray); } @@ -3007,7 +3007,7 @@ class Calculation return ($value) ? self::$localeBoolean['TRUE'] : self::$localeBoolean['FALSE']; } } - return Calculation\Categoriess::flattenSingleValue($value); + return Calculation\Categories::flattenSingleValue($value); } @@ -3020,7 +3020,7 @@ class Calculation private function showTypeDetails($value) { if ($this->_debugLog->getWriteDebugLog()) { - $testArray = Calculation\Categoriess::flattenArray($value); + $testArray = Calculation\Categories::flattenArray($value); if (count($testArray) == 1) { $value = array_pop($testArray); } @@ -3512,7 +3512,7 @@ class Calculation } // evaluate postfix notation - private function processTokenStack($tokens, $cellID = null, PHPExcel_Cell $pCell = null) + private function processTokenStack($tokens, $cellID = null, Cell $pCell = null) { if ($tokens == false) { return false; @@ -3522,7 +3522,7 @@ class Calculation // so we store the parent cell collection so that we can re-attach it when necessary $pCellWorksheet = ($pCell !== null) ? $pCell->getWorksheet() : null; $pCellParent = ($pCell !== null) ? $pCell->getParent() : null; - $stack = new PHPExcel_Calculation_Token_Stack; + $stack = new Calculation\Token\Stack; // Loop through each token in turn foreach ($tokens as $tokenData) { @@ -3598,11 +3598,11 @@ class Calculation $oData = array_merge(explode(':', $operand1Data['reference']), explode(':', $operand2Data['reference'])); $oCol = $oRow = array(); foreach ($oData as $oDatum) { - $oCR = PHPExcel_Cell::coordinateFromString($oDatum); - $oCol[] = PHPExcel_Cell::columnIndexFromString($oCR[0]) - 1; + $oCR = Cell::coordinateFromString($oDatum); + $oCol[] = Cell::columnIndexFromString($oCR[0]) - 1; $oRow[] = $oCR[1]; } - $cellRef = PHPExcel_Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.PHPExcel_Cell::stringFromColumnIndex(max($oCol)).max($oRow); + $cellRef = Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.Cell::stringFromColumnIndex(max($oCol)).max($oRow); if ($pCellParent !== null) { $cellValue = $this->extractCellRange($cellRef, $this->spreadsheet->getSheetByName($sheet1), false); } else { @@ -3610,7 +3610,7 @@ class Calculation } $stack->push('Cell Reference', $cellValue, $cellRef); } else { - $stack->push('Error', Calculation\Categoriess::REF(), null); + $stack->push('Error', Calculation\Categories::REF(), null); } break; case '+': // Addition @@ -3643,11 +3643,11 @@ class Calculation self::checkMatrixOperands($operand1, $operand2, 2); try { // Convert operand 1 from a PHP array to a matrix - $matrix = new PHPExcel_Shared_JAMA_Matrix($operand1); + $matrix = new Shared\JAMA\Matrix($operand1); // Perform the required operation against the operand 1 matrix, passing in operand 2 $matrixResult = $matrix->concat($operand2); $result = $matrixResult->getArray(); - } catch (PHPExcel_Exception $ex) { + } catch (Exception $ex) { $this->_debugLog->writeDebugLog('JAMA Matrix Exception: ', $ex->getMessage()); $result = '#VALUE!'; } @@ -3663,11 +3663,11 @@ class Calculation foreach (array_keys($rowIntersect) as $row) { $oRow[] = $row; foreach ($rowIntersect[$row] as $col => $data) { - $oCol[] = PHPExcel_Cell::columnIndexFromString($col) - 1; + $oCol[] = Cell::columnIndexFromString($col) - 1; $cellIntersect[$row] = array_intersect_key($operand1[$row], $operand2[$row]); } } - $cellRef = PHPExcel_Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.PHPExcel_Cell::stringFromColumnIndex(max($oCol)).max($oRow); + $cellRef = Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.Cell::stringFromColumnIndex(max($oCol)).max($oRow); $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($cellIntersect)); $stack->push('Value', $cellIntersect, $cellRef); break; @@ -3692,10 +3692,10 @@ class Calculation if (is_array($arg)) { self::checkMatrixOperands($arg, $multiplier, 2); try { - $matrix1 = new PHPExcel_Shared_JAMA_Matrix($arg); + $matrix1 = new Shared\JAMA\Matrix($arg); $matrixResult = $matrix1->arrayTimesEquals($multiplier); $result = $matrixResult->getArray(); - } catch (PHPExcel_Exception $ex) { + } catch (Exception $ex) { $this->_debugLog->writeDebugLog('JAMA Matrix Exception: ', $ex->getMessage()); $result = '#VALUE!'; } @@ -3712,7 +3712,7 @@ class Calculation // echo 'Reference is a Range of cells
'; if ($pCell === null) { // We can't access the range, so return a REF error - $cellValue = Calculation\Categoriess::REF(); + $cellValue = Calculation\Categories::REF(); } else { $cellRef = $matches[6].$matches[7].':'.$matches[9].$matches[10]; if ($matches[2] > '') { @@ -3746,7 +3746,7 @@ class Calculation // echo 'Reference is a single Cell
'; if ($pCell === null) { // We can't access the cell, so return a REF error - $cellValue = Calculation\Categoriess::REF(); + $cellValue = Calculation\Categories::REF(); } else { $cellRef = $matches[6].$matches[7]; if ($matches[2] > '') { @@ -3843,7 +3843,7 @@ class Calculation if ($functionName != 'MKMATRIX') { if ($this->_debugLog->getWriteDebugLog()) { krsort($argArrayVals); - $this->_debugLog->writeDebugLog('Evaluating ', self::localeFunc($functionName), '( ', implode(self::$localeArgumentSeparator.' ', Calculation\Categoriess::flattenArray($argArrayVals)), ' )'); + $this->_debugLog->writeDebugLog('Evaluating ', self::localeFunc($functionName), '( ', implode(self::$localeArgumentSeparator.' ', Calculation\Categories::flattenArray($argArrayVals)), ' )'); } } // Process each argument in turn, building the return value as an array @@ -3877,7 +3877,7 @@ class Calculation $result = call_user_func_array(explode('::', $functionCall), $args); } else { foreach ($args as &$arg) { - $arg = Calculation\Categoriess::flattenSingleValue($arg); + $arg = Calculation\Categories::flattenSingleValue($arg); } unset($arg); $result = call_user_func_array($functionCall, $args); @@ -3921,7 +3921,7 @@ class Calculation $output = $output['value']; // if ((is_array($output)) && (self::$returnArrayAsType != self::RETURN_ARRAY_AS_ARRAY)) { -// return array_shift(Calculation\Categoriess::flattenArray($output)); +// return array_shift(Calculation\Categories::flattenArray($output)); // } return $output; } @@ -3950,7 +3950,7 @@ class Calculation $stack->push('Value', $operand); $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($operand)); return false; - } elseif (!PHPExcel_Shared_String::convertToNumberIfFraction($operand)) { + } elseif (!Shared\String::convertToNumberIfFraction($operand)) { // If not a numeric or a fraction, then it's a text string, and so can't be used in mathematical binary operations $stack->push('Value', '#VALUE!'); $this->_debugLog->writeDebugLog('Evaluation Result is a ', $this->showTypeDetails('#VALUE!')); @@ -4010,7 +4010,7 @@ class Calculation } // Use case insensitive comparaison if not OpenOffice mode - if (Calculation\Categoriess::getCompatibilityMode() != Calculation\Categoriess::COMPATIBILITY_OPENOFFICE) { + if (Calculation\Categories::getCompatibilityMode() != Calculation\Categories::COMPATIBILITY_OPENOFFICE) { if (is_string($operand1)) { $operand1 = strtoupper($operand1); } @@ -4019,7 +4019,7 @@ class Calculation } } - $useLowercaseFirstComparison = is_string($operand1) && is_string($operand2) && Calculation\Categoriess::getCompatibilityMode() == Calculation\Categoriess::COMPATIBILITY_OPENOFFICE; + $useLowercaseFirstComparison = is_string($operand1) && is_string($operand2) && Calculation\Categories::getCompatibilityMode() == Calculation\Categories::COMPATIBILITY_OPENOFFICE; // execute the necessary operation switch ($operation) { @@ -4092,8 +4092,8 @@ class Calculation */ private function strcmpLowercaseFirst($str1, $str2) { - $inversedStr1 = PHPExcel_Shared_String::StrCaseReverse($str1); - $inversedStr2 = PHPExcel_Shared_String::StrCaseReverse($str2); + $inversedStr1 = Shared\String::StrCaseReverse($str1); + $inversedStr2 = Shared\String::StrCaseReverse($str2); return strcmp($inversedStr1, $inversedStr2); } @@ -4117,19 +4117,19 @@ class Calculation try { // Convert operand 1 from a PHP array to a matrix - $matrix = new PHPExcel_Shared_JAMA_Matrix($operand1); + $matrix = new Shared\JAMA\Matrix($operand1); // Perform the required operation against the operand 1 matrix, passing in operand 2 $matrixResult = $matrix->$matrixFunction($operand2); $result = $matrixResult->getArray(); - } catch (PHPExcel_Exception $ex) { + } catch (Exception $ex) { $this->_debugLog->writeDebugLog('JAMA Matrix Exception: ', $ex->getMessage()); $result = '#VALUE!'; } } else { - if ((Calculation\Categoriess::getCompatibilityMode() != Calculation\Categoriess::COMPATIBILITY_OPENOFFICE) && + if ((Calculation\Categories::getCompatibilityMode() != Calculation\Categories::COMPATIBILITY_OPENOFFICE) && ((is_string($operand1) && !is_numeric($operand1) && strlen($operand1)>0) || (is_string($operand2) && !is_numeric($operand2) && strlen($operand2)>0))) { - $result = Calculation\Categoriess::VALUE(); + $result = Calculation\Categories::VALUE(); } else { // If we're dealing with non-matrix operations, execute the necessary operation switch ($operation) { @@ -4178,7 +4178,7 @@ class Calculation $this->formulaError = $errorMessage; $this->cyclicReferenceStack->clear(); if (!$this->suppressFormulaErrors) { - throw new PHPExcel_Calculation_Exception($errorMessage); + throw new Calculation\Exception($errorMessage); } trigger_error($errorMessage, E_USER_ERROR); } @@ -4187,13 +4187,13 @@ class Calculation /** * Extract range values * - * @param string &$pRange String based range representation - * @param PHPExcel_Worksheet $pSheet Worksheet - * @param boolean $resetLog Flag indicating whether calculation log should be reset or not - * @return mixed Array of values in range if range contains more than one element. Otherwise, a single value is returned. - * @throws PHPExcel_Calculation_Exception + * @param string &$pRange String based range representation + * @param Worksheet $pSheet Worksheet + * @param boolean $resetLog Flag indicating whether calculation log should be reset or not + * @return mixed Array of values in range if range contains more than one element. Otherwise, a single value is returned. + * @throws Calculation\Exception */ - public function extractCellRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog = true) + public function extractCellRange(&$pRange = 'A1', Worksheet $pSheet = null, $resetLog = true) { // Return value $returnValue = array (); @@ -4205,14 +4205,14 @@ class Calculation // echo 'Range reference is '.$pRange.PHP_EOL; if (strpos($pRange, '!') !== false) { // echo '$pRange reference includes sheet reference', PHP_EOL; - list($pSheetName, $pRange) = PHPExcel_Worksheet::extractSheetTitle($pRange, true); + list($pSheetName, $pRange) = Worksheet::extractSheetTitle($pRange, true); // echo 'New sheet name is '.$pSheetName, PHP_EOL; // echo 'Adjusted Range reference is '.$pRange, PHP_EOL; $pSheet = $this->spreadsheet->getSheetByName($pSheetName); } // Extract range - $aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange); + $aReferences = Cell::extractAllCellReferencesInRange($pRange); $pRange = $pSheetName.'!'.$pRange; if (!isset($aReferences[1])) { // Single cell in range @@ -4245,13 +4245,13 @@ class Calculation /** * Extract range values * - * @param string &$pRange String based range representation - * @param PHPExcel_Worksheet $pSheet Worksheet - * @return mixed Array of values in range if range contains more than one element. Otherwise, a single value is returned. - * @param boolean $resetLog Flag indicating whether calculation log should be reset or not - * @throws PHPExcel_Calculation_Exception + * @param string &$pRange String based range representation + * @param Worksheet $pSheet Worksheet + * @return mixed Array of values in range if range contains more than one element. Otherwise, a single value is returned. + * @param boolean $resetLog Flag indicating whether calculation log should be reset or not + * @throws Calculation\Exception */ - public function extractNamedRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog = true) + public function extractNamedRange(&$pRange = 'A1', Worksheet $pSheet = null, $resetLog = true) { // Return value $returnValue = array (); @@ -4263,19 +4263,19 @@ class Calculation // echo 'Range reference is '.$pRange.'
'; if (strpos($pRange, '!') !== false) { // echo '$pRange reference includes sheet reference', PHP_EOL; - list($pSheetName, $pRange) = PHPExcel_Worksheet::extractSheetTitle($pRange, true); + list($pSheetName, $pRange) = Worksheet::extractSheetTitle($pRange, true); // echo 'New sheet name is '.$pSheetName, PHP_EOL; // echo 'Adjusted Range reference is '.$pRange, PHP_EOL; $pSheet = $this->spreadsheet->getSheetByName($pSheetName); } // Named range? - $namedRange = PHPExcel_NamedRange::resolveRange($pRange, $pSheet); + $namedRange = NamedRange::resolveRange($pRange, $pSheet); if ($namedRange !== null) { $pSheet = $namedRange->getWorksheet(); // echo 'Named Range '.$pRange.' ('; $pRange = $namedRange->getRange(); - $splitRange = PHPExcel_Cell::splitRange($pRange); + $splitRange = Cell::splitRange($pRange); // Convert row and column references if (ctype_alpha($splitRange[0][0])) { $pRange = $splitRange[0][0] . '1:' . $splitRange[0][1] . $namedRange->getWorksheet()->getHighestRow(); @@ -4292,15 +4292,15 @@ class Calculation // } // } } else { - return Calculation\Categoriess::REF(); + return Calculation\Categories::REF(); } // Extract range - $aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange); + $aReferences = Cell::extractAllCellReferencesInRange($pRange); // var_dump($aReferences); if (!isset($aReferences[1])) { // Single cell (or single column or row) in range - list($currentCol, $currentRow) = PHPExcel_Cell::coordinateFromString($aReferences[0]); + list($currentCol, $currentRow) = Cell::coordinateFromString($aReferences[0]); $cellValue = null; if ($pSheet->cellExists($aReferences[0])) { $returnValue[$currentRow][$currentCol] = $pSheet->getCell($aReferences[0])->getCalculatedValue($resetLog); @@ -4311,7 +4311,7 @@ class Calculation // Extract cell data for all cells in the range foreach ($aReferences as $reference) { // Extract range - list($currentCol, $currentRow) = PHPExcel_Cell::coordinateFromString($reference); + list($currentCol, $currentRow) = Cell::coordinateFromString($reference); // echo 'NAMED RANGE: $currentCol='.$currentCol.' $currentRow='.$currentRow.'
'; $cellValue = null; if ($pSheet->cellExists($reference)) { @@ -4339,7 +4339,7 @@ class Calculation { $pFunction = strtoupper($pFunction); if (isset(self::$PHPExcelFunctions[$pFunction])) { - return (self::$PHPExcelFunctions[$pFunction]['functionCall'] != 'Calculation\Categoriess::DUMMY'); + return (self::$PHPExcelFunctions[$pFunction]['functionCall'] != 'Calculation\Categories::DUMMY'); } else { return false; } @@ -4356,7 +4356,7 @@ class Calculation $returnValue = array(); foreach (self::$PHPExcelFunctions as $functionName => $function) { - if ($function['functionCall'] != 'Calculation\Categoriess::DUMMY') { + if ($function['functionCall'] != 'Calculation\Categories::DUMMY') { $returnValue[$functionName] = new Calculation\Categories( $function['category'], $functionName, @@ -4388,7 +4388,7 @@ class Calculation { $returnValue = array(); foreach (self::$PHPExcelFunctions as $functionName => $function) { - if ($function['functionCall'] != 'Calculation\Categoriess::DUMMY') { + if ($function['functionCall'] != 'Calculation\Categories::DUMMY') { $returnValue[] = $functionName; } } diff --git a/src/PhpSpreadsheet/Chart.php b/src/PhpSpreadsheet/Chart.php index 96b82f6a..a3718aa4 100644 --- a/src/PhpSpreadsheet/Chart.php +++ b/src/PhpSpreadsheet/Chart.php @@ -39,42 +39,42 @@ class Chart /** * Worksheet * - * @var \PHPExcel\Worksheet + * @var Worksheet */ private $worksheet; /** * Chart Title * - * @var PHPExcel_Chart_Title + * @var Chart\Title */ private $title; /** * Chart Legend * - * @var PHPExcel_Chart_Legend + * @var Chart\Legend */ private $legend; /** * X-Axis Label * - * @var PHPExcel_Chart_Title + * @var Chart\Title */ private $xAxisLabel; /** * Y-Axis Label * - * @var PHPExcel_Chart_Title + * @var Chart\Title */ private $yAxisLabel; /** * Chart Plot Area * - * @var PHPExcel_Chart_PlotArea + * @var Chart\PlotArea */ private $plotArea; @@ -95,28 +95,28 @@ class Chart /** * Chart Asix Y as * - * @var PHPExcel_Chart_Axis + * @var Chart\Axis */ private $yAxis; /** * Chart Asix X as * - * @var PHPExcel_Chart_Axis + * @var Chart\Axis */ private $xAxis; /** * Chart Major Gridlines as * - * @var PHPExcel_Chart_GridLines + * @var Chart\GridLines */ private $majorGridlines; /** * Chart Minor Gridlines as * - * @var PHPExcel_Chart_GridLines + * @var Chart\GridLines */ private $minorGridlines; @@ -169,9 +169,9 @@ class Chart /** - * Create a new PHPExcel_Chart + * Create a new Chart */ - public function __construct($name, PHPExcel_Chart_Title $title = null, PHPExcel_Chart_Legend $legend = null, PHPExcel_Chart_PlotArea $plotArea = null, $plotVisibleOnly = true, $displayBlanksAs = '0', PHPExcel_Chart_Title $xAxisLabel = null, PHPExcel_Chart_Title $yAxisLabel = null, PHPExcel_Chart_Axis $xAxis = null, PHPExcel_Chart_Axis $yAxis = null, PHPExcel_Chart_GridLines $majorGridlines = null, PHPExcel_Chart_GridLines $minorGridlines = null) + public function __construct($name, Chart\Title $title = null, Chart\Legend $legend = null, Chart\PlotArea $plotArea = null, $plotVisibleOnly = true, $displayBlanksAs = '0', Chart\Title $xAxisLabel = null, Chart\Title $yAxisLabel = null, Chart\Axis $xAxis = null, Chart\Axis $yAxis = null, Chart\GridLines $majorGridlines = null, Chart\GridLines $minorGridlines = null) { $this->name = $name; $this->title = $title; @@ -200,7 +200,7 @@ class Chart /** * Get Worksheet * - * @return PHPExcel_Worksheet + * @return Worksheet */ public function getWorksheet() { @@ -210,11 +210,11 @@ class Chart /** * Set Worksheet * - * @param PHPExcel_Worksheet $pValue - * @throws PHPExcel_Chart_Exception - * @return PHPExcel_Chart + * @param Worksheet $pValue + * @throws Chart\Exception + * @return Chart */ - public function setWorksheet(PHPExcel_Worksheet $pValue = null) + public function setWorksheet(Worksheet $pValue = null) { $this->worksheet = $pValue; @@ -224,7 +224,7 @@ class Chart /** * Get Title * - * @return PHPExcel_Chart_Title + * @return Chart\Title */ public function getTitle() { @@ -234,10 +234,10 @@ class Chart /** * Set Title * - * @param PHPExcel_Chart_Title $title - * @return PHPExcel_Chart + * @param Chart\Title $title + * @return Chart */ - public function setTitle(PHPExcel_Chart_Title $title) + public function setTitle(Chart\Title $title) { $this->title = $title; @@ -247,7 +247,7 @@ class Chart /** * Get Legend * - * @return PHPExcel_Chart_Legend + * @return Chart\Legend */ public function getLegend() { @@ -257,10 +257,10 @@ class Chart /** * Set Legend * - * @param PHPExcel_Chart_Legend $legend - * @return PHPExcel_Chart + * @param Chart\Legend $legend + * @return Chart */ - public function setLegend(PHPExcel_Chart_Legend $legend) + public function setLegend(Chart\Legend $legend) { $this->legend = $legend; @@ -270,7 +270,7 @@ class Chart /** * Get X-Axis Label * - * @return PHPExcel_Chart_Title + * @return Chart\Title */ public function getXAxisLabel() { @@ -280,10 +280,10 @@ class Chart /** * Set X-Axis Label * - * @param PHPExcel_Chart_Title $label - * @return PHPExcel_Chart + * @param Chart\Title $label + * @return Chart */ - public function setXAxisLabel(PHPExcel_Chart_Title $label) + public function setXAxisLabel(Chart\Title $label) { $this->xAxisLabel = $label; @@ -293,7 +293,7 @@ class Chart /** * Get Y-Axis Label * - * @return PHPExcel_Chart_Title + * @return Chart\Title */ public function getYAxisLabel() { @@ -303,10 +303,10 @@ class Chart /** * Set Y-Axis Label * - * @param PHPExcel_Chart_Title $label - * @return PHPExcel_Chart + * @param Chart\Title $label + * @return Chart */ - public function setYAxisLabel(PHPExcel_Chart_Title $label) + public function setYAxisLabel(Chart\Title $label) { $this->yAxisLabel = $label; @@ -316,7 +316,7 @@ class Chart /** * Get Plot Area * - * @return PHPExcel_Chart_PlotArea + * @return Chart\PlotArea */ public function getPlotArea() { @@ -337,7 +337,7 @@ class Chart * Set Plot Visible Only * * @param boolean $plotVisibleOnly - * @return PHPExcel_Chart + * @return Chart */ public function setPlotVisibleOnly($plotVisibleOnly = true) { @@ -360,7 +360,7 @@ class Chart * Set Display Blanks as * * @param string $displayBlanksAs - * @return PHPExcel_Chart + * @return Chart */ public function setDisplayBlanksAs($displayBlanksAs = '0') { @@ -371,7 +371,7 @@ class Chart /** * Get yAxis * - * @return PHPExcel_Chart_Axis + * @return Chart\Axis */ public function getChartAxisY() { @@ -379,13 +379,13 @@ class Chart return $this->yAxis; } - return new PHPExcel_Chart_Axis(); + return new Chart\Axis(); } /** * Get xAxis * - * @return PHPExcel_Chart_Axis + * @return Chart\Axis */ public function getChartAxisX() { @@ -393,13 +393,13 @@ class Chart return $this->xAxis; } - return new PHPExcel_Chart_Axis(); + return new Chart\Axis(); } /** * Get Major Gridlines * - * @return PHPExcel_Chart_GridLines + * @return Chart\GridLines */ public function getMajorGridlines() { @@ -407,13 +407,13 @@ class Chart return $this->majorGridlines; } - return new PHPExcel_Chart_GridLines(); + return new Chart\GridLines(); } /** * Get Minor Gridlines * - * @return PHPExcel_Chart_GridLines + * @return Chart\GridLines */ public function getMinorGridlines() { @@ -421,7 +421,7 @@ class Chart return $this->minorGridlines; } - return new PHPExcel_Chart_GridLines(); + return new Chart\GridLines(); } @@ -431,7 +431,7 @@ class Chart * @param string $cell * @param integer $xOffset * @param integer $yOffset - * @return PHPExcel_Chart + * @return Chart */ public function setTopLeftPosition($cell, $xOffset = null, $yOffset = null) { @@ -474,7 +474,7 @@ class Chart * Set the Top Left cell position for the chart * * @param string $cell - * @return PHPExcel_Chart + * @return Chart */ public function setTopLeftCell($cell) { @@ -488,7 +488,7 @@ class Chart * * @param integer $xOffset * @param integer $yOffset - * @return PHPExcel_Chart + * @return Chart */ public function setTopLeftOffset($xOffset = null, $yOffset = null) { @@ -545,7 +545,7 @@ class Chart * @param string $cell * @param integer $xOffset * @param integer $yOffset - * @return PHPExcel_Chart + * @return Chart */ public function setBottomRightPosition($cell, $xOffset = null, $yOffset = null) { @@ -596,7 +596,7 @@ class Chart * * @param integer $xOffset * @param integer $yOffset - * @return PHPExcel_Chart + * @return Chart */ public function setBottomRightOffset($xOffset = null, $yOffset = null) { @@ -657,21 +657,21 @@ class Chart public function render($outputDestination = null) { - $libraryName = PHPExcel_Settings::getChartRendererName(); + $libraryName = Settings::getChartRendererName(); if (is_null($libraryName)) { return false; } // Ensure that data series values are up-to-date before we render $this->refresh(); - $libraryPath = PHPExcel_Settings::getChartRendererPath(); + $libraryPath = Settings::getChartRendererPath(); $includePath = str_replace('\\', '/', get_include_path()); $rendererPath = str_replace('\\', '/', $libraryPath); if (strpos($rendererPath, $includePath) === false) { set_include_path(get_include_path() . PATH_SEPARATOR . $libraryPath); } - $rendererName = 'PHPExcel_Chart_Renderer_'.$libraryName; + $rendererName = '\\PHPExcel\\Chart\\Renderer\\'.$libraryName; $renderer = new $rendererName($this); if ($outputDestination == 'php://output') { diff --git a/src/PhpSpreadsheet/Comment.php b/src/PhpSpreadsheet/Comment.php index 228a1f49..20a143c6 100644 --- a/src/PhpSpreadsheet/Comment.php +++ b/src/PhpSpreadsheet/Comment.php @@ -39,7 +39,7 @@ class Comment implements IComparable /** * Rich text comment * - * @var PHPExcel_RichText + * @var RichText */ private $text; @@ -81,7 +81,7 @@ class Comment implements IComparable /** * Comment fill color * - * @var PHPExcel_Style_Color + * @var Style\Color */ private $fillColor; @@ -93,17 +93,17 @@ class Comment implements IComparable private $alignment; /** - * Create a new PHPExcel_Comment + * Create a new Comment * - * @throws PHPExcel_Exception + * @throws Exception */ public function __construct() { // Initialise variables $this->author = 'Author'; - $this->text = new PHPExcel_RichText(); - $this->fillColor = new PHPExcel_Style_Color('FFFFFFE1'); - $this->alignment = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL; + $this->text = new RichText(); + $this->fillColor = new Style\Color('FFFFFFE1'); + $this->alignment = Style\Alignment::HORIZONTAL_GENERAL; } /** @@ -120,7 +120,7 @@ class Comment implements IComparable * Set Author * * @param string $pValue - * @return PHPExcel_Comment + * @return Comment */ public function setAuthor($pValue = '') { @@ -131,7 +131,7 @@ class Comment implements IComparable /** * Get Rich text comment * - * @return PHPExcel_RichText + * @return RichText */ public function getText() { @@ -141,10 +141,10 @@ class Comment implements IComparable /** * Set Rich text comment * - * @param PHPExcel_RichText $pValue - * @return PHPExcel_Comment + * @param RichText $pValue + * @return Comment */ - public function setText(PHPExcel_RichText $pValue) + public function setText(RichText $pValue) { $this->text = $pValue; return $this; @@ -164,7 +164,7 @@ class Comment implements IComparable * Set comment width (CSS style, i.e. XXpx or YYpt) * * @param string $value - * @return PHPExcel_Comment + * @return Comment */ public function setWidth($value = '96pt') { @@ -186,7 +186,7 @@ class Comment implements IComparable * Set comment height (CSS style, i.e. XXpx or YYpt) * * @param string $value - * @return PHPExcel_Comment + * @return Comment */ public function setHeight($value = '55.5pt') { @@ -208,7 +208,7 @@ class Comment implements IComparable * Set left margin (CSS style, i.e. XXpx or YYpt) * * @param string $value - * @return PHPExcel_Comment + * @return Comment */ public function setMarginLeft($value = '59.25pt') { @@ -230,7 +230,7 @@ class Comment implements IComparable * Set top margin (CSS style, i.e. XXpx or YYpt) * * @param string $value - * @return PHPExcel_Comment + * @return Comment */ public function setMarginTop($value = '1.5pt') { @@ -252,7 +252,7 @@ class Comment implements IComparable * Set comment default visibility * * @param boolean $value - * @return PHPExcel_Comment + * @return Comment */ public function setVisible($value = false) { @@ -263,7 +263,7 @@ class Comment implements IComparable /** * Get fill color * - * @return PHPExcel_Style_Color + * @return Style\Color */ public function getFillColor() { @@ -274,9 +274,9 @@ class Comment implements IComparable * Set Alignment * * @param string $pValue - * @return PHPExcel_Comment + * @return Comment */ - public function setAlignment($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL) + public function setAlignment($pValue = Style\Alignment::HORIZONTAL_GENERAL) { $this->alignment = $pValue; return $this; diff --git a/src/PhpSpreadsheet/HashTable.php b/src/PhpSpreadsheet/HashTable.php index 5022dd3d..19c7a91e 100644 --- a/src/PhpSpreadsheet/HashTable.php +++ b/src/PhpSpreadsheet/HashTable.php @@ -69,7 +69,7 @@ class HashTable if ($pSource == null) { return; } elseif (!is_array($pSource)) { - throw new PHPExcel_Exception('Invalid array parameter passed.'); + throw new Exception('Invalid array parameter passed.'); } foreach ($pSource as $item) { @@ -80,10 +80,10 @@ class HashTable /** * Add HashTable item * - * @param PHPExcel_IComparable $pSource Item to add + * @param IComparable $pSource Item to add * @throws Exception */ - public function add(PHPExcel_IComparable $pSource = null) + public function add(IComparable $pSource = null) { $hash = $pSource->getHashCode(); if (!isset($this->items[$hash])) { @@ -98,7 +98,7 @@ class HashTable * @param IComparable $pSource Item to remove * @throws Exception */ - public function remove(PHPExcel_IComparable $pSource = null) + public function remove(IComparable $pSource = null) { $hash = $pSource->getHashCode(); if (isset($this->items[$hash])) { diff --git a/src/PhpSpreadsheet/IOFactory.php b/src/PhpSpreadsheet/IOFactory.php index 50453b51..2fbce12b 100644 --- a/src/PhpSpreadsheet/IOFactory.php +++ b/src/PhpSpreadsheet/IOFactory.php @@ -37,8 +37,8 @@ class IOFactory * @static */ private static $searchLocations = array( - array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}' ), - array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => 'PHPExcel_Reader_{0}' ) + array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => '\\PHPExcel\\Writer\\{0}' ), + array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => '\\PHPExcel\\Reader\\{0}' ) ); /** @@ -60,7 +60,7 @@ class IOFactory ); /** - * Private constructor for PHPExcel_IOFactory + * Private constructor for IOFactory */ private function __construct() { @@ -84,14 +84,14 @@ class IOFactory * @static * @access public * @param array $value - * @throws PHPExcel_Reader_Exception + * @throws Reader\Exception */ public static function setSearchLocations($value) { if (is_array($value)) { self::$searchLocations = $value; } else { - throw new PHPExcel_Reader_Exception('Invalid parameter passed.'); + throw new Reader\Exception('Invalid parameter passed.'); } } @@ -102,7 +102,7 @@ class IOFactory * @access public * @param string $type Example: IWriter * @param string $location Example: PHPExcel/Writer/{0}.php - * @param string $classname Example: PHPExcel_Writer_{0} + * @param string $classname Example: Writer\{0} */ public static function addSearchLocation($type = '', $location = '', $classname = '') { @@ -110,14 +110,14 @@ class IOFactory } /** - * Create PHPExcel_Writer_IWriter + * Create Writer\IWriter * * @static * @access public * @param PHPExcel $phpExcel * @param string $writerType Example: Excel2007 - * @return PHPExcel_Writer_IWriter - * @throws PHPExcel_Reader_Exception + * @return Writer\IWriter + * @throws Writer\Exception */ public static function createWriter(PHPExcel $phpExcel, $writerType = '') { @@ -137,17 +137,17 @@ class IOFactory } // Nothing found... - throw new PHPExcel_Reader_Exception("No $searchType found for type $writerType"); + throw new Writer\Exception("No $searchType found for type $writerType"); } /** - * Create PHPExcel_Reader_IReader + * Create Reader\IReader * * @static * @access public * @param string $readerType Example: Excel2007 - * @return PHPExcel_Reader_IReader - * @throws PHPExcel_Reader_Exception + * @return Reader\IReader + * @throws Reader\Exception */ public static function createReader($readerType = '') { @@ -167,17 +167,17 @@ class IOFactory } // Nothing found... - throw new PHPExcel_Reader_Exception("No $searchType found for type $readerType"); + throw new Reader\Exception("No $searchType found for type $readerType"); } /** - * Loads PHPExcel from file using automatic PHPExcel_Reader_IReader resolution + * Loads PHPExcel from file using automatic Reader\IReader resolution * * @static * @access public * @param string $pFilename The name of the spreadsheet file * @return PHPExcel - * @throws PHPExcel_Reader_Exception + * @throws Reader\Exception */ public static function load($pFilename) { @@ -186,13 +186,13 @@ class IOFactory } /** - * Identify file type using automatic PHPExcel_Reader_IReader resolution + * Identify file type using automatic Reader\IReader resolution * * @static * @access public * @param string $pFilename The name of the spreadsheet file to identify * @return string - * @throws PHPExcel_Reader_Exception + * @throws Reader\Exception */ public static function identify($pFilename) { @@ -204,13 +204,13 @@ class IOFactory } /** - * Create PHPExcel_Reader_IReader for file using automatic PHPExcel_Reader_IReader resolution + * Create Reader\IReader for file using automatic Reader\IReader resolution * * @static * @access public * @param string $pFilename The name of the spreadsheet file - * @return PHPExcel_Reader_IReader - * @throws PHPExcel_Reader_Exception + * @return Reader\IReader + * @throws Reader\Exception */ public static function createReaderForFile($pFilename) { @@ -277,6 +277,6 @@ class IOFactory } } - throw new PHPExcel_Reader_Exception('Unable to identify a reader for this file'); + throw new Reader\Exception('Unable to identify a reader for this file'); } } diff --git a/src/PhpSpreadsheet/NamedRange.php b/src/PhpSpreadsheet/NamedRange.php index a1275b97..672997c4 100644 --- a/src/PhpSpreadsheet/NamedRange.php +++ b/src/PhpSpreadsheet/NamedRange.php @@ -39,7 +39,7 @@ class NamedRange /** * Worksheet on which the named range can be resolved * - * @var PHPExcel_Worksheet + * @var Worksheet */ private $worksheet; @@ -60,7 +60,7 @@ class NamedRange /** * Scope * - * @var PHPExcel_Worksheet + * @var Worksheet */ private $scope; @@ -68,17 +68,17 @@ class NamedRange * Create a new NamedRange * * @param string $pName - * @param PHPExcel_Worksheet $pWorksheet + * @param Worksheet $pWorksheet * @param string $pRange * @param bool $pLocalOnly - * @param PHPExcel_Worksheet|null $pScope Scope. Only applies when $pLocalOnly = true. Null for global scope. - * @throws PHPExcel_Exception + * @param Worksheet|null $pScope Scope. Only applies when $pLocalOnly = true. Null for global scope. + * @throws Exception */ - public function __construct($pName = null, PHPExcel_Worksheet $pWorksheet, $pRange = 'A1', $pLocalOnly = false, $pScope = null) + public function __construct($pName = null, Worksheet $pWorksheet, $pRange = 'A1', $pLocalOnly = false, $pScope = null) { // Validate data if (($pName === null) || ($pWorksheet === null) || ($pRange === null)) { - throw new PHPExcel_Exception('Parameters can not be null.'); + throw new Exception('Parameters can not be null.'); } // Set local members @@ -103,7 +103,7 @@ class NamedRange * Set name * * @param string $value - * @return PHPExcel_NamedRange + * @return NamedRange */ public function setName($value = null) { @@ -123,7 +123,7 @@ class NamedRange // New title $newTitle = $this->name; - PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->worksheet->getParent(), $oldTitle, $newTitle); + ReferenceHelper::getInstance()->updateNamedFormulas($this->worksheet->getParent(), $oldTitle, $newTitle); } return $this; } @@ -131,7 +131,7 @@ class NamedRange /** * Get worksheet * - * @return PHPExcel_Worksheet + * @return Worksheet */ public function getWorksheet() { @@ -141,10 +141,10 @@ class NamedRange /** * Set worksheet * - * @param PHPExcel_Worksheet $value - * @return PHPExcel_NamedRange + * @param Worksheet $value + * @return NamedRange */ - public function setWorksheet(PHPExcel_Worksheet $value = null) + public function setWorksheet(Worksheet $value = null) { if ($value !== null) { $this->worksheet = $value; @@ -166,7 +166,7 @@ class NamedRange * Set range * * @param string $value - * @return PHPExcel_NamedRange + * @return NamedRange */ public function setRange($value = null) { @@ -190,7 +190,7 @@ class NamedRange * Set localOnly * * @param bool $value - * @return PHPExcel_NamedRange + * @return NamedRange */ public function setLocalOnly($value = false) { @@ -202,7 +202,7 @@ class NamedRange /** * Get scope * - * @return PHPExcel_Worksheet|null + * @return Worksheet|null */ public function getScope() { @@ -212,10 +212,10 @@ class NamedRange /** * Set scope * - * @param PHPExcel_Worksheet|null $value - * @return PHPExcel_NamedRange + * @param Worksheet|null $value + * @return NamedRange */ - public function setScope(PHPExcel_Worksheet $value = null) + public function setScope(Worksheet $value = null) { $this->scope = $value; $this->localOnly = ($value == null) ? false : true; @@ -226,10 +226,10 @@ class NamedRange * Resolve a named range to a regular cell range * * @param string $pNamedRange Named range - * @param PHPExcel_Worksheet|null $pSheet Scope. Use null for global scope - * @return PHPExcel_NamedRange + * @param Worksheet|null $pSheet Scope. Use null for global scope + * @return NamedRange */ - public static function resolveRange($pNamedRange = '', PHPExcel_Worksheet $pSheet) + public static function resolveRange($pNamedRange = '', Worksheet $pSheet) { return $pSheet->getParent()->getNamedRange($pNamedRange, $pSheet); } diff --git a/src/PhpSpreadsheet/Reader/Excel2003XML.php b/src/PhpSpreadsheet/Reader/Excel2003XML.php index 8270e58f..94339b2b 100644 --- a/src/PhpSpreadsheet/Reader/Excel2003XML.php +++ b/src/PhpSpreadsheet/Reader/Excel2003XML.php @@ -44,20 +44,20 @@ class Excel2003XML extends BaseReader implements IReader protected $charSet = 'UTF-8'; /** - * Create a new PHPExcel_Reader_Excel2003XML + * Create a new Excel2003XML */ public function __construct() { - $this->readFilter = new PHPExcel_Reader_DefaultReadFilter(); + $this->readFilter = new DefaultReadFilter(); } /** - * Can the current PHPExcel_Reader_IReader read the file? + * Can the current IReader read the file? * * @param string $pFilename * @return boolean - * @throws PHPExcel_Reader_Exception + * @throws Exception */ public function canRead($pFilename) { @@ -108,21 +108,25 @@ class Excel2003XML extends BaseReader implements IReader * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object * * @param string $pFilename - * @throws PHPExcel_Reader_Exception + * @throws Exception */ public function listWorksheetNames($pFilename) { // Check if file exists if (!file_exists($pFilename)) { - throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist."); + throw new Exception("Could not open " . $pFilename . " for reading! File does not exist."); } if (!$this->canRead($pFilename)) { - throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file."); + throw new Exception($pFilename . " is an Invalid Spreadsheet file."); } $worksheetNames = array(); - $xml = simplexml_load_string($this->securityScan(file_get_contents($pFilename)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); + $xml = simplexml_load_string( + $this->securityScan(file_get_contents($pFilename)), + 'SimpleXMLElement', + \PHPExcel\Settings::getLibXmlLoaderOptions() + ); $namespaces = $xml->getNamespaces(true); $xml_ss = $xml->children($namespaces['ss']); @@ -139,18 +143,22 @@ class Excel2003XML extends BaseReader implements IReader * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns) * * @param string $pFilename - * @throws PHPExcel_Reader_Exception + * @throws Exception */ public function listWorksheetInfo($pFilename) { // Check if file exists if (!file_exists($pFilename)) { - throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist."); + throw new Exception("Could not open " . $pFilename . " for reading! File does not exist."); } $worksheetInfo = array(); - $xml = simplexml_load_string($this->securityScan(file_get_contents($pFilename)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); + $xml = simplexml_load_string( + $this->securityScan(file_get_contents($pFilename)), + 'SimpleXMLElement', + \PHPExcel\Settings::getLibXmlLoaderOptions() + ); $namespaces = $xml->getNamespaces(true); $worksheetID = 1; @@ -195,7 +203,7 @@ class Excel2003XML extends BaseReader implements IReader } } - $tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']); + $tmpInfo['lastColumnLetter'] = \PHPExcel\Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']); $tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1; $worksheetInfo[] = $tmpInfo; @@ -210,8 +218,8 @@ class Excel2003XML extends BaseReader implements IReader * Loads PHPExcel from file * * @param string $pFilename - * @return PHPExcel - * @throws PHPExcel_Reader_Exception + * @return Spreadsheet + * @throws Exception */ public function load($pFilename) { @@ -273,7 +281,7 @@ class Excel2003XML extends BaseReader implements IReader * @param string $pFilename * @param PHPExcel $objPHPExcel * @return PHPExcel - * @throws PHPExcel_Reader_Exception + * @throws Exception */ public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel) { @@ -281,25 +289,25 @@ class Excel2003XML extends BaseReader implements IReader $toFormats = array('-', ' '); $underlineStyles = array ( - PHPExcel_Style_Font::UNDERLINE_NONE, - PHPExcel_Style_Font::UNDERLINE_DOUBLE, - PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING, - PHPExcel_Style_Font::UNDERLINE_SINGLE, - PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING + \PHPExcel\Style\Font::UNDERLINE_NONE, + \PHPExcel\Style\Font::UNDERLINE_DOUBLE, + \PHPExcel\Style\Font::UNDERLINE_DOUBLEACCOUNTING, + \PHPExcel\Style\Font::UNDERLINE_SINGLE, + \PHPExcel\Style\Font::UNDERLINE_SINGLEACCOUNTING ); $verticalAlignmentStyles = array ( - PHPExcel_Style_Alignment::VERTICAL_BOTTOM, - PHPExcel_Style_Alignment::VERTICAL_TOP, - PHPExcel_Style_Alignment::VERTICAL_CENTER, - PHPExcel_Style_Alignment::VERTICAL_JUSTIFY + \PHPExcel\Style\Alignment::VERTICAL_BOTTOM, + \PHPExcel\Style\Alignment::VERTICAL_TOP, + \PHPExcel\Style\Alignment::VERTICAL_CENTER, + \PHPExcel\Style\Alignment::VERTICAL_JUSTIFY ); $horizontalAlignmentStyles = array ( - PHPExcel_Style_Alignment::HORIZONTAL_GENERAL, - PHPExcel_Style_Alignment::HORIZONTAL_LEFT, - PHPExcel_Style_Alignment::HORIZONTAL_RIGHT, - PHPExcel_Style_Alignment::HORIZONTAL_CENTER, - PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS, - PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY + \PHPExcel\Style\Alignment::HORIZONTAL_GENERAL, + \PHPExcel\Style\Alignment::HORIZONTAL_LEFT, + \PHPExcel\Style\Alignment::HORIZONTAL_RIGHT, + \PHPExcel\Style\Alignment::HORIZONTAL_CENTER, + \PHPExcel\Style\Alignment::HORIZONTAL_CENTER_CONTINUOUS, + \PHPExcel\Style\Alignment::HORIZONTAL_JUSTIFY ); $timezoneObj = new DateTimeZone('Europe/London'); @@ -307,14 +315,18 @@ class Excel2003XML extends BaseReader implements IReader // Check if file exists if (!file_exists($pFilename)) { - throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist."); + throw new Exception("Could not open " . $pFilename . " for reading! File does not exist."); } if (!$this->canRead($pFilename)) { - throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file."); + throw new Exception($pFilename . " is an Invalid Spreadsheet file."); } - $xml = simplexml_load_string($this->securityScan(file_get_contents($pFilename)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); + $xml = simplexml_load_string( + $this->securityScan(file_get_contents($pFilename)), + 'SimpleXMLElement', + \PHPExcel\Settings::getLibXmlLoaderOptions() + ); $namespaces = $xml->getNamespaces(true); $docProps = $objPHPExcel->getProperties(); @@ -362,27 +374,27 @@ class Excel2003XML extends BaseReader implements IReader if (isset($xml->CustomDocumentProperties)) { foreach ($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) { $propertyAttributes = $propertyValue->attributes($namespaces['dt']); - $propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/', 'PHPExcel_Reader_Excel2003XML::hex2str', $propertyName); - $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_UNKNOWN; + $propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/', '\\PHPExcel\\Reader\\Excel2003XML::hex2str', $propertyName); + $propertyType = \PHPExcel\Document\Properties::PROPERTY_TYPE_UNKNOWN; switch ((string) $propertyAttributes) { case 'string': - $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING; + $propertyType = \PHPExcel\Document\Properties::PROPERTY_TYPE_STRING; $propertyValue = trim($propertyValue); break; case 'boolean': - $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_BOOLEAN; + $propertyType = \PHPExcel\Document\Properties::PROPERTY_TYPE_BOOLEAN; $propertyValue = (bool) $propertyValue; break; case 'integer': - $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_INTEGER; + $propertyType = \PHPExcel\Document\Properties::PROPERTY_TYPE_INTEGER; $propertyValue = intval($propertyValue); break; case 'float': - $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_FLOAT; + $propertyType = \PHPExcel\Document\Properties::PROPERTY_TYPE_FLOAT; $propertyValue = floatval($propertyValue); break; case 'dateTime.tz': - $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_DATE; + $propertyType = \PHPExcel\Document\Properties::PROPERTY_TYPE_DATE; $propertyValue = strtotime(trim($propertyValue)); break; } @@ -432,7 +444,7 @@ class Excel2003XML extends BaseReader implements IReader // echo $borderStyleKey.' = '.$borderStyleValue.'
'; switch ($borderStyleKey) { case 'LineStyle': - $thisBorder['style'] = PHPExcel_Style_Border::BORDER_MEDIUM; + $thisBorder['style'] = \PHPExcel\Style\Border::BORDER_MEDIUM; // $thisBorder['style'] = $borderStyleValue; break; case 'Weight': @@ -547,7 +559,7 @@ class Excel2003XML extends BaseReader implements IReader foreach ($worksheet->Table->Column as $columnData) { $columnData_ss = $columnData->attributes($namespaces['ss']); if (isset($columnData_ss['Index'])) { - $columnID = PHPExcel_Cell::stringFromColumnIndex($columnData_ss['Index']-1); + $columnID = \PHPExcel\Cell::stringFromColumnIndex($columnData_ss['Index']-1); } if (isset($columnData_ss['Width'])) { $columnWidth = $columnData_ss['Width']; @@ -573,7 +585,7 @@ class Excel2003XML extends BaseReader implements IReader foreach ($rowData->Cell as $cell) { $cell_ss = $cell->attributes($namespaces['ss']); if (isset($cell_ss['Index'])) { - $columnID = PHPExcel_Cell::stringFromColumnIndex($cell_ss['Index']-1); + $columnID = \PHPExcel\Cell::stringFromColumnIndex($cell_ss['Index']-1); } $cellRange = $columnID.$rowID; @@ -587,7 +599,7 @@ class Excel2003XML extends BaseReader implements IReader $columnTo = $columnID; if (isset($cell_ss['MergeAcross'])) { $additionalMergedCells += (int)$cell_ss['MergeAcross']; - $columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] -1); + $columnTo = \PHPExcel\Cell::stringFromColumnIndex(\PHPExcel\Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] -1); } $rowTo = $rowID; if (isset($cell_ss['MergeDown'])) { @@ -610,7 +622,7 @@ class Excel2003XML extends BaseReader implements IReader } if (isset($cell->Data)) { $cellValue = $cellData = $cell->Data; - $type = PHPExcel_Cell_DataType::TYPE_NULL; + $type = \PHPExcel\Cell_DataType::TYPE_NULL; $cellData_ss = $cellData->attributes($namespaces['ss']); if (isset($cellData_ss['Type'])) { $cellDataType = $cellData_ss['Type']; @@ -626,33 +638,33 @@ class Excel2003XML extends BaseReader implements IReader */ case 'String': $cellValue = self::convertStringEncoding($cellValue, $this->charSet); - $type = PHPExcel_Cell_DataType::TYPE_STRING; + $type = \PHPExcel\Cell\DataType::TYPE_STRING; break; case 'Number': - $type = PHPExcel_Cell_DataType::TYPE_NUMERIC; + $type = \PHPExcel\Cell\DataType::TYPE_NUMERIC; $cellValue = (float) $cellValue; if (floor($cellValue) == $cellValue) { $cellValue = (integer) $cellValue; } break; case 'Boolean': - $type = PHPExcel_Cell_DataType::TYPE_BOOL; + $type = \PHPExcel\Cell\DataType::TYPE_BOOL; $cellValue = ($cellValue != 0); break; case 'DateTime': - $type = PHPExcel_Cell_DataType::TYPE_NUMERIC; - $cellValue = PHPExcel_Shared_Date::PHPToExcel(strtotime($cellValue)); + $type = \PHPExcel\Cell\DataType::TYPE_NUMERIC; + $cellValue = \PHPExcel\Shared\Date::PHPToExcel(strtotime($cellValue)); break; case 'Error': - $type = PHPExcel_Cell_DataType::TYPE_ERROR; + $type = \PHPExcel\Cell\DataType::TYPE_ERROR; break; } } if ($hasCalculatedValue) { // echo 'FORMULA
'; - $type = PHPExcel_Cell_DataType::TYPE_FORMULA; - $columnNumber = PHPExcel_Cell::columnIndexFromString($columnID); + $type = \PHPExcel\Cell\DataType::TYPE_FORMULA; + $columnNumber = \PHPExcel\Cell::columnIndexFromString($columnID); if (substr($cellDataFormula, 0, 3) == 'of:') { $cellDataFormula = substr($cellDataFormula, 3); // echo 'Before: ', $cellDataFormula,'
'; @@ -698,7 +710,7 @@ class Excel2003XML extends BaseReader implements IReader if ($columnReference{0} == '[') { $columnReference = $columnNumber + trim($columnReference, '[]'); } - $A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference; + $A1CellReference = \PHPExcel\Cell::stringFromColumnIndex($columnReference-1).$rowReference; $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0])); } } @@ -781,7 +793,7 @@ class Excel2003XML extends BaseReader implements IReader protected static function convertStringEncoding($string, $charset) { if ($charset != 'UTF-8') { - return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', $charset); + return \PHPExcel\Shared\String::ConvertEncoding($string, 'UTF-8', $charset); } return $string; } @@ -789,7 +801,7 @@ class Excel2003XML extends BaseReader implements IReader protected function parseRichText($is = '') { - $value = new PHPExcel_RichText(); + $value = new \PHPExcel\RichText(); $value->createText(self::convertStringEncoding($is, $this->charSet)); diff --git a/src/PhpSpreadsheet/Reader/Excel2007.php b/src/PhpSpreadsheet/Reader/Excel2007.php index c37496bc..d056c614 100644 --- a/src/PhpSpreadsheet/Reader/Excel2007.php +++ b/src/PhpSpreadsheet/Reader/Excel2007.php @@ -419,8 +419,8 @@ class Excel2007 extends BaseReader implements IReader $cellDataOfficeChildren = $xmlProperty->children('http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes'); $attributeType = $cellDataOfficeChildren->getName(); $attributeValue = (string) $cellDataOfficeChildren->{$attributeType}; - $attributeValue = PHPExcel_DocumentProperties::convertProperty($attributeValue, $attributeType); - $attributeType = PHPExcel_DocumentProperties::convertPropertyType($attributeType); + $attributeValue = \PHPExcel\Document\Properties::convertProperty($attributeValue, $attributeType); + $attributeType = \PHPExcel\Document\Properties::convertPropertyType($attributeType); $docProps->setCustomProperty($propertyName, $attributeValue, $attributeType); } } diff --git a/src/PhpSpreadsheet/Reader/Excel5/RC4.php b/src/PhpSpreadsheet/Reader/Excel5/RC4.php index 5640539c..ea7eaeee 100644 --- a/src/PhpSpreadsheet/Reader/Excel5/RC4.php +++ b/src/PhpSpreadsheet/Reader/Excel5/RC4.php @@ -1,5 +1,7 @@ setCreated($creationDate); break; case 'user-defined': - $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING; + $propertyValueType = \PHPExcel\Document\Properties::PROPERTY_TYPE_STRING; foreach ($propertyValueAttributes as $key => $value) { if ($key == 'name') { $propertyValueName = (string) $value; } elseif ($key == 'value-type') { switch ($value) { case 'date': - $propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue, 'date'); - $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_DATE; + $propertyValue = \PHPExcel\Document\Properties::convertProperty($propertyValue, 'date'); + $propertyValueType = \PHPExcel\Document\Properties::PROPERTY_TYPE_DATE; break; case 'boolean': - $propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue, 'bool'); - $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_BOOLEAN; + $propertyValue = \PHPExcel\Document\Properties::convertProperty($propertyValue, 'bool'); + $propertyValueType = \PHPExcel\Document\Properties::PROPERTY_TYPE_BOOLEAN; break; case 'float': - $propertyValue = PHPExcel_DocumentProperties::convertProperty($propertyValue, 'r4'); - $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_FLOAT; + $propertyValue = \PHPExcel\Document\Properties::convertProperty($propertyValue, 'r4'); + $propertyValueType = \PHPExcel\Document\Properties::PROPERTY_TYPE_FLOAT; break; default: - $propertyValueType = PHPExcel_DocumentProperties::PROPERTY_TYPE_STRING; + $propertyValueType = \PHPExcel\Document\Properties::PROPERTY_TYPE_STRING; } } } diff --git a/src/PhpSpreadsheet/Settings.php b/src/PhpSpreadsheet/Settings.php index 7ad29603..7fc52cb9 100644 --- a/src/PhpSpreadsheet/Settings.php +++ b/src/PhpSpreadsheet/Settings.php @@ -31,8 +31,8 @@ class Settings { /** constants */ /** Available Zip library classes */ - const PCLZIP = 'PHPExcel_Shared_ZipArchive'; - const ZIPARCHIVE = 'ZipArchive'; + const PCLZIP = '\\PHPExcel\\Shared\\ZipArchive'; + const ZIPARCHIVE = '\\ZipArchive'; /** Optional Chart Rendering libraries */ const CHART_RENDERER_JPGRAPH = 'jpgraph'; @@ -108,7 +108,7 @@ class Settings * Set the Zip handler Class that PHPExcel should use for Zip file management (PCLZip or ZipArchive) * * @param string $zipClass The Zip handler class that PHPExcel should use for Zip file management - * e.g. PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive + * e.g. \PHPExcel\Settings::PCLZip or \PHPExcel\Settings::ZipArchive * @return boolean Success or failure */ public static function setZipClass($zipClass) @@ -128,7 +128,7 @@ class Settings * * @return string Name of the Zip handler Class that PHPExcel is configured to use * for Zip file management - * e.g. PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive + * e.g. \PHPExcel\Settings::PCLZip or \PHPExcel\Settings::ZipArchive */ public static function getZipClass() { @@ -143,7 +143,7 @@ class Settings */ public static function getCacheStorageMethod() { - return PHPExcel_CachedObjectStorageFactory::getCacheStorageMethod(); + return CachedObjectStorageFactory::getCacheStorageMethod(); } @@ -154,7 +154,7 @@ class Settings */ public static function getCacheStorageClass() { - return PHPExcel_CachedObjectStorageFactory::getCacheStorageClass(); + return CachedObjectStorageFactory::getCacheStorageClass(); } @@ -165,9 +165,9 @@ class Settings * @param array $arguments Optional configuration arguments for the cacheing method * @return boolean Success or failure */ - public static function setCacheStorageMethod($method = PHPExcel_CachedObjectStorageFactory::cache_in_memory, $arguments = array()) + public static function setCacheStorageMethod($method = CachedObjectStorageFactory::cache_in_memory, $arguments = array()) { - return PHPExcel_CachedObjectStorageFactory::initialize($method, $arguments); + return CachedObjectStorageFactory::initialize($method, $arguments); } @@ -179,7 +179,7 @@ class Settings */ public static function setLocale($locale = 'en_us') { - return PHPExcel_Calculation::getInstance()->setLocale($locale); + return Calculation::getInstance()->setLocale($locale); } @@ -187,7 +187,7 @@ class Settings * Set details of the external library that PHPExcel should use for rendering charts * * @param string $libraryName Internal reference name of the library - * e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH + * e.g. \PHPExcel\Settings::CHART_RENDERER_JPGRAPH * @param string $libraryBaseDir Directory path to the library's base folder * * @return boolean Success or failure @@ -205,7 +205,7 @@ class Settings * Identify to PHPExcel the external library to use for rendering charts * * @param string $libraryName Internal reference name of the library - * e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH + * e.g. \PHPExcel\Settings::CHART_RENDERER_JPGRAPH * * @return boolean Success or failure */ @@ -242,7 +242,7 @@ class Settings * * @return string|NULL Internal reference name of the Chart Rendering Library that PHPExcel is * currently configured to use - * e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH + * e.g. \PHPExcel\Settings::CHART_RENDERER_JPGRAPH */ public static function getChartRendererName() { @@ -266,9 +266,9 @@ class Settings * Set details of the external library that PHPExcel should use for rendering PDF files * * @param string $libraryName Internal reference name of the library - * e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF, - * PHPExcel_Settings::PDF_RENDERER_DOMPDF - * or PHPExcel_Settings::PDF_RENDERER_MPDF + * e.g. \PHPExcel\Settings::PDF_RENDERER_TCPDF, + * \PHPExcel\Settings::PDF_RENDERER_DOMPDF + * or \PHPExcel\Settings::PDF_RENDERER_MPDF * @param string $libraryBaseDir Directory path to the library's base folder * * @return boolean Success or failure @@ -286,9 +286,9 @@ class Settings * Identify to PHPExcel the external library to use for rendering PDF files * * @param string $libraryName Internal reference name of the library - * e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF, - * PHPExcel_Settings::PDF_RENDERER_DOMPDF - * or PHPExcel_Settings::PDF_RENDERER_MPDF + * e.g. \PHPExcel\Settings::PDF_RENDERER_TCPDF, + * \PHPExcel\Settings::PDF_RENDERER_DOMPDF + * or \PHPExcel\Settings::PDF_RENDERER_MPDF * * @return boolean Success or failure */ @@ -325,9 +325,9 @@ class Settings * * @return string|NULL Internal reference name of the PDF Rendering Library that PHPExcel is * currently configured to use - * e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF, - * PHPExcel_Settings::PDF_RENDERER_DOMPDF - * or PHPExcel_Settings::PDF_RENDERER_MPDF + * e.g. \PHPExcel\Settings::PDF_RENDERER_TCPDF, + * \PHPExcel\Settings::PDF_RENDERER_DOMPDF + * or \PHPExcel\Settings::PDF_RENDERER_MPDF */ public static function getPdfRendererName() { diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php index 734bbee3..0223b78c 100644 --- a/src/PhpSpreadsheet/Spreadsheet.php +++ b/src/PhpSpreadsheet/Spreadsheet.php @@ -39,14 +39,14 @@ class Spreadsheet /** * Document properties * - * @var DocumentProperties + * @var Document\Properties */ private $properties; /** * Document security * - * @var DocumentSecurity + * @var Document\Security */ private $security; @@ -424,7 +424,7 @@ class Spreadsheet /** * Get properties * - * @return DocumentProperties + * @return Document\Properties */ public function getProperties() { @@ -434,9 +434,9 @@ class Spreadsheet /** * Set properties * - * @param DocumentProperties $pValue + * @param Document\Properties $pValue */ - public function setProperties(DocumentProperties $pValue) + public function setProperties(Document\Properties $pValue) { $this->properties = $pValue; } @@ -444,7 +444,7 @@ class Spreadsheet /** * Get security * - * @return DocumentSecurity + * @return Document\Security */ public function getSecurity() { @@ -454,9 +454,9 @@ class Spreadsheet /** * Set security * - * @param DocumentSecurity $pValue + * @param Document\Security $pValue */ - public function setSecurity(DocumentSecurity $pValue) + public function setSecurity(Document\Security $pValue) { $this->security = $pValue; }