diff --git a/Examples/01simple.php b/Examples/01simple.php index 82ca309b..5ff6fc13 100644 --- a/Examples/01simple.php +++ b/Examples/01simple.php @@ -34,12 +34,12 @@ date_default_timezone_set('Europe/London'); define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); /** Include PHPExcel */ -require_once dirname(__FILE__) . '/../classes/Bootstrap.php'; +require_once dirname(__FILE__) . '/../src/Bootstrap.php'; // Create new PHPExcel object echo date('H:i:s') , " Create new PHPExcel object" , EOL; -$objPHPExcel = new PHPExcel\Spreadsheet(); +$objPHPExcel = new \PHPExcel\Spreadsheet(); // Set document properties echo date('H:i:s') , " Set document properties" , EOL; @@ -92,7 +92,7 @@ $objPHPExcel->setActiveSheetIndex(0); echo date('H:i:s') , " Write to Excel2007 format" , EOL; $callStartTime = microtime(true); -$objWriter = PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007'); +$objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007'); $objWriter->save(str_replace('.php', '.xlsx', __FILE__)); $callEndTime = microtime(true); $callTime = $callEndTime - $callStartTime; @@ -107,7 +107,7 @@ echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 echo date('H:i:s') , " Write to Excel5 format" , EOL; $callStartTime = microtime(true); -$objWriter = PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel5'); +$objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel5'); $objWriter->save(str_replace('.php', '.xls', __FILE__)); $callEndTime = microtime(true); $callTime = $callEndTime - $callStartTime; diff --git a/Examples/02types.php b/Examples/02types.php index 6ac11c7b..aa3bb1d9 100644 --- a/Examples/02types.php +++ b/Examples/02types.php @@ -34,12 +34,12 @@ date_default_timezone_set('Europe/London'); define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); /** Include PHPExcel */ -require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../classes/Bootstrap.php'; // Create new PHPExcel object echo date('H:i:s') , " Create new PHPExcel object" , EOL; -$objPHPExcel = new PHPExcel(); +$objPHPExcel = new \PHPExcel\Spreadsheet(); // Set document properties echo date('H:i:s') , " Set document properties" , EOL; @@ -149,7 +149,7 @@ $objPHPExcel->setActiveSheetIndex(0); echo date('H:i:s') , " Write to Excel2007 format" , EOL; $callStartTime = microtime(true); -$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007'); +$objWriter = \PHPExcel\IOFactory::createWriter($objPHPExcel, 'Excel2007'); $objWriter->save(str_replace('.php', '.xlsx', __FILE__)); $callEndTime = microtime(true); $callTime = $callEndTime - $callStartTime; @@ -163,7 +163,7 @@ echo date('H:i:s') , ' Current memory usage: ' , (memory_get_usage(true) / 1024 echo date('H:i:s') , " Reload workbook from saved file" , EOL; $callStartTime = microtime(true); -$objPHPExcel = PHPExcel_IOFactory::load(str_replace('.php', '.xlsx', __FILE__)); +$objPHPExcel = \PHPExcel\IOFactory::load(str_replace('.php', '.xlsx', __FILE__)); $callEndTime = microtime(true); $callTime = $callEndTime - $callStartTime; diff --git a/classes/src/Calculation/Function.php b/classes/src/Calculation/Function.php deleted file mode 100644 index 3febd6f9..00000000 --- a/classes/src/Calculation/Function.php +++ /dev/null @@ -1,150 +0,0 @@ -category = $pCategory; - $this->excelName = $pExcelName; - $this->phpExcelName = $pPHPExcelName; - } else { - throw new PHPExcel_Calculation_Exception("Invalid parameters passed."); - } - } - - /** - * Get Category (represented by CATEGORY_*) - * - * @return string - */ - public function getCategory() - { - return $this->category; - } - - /** - * Set Category (represented by CATEGORY_*) - * - * @param string $value - * @throws PHPExcel_Calculation_Exception - */ - public function setCategory($value = null) - { - if (!is_null($value)) { - $this->category = $value; - } else { - throw new PHPExcel_Calculation_Exception("Invalid parameter passed."); - } - } - - /** - * Get Excel name - * - * @return string - */ - public function getExcelName() - { - return $this->excelName; - } - - /** - * Set Excel name - * - * @param string $value - */ - public function setExcelName($value) - { - $this->excelName = $value; - } - - /** - * Get PHPExcel name - * - * @return string - */ - public function getPHPExcelName() - { - return $this->phpExcelName; - } - - /** - * Set PHPExcel name - * - * @param string $value - */ - public function setPHPExcelName($value) - { - $this->phpExcelName = $value; - } -} diff --git a/classes/Autoloader.php b/src/Autoloader.php similarity index 97% rename from classes/Autoloader.php rename to src/Autoloader.php index 50854633..0ebb544a 100644 --- a/classes/Autoloader.php +++ b/src/Autoloader.php @@ -58,7 +58,7 @@ class Autoloader } $classFilePath = __DIR__ . DIRECTORY_SEPARATOR . - 'src' . DIRECTORY_SEPARATOR . + 'PhpSpreadsheet' . DIRECTORY_SEPARATOR . str_replace(['PHPExcel\\', '\\'], ['', '/'], $className) . '.php'; diff --git a/classes/Bootstrap.php b/src/Bootstrap.php similarity index 100% rename from classes/Bootstrap.php rename to src/Bootstrap.php diff --git a/classes/src/CachedObjectStorage/APC.php b/src/PhpSpreadsheet/CachedObjectStorage/APC.php similarity index 100% rename from classes/src/CachedObjectStorage/APC.php rename to src/PhpSpreadsheet/CachedObjectStorage/APC.php diff --git a/classes/src/CachedObjectStorage/CacheBase.php b/src/PhpSpreadsheet/CachedObjectStorage/CacheBase.php similarity index 100% rename from classes/src/CachedObjectStorage/CacheBase.php rename to src/PhpSpreadsheet/CachedObjectStorage/CacheBase.php diff --git a/classes/src/CachedObjectStorage/DiscISAM.php b/src/PhpSpreadsheet/CachedObjectStorage/DiscISAM.php similarity index 100% rename from classes/src/CachedObjectStorage/DiscISAM.php rename to src/PhpSpreadsheet/CachedObjectStorage/DiscISAM.php diff --git a/classes/src/CachedObjectStorage/ICache.php b/src/PhpSpreadsheet/CachedObjectStorage/ICache.php similarity index 100% rename from classes/src/CachedObjectStorage/ICache.php rename to src/PhpSpreadsheet/CachedObjectStorage/ICache.php diff --git a/classes/src/CachedObjectStorage/Igbinary.php b/src/PhpSpreadsheet/CachedObjectStorage/Igbinary.php similarity index 100% rename from classes/src/CachedObjectStorage/Igbinary.php rename to src/PhpSpreadsheet/CachedObjectStorage/Igbinary.php diff --git a/classes/src/CachedObjectStorage/Memcache.php b/src/PhpSpreadsheet/CachedObjectStorage/Memcache.php similarity index 100% rename from classes/src/CachedObjectStorage/Memcache.php rename to src/PhpSpreadsheet/CachedObjectStorage/Memcache.php diff --git a/classes/src/CachedObjectStorage/Memory.php b/src/PhpSpreadsheet/CachedObjectStorage/Memory.php similarity index 100% rename from classes/src/CachedObjectStorage/Memory.php rename to src/PhpSpreadsheet/CachedObjectStorage/Memory.php diff --git a/classes/src/CachedObjectStorage/MemoryGZip.php b/src/PhpSpreadsheet/CachedObjectStorage/MemoryGZip.php similarity index 100% rename from classes/src/CachedObjectStorage/MemoryGZip.php rename to src/PhpSpreadsheet/CachedObjectStorage/MemoryGZip.php diff --git a/classes/src/CachedObjectStorage/MemorySerialized.php b/src/PhpSpreadsheet/CachedObjectStorage/MemorySerialized.php similarity index 100% rename from classes/src/CachedObjectStorage/MemorySerialized.php rename to src/PhpSpreadsheet/CachedObjectStorage/MemorySerialized.php diff --git a/classes/src/CachedObjectStorage/PHPTemp.php b/src/PhpSpreadsheet/CachedObjectStorage/PHPTemp.php similarity index 100% rename from classes/src/CachedObjectStorage/PHPTemp.php rename to src/PhpSpreadsheet/CachedObjectStorage/PHPTemp.php diff --git a/classes/src/CachedObjectStorage/SQLite.php b/src/PhpSpreadsheet/CachedObjectStorage/SQLite.php similarity index 100% rename from classes/src/CachedObjectStorage/SQLite.php rename to src/PhpSpreadsheet/CachedObjectStorage/SQLite.php diff --git a/classes/src/CachedObjectStorage/SQLite3.php b/src/PhpSpreadsheet/CachedObjectStorage/SQLite3.php similarity index 100% rename from classes/src/CachedObjectStorage/SQLite3.php rename to src/PhpSpreadsheet/CachedObjectStorage/SQLite3.php diff --git a/classes/src/CachedObjectStorage/Wincache.php b/src/PhpSpreadsheet/CachedObjectStorage/Wincache.php similarity index 100% rename from classes/src/CachedObjectStorage/Wincache.php rename to src/PhpSpreadsheet/CachedObjectStorage/Wincache.php diff --git a/classes/src/CachedObjectStorageFactory.php b/src/PhpSpreadsheet/CachedObjectStorageFactory.php similarity index 100% rename from classes/src/CachedObjectStorageFactory.php rename to src/PhpSpreadsheet/CachedObjectStorageFactory.php diff --git a/classes/src/CalcEngine/CyclicReferenceStack.php b/src/PhpSpreadsheet/CalcEngine/CyclicReferenceStack.php similarity index 100% rename from classes/src/CalcEngine/CyclicReferenceStack.php rename to src/PhpSpreadsheet/CalcEngine/CyclicReferenceStack.php diff --git a/classes/src/CalcEngine/Logger.php b/src/PhpSpreadsheet/CalcEngine/Logger.php similarity index 100% rename from classes/src/CalcEngine/Logger.php rename to src/PhpSpreadsheet/CalcEngine/Logger.php diff --git a/classes/src/Calculation.php b/src/PhpSpreadsheet/Calculation.php similarity index 99% rename from classes/src/Calculation.php rename to src/PhpSpreadsheet/Calculation.php index 378c3604..d6ab6519 100644 --- a/classes/src/Calculation.php +++ b/src/PhpSpreadsheet/Calculation.php @@ -2116,7 +2116,7 @@ class Calculation } if (!isset(self::$instance) || (self::$instance === null)) { - self::$instance = new PHPExcel_Calculation(); + self::$instance = new \PHPExcel\Calculation(); } return self::$instance; diff --git a/classes/src/Calculation/Categories.php b/src/PhpSpreadsheet/Calculation/Categories.php similarity index 100% rename from classes/src/Calculation/Categories.php rename to src/PhpSpreadsheet/Calculation/Categories.php diff --git a/classes/src/Calculation/Database.php b/src/PhpSpreadsheet/Calculation/Database.php similarity index 100% rename from classes/src/Calculation/Database.php rename to src/PhpSpreadsheet/Calculation/Database.php diff --git a/classes/src/Calculation/DateTime.php b/src/PhpSpreadsheet/Calculation/DateTime.php similarity index 100% rename from classes/src/Calculation/DateTime.php rename to src/PhpSpreadsheet/Calculation/DateTime.php diff --git a/classes/src/Calculation/Engineering.php b/src/PhpSpreadsheet/Calculation/Engineering.php similarity index 100% rename from classes/src/Calculation/Engineering.php rename to src/PhpSpreadsheet/Calculation/Engineering.php diff --git a/classes/src/Calculation/Exception.php b/src/PhpSpreadsheet/Calculation/Exception.php similarity index 100% rename from classes/src/Calculation/Exception.php rename to src/PhpSpreadsheet/Calculation/Exception.php diff --git a/classes/src/Calculation/ExceptionHandler.php b/src/PhpSpreadsheet/Calculation/ExceptionHandler.php similarity index 100% rename from classes/src/Calculation/ExceptionHandler.php rename to src/PhpSpreadsheet/Calculation/ExceptionHandler.php diff --git a/classes/src/Calculation/Financial.php b/src/PhpSpreadsheet/Calculation/Financial.php similarity index 100% rename from classes/src/Calculation/Financial.php rename to src/PhpSpreadsheet/Calculation/Financial.php diff --git a/classes/src/Calculation/FormulaParser.php b/src/PhpSpreadsheet/Calculation/FormulaParser.php similarity index 100% rename from classes/src/Calculation/FormulaParser.php rename to src/PhpSpreadsheet/Calculation/FormulaParser.php diff --git a/classes/src/Calculation/FormulaToken.php b/src/PhpSpreadsheet/Calculation/FormulaToken.php similarity index 100% rename from classes/src/Calculation/FormulaToken.php rename to src/PhpSpreadsheet/Calculation/FormulaToken.php diff --git a/classes/src/Calculation/Functions.php b/src/PhpSpreadsheet/Calculation/Functions.php similarity index 100% rename from classes/src/Calculation/Functions.php rename to src/PhpSpreadsheet/Calculation/Functions.php diff --git a/classes/src/Calculation/Logical.php b/src/PhpSpreadsheet/Calculation/Logical.php similarity index 100% rename from classes/src/Calculation/Logical.php rename to src/PhpSpreadsheet/Calculation/Logical.php diff --git a/classes/src/Calculation/LookupRef.php b/src/PhpSpreadsheet/Calculation/LookupRef.php similarity index 100% rename from classes/src/Calculation/LookupRef.php rename to src/PhpSpreadsheet/Calculation/LookupRef.php diff --git a/classes/src/Calculation/MathTrig.php b/src/PhpSpreadsheet/Calculation/MathTrig.php similarity index 100% rename from classes/src/Calculation/MathTrig.php rename to src/PhpSpreadsheet/Calculation/MathTrig.php diff --git a/classes/src/Calculation/Statistical.php b/src/PhpSpreadsheet/Calculation/Statistical.php similarity index 100% rename from classes/src/Calculation/Statistical.php rename to src/PhpSpreadsheet/Calculation/Statistical.php diff --git a/classes/src/Calculation/TextData.php b/src/PhpSpreadsheet/Calculation/TextData.php similarity index 100% rename from classes/src/Calculation/TextData.php rename to src/PhpSpreadsheet/Calculation/TextData.php diff --git a/classes/src/Calculation/Token/Stack.php b/src/PhpSpreadsheet/Calculation/Token/Stack.php similarity index 98% rename from classes/src/Calculation/Token/Stack.php rename to src/PhpSpreadsheet/Calculation/Token/Stack.php index 02ed5aaf..2912088c 100644 --- a/classes/src/Calculation/Token/Stack.php +++ b/src/PhpSpreadsheet/Calculation/Token/Stack.php @@ -1,5 +1,7 @@ setValueExplicit(true, PHPExcel_Cell_DataType::TYPE_BOOL); + if ($value == \PHPExcel\Calculation::getTRUE()) { + $cell->setValueExplicit(true, DataType::TYPE_BOOL); return true; - } elseif ($value == PHPExcel_Calculation::getFALSE()) { - $cell->setValueExplicit(false, PHPExcel_Cell_DataType::TYPE_BOOL); + } elseif ($value == \PHPExcel\Calculation::getFALSE()) { + $cell->setValueExplicit(false, DataType::TYPE_BOOL); return true; } // Check for number in scientific format - if (preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NUMBER.'$/', $value)) { - $cell->setValueExplicit((float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC); + if (preg_match('/^'.\PHPExcel\Calculation::CALCULATION_REGEXP_NUMBER.'$/', $value)) { + $cell->setValueExplicit((float) $value, DataType::TYPE_NUMERIC); return true; } @@ -70,7 +70,7 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder if ($matches[1] == '-') { $value = 0 - $value; } - $cell->setValueExplicit((float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC); + $cell->setValueExplicit((float) $value, DataType::TYPE_NUMERIC); // Set style $cell->getWorksheet()->getStyle($cell->getCoordinate()) ->getNumberFormat()->setFormatCode('??/??'); @@ -81,7 +81,7 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder if ($matches[1] == '-') { $value = 0 - $value; } - $cell->setValueExplicit((float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC); + $cell->setValueExplicit((float) $value, DataType::TYPE_NUMERIC); // Set style $cell->getWorksheet()->getStyle($cell->getCoordinate()) ->getNumberFormat()->setFormatCode('# ??/??'); @@ -92,34 +92,34 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder if (preg_match('/^\-?[0-9]*\.?[0-9]*\s?\%$/', $value)) { // Convert value to number $value = (float) str_replace('%', '', $value) / 100; - $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_NUMERIC); + $cell->setValueExplicit($value, DataType::TYPE_NUMERIC); // Set style $cell->getWorksheet()->getStyle($cell->getCoordinate()) - ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00); + ->getNumberFormat()->setFormatCode(\PHPExcel\Style\NumberFormat::FORMAT_PERCENTAGE_00); return true; } // Check for currency - $currencyCode = PHPExcel_Shared_String::getCurrencyCode(); - $decimalSeparator = PHPExcel_Shared_String::getDecimalSeparator(); - $thousandsSeparator = PHPExcel_Shared_String::getThousandsSeparator(); + $currencyCode = \PHPExcel\Shared\String::getCurrencyCode(); + $decimalSeparator = \PHPExcel\Shared\String::getDecimalSeparator(); + $thousandsSeparator = \PHPExcel\Shared\String::getThousandsSeparator(); if (preg_match('/^'.preg_quote($currencyCode).' *(\d{1,3}('.preg_quote($thousandsSeparator).'\d{3})*|(\d+))('.preg_quote($decimalSeparator).'\d{2})?$/', $value)) { // Convert value to number $value = (float) trim(str_replace(array($currencyCode, $thousandsSeparator, $decimalSeparator), array('', '', '.'), $value)); - $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_NUMERIC); + $cell->setValueExplicit($value, DataType::TYPE_NUMERIC); // Set style $cell->getWorksheet()->getStyle($cell->getCoordinate()) ->getNumberFormat()->setFormatCode( - str_replace('$', $currencyCode, PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE) + str_replace('$', $currencyCode, \PHPExcel\Style\NumberFormat::FORMAT_CURRENCY_USD_SIMPLE) ); return true; } elseif (preg_match('/^\$ *(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?$/', $value)) { // Convert value to number $value = (float) trim(str_replace(array('$',','), '', $value)); - $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_NUMERIC); + $cell->setValueExplicit($value, DataType::TYPE_NUMERIC); // Set style $cell->getWorksheet()->getStyle($cell->getCoordinate()) - ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE); + ->getNumberFormat()->setFormatCode(\PHPExcel\Style\NumberFormat::FORMAT_CURRENCY_USD_SIMPLE); return true; } @@ -128,10 +128,10 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder // Convert value to number list($h, $m) = explode(':', $value); $days = $h / 24 + $m / 1440; - $cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC); + $cell->setValueExplicit($days, DataType::TYPE_NUMERIC); // Set style $cell->getWorksheet()->getStyle($cell->getCoordinate()) - ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3); + ->getNumberFormat()->setFormatCode(\PHPExcel\Style\NumberFormat::FORMAT_DATE_TIME3); return true; } @@ -141,17 +141,17 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder list($h, $m, $s) = explode(':', $value); $days = $h / 24 + $m / 1440 + $s / 86400; // Convert value to number - $cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC); + $cell->setValueExplicit($days, DataType::TYPE_NUMERIC); // Set style $cell->getWorksheet()->getStyle($cell->getCoordinate()) - ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4); + ->getNumberFormat()->setFormatCode(\PHPExcel\Style\NumberFormat::FORMAT_DATE_TIME4); return true; } // Check for datetime, e.g. '2008-12-31', '2008-12-31 15:59', '2008-12-31 15:59:10' if (($d = PHPExcel_Shared_Date::stringToExcel($value)) !== false) { // Convert value to number - $cell->setValueExplicit($d, PHPExcel_Cell_DataType::TYPE_NUMERIC); + $cell->setValueExplicit($d, DataType::TYPE_NUMERIC); // Determine style. Either there is a time part or not. Look for ':' if (strpos($value, ':') !== false) { $formatCode = 'yyyy-mm-dd h:mm'; @@ -166,7 +166,7 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder // Check for newline character "\n" if (strpos($value, "\n") !== false) { $value = PHPExcel_Shared_String::SanitizeUTF8($value); - $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_STRING); + $cell->setValueExplicit($value, DataType::TYPE_STRING); // Set style $cell->getWorksheet()->getStyle($cell->getCoordinate()) ->getAlignment()->setWrapText(true); diff --git a/classes/src/Cell/DataType.php b/src/PhpSpreadsheet/Cell/DataType.php similarity index 100% rename from classes/src/Cell/DataType.php rename to src/PhpSpreadsheet/Cell/DataType.php diff --git a/classes/src/Cell/DataValidation.php b/src/PhpSpreadsheet/Cell/DataValidation.php similarity index 100% rename from classes/src/Cell/DataValidation.php rename to src/PhpSpreadsheet/Cell/DataValidation.php diff --git a/classes/src/Cell/DefaultValueBinder.php b/src/PhpSpreadsheet/Cell/DefaultValueBinder.php similarity index 100% rename from classes/src/Cell/DefaultValueBinder.php rename to src/PhpSpreadsheet/Cell/DefaultValueBinder.php diff --git a/classes/src/Cell/Hyperlink.php b/src/PhpSpreadsheet/Cell/Hyperlink.php similarity index 100% rename from classes/src/Cell/Hyperlink.php rename to src/PhpSpreadsheet/Cell/Hyperlink.php diff --git a/classes/src/Cell/IValueBinder.php b/src/PhpSpreadsheet/Cell/IValueBinder.php similarity index 100% rename from classes/src/Cell/IValueBinder.php rename to src/PhpSpreadsheet/Cell/IValueBinder.php diff --git a/classes/src/Chart.php b/src/PhpSpreadsheet/Chart.php similarity index 100% rename from classes/src/Chart.php rename to src/PhpSpreadsheet/Chart.php diff --git a/classes/src/Chart/Axis.php b/src/PhpSpreadsheet/Chart/Axis.php similarity index 100% rename from classes/src/Chart/Axis.php rename to src/PhpSpreadsheet/Chart/Axis.php diff --git a/classes/src/Chart/DataSeries.php b/src/PhpSpreadsheet/Chart/DataSeries.php similarity index 99% rename from classes/src/Chart/DataSeries.php rename to src/PhpSpreadsheet/Chart/DataSeries.php index c1e284aa..4f7eeb50 100644 --- a/classes/src/Chart/DataSeries.php +++ b/src/PhpSpreadsheet/Chart/DataSeries.php @@ -27,7 +27,7 @@ namespace PHPExcel\Chart; * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @version ##VERSION##, ##DATE## */ -class PHPExcel_Chart_DataSeries +class DataSeries { const TYPE_BARCHART = 'barChart'; const TYPE_BARCHART_3D = 'bar3DChart'; diff --git a/classes/src/Chart/DataSeriesValues.php b/src/PhpSpreadsheet/Chart/DataSeriesValues.php similarity index 100% rename from classes/src/Chart/DataSeriesValues.php rename to src/PhpSpreadsheet/Chart/DataSeriesValues.php diff --git a/classes/src/Chart/Exception.php b/src/PhpSpreadsheet/Chart/Exception.php similarity index 97% rename from classes/src/Chart/Exception.php rename to src/PhpSpreadsheet/Chart/Exception.php index c643b8ff..b9027dcf 100644 --- a/classes/src/Chart/Exception.php +++ b/src/PhpSpreadsheet/Chart/Exception.php @@ -27,7 +27,7 @@ namespace PHPExcel\Chart; * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @version ##VERSION##, ##DATE## */ -class Exception extends PHPExcel_Exception +class Exception extends \PHPExcel\Exception { /** * Error handler callback diff --git a/classes/src/Chart/GridLines.php b/src/PhpSpreadsheet/Chart/GridLines.php similarity index 100% rename from classes/src/Chart/GridLines.php rename to src/PhpSpreadsheet/Chart/GridLines.php diff --git a/classes/src/Chart/Layout.php b/src/PhpSpreadsheet/Chart/Layout.php similarity index 97% rename from classes/src/Chart/Layout.php rename to src/PhpSpreadsheet/Chart/Layout.php index c0c2fbcc..6443e3b6 100644 --- a/classes/src/Chart/Layout.php +++ b/src/PhpSpreadsheet/Chart/Layout.php @@ -22,10 +22,10 @@ namespace PHPExcel\Chart; * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * @category PHPExcel - * @package PHPExcel_Chart - * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) - * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version ##VERSION##, ##DATE## + * @package PHPExcel_Chart + * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) + * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL + * @version ##VERSION##, ##DATE## */ class Layout { diff --git a/classes/src/Chart/Legend.php b/src/PhpSpreadsheet/Chart/Legend.php similarity index 94% rename from classes/src/Chart/Legend.php rename to src/PhpSpreadsheet/Chart/Legend.php index f7203b3c..e7e7f13f 100644 --- a/classes/src/Chart/Legend.php +++ b/src/PhpSpreadsheet/Chart/Legend.php @@ -22,10 +22,10 @@ namespace PHPExcel\Chart; * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * @category PHPExcel - * @package PHPExcel_Chart - * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) - * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version ##VERSION##, ##DATE## + * @package PHPExcel_Chart + * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) + * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL + * @version ##VERSION##, ##DATE## */ class Legend { diff --git a/classes/src/Chart/PlotArea.php b/src/PhpSpreadsheet/Chart/PlotArea.php similarity index 92% rename from classes/src/Chart/PlotArea.php rename to src/PhpSpreadsheet/Chart/PlotArea.php index f44c3d26..c0907a96 100644 --- a/classes/src/Chart/PlotArea.php +++ b/src/PhpSpreadsheet/Chart/PlotArea.php @@ -22,10 +22,10 @@ namespace PHPExcel\Chart; * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * @category PHPExcel - * @package PHPExcel_Chart - * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) - * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL - * @version ##VERSION##, ##DATE## + * @package PHPExcel_Chart + * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) + * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL + * @version ##VERSION##, ##DATE## */ class PlotArea { diff --git a/classes/src/Chart/Properties.php b/src/PhpSpreadsheet/Chart/Properties.php similarity index 100% rename from classes/src/Chart/Properties.php rename to src/PhpSpreadsheet/Chart/Properties.php diff --git a/classes/src/Chart/Renderer/PHP Charting Libraries.txt b/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt similarity index 100% rename from classes/src/Chart/Renderer/PHP Charting Libraries.txt rename to src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt diff --git a/classes/src/Chart/Renderer/jpgraph.php b/src/PhpSpreadsheet/Chart/Renderer/jpgraph.php similarity index 100% rename from classes/src/Chart/Renderer/jpgraph.php rename to src/PhpSpreadsheet/Chart/Renderer/jpgraph.php diff --git a/classes/src/Chart/Title.php b/src/PhpSpreadsheet/Chart/Title.php similarity index 100% rename from classes/src/Chart/Title.php rename to src/PhpSpreadsheet/Chart/Title.php diff --git a/classes/src/Comment.php b/src/PhpSpreadsheet/Comment.php similarity index 100% rename from classes/src/Comment.php rename to src/PhpSpreadsheet/Comment.php diff --git a/classes/src/Document/Properties.php b/src/PhpSpreadsheet/Document/Properties.php similarity index 99% rename from classes/src/Document/Properties.php rename to src/PhpSpreadsheet/Document/Properties.php index 8844fabe..78f579f5 100644 --- a/classes/src/Document/Properties.php +++ b/src/PhpSpreadsheet/Document/Properties.php @@ -123,7 +123,7 @@ class Properties /** - * Create a new PHPExcel_DocumentProperties + * Create a new Document Properties instance */ public function __construct() { diff --git a/classes/src/Document/Security.php b/src/PhpSpreadsheet/Document/Security.php similarity index 99% rename from classes/src/Document/Security.php rename to src/PhpSpreadsheet/Document/Security.php index 3c30c7c1..57166aa0 100644 --- a/classes/src/Document/Security.php +++ b/src/PhpSpreadsheet/Document/Security.php @@ -65,7 +65,7 @@ class Security private $workbookPassword = ''; /** - * Create a new PHPExcel_DocumentSecurity + * Create a new Document Security instance */ public function __construct() { diff --git a/classes/src/Exception.php b/src/PhpSpreadsheet/Exception.php similarity index 100% rename from classes/src/Exception.php rename to src/PhpSpreadsheet/Exception.php diff --git a/classes/src/HashTable.php b/src/PhpSpreadsheet/HashTable.php similarity index 100% rename from classes/src/HashTable.php rename to src/PhpSpreadsheet/HashTable.php diff --git a/classes/src/Helper/HTML.php b/src/PhpSpreadsheet/Helper/HTML.php similarity index 100% rename from classes/src/Helper/HTML.php rename to src/PhpSpreadsheet/Helper/HTML.php diff --git a/classes/src/IComparable.php b/src/PhpSpreadsheet/IComparable.php similarity index 100% rename from classes/src/IComparable.php rename to src/PhpSpreadsheet/IComparable.php diff --git a/classes/src/IOFactory.php b/src/PhpSpreadsheet/IOFactory.php similarity index 100% rename from classes/src/IOFactory.php rename to src/PhpSpreadsheet/IOFactory.php diff --git a/classes/src/NamedRange.php b/src/PhpSpreadsheet/NamedRange.php similarity index 100% rename from classes/src/NamedRange.php rename to src/PhpSpreadsheet/NamedRange.php diff --git a/classes/src/Reader/Abstract.php b/src/PhpSpreadsheet/Reader/Abstract.php similarity index 100% rename from classes/src/Reader/Abstract.php rename to src/PhpSpreadsheet/Reader/Abstract.php diff --git a/classes/src/Reader/CSV.php b/src/PhpSpreadsheet/Reader/CSV.php similarity index 100% rename from classes/src/Reader/CSV.php rename to src/PhpSpreadsheet/Reader/CSV.php diff --git a/classes/src/Reader/DefaultReadFilter.php b/src/PhpSpreadsheet/Reader/DefaultReadFilter.php similarity index 100% rename from classes/src/Reader/DefaultReadFilter.php rename to src/PhpSpreadsheet/Reader/DefaultReadFilter.php diff --git a/classes/src/Reader/Excel2003XML.php b/src/PhpSpreadsheet/Reader/Excel2003XML.php similarity index 100% rename from classes/src/Reader/Excel2003XML.php rename to src/PhpSpreadsheet/Reader/Excel2003XML.php diff --git a/classes/src/Reader/Excel2007.php b/src/PhpSpreadsheet/Reader/Excel2007.php similarity index 99% rename from classes/src/Reader/Excel2007.php rename to src/PhpSpreadsheet/Reader/Excel2007.php index 82b00213..c439bfc9 100644 --- a/classes/src/Reader/Excel2007.php +++ b/src/PhpSpreadsheet/Reader/Excel2007.php @@ -951,8 +951,7 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE } // Extract all cell references in $ref - $aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($ref); - foreach ($aReferences as $reference) { + foreach (PHPExcel_Cell::extractAllCellReferencesInRange($ref) as $reference) { $docSheet->getStyle($reference)->setConditionalStyles($conditionalStyles); } } @@ -1178,8 +1177,7 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE $stRange = $docSheet->shrinkRangeToFit($range); // Extract all cell references in $range - $aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($stRange); - foreach ($aReferences as $reference) { + foreach (PHPExcel_Cell::extractAllCellReferencesInRange($stRange) as $reference) { // Create validation $docValidation = $docSheet->getCell($reference)->getDataValidation(); $docValidation->setType((string) $dataValidation["type"]); diff --git a/classes/src/Reader/Excel2007/Chart.php b/src/PhpSpreadsheet/Reader/Excel2007/Chart.php similarity index 100% rename from classes/src/Reader/Excel2007/Chart.php rename to src/PhpSpreadsheet/Reader/Excel2007/Chart.php diff --git a/classes/src/Reader/Excel2007/Theme.php b/src/PhpSpreadsheet/Reader/Excel2007/Theme.php similarity index 100% rename from classes/src/Reader/Excel2007/Theme.php rename to src/PhpSpreadsheet/Reader/Excel2007/Theme.php diff --git a/classes/src/Reader/Excel5.php b/src/PhpSpreadsheet/Reader/Excel5.php similarity index 99% rename from classes/src/Reader/Excel5.php rename to src/PhpSpreadsheet/Reader/Excel5.php index 498e9852..ec22fe5c 100644 --- a/classes/src/Reader/Excel5.php +++ b/src/PhpSpreadsheet/Reader/Excel5.php @@ -4883,8 +4883,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce foreach ($cellRangeAddresses as $cellRange) { $stRange = $this->phpSheet->shrinkRangeToFit($cellRange); - $stRange = PHPExcel_Cell::extractAllCellReferencesInRange($stRange); - foreach ($stRange as $coordinate) { + foreach (PHPExcel_Cell::extractAllCellReferencesInRange($stRange) as $coordinate) { $objValidation = $this->phpSheet->getCell($coordinate)->getDataValidation(); $objValidation->setType($type); $objValidation->setErrorStyle($errorStyle); diff --git a/classes/src/Reader/Excel5/Escher.php b/src/PhpSpreadsheet/Reader/Excel5/Escher.php similarity index 100% rename from classes/src/Reader/Excel5/Escher.php rename to src/PhpSpreadsheet/Reader/Excel5/Escher.php diff --git a/classes/src/Reader/Excel5/MD5.php b/src/PhpSpreadsheet/Reader/Excel5/MD5.php similarity index 100% rename from classes/src/Reader/Excel5/MD5.php rename to src/PhpSpreadsheet/Reader/Excel5/MD5.php diff --git a/classes/src/Reader/Excel5/RC4.php b/src/PhpSpreadsheet/Reader/Excel5/RC4.php similarity index 100% rename from classes/src/Reader/Excel5/RC4.php rename to src/PhpSpreadsheet/Reader/Excel5/RC4.php diff --git a/classes/src/Reader/Exception.php b/src/PhpSpreadsheet/Reader/Exception.php similarity index 100% rename from classes/src/Reader/Exception.php rename to src/PhpSpreadsheet/Reader/Exception.php diff --git a/classes/src/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php similarity index 100% rename from classes/src/Reader/Gnumeric.php rename to src/PhpSpreadsheet/Reader/Gnumeric.php diff --git a/classes/src/Reader/HTML.php b/src/PhpSpreadsheet/Reader/HTML.php similarity index 100% rename from classes/src/Reader/HTML.php rename to src/PhpSpreadsheet/Reader/HTML.php diff --git a/classes/src/Reader/IReadFilter.php b/src/PhpSpreadsheet/Reader/IReadFilter.php similarity index 100% rename from classes/src/Reader/IReadFilter.php rename to src/PhpSpreadsheet/Reader/IReadFilter.php diff --git a/classes/src/Reader/IReader.php b/src/PhpSpreadsheet/Reader/IReader.php similarity index 100% rename from classes/src/Reader/IReader.php rename to src/PhpSpreadsheet/Reader/IReader.php diff --git a/classes/src/Reader/OOCalc.php b/src/PhpSpreadsheet/Reader/OOCalc.php similarity index 100% rename from classes/src/Reader/OOCalc.php rename to src/PhpSpreadsheet/Reader/OOCalc.php diff --git a/classes/src/Reader/SYLK.php b/src/PhpSpreadsheet/Reader/SYLK.php similarity index 100% rename from classes/src/Reader/SYLK.php rename to src/PhpSpreadsheet/Reader/SYLK.php diff --git a/classes/src/ReferenceHelper.php b/src/PhpSpreadsheet/ReferenceHelper.php similarity index 100% rename from classes/src/ReferenceHelper.php rename to src/PhpSpreadsheet/ReferenceHelper.php diff --git a/classes/src/RichText.php b/src/PhpSpreadsheet/RichText.php similarity index 100% rename from classes/src/RichText.php rename to src/PhpSpreadsheet/RichText.php diff --git a/classes/src/RichText/ITextElement.php b/src/PhpSpreadsheet/RichText/ITextElement.php similarity index 100% rename from classes/src/RichText/ITextElement.php rename to src/PhpSpreadsheet/RichText/ITextElement.php diff --git a/classes/src/RichText/Run.php b/src/PhpSpreadsheet/RichText/Run.php similarity index 100% rename from classes/src/RichText/Run.php rename to src/PhpSpreadsheet/RichText/Run.php diff --git a/classes/src/RichText/TextElement.php b/src/PhpSpreadsheet/RichText/TextElement.php similarity index 100% rename from classes/src/RichText/TextElement.php rename to src/PhpSpreadsheet/RichText/TextElement.php diff --git a/classes/src/Settings.php b/src/PhpSpreadsheet/Settings.php similarity index 100% rename from classes/src/Settings.php rename to src/PhpSpreadsheet/Settings.php diff --git a/classes/src/Shared/CodePage.php b/src/PhpSpreadsheet/Shared/CodePage.php similarity index 100% rename from classes/src/Shared/CodePage.php rename to src/PhpSpreadsheet/Shared/CodePage.php diff --git a/classes/src/Shared/Date.php b/src/PhpSpreadsheet/Shared/Date.php similarity index 100% rename from classes/src/Shared/Date.php rename to src/PhpSpreadsheet/Shared/Date.php diff --git a/classes/src/Shared/Drawing.php b/src/PhpSpreadsheet/Shared/Drawing.php similarity index 100% rename from classes/src/Shared/Drawing.php rename to src/PhpSpreadsheet/Shared/Drawing.php diff --git a/classes/src/Shared/Escher.php b/src/PhpSpreadsheet/Shared/Escher.php similarity index 100% rename from classes/src/Shared/Escher.php rename to src/PhpSpreadsheet/Shared/Escher.php diff --git a/classes/src/Shared/Escher/DgContainer.php b/src/PhpSpreadsheet/Shared/Escher/DgContainer.php similarity index 100% rename from classes/src/Shared/Escher/DgContainer.php rename to src/PhpSpreadsheet/Shared/Escher/DgContainer.php diff --git a/classes/src/Shared/Escher/DgContainer/SpgrContainer.php b/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php similarity index 100% rename from classes/src/Shared/Escher/DgContainer/SpgrContainer.php rename to src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer.php diff --git a/classes/src/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php similarity index 100% rename from classes/src/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php rename to src/PhpSpreadsheet/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php diff --git a/classes/src/Shared/Escher/DggContainer.php b/src/PhpSpreadsheet/Shared/Escher/DggContainer.php similarity index 100% rename from classes/src/Shared/Escher/DggContainer.php rename to src/PhpSpreadsheet/Shared/Escher/DggContainer.php diff --git a/classes/src/Shared/Escher/DggContainer/BstoreContainer.php b/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php similarity index 100% rename from classes/src/Shared/Escher/DggContainer/BstoreContainer.php rename to src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer.php diff --git a/classes/src/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php similarity index 100% rename from classes/src/Shared/Escher/DggContainer/BstoreContainer/BSE.php rename to src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php diff --git a/classes/src/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php similarity index 100% rename from classes/src/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php rename to src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php diff --git a/classes/src/Shared/Excel5.php b/src/PhpSpreadsheet/Shared/Excel5.php similarity index 100% rename from classes/src/Shared/Excel5.php rename to src/PhpSpreadsheet/Shared/Excel5.php diff --git a/classes/src/Shared/File.php b/src/PhpSpreadsheet/Shared/File.php similarity index 100% rename from classes/src/Shared/File.php rename to src/PhpSpreadsheet/Shared/File.php diff --git a/classes/src/Shared/Font.php b/src/PhpSpreadsheet/Shared/Font.php similarity index 100% rename from classes/src/Shared/Font.php rename to src/PhpSpreadsheet/Shared/Font.php diff --git a/classes/src/Shared/JAMA/CHANGELOG.TXT b/src/PhpSpreadsheet/Shared/JAMA/CHANGELOG.TXT similarity index 100% rename from classes/src/Shared/JAMA/CHANGELOG.TXT rename to src/PhpSpreadsheet/Shared/JAMA/CHANGELOG.TXT diff --git a/classes/src/Shared/JAMA/CholeskyDecomposition.php b/src/PhpSpreadsheet/Shared/JAMA/CholeskyDecomposition.php similarity index 100% rename from classes/src/Shared/JAMA/CholeskyDecomposition.php rename to src/PhpSpreadsheet/Shared/JAMA/CholeskyDecomposition.php diff --git a/classes/src/Shared/JAMA/EigenvalueDecomposition.php b/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php similarity index 100% rename from classes/src/Shared/JAMA/EigenvalueDecomposition.php rename to src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php diff --git a/classes/src/Shared/JAMA/LUDecomposition.php b/src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php similarity index 100% rename from classes/src/Shared/JAMA/LUDecomposition.php rename to src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php diff --git a/classes/src/Shared/JAMA/Matrix.php b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php similarity index 100% rename from classes/src/Shared/JAMA/Matrix.php rename to src/PhpSpreadsheet/Shared/JAMA/Matrix.php diff --git a/classes/src/Shared/JAMA/QRDecomposition.php b/src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php similarity index 100% rename from classes/src/Shared/JAMA/QRDecomposition.php rename to src/PhpSpreadsheet/Shared/JAMA/QRDecomposition.php diff --git a/classes/src/Shared/JAMA/SingularValueDecomposition.php b/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php similarity index 100% rename from classes/src/Shared/JAMA/SingularValueDecomposition.php rename to src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php diff --git a/classes/src/Shared/JAMA/utils/Error.php b/src/PhpSpreadsheet/Shared/JAMA/utils/Error.php similarity index 100% rename from classes/src/Shared/JAMA/utils/Error.php rename to src/PhpSpreadsheet/Shared/JAMA/utils/Error.php diff --git a/classes/src/Shared/JAMA/utils/Maths.php b/src/PhpSpreadsheet/Shared/JAMA/utils/Maths.php similarity index 100% rename from classes/src/Shared/JAMA/utils/Maths.php rename to src/PhpSpreadsheet/Shared/JAMA/utils/Maths.php diff --git a/classes/src/Shared/OLE.php b/src/PhpSpreadsheet/Shared/OLE.php similarity index 100% rename from classes/src/Shared/OLE.php rename to src/PhpSpreadsheet/Shared/OLE.php diff --git a/classes/src/Shared/OLE/ChainedBlockStream.php b/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php similarity index 100% rename from classes/src/Shared/OLE/ChainedBlockStream.php rename to src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php diff --git a/classes/src/Shared/OLE/PPS.php b/src/PhpSpreadsheet/Shared/OLE/PPS.php similarity index 100% rename from classes/src/Shared/OLE/PPS.php rename to src/PhpSpreadsheet/Shared/OLE/PPS.php diff --git a/classes/src/Shared/OLE/PPS/File.php b/src/PhpSpreadsheet/Shared/OLE/PPS/File.php similarity index 100% rename from classes/src/Shared/OLE/PPS/File.php rename to src/PhpSpreadsheet/Shared/OLE/PPS/File.php diff --git a/classes/src/Shared/OLE/PPS/Root.php b/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php similarity index 100% rename from classes/src/Shared/OLE/PPS/Root.php rename to src/PhpSpreadsheet/Shared/OLE/PPS/Root.php diff --git a/classes/src/Shared/OLERead.php b/src/PhpSpreadsheet/Shared/OLERead.php similarity index 100% rename from classes/src/Shared/OLERead.php rename to src/PhpSpreadsheet/Shared/OLERead.php diff --git a/classes/src/Shared/PCLZip/gnu-lgpl.txt b/src/PhpSpreadsheet/Shared/PCLZip/gnu-lgpl.txt similarity index 100% rename from classes/src/Shared/PCLZip/gnu-lgpl.txt rename to src/PhpSpreadsheet/Shared/PCLZip/gnu-lgpl.txt diff --git a/classes/src/Shared/PCLZip/pclzip.lib.php b/src/PhpSpreadsheet/Shared/PCLZip/pclzip.lib.php similarity index 100% rename from classes/src/Shared/PCLZip/pclzip.lib.php rename to src/PhpSpreadsheet/Shared/PCLZip/pclzip.lib.php diff --git a/classes/src/Shared/PCLZip/readme.txt b/src/PhpSpreadsheet/Shared/PCLZip/readme.txt similarity index 100% rename from classes/src/Shared/PCLZip/readme.txt rename to src/PhpSpreadsheet/Shared/PCLZip/readme.txt diff --git a/classes/src/Shared/PasswordHasher.php b/src/PhpSpreadsheet/Shared/PasswordHasher.php similarity index 100% rename from classes/src/Shared/PasswordHasher.php rename to src/PhpSpreadsheet/Shared/PasswordHasher.php diff --git a/classes/src/Shared/String.php b/src/PhpSpreadsheet/Shared/String.php similarity index 100% rename from classes/src/Shared/String.php rename to src/PhpSpreadsheet/Shared/String.php diff --git a/classes/src/Shared/TimeZone.php b/src/PhpSpreadsheet/Shared/TimeZone.php similarity index 100% rename from classes/src/Shared/TimeZone.php rename to src/PhpSpreadsheet/Shared/TimeZone.php diff --git a/classes/src/Shared/XMLWriter.php b/src/PhpSpreadsheet/Shared/XMLWriter.php similarity index 100% rename from classes/src/Shared/XMLWriter.php rename to src/PhpSpreadsheet/Shared/XMLWriter.php diff --git a/classes/src/Shared/ZipArchive.php b/src/PhpSpreadsheet/Shared/ZipArchive.php similarity index 100% rename from classes/src/Shared/ZipArchive.php rename to src/PhpSpreadsheet/Shared/ZipArchive.php diff --git a/classes/src/Shared/ZipStreamWrapper.php b/src/PhpSpreadsheet/Shared/ZipStreamWrapper.php similarity index 100% rename from classes/src/Shared/ZipStreamWrapper.php rename to src/PhpSpreadsheet/Shared/ZipStreamWrapper.php diff --git a/classes/src/Shared/trend/bestFitClass.php b/src/PhpSpreadsheet/Shared/trend/bestFitClass.php similarity index 100% rename from classes/src/Shared/trend/bestFitClass.php rename to src/PhpSpreadsheet/Shared/trend/bestFitClass.php diff --git a/classes/src/Shared/trend/exponentialBestFitClass.php b/src/PhpSpreadsheet/Shared/trend/exponentialBestFitClass.php similarity index 100% rename from classes/src/Shared/trend/exponentialBestFitClass.php rename to src/PhpSpreadsheet/Shared/trend/exponentialBestFitClass.php diff --git a/classes/src/Shared/trend/linearBestFitClass.php b/src/PhpSpreadsheet/Shared/trend/linearBestFitClass.php similarity index 100% rename from classes/src/Shared/trend/linearBestFitClass.php rename to src/PhpSpreadsheet/Shared/trend/linearBestFitClass.php diff --git a/classes/src/Shared/trend/logarithmicBestFitClass.php b/src/PhpSpreadsheet/Shared/trend/logarithmicBestFitClass.php similarity index 100% rename from classes/src/Shared/trend/logarithmicBestFitClass.php rename to src/PhpSpreadsheet/Shared/trend/logarithmicBestFitClass.php diff --git a/classes/src/Shared/trend/polynomialBestFitClass.php b/src/PhpSpreadsheet/Shared/trend/polynomialBestFitClass.php similarity index 100% rename from classes/src/Shared/trend/polynomialBestFitClass.php rename to src/PhpSpreadsheet/Shared/trend/polynomialBestFitClass.php diff --git a/classes/src/Shared/trend/powerBestFitClass.php b/src/PhpSpreadsheet/Shared/trend/powerBestFitClass.php similarity index 100% rename from classes/src/Shared/trend/powerBestFitClass.php rename to src/PhpSpreadsheet/Shared/trend/powerBestFitClass.php diff --git a/classes/src/Shared/trend/trendClass.php b/src/PhpSpreadsheet/Shared/trend/trendClass.php similarity index 100% rename from classes/src/Shared/trend/trendClass.php rename to src/PhpSpreadsheet/Shared/trend/trendClass.php diff --git a/classes/src/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php similarity index 100% rename from classes/src/Spreadsheet.php rename to src/PhpSpreadsheet/Spreadsheet.php diff --git a/classes/src/Style.php b/src/PhpSpreadsheet/Style.php similarity index 100% rename from classes/src/Style.php rename to src/PhpSpreadsheet/Style.php diff --git a/classes/src/Style/Alignment.php b/src/PhpSpreadsheet/Style/Alignment.php similarity index 100% rename from classes/src/Style/Alignment.php rename to src/PhpSpreadsheet/Style/Alignment.php diff --git a/classes/src/Style/Border.php b/src/PhpSpreadsheet/Style/Border.php similarity index 100% rename from classes/src/Style/Border.php rename to src/PhpSpreadsheet/Style/Border.php diff --git a/classes/src/Style/Borders.php b/src/PhpSpreadsheet/Style/Borders.php similarity index 100% rename from classes/src/Style/Borders.php rename to src/PhpSpreadsheet/Style/Borders.php diff --git a/classes/src/Style/Color.php b/src/PhpSpreadsheet/Style/Color.php similarity index 100% rename from classes/src/Style/Color.php rename to src/PhpSpreadsheet/Style/Color.php diff --git a/classes/src/Style/Conditional.php b/src/PhpSpreadsheet/Style/Conditional.php similarity index 100% rename from classes/src/Style/Conditional.php rename to src/PhpSpreadsheet/Style/Conditional.php diff --git a/classes/src/Style/Fill.php b/src/PhpSpreadsheet/Style/Fill.php similarity index 100% rename from classes/src/Style/Fill.php rename to src/PhpSpreadsheet/Style/Fill.php diff --git a/classes/src/Style/Font.php b/src/PhpSpreadsheet/Style/Font.php similarity index 100% rename from classes/src/Style/Font.php rename to src/PhpSpreadsheet/Style/Font.php diff --git a/classes/src/Style/NumberFormat.php b/src/PhpSpreadsheet/Style/NumberFormat.php similarity index 100% rename from classes/src/Style/NumberFormat.php rename to src/PhpSpreadsheet/Style/NumberFormat.php diff --git a/classes/src/Style/Protection.php b/src/PhpSpreadsheet/Style/Protection.php similarity index 100% rename from classes/src/Style/Protection.php rename to src/PhpSpreadsheet/Style/Protection.php diff --git a/classes/src/Style/Supervisor.php b/src/PhpSpreadsheet/Style/Supervisor.php similarity index 100% rename from classes/src/Style/Supervisor.php rename to src/PhpSpreadsheet/Style/Supervisor.php diff --git a/classes/src/Worksheet.php b/src/PhpSpreadsheet/Worksheet.php similarity index 100% rename from classes/src/Worksheet.php rename to src/PhpSpreadsheet/Worksheet.php diff --git a/classes/src/Worksheet/AutoFilter.php b/src/PhpSpreadsheet/Worksheet/AutoFilter.php similarity index 100% rename from classes/src/Worksheet/AutoFilter.php rename to src/PhpSpreadsheet/Worksheet/AutoFilter.php diff --git a/classes/src/Worksheet/AutoFilter/Column.php b/src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php similarity index 100% rename from classes/src/Worksheet/AutoFilter/Column.php rename to src/PhpSpreadsheet/Worksheet/AutoFilter/Column.php diff --git a/classes/src/Worksheet/AutoFilter/Column/Rule.php b/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php similarity index 100% rename from classes/src/Worksheet/AutoFilter/Column/Rule.php rename to src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php diff --git a/classes/src/Worksheet/BaseDrawing.php b/src/PhpSpreadsheet/Worksheet/BaseDrawing.php similarity index 100% rename from classes/src/Worksheet/BaseDrawing.php rename to src/PhpSpreadsheet/Worksheet/BaseDrawing.php diff --git a/classes/src/Worksheet/CellIterator.php b/src/PhpSpreadsheet/Worksheet/CellIterator.php similarity index 100% rename from classes/src/Worksheet/CellIterator.php rename to src/PhpSpreadsheet/Worksheet/CellIterator.php diff --git a/classes/src/Worksheet/Column.php b/src/PhpSpreadsheet/Worksheet/Column.php similarity index 100% rename from classes/src/Worksheet/Column.php rename to src/PhpSpreadsheet/Worksheet/Column.php diff --git a/classes/src/Worksheet/ColumnCellIterator.php b/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php similarity index 100% rename from classes/src/Worksheet/ColumnCellIterator.php rename to src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php diff --git a/classes/src/Worksheet/ColumnDimension.php b/src/PhpSpreadsheet/Worksheet/ColumnDimension.php similarity index 100% rename from classes/src/Worksheet/ColumnDimension.php rename to src/PhpSpreadsheet/Worksheet/ColumnDimension.php diff --git a/classes/src/Worksheet/ColumnIterator.php b/src/PhpSpreadsheet/Worksheet/ColumnIterator.php similarity index 100% rename from classes/src/Worksheet/ColumnIterator.php rename to src/PhpSpreadsheet/Worksheet/ColumnIterator.php diff --git a/classes/src/Worksheet/Dimension.php b/src/PhpSpreadsheet/Worksheet/Dimension.php similarity index 100% rename from classes/src/Worksheet/Dimension.php rename to src/PhpSpreadsheet/Worksheet/Dimension.php diff --git a/classes/src/Worksheet/Drawing.php b/src/PhpSpreadsheet/Worksheet/Drawing.php similarity index 100% rename from classes/src/Worksheet/Drawing.php rename to src/PhpSpreadsheet/Worksheet/Drawing.php diff --git a/classes/src/Worksheet/Drawing/Shadow.php b/src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php similarity index 100% rename from classes/src/Worksheet/Drawing/Shadow.php rename to src/PhpSpreadsheet/Worksheet/Drawing/Shadow.php diff --git a/classes/src/Worksheet/HeaderFooter.php b/src/PhpSpreadsheet/Worksheet/HeaderFooter.php similarity index 100% rename from classes/src/Worksheet/HeaderFooter.php rename to src/PhpSpreadsheet/Worksheet/HeaderFooter.php diff --git a/classes/src/Worksheet/HeaderFooterDrawing.php b/src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php similarity index 100% rename from classes/src/Worksheet/HeaderFooterDrawing.php rename to src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php diff --git a/classes/src/Worksheet/Iterator.php b/src/PhpSpreadsheet/Worksheet/Iterator.php similarity index 100% rename from classes/src/Worksheet/Iterator.php rename to src/PhpSpreadsheet/Worksheet/Iterator.php diff --git a/classes/src/Worksheet/MemoryDrawing.php b/src/PhpSpreadsheet/Worksheet/MemoryDrawing.php similarity index 100% rename from classes/src/Worksheet/MemoryDrawing.php rename to src/PhpSpreadsheet/Worksheet/MemoryDrawing.php diff --git a/classes/src/Worksheet/PageMargins.php b/src/PhpSpreadsheet/Worksheet/PageMargins.php similarity index 100% rename from classes/src/Worksheet/PageMargins.php rename to src/PhpSpreadsheet/Worksheet/PageMargins.php diff --git a/classes/src/Worksheet/PageSetup.php b/src/PhpSpreadsheet/Worksheet/PageSetup.php similarity index 100% rename from classes/src/Worksheet/PageSetup.php rename to src/PhpSpreadsheet/Worksheet/PageSetup.php diff --git a/classes/src/Worksheet/Protection.php b/src/PhpSpreadsheet/Worksheet/Protection.php similarity index 100% rename from classes/src/Worksheet/Protection.php rename to src/PhpSpreadsheet/Worksheet/Protection.php diff --git a/classes/src/Worksheet/Row.php b/src/PhpSpreadsheet/Worksheet/Row.php similarity index 100% rename from classes/src/Worksheet/Row.php rename to src/PhpSpreadsheet/Worksheet/Row.php diff --git a/classes/src/Worksheet/RowCellIterator.php b/src/PhpSpreadsheet/Worksheet/RowCellIterator.php similarity index 100% rename from classes/src/Worksheet/RowCellIterator.php rename to src/PhpSpreadsheet/Worksheet/RowCellIterator.php diff --git a/classes/src/Worksheet/RowDimension.php b/src/PhpSpreadsheet/Worksheet/RowDimension.php similarity index 100% rename from classes/src/Worksheet/RowDimension.php rename to src/PhpSpreadsheet/Worksheet/RowDimension.php diff --git a/classes/src/Worksheet/RowIterator.php b/src/PhpSpreadsheet/Worksheet/RowIterator.php similarity index 100% rename from classes/src/Worksheet/RowIterator.php rename to src/PhpSpreadsheet/Worksheet/RowIterator.php diff --git a/classes/src/Worksheet/SheetView.php b/src/PhpSpreadsheet/Worksheet/SheetView.php similarity index 100% rename from classes/src/Worksheet/SheetView.php rename to src/PhpSpreadsheet/Worksheet/SheetView.php diff --git a/classes/src/Writer/Abstract.php b/src/PhpSpreadsheet/Writer/Abstract.php similarity index 100% rename from classes/src/Writer/Abstract.php rename to src/PhpSpreadsheet/Writer/Abstract.php diff --git a/classes/src/Writer/CSV.php b/src/PhpSpreadsheet/Writer/CSV.php similarity index 100% rename from classes/src/Writer/CSV.php rename to src/PhpSpreadsheet/Writer/CSV.php diff --git a/classes/src/Writer/Excel2007.php b/src/PhpSpreadsheet/Writer/Excel2007.php similarity index 100% rename from classes/src/Writer/Excel2007.php rename to src/PhpSpreadsheet/Writer/Excel2007.php diff --git a/classes/src/Writer/Excel2007/Chart.php b/src/PhpSpreadsheet/Writer/Excel2007/Chart.php similarity index 100% rename from classes/src/Writer/Excel2007/Chart.php rename to src/PhpSpreadsheet/Writer/Excel2007/Chart.php diff --git a/classes/src/Writer/Excel2007/Comments.php b/src/PhpSpreadsheet/Writer/Excel2007/Comments.php similarity index 100% rename from classes/src/Writer/Excel2007/Comments.php rename to src/PhpSpreadsheet/Writer/Excel2007/Comments.php diff --git a/classes/src/Writer/Excel2007/ContentTypes.php b/src/PhpSpreadsheet/Writer/Excel2007/ContentTypes.php similarity index 100% rename from classes/src/Writer/Excel2007/ContentTypes.php rename to src/PhpSpreadsheet/Writer/Excel2007/ContentTypes.php diff --git a/classes/src/Writer/Excel2007/DocProps.php b/src/PhpSpreadsheet/Writer/Excel2007/DocProps.php similarity index 100% rename from classes/src/Writer/Excel2007/DocProps.php rename to src/PhpSpreadsheet/Writer/Excel2007/DocProps.php diff --git a/classes/src/Writer/Excel2007/Drawing.php b/src/PhpSpreadsheet/Writer/Excel2007/Drawing.php similarity index 100% rename from classes/src/Writer/Excel2007/Drawing.php rename to src/PhpSpreadsheet/Writer/Excel2007/Drawing.php diff --git a/classes/src/Writer/Excel2007/Rels.php b/src/PhpSpreadsheet/Writer/Excel2007/Rels.php similarity index 100% rename from classes/src/Writer/Excel2007/Rels.php rename to src/PhpSpreadsheet/Writer/Excel2007/Rels.php diff --git a/classes/src/Writer/Excel2007/RelsRibbon.php b/src/PhpSpreadsheet/Writer/Excel2007/RelsRibbon.php similarity index 100% rename from classes/src/Writer/Excel2007/RelsRibbon.php rename to src/PhpSpreadsheet/Writer/Excel2007/RelsRibbon.php diff --git a/classes/src/Writer/Excel2007/RelsVBA.php b/src/PhpSpreadsheet/Writer/Excel2007/RelsVBA.php similarity index 100% rename from classes/src/Writer/Excel2007/RelsVBA.php rename to src/PhpSpreadsheet/Writer/Excel2007/RelsVBA.php diff --git a/classes/src/Writer/Excel2007/StringTable.php b/src/PhpSpreadsheet/Writer/Excel2007/StringTable.php similarity index 100% rename from classes/src/Writer/Excel2007/StringTable.php rename to src/PhpSpreadsheet/Writer/Excel2007/StringTable.php diff --git a/classes/src/Writer/Excel2007/Style.php b/src/PhpSpreadsheet/Writer/Excel2007/Style.php similarity index 100% rename from classes/src/Writer/Excel2007/Style.php rename to src/PhpSpreadsheet/Writer/Excel2007/Style.php diff --git a/classes/src/Writer/Excel2007/Theme.php b/src/PhpSpreadsheet/Writer/Excel2007/Theme.php similarity index 100% rename from classes/src/Writer/Excel2007/Theme.php rename to src/PhpSpreadsheet/Writer/Excel2007/Theme.php diff --git a/classes/src/Writer/Excel2007/Workbook.php b/src/PhpSpreadsheet/Writer/Excel2007/Workbook.php similarity index 100% rename from classes/src/Writer/Excel2007/Workbook.php rename to src/PhpSpreadsheet/Writer/Excel2007/Workbook.php diff --git a/classes/src/Writer/Excel2007/Worksheet.php b/src/PhpSpreadsheet/Writer/Excel2007/Worksheet.php similarity index 100% rename from classes/src/Writer/Excel2007/Worksheet.php rename to src/PhpSpreadsheet/Writer/Excel2007/Worksheet.php diff --git a/classes/src/Writer/Excel2007/WriterPart.php b/src/PhpSpreadsheet/Writer/Excel2007/WriterPart.php similarity index 100% rename from classes/src/Writer/Excel2007/WriterPart.php rename to src/PhpSpreadsheet/Writer/Excel2007/WriterPart.php diff --git a/classes/src/Writer/Excel5.php b/src/PhpSpreadsheet/Writer/Excel5.php similarity index 100% rename from classes/src/Writer/Excel5.php rename to src/PhpSpreadsheet/Writer/Excel5.php diff --git a/classes/src/Writer/Excel5/BIFFwriter.php b/src/PhpSpreadsheet/Writer/Excel5/BIFFwriter.php similarity index 100% rename from classes/src/Writer/Excel5/BIFFwriter.php rename to src/PhpSpreadsheet/Writer/Excel5/BIFFwriter.php diff --git a/classes/src/Writer/Excel5/Escher.php b/src/PhpSpreadsheet/Writer/Excel5/Escher.php similarity index 100% rename from classes/src/Writer/Excel5/Escher.php rename to src/PhpSpreadsheet/Writer/Excel5/Escher.php diff --git a/classes/src/Writer/Excel5/Font.php b/src/PhpSpreadsheet/Writer/Excel5/Font.php similarity index 100% rename from classes/src/Writer/Excel5/Font.php rename to src/PhpSpreadsheet/Writer/Excel5/Font.php diff --git a/classes/src/Writer/Excel5/Parser.php b/src/PhpSpreadsheet/Writer/Excel5/Parser.php similarity index 100% rename from classes/src/Writer/Excel5/Parser.php rename to src/PhpSpreadsheet/Writer/Excel5/Parser.php diff --git a/classes/src/Writer/Excel5/Workbook.php b/src/PhpSpreadsheet/Writer/Excel5/Workbook.php similarity index 100% rename from classes/src/Writer/Excel5/Workbook.php rename to src/PhpSpreadsheet/Writer/Excel5/Workbook.php diff --git a/classes/src/Writer/Excel5/Worksheet.php b/src/PhpSpreadsheet/Writer/Excel5/Worksheet.php similarity index 100% rename from classes/src/Writer/Excel5/Worksheet.php rename to src/PhpSpreadsheet/Writer/Excel5/Worksheet.php diff --git a/classes/src/Writer/Excel5/Xf.php b/src/PhpSpreadsheet/Writer/Excel5/Xf.php similarity index 100% rename from classes/src/Writer/Excel5/Xf.php rename to src/PhpSpreadsheet/Writer/Excel5/Xf.php diff --git a/classes/src/Writer/Exception.php b/src/PhpSpreadsheet/Writer/Exception.php similarity index 100% rename from classes/src/Writer/Exception.php rename to src/PhpSpreadsheet/Writer/Exception.php diff --git a/classes/src/Writer/HTML.php b/src/PhpSpreadsheet/Writer/HTML.php similarity index 100% rename from classes/src/Writer/HTML.php rename to src/PhpSpreadsheet/Writer/HTML.php diff --git a/classes/src/Writer/IWriter.php b/src/PhpSpreadsheet/Writer/IWriter.php similarity index 100% rename from classes/src/Writer/IWriter.php rename to src/PhpSpreadsheet/Writer/IWriter.php diff --git a/classes/src/Writer/OpenDocument.php b/src/PhpSpreadsheet/Writer/OpenDocument.php similarity index 100% rename from classes/src/Writer/OpenDocument.php rename to src/PhpSpreadsheet/Writer/OpenDocument.php diff --git a/classes/src/Writer/OpenDocument/Cell/Comment.php b/src/PhpSpreadsheet/Writer/OpenDocument/Cell/Comment.php similarity index 100% rename from classes/src/Writer/OpenDocument/Cell/Comment.php rename to src/PhpSpreadsheet/Writer/OpenDocument/Cell/Comment.php diff --git a/classes/src/Writer/OpenDocument/Content.php b/src/PhpSpreadsheet/Writer/OpenDocument/Content.php similarity index 100% rename from classes/src/Writer/OpenDocument/Content.php rename to src/PhpSpreadsheet/Writer/OpenDocument/Content.php diff --git a/classes/src/Writer/OpenDocument/Meta.php b/src/PhpSpreadsheet/Writer/OpenDocument/Meta.php similarity index 100% rename from classes/src/Writer/OpenDocument/Meta.php rename to src/PhpSpreadsheet/Writer/OpenDocument/Meta.php diff --git a/classes/src/Writer/OpenDocument/MetaInf.php b/src/PhpSpreadsheet/Writer/OpenDocument/MetaInf.php similarity index 100% rename from classes/src/Writer/OpenDocument/MetaInf.php rename to src/PhpSpreadsheet/Writer/OpenDocument/MetaInf.php diff --git a/classes/src/Writer/OpenDocument/Mimetype.php b/src/PhpSpreadsheet/Writer/OpenDocument/Mimetype.php similarity index 100% rename from classes/src/Writer/OpenDocument/Mimetype.php rename to src/PhpSpreadsheet/Writer/OpenDocument/Mimetype.php diff --git a/classes/src/Writer/OpenDocument/Settings.php b/src/PhpSpreadsheet/Writer/OpenDocument/Settings.php similarity index 100% rename from classes/src/Writer/OpenDocument/Settings.php rename to src/PhpSpreadsheet/Writer/OpenDocument/Settings.php diff --git a/classes/src/Writer/OpenDocument/Styles.php b/src/PhpSpreadsheet/Writer/OpenDocument/Styles.php similarity index 100% rename from classes/src/Writer/OpenDocument/Styles.php rename to src/PhpSpreadsheet/Writer/OpenDocument/Styles.php diff --git a/classes/src/Writer/OpenDocument/Thumbnails.php b/src/PhpSpreadsheet/Writer/OpenDocument/Thumbnails.php similarity index 100% rename from classes/src/Writer/OpenDocument/Thumbnails.php rename to src/PhpSpreadsheet/Writer/OpenDocument/Thumbnails.php diff --git a/classes/src/Writer/OpenDocument/WriterPart.php b/src/PhpSpreadsheet/Writer/OpenDocument/WriterPart.php similarity index 100% rename from classes/src/Writer/OpenDocument/WriterPart.php rename to src/PhpSpreadsheet/Writer/OpenDocument/WriterPart.php diff --git a/classes/src/Writer/PDF.php b/src/PhpSpreadsheet/Writer/PDF.php similarity index 100% rename from classes/src/Writer/PDF.php rename to src/PhpSpreadsheet/Writer/PDF.php diff --git a/classes/src/Writer/PDF/Core.php b/src/PhpSpreadsheet/Writer/PDF/Core.php similarity index 100% rename from classes/src/Writer/PDF/Core.php rename to src/PhpSpreadsheet/Writer/PDF/Core.php diff --git a/classes/src/Writer/PDF/DomPDF.php b/src/PhpSpreadsheet/Writer/PDF/DomPDF.php similarity index 100% rename from classes/src/Writer/PDF/DomPDF.php rename to src/PhpSpreadsheet/Writer/PDF/DomPDF.php diff --git a/classes/src/Writer/PDF/mPDF.php b/src/PhpSpreadsheet/Writer/PDF/mPDF.php similarity index 100% rename from classes/src/Writer/PDF/mPDF.php rename to src/PhpSpreadsheet/Writer/PDF/mPDF.php diff --git a/classes/src/Writer/PDF/tcPDF.php b/src/PhpSpreadsheet/Writer/PDF/tcPDF.php similarity index 100% rename from classes/src/Writer/PDF/tcPDF.php rename to src/PhpSpreadsheet/Writer/PDF/tcPDF.php diff --git a/classes/src/locale/bg/config b/src/PhpSpreadsheet/locale/bg/config similarity index 100% rename from classes/src/locale/bg/config rename to src/PhpSpreadsheet/locale/bg/config diff --git a/classes/src/locale/cs/config b/src/PhpSpreadsheet/locale/cs/config similarity index 100% rename from classes/src/locale/cs/config rename to src/PhpSpreadsheet/locale/cs/config diff --git a/classes/src/locale/cs/functions b/src/PhpSpreadsheet/locale/cs/functions similarity index 100% rename from classes/src/locale/cs/functions rename to src/PhpSpreadsheet/locale/cs/functions diff --git a/classes/src/locale/da/config b/src/PhpSpreadsheet/locale/da/config similarity index 100% rename from classes/src/locale/da/config rename to src/PhpSpreadsheet/locale/da/config diff --git a/classes/src/locale/da/functions b/src/PhpSpreadsheet/locale/da/functions similarity index 100% rename from classes/src/locale/da/functions rename to src/PhpSpreadsheet/locale/da/functions diff --git a/classes/src/locale/de/config b/src/PhpSpreadsheet/locale/de/config similarity index 100% rename from classes/src/locale/de/config rename to src/PhpSpreadsheet/locale/de/config diff --git a/classes/src/locale/de/functions b/src/PhpSpreadsheet/locale/de/functions similarity index 100% rename from classes/src/locale/de/functions rename to src/PhpSpreadsheet/locale/de/functions diff --git a/classes/src/locale/en/uk/config b/src/PhpSpreadsheet/locale/en/uk/config similarity index 100% rename from classes/src/locale/en/uk/config rename to src/PhpSpreadsheet/locale/en/uk/config diff --git a/classes/src/locale/es/config b/src/PhpSpreadsheet/locale/es/config similarity index 100% rename from classes/src/locale/es/config rename to src/PhpSpreadsheet/locale/es/config diff --git a/classes/src/locale/es/functions b/src/PhpSpreadsheet/locale/es/functions similarity index 100% rename from classes/src/locale/es/functions rename to src/PhpSpreadsheet/locale/es/functions diff --git a/classes/src/locale/fi/config b/src/PhpSpreadsheet/locale/fi/config similarity index 100% rename from classes/src/locale/fi/config rename to src/PhpSpreadsheet/locale/fi/config diff --git a/classes/src/locale/fi/functions b/src/PhpSpreadsheet/locale/fi/functions similarity index 100% rename from classes/src/locale/fi/functions rename to src/PhpSpreadsheet/locale/fi/functions diff --git a/classes/src/locale/fr/config b/src/PhpSpreadsheet/locale/fr/config similarity index 100% rename from classes/src/locale/fr/config rename to src/PhpSpreadsheet/locale/fr/config diff --git a/classes/src/locale/fr/functions b/src/PhpSpreadsheet/locale/fr/functions similarity index 100% rename from classes/src/locale/fr/functions rename to src/PhpSpreadsheet/locale/fr/functions diff --git a/classes/src/locale/hu/config b/src/PhpSpreadsheet/locale/hu/config similarity index 100% rename from classes/src/locale/hu/config rename to src/PhpSpreadsheet/locale/hu/config diff --git a/classes/src/locale/hu/functions b/src/PhpSpreadsheet/locale/hu/functions similarity index 100% rename from classes/src/locale/hu/functions rename to src/PhpSpreadsheet/locale/hu/functions diff --git a/classes/src/locale/it/config b/src/PhpSpreadsheet/locale/it/config similarity index 100% rename from classes/src/locale/it/config rename to src/PhpSpreadsheet/locale/it/config diff --git a/classes/src/locale/it/functions b/src/PhpSpreadsheet/locale/it/functions similarity index 100% rename from classes/src/locale/it/functions rename to src/PhpSpreadsheet/locale/it/functions diff --git a/classes/src/locale/nl/config b/src/PhpSpreadsheet/locale/nl/config similarity index 100% rename from classes/src/locale/nl/config rename to src/PhpSpreadsheet/locale/nl/config diff --git a/classes/src/locale/nl/functions b/src/PhpSpreadsheet/locale/nl/functions similarity index 100% rename from classes/src/locale/nl/functions rename to src/PhpSpreadsheet/locale/nl/functions diff --git a/classes/src/locale/no/config b/src/PhpSpreadsheet/locale/no/config similarity index 100% rename from classes/src/locale/no/config rename to src/PhpSpreadsheet/locale/no/config diff --git a/classes/src/locale/no/functions b/src/PhpSpreadsheet/locale/no/functions similarity index 100% rename from classes/src/locale/no/functions rename to src/PhpSpreadsheet/locale/no/functions diff --git a/classes/src/locale/pl/config b/src/PhpSpreadsheet/locale/pl/config similarity index 100% rename from classes/src/locale/pl/config rename to src/PhpSpreadsheet/locale/pl/config diff --git a/classes/src/locale/pl/functions b/src/PhpSpreadsheet/locale/pl/functions similarity index 100% rename from classes/src/locale/pl/functions rename to src/PhpSpreadsheet/locale/pl/functions diff --git a/classes/src/locale/pt/br/config b/src/PhpSpreadsheet/locale/pt/br/config similarity index 100% rename from classes/src/locale/pt/br/config rename to src/PhpSpreadsheet/locale/pt/br/config diff --git a/classes/src/locale/pt/br/functions b/src/PhpSpreadsheet/locale/pt/br/functions similarity index 100% rename from classes/src/locale/pt/br/functions rename to src/PhpSpreadsheet/locale/pt/br/functions diff --git a/classes/src/locale/pt/config b/src/PhpSpreadsheet/locale/pt/config similarity index 100% rename from classes/src/locale/pt/config rename to src/PhpSpreadsheet/locale/pt/config diff --git a/classes/src/locale/pt/functions b/src/PhpSpreadsheet/locale/pt/functions similarity index 100% rename from classes/src/locale/pt/functions rename to src/PhpSpreadsheet/locale/pt/functions diff --git a/classes/src/locale/ru/config b/src/PhpSpreadsheet/locale/ru/config similarity index 100% rename from classes/src/locale/ru/config rename to src/PhpSpreadsheet/locale/ru/config diff --git a/classes/src/locale/ru/functions b/src/PhpSpreadsheet/locale/ru/functions similarity index 100% rename from classes/src/locale/ru/functions rename to src/PhpSpreadsheet/locale/ru/functions diff --git a/classes/src/locale/sv/config b/src/PhpSpreadsheet/locale/sv/config similarity index 100% rename from classes/src/locale/sv/config rename to src/PhpSpreadsheet/locale/sv/config diff --git a/classes/src/locale/sv/functions b/src/PhpSpreadsheet/locale/sv/functions similarity index 100% rename from classes/src/locale/sv/functions rename to src/PhpSpreadsheet/locale/sv/functions diff --git a/classes/src/locale/tr/config b/src/PhpSpreadsheet/locale/tr/config similarity index 100% rename from classes/src/locale/tr/config rename to src/PhpSpreadsheet/locale/tr/config diff --git a/classes/src/locale/tr/functions b/src/PhpSpreadsheet/locale/tr/functions similarity index 100% rename from classes/src/locale/tr/functions rename to src/PhpSpreadsheet/locale/tr/functions diff --git a/unitTests/Classes/src/Cell/AdvancedValueBinderTest.php b/unitTests/Classes/src/Cell/AdvancedValueBinderTest.php index 22116411..802eee85 100644 --- a/unitTests/Classes/src/Cell/AdvancedValueBinderTest.php +++ b/unitTests/Classes/src/Cell/AdvancedValueBinderTest.php @@ -36,10 +36,10 @@ class AdvancedValueBinderTest extends PHPUnit_Framework_TestCase public function testCurrency($value, $valueBinded, $format, $thousandsSeparator, $decimalSeparator, $currencyCode) { $sheet = $this->getMock( - 'PHPExcel_Worksheet', + '\\PHPExcel\\Worksheet', array('getStyle', 'getNumberFormat', 'setFormatCode','getCellCacheController') ); - $cache = $this->getMockBuilder('PHPExcel_CachedObjectStorage_Memory') + $cache = $this->getMockBuilder('\\PHPExcel\\CachedObjectStorage\\Memory') ->disableOriginalConstructor() ->getMock(); $cache->expects($this->any()) @@ -60,13 +60,13 @@ class AdvancedValueBinderTest extends PHPUnit_Framework_TestCase ->method('getCellCacheController') ->will($this->returnValue($cache)); - PHPExcel_Shared_String::setCurrencyCode($currencyCode); - PHPExcel_Shared_String::setDecimalSeparator($decimalSeparator); - PHPExcel_Shared_String::setThousandsSeparator($thousandsSeparator); + \PHPExcel\Shared\String::setCurrencyCode($currencyCode); + \PHPExcel\Shared\String::setDecimalSeparator($decimalSeparator); + \PHPExcel\Shared\String::setThousandsSeparator($thousandsSeparator); - $cell = new PHPExcel_Cell(null, PHPExcel_Cell_DataType::TYPE_STRING, $sheet); + $cell = new \PHPExcel\Cell(null, \PHPExcel\Cell\DataType::TYPE_STRING, $sheet); - $binder = new PHPExcel_Cell_AdvancedValueBinder(); + $binder = new \PHPExcel\Cell\AdvancedValueBinder(); $binder->bindValue($cell, $value); $this->assertEquals($valueBinded, $cell->getValue()); } diff --git a/unitTests/bootstrap.php b/unitTests/bootstrap.php index 7525ea9e..c575eb63 100644 --- a/unitTests/bootstrap.php +++ b/unitTests/bootstrap.php @@ -17,7 +17,7 @@ date_default_timezone_set('Europe/London'); // Define path to application directory defined('APPLICATION_PATH') - || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../classes')); + || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../src')); // Define path to application tests directory defined('APPLICATION_TESTS_PATH') @@ -28,7 +28,7 @@ defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'ci'); // Ensure library/ is on include_path set_include_path(implode(PATH_SEPARATOR, array( - realpath(APPLICATION_PATH . '/../classes'), + realpath(APPLICATION_PATH . '/../src'), './', dirname(__FILE__), get_include_path(), diff --git a/unitTests/phpunit.xml b/unitTests/phpunit.xml index 81c7c9de..af201967 100644 --- a/unitTests/phpunit.xml +++ b/unitTests/phpunit.xml @@ -21,11 +21,11 @@ - ../classes + ../src - ../classes/src/Shared/PCLZip - ../classes/src/Shared/JAMA - ../classes/src/Writer/PDF + ../src/PhpSpreadsheet/Shared/PCLZip + ../src/PhpSpreadsheet/Shared/JAMA + ../src/PhpSpreadsheet/Writer/PDF