Add missing class properties (#241)

This commit is contained in:
Claudio Zizza 2017-10-08 06:18:39 +02:00 committed by Adrien Crivelli
parent 483f3c98ff
commit c9795e13b5
11 changed files with 497 additions and 375 deletions

View File

@ -212,7 +212,7 @@ class Axis extends Properties
*/ */
public function setAxisOrientation($orientation) public function setAxisOrientation($orientation)
{ {
$this->orientation = (string) $orientation; $this->axisOptions['orientation'] = (string) $orientation;
} }
/** /**

View File

@ -396,6 +396,16 @@ class Xls extends BaseReader implements IReader
*/ */
private $md5Ctxt; private $md5Ctxt;
/**
* @var int
*/
private $textObjRef;
/**
* @var string
*/
private $_baseCell;
/** /**
* Create a new Xls Reader instance. * Create a new Xls Reader instance.
*/ */

View File

@ -97,6 +97,13 @@ class OLE
*/ */
public $smallBlockSize; public $smallBlockSize;
/**
* Threshold for big blocks.
*
* @var int
*/
private $bigBlockThreshold;
/** /**
* Reads an OLE container from the contents of the file given. * Reads an OLE container from the contents of the file given.
* *
@ -299,7 +306,7 @@ class OLE
$type = self::_readInt1($fh); $type = self::_readInt1($fh);
switch ($type) { switch ($type) {
case self::OLE_PPS_TYPE_ROOT: case self::OLE_PPS_TYPE_ROOT:
$pps = new OLE\PPS_Root(null, null, []); $pps = new OLE\PPS\Root(null, null, []);
$this->root = $pps; $this->root = $pps;
break; break;

View File

@ -40,6 +40,26 @@ class Root extends PPS
*/ */
protected $tempDirectory; protected $tempDirectory;
/**
* @var resource
*/
private $_FILEH_;
/**
* @var string
*/
private $_tmp_filename;
/**
* @var int
*/
private $_SMALL_BLOCK_SIZE;
/**
* @var int
*/
private $_BIG_BLOCK_SIZE;
/** /**
* @param int $time_1st A timestamp * @param int $time_1st A timestamp
* @param int $time_2nd A timestamp * @param int $time_2nd A timestamp

View File

@ -38,6 +38,56 @@ class OLERead
public $summaryInformation; public $summaryInformation;
public $documentSummaryInformation; public $documentSummaryInformation;
/**
* @var int
*/
private $numBigBlockDepotBlocks;
/**
* @var int
*/
private $rootStartBlock;
/**
* @var int
*/
private $sbdStartBlock;
/**
* @var int
*/
private $extensionBlock;
/**
* @var int
*/
private $numExtensionBlocks;
/**
* @var string
*/
private $bigBlockChain;
/**
* @var string
*/
private $smallBlockChain;
/**
* @var string
*/
private $entry;
/**
* @var int
*/
private $rootentry;
/**
* @var array
*/
private $props = [];
/** /**
* Read the file. * Read the file.
* *

View File

@ -37,6 +37,11 @@ class Border extends Supervisor implements IComparable
*/ */
protected $color; protected $color;
/**
* @var int
*/
public $colorIndex;
/** /**
* Create a new Border. * Create a new Border.
* *

View File

@ -30,6 +30,16 @@ class Fill extends Supervisor implements IComparable
const FILL_PATTERN_LIGHTVERTICAL = 'lightVertical'; const FILL_PATTERN_LIGHTVERTICAL = 'lightVertical';
const FILL_PATTERN_MEDIUMGRAY = 'mediumGray'; const FILL_PATTERN_MEDIUMGRAY = 'mediumGray';
/**
* @var int
*/
public $startcolorIndex;
/**
* @var int
*/
public $endcolorIndex;
/** /**
* Fill type. * Fill type.
* *

View File

@ -77,6 +77,11 @@ class Font extends Supervisor implements IComparable
*/ */
protected $color; protected $color;
/**
* @var int
*/
public $colorIndex;
/** /**
* Create a new Font. * Create a new Font.
* *

View File

@ -89,6 +89,16 @@ class Xls extends BaseWriter implements IWriter
*/ */
private $documentSummaryInformation; private $documentSummaryInformation;
/**
* @var \PhpOffice\PhpSpreadsheet\Writer\Xls\Workbook
*/
private $writerWorkbook;
/**
* @var \PhpOffice\PhpSpreadsheet\Writer\Xls\Worksheet[]
*/
private $writerWorksheets;
/** /**
* Create a new Xls Writer. * Create a new Xls Writer.
* *

View File

@ -94,27 +94,11 @@ class Parser
public $references; public $references;
/** /**
* The class constructor. * The Excel ptg indices.
*
* @var array
*/ */
public function __construct() private $ptg = [
{
$this->currentCharacter = 0;
$this->currentToken = ''; // The token we are working on.
$this->formula = ''; // The formula to parse.
$this->lookAhead = ''; // The character ahead of the current char.
$this->parseTree = ''; // The parse tree to be generated.
$this->initializeHashes(); // Initialize the hashes: ptg's and function's ptg's
$this->externalSheets = [];
$this->references = [];
}
/**
* Initialize the ptg and function hashes.
*/
private function initializeHashes()
{
// The Excel ptg indices
$this->ptg = [
'ptgExp' => 0x01, 'ptgExp' => 0x01,
'ptgTbl' => 0x02, 'ptgTbl' => 0x02,
'ptgAdd' => 0x03, 'ptgAdd' => 0x03,
@ -212,20 +196,23 @@ class Parser
'ptgAreaErr3dA' => 0x7D, 'ptgAreaErr3dA' => 0x7D,
]; ];
// Thanks to Michael Meeks and Gnumeric for the initial arg values. /**
// * Thanks to Michael Meeks and Gnumeric for the initial arg values.
// The following hash was generated by "function_locale.pl" in the distro. *
// Refer to function_locale.pl for non-English function names. * The following hash was generated by "function_locale.pl" in the distro.
// * Refer to function_locale.pl for non-English function names.
// The array elements are as follow: *
// ptg: The Excel function ptg code. * The array elements are as follow:
// args: The number of arguments that the function takes: * ptg: The Excel function ptg code.
// >=0 is a fixed number of arguments. * args: The number of arguments that the function takes:
// -1 is a variable number of arguments. * >=0 is a fixed number of arguments.
// class: The reference, value or array class of the function args. * -1 is a variable number of arguments.
// vol: The function is volatile. * class: The reference, value or array class of the function args.
// * vol: The function is volatile.
$this->functions = [ *
* @var array
*/
private $functions = [
// function ptg args class vol // function ptg args class vol
'COUNT' => [0, -1, 0, 0], 'COUNT' => [0, -1, 0, 0],
'IF' => [1, -1, 1, 0], 'IF' => [1, -1, 1, 0],
@ -478,6 +465,19 @@ class Parser
'VARA' => [367, -1, 0, 0], 'VARA' => [367, -1, 0, 0],
'BAHTTEXT' => [368, 1, 0, 0], 'BAHTTEXT' => [368, 1, 0, 0],
]; ];
/**
* The class constructor.
*/
public function __construct()
{
$this->currentCharacter = 0;
$this->currentToken = ''; // The token we are working on.
$this->formula = ''; // The formula to parse.
$this->lookAhead = ''; // The character ahead of the current char.
$this->parseTree = ''; // The parse tree to be generated.
$this->externalSheets = [];
$this->references = [];
} }
/** /**

View File

@ -18,6 +18,11 @@ class Chart extends WriterPart
{ {
protected $calculateCellValues; protected $calculateCellValues;
/**
* @var int
*/
private $_seriesIndex;
/** /**
* Write charts to XML format. * Write charts to XML format.
* *