Clientbase
/
Spreadsheet_Excel_Writer
mirror of https://github.com/basemaster/Spreadsheet_Excel_Writer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure traditional include-path-style class loading does not interfere with a working class autoloader

This commit is contained in:
Alexey Kopytko 2016-06-16 11:27:22 +09:00
parent 012389ee13
commit 3e8a35b81f
6 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Spreadsheet/Excel/Writer.php
View File

@ -31,8 +31,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
require_once 'PEAR.php'; if (!class_exists('Spreadsheet_Excel_Writer_Workbook')) {
require_once 'Spreadsheet/Excel/Writer/Workbook.php'; require_once 'Spreadsheet/Excel/Writer/Workbook.php';
}
/** /**
* Class for writing Excel Spreadsheets. This class should change COMPLETELY. * Class for writing Excel Spreadsheets. This class should change COMPLETELY.

4
Spreadsheet/Excel/Writer/BIFFwriter.php
View File

@ -32,7 +32,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
require_once 'PEAR.php'; if (!class_exists('PEAR')) {
require_once 'PEAR.php';
}
/** /**
* Class for writing Excel BIFF records. * Class for writing Excel BIFF records.

4
Spreadsheet/Excel/Writer/Format.php
View File

@ -32,7 +32,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
require_once 'PEAR.php'; if (!class_exists('PEAR')) {
require_once 'PEAR.php';
}
/** /**
* Class for generating Excel XF records (formats) * Class for generating Excel XF records (formats)

4
Spreadsheet/Excel/Writer/Parser.php
View File

@ -97,7 +97,9 @@ define('SPREADSHEET_EXCEL_WRITER_NE', "<>");
*/ */
define('SPREADSHEET_EXCEL_WRITER_CONCAT', "&"); define('SPREADSHEET_EXCEL_WRITER_CONCAT', "&");
require_once 'PEAR.php'; if (!class_exists('PEAR')) {
require_once 'PEAR.php';
}
/** /**
* Class for parsing Excel formulas * Class for parsing Excel formulas

24
Spreadsheet/Excel/Writer/Workbook.php
View File

@ -32,12 +32,20 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
require_once 'Spreadsheet/Excel/Writer/Format.php'; if (!class_exists('Spreadsheet_Excel_Writer_BIFFwriter')) {
require_once 'Spreadsheet/Excel/Writer/BIFFwriter.php'; require_once 'Spreadsheet/Excel/Writer/Format.php';
require_once 'Spreadsheet/Excel/Writer/Worksheet.php'; require_once 'Spreadsheet/Excel/Writer/BIFFwriter.php';
require_once 'Spreadsheet/Excel/Writer/Parser.php'; require_once 'Spreadsheet/Excel/Writer/Worksheet.php';
require_once 'OLE/PPS/Root.php'; require_once 'Spreadsheet/Excel/Writer/Parser.php';
require_once 'OLE/PPS/File.php'; }
if (!class_exists('OLE_PPS_Root')) {
require_once 'OLE/PPS/Root.php';
}
if (!class_exists('OLE_PPS_File')) {
require_once 'OLE/PPS/File.php';
}
/** /**
* Class for generating Excel Spreadsheets * Class for generating Excel Spreadsheets
@ -378,7 +386,9 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
*/ */
public function &addValidator() public function &addValidator()
{ {
include_once 'Spreadsheet/Excel/Writer/Validator.php'; if (!class_exists('Spreadsheet_Excel_Writer_Validator')) {
include_once 'Spreadsheet/Excel/Writer/Validator.php';
}
/* FIXME: check for successful inclusion*/ /* FIXME: check for successful inclusion*/
$valid = new Spreadsheet_Excel_Writer_Validator($this->_parser); $valid = new Spreadsheet_Excel_Writer_Validator($this->_parser);
return $valid; return $valid;

6
Spreadsheet/Excel/Writer/Worksheet.php
View File

@ -32,8 +32,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
require_once 'Spreadsheet/Excel/Writer/Parser.php'; if (!class_exists('Spreadsheet_Excel_Writer_BIFFwriter')) {
require_once 'Spreadsheet/Excel/Writer/BIFFwriter.php'; require_once 'Spreadsheet/Excel/Writer/Parser.php';
require_once 'Spreadsheet/Excel/Writer/BIFFwriter.php';
}
/** /**
* Class for generating Excel Spreadsheets * Class for generating Excel Spreadsheets