Renamed old-style constructors

This commit is contained in:
Alexey Kopytko 2016-06-16 11:41:45 +09:00
parent 2cfd980499
commit 0da21c8611
7 changed files with 10 additions and 10 deletions

View File

@ -51,10 +51,10 @@ class Spreadsheet_Excel_Writer extends Spreadsheet_Excel_Writer_Workbook
* @param string $filename The optional filename for the Workbook. * @param string $filename The optional filename for the Workbook.
* @return Spreadsheet_Excel_Writer_Workbook The Workbook created * @return Spreadsheet_Excel_Writer_Workbook The Workbook created
*/ */
function Spreadsheet_Excel_Writer($filename = '') function __construct($filename = '')
{ {
$this->_filename = $filename; $this->_filename = $filename;
$this->Spreadsheet_Excel_Writer_Workbook($filename); parent::__construct($filename);
} }
/** /**

View File

@ -103,7 +103,7 @@ class Spreadsheet_Excel_Writer_BIFFwriter extends PEAR
* *
* @access public * @access public
*/ */
public function Spreadsheet_Excel_Writer_BIFFwriter() public function __construct()
{ {
$this->_byte_order = ''; $this->_byte_order = '';
$this->_data = ''; $this->_data = '';

View File

@ -251,7 +251,7 @@ class Spreadsheet_Excel_Writer_Format extends PEAR
* @param integer $index the XF index for the format. * @param integer $index the XF index for the format.
* @param array $properties array with properties to be set on initialization. * @param array $properties array with properties to be set on initialization.
*/ */
public function Spreadsheet_Excel_Writer_Format($BIFF_version, $index = 0, $properties = array()) public function __construct($BIFF_version, $index = 0, $properties = array())
{ {
$this->_xf_index = $index; $this->_xf_index = $index;
$this->_BIFF_version = $BIFF_version; $this->_BIFF_version = $BIFF_version;

View File

@ -171,7 +171,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
* @param integer $byte_order The byte order (Little endian or Big endian) of the architecture * @param integer $byte_order The byte order (Little endian or Big endian) of the architecture
(optional). 1 => big endian, 0 (default) little endian. (optional). 1 => big endian, 0 (default) little endian.
*/ */
public function Spreadsheet_Excel_Writer_Parser($byte_order, $biff_version) public function __construct($byte_order, $biff_version)
{ {
$this->_current_char = 0; $this->_current_char = 0;
$this->_BIFF_version = $biff_version; $this->_BIFF_version = $biff_version;

View File

@ -67,7 +67,7 @@ class Spreadsheet_Excel_Writer_Validator
*/ */
public $_parser; public $_parser;
public function Spreadsheet_Excel_Writer_Validator(&$parser) public function __construct(&$parser)
{ {
$this->_parser = $parser; $this->_parser = $parser;
$this->_type = 0x01; // FIXME: add method for setting datatype $this->_type = 0x01; // FIXME: add method for setting datatype

View File

@ -182,10 +182,10 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
* @param string filename for storing the workbook. "-" for writing to stdout. * @param string filename for storing the workbook. "-" for writing to stdout.
* @access public * @access public
*/ */
public function Spreadsheet_Excel_Writer_Workbook($filename) public function __construct($filename)
{ {
// It needs to call its parent's constructor explicitly // It needs to call its parent's constructor explicitly
$this->Spreadsheet_Excel_Writer_BIFFwriter(); parent::__construct();
$this->_filename = $filename; $this->_filename = $filename;
$this->_parser = new Spreadsheet_Excel_Writer_Parser($this->_byte_order, $this->_BIFF_version); $this->_parser = new Spreadsheet_Excel_Writer_Parser($this->_byte_order, $this->_BIFF_version);

View File

@ -387,7 +387,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
* @param string $tmp_dir The path to the directory for temporary files * @param string $tmp_dir The path to the directory for temporary files
* @access private * @access private
*/ */
public function Spreadsheet_Excel_Writer_Worksheet($BIFF_version, $name, public function __construct($BIFF_version, $name,
$index, &$activesheet, $index, &$activesheet,
&$firstsheet, &$str_total, &$firstsheet, &$str_total,
&$str_unique, &$str_table, &$str_unique, &$str_table,
@ -395,7 +395,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
$tmp_dir) $tmp_dir)
{ {
// It needs to call its parent's constructor explicitly // It needs to call its parent's constructor explicitly
$this->Spreadsheet_Excel_Writer_BIFFwriter(); parent::__construct();
$this->_BIFF_version = $BIFF_version; $this->_BIFF_version = $BIFF_version;
$rowmax = 65536; // 16384 in Excel 5 $rowmax = 65536; // 16384 in Excel 5
$colmax = 256; $colmax = 256;