alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve test code (#1002) 

* Enhancements suggested by scrutiniser

* Styling
This commit is contained in:
Mark Baker 2019-06-10 01:48:06 +02:00 committed by GitHub
parent d6018a273e
commit dd656b4c53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
samples/Autofilter/10_Autofilter_selection_1.php
View File

@ -52,25 +52,25 @@ $row = 2;
foreach ($years as $year) {
foreach ($periods as $period) {
foreach ($countries as $country) {
$endDays = date('t', mktime(0, 0, 0, $period, 1, $year));
$endDays = date('t', mktime(0, 0, 0, $period, 1, (int) $year));
for ($i = 1; $i <= $endDays; ++$i) {
$eDate = Date::formattedPHPToExcel(
$year,
$period,
$i
);
$value = rand(500, 1000) * (1 + rand(-0.25, +0.25));
$value = rand(500, 1000) * (1 + (rand(-1, 1) / 4));
$salesValue = $invoiceValue = null;
$incomeOrExpenditure = rand(-1, 1);
if ($incomeOrExpenditure == -1) {
$expenditure = rand(-500, -1000) * (1 + rand(-0.25, +0.25));
$expenditure = rand(-500, -1000) * (1 + (rand(-1, 1) / 4));
$income = null;
} elseif ($incomeOrExpenditure == 1) {
$expenditure = rand(-500, -1000) * (1 + rand(-0.25, +0.25));
$income = rand(500, 1000) * (1 + rand(-0.25, +0.25));
$expenditure = rand(-500, -1000) * (1 + (rand(-1, 1) / 4));
$income = rand(500, 1000) * (1 + (rand(-1, 1) / 4));
} else {
$expenditure = null;
$income = rand(500, 1000) * (1 + rand(-0.25, +0.25));
$income = rand(500, 1000) * (1 + (rand(-1, 1) / 4));
}
$dataArray = [$year,
$period,

10
samples/Autofilter/10_Autofilter_selection_2.php
View File

@ -52,25 +52,25 @@ $row = 2;
foreach ($years as $year) {
foreach ($periods as $period) {
foreach ($countries as $country) {
$endDays = date('t', mktime(0, 0, 0, $period, 1, $year));
$endDays = date('t', mktime(0, 0, 0, $period, 1, (int) $year));
for ($i = 1; $i <= $endDays; ++$i) {
$eDate = Date::formattedPHPToExcel(
$year,
$period,
$i
);
$value = rand(500, 1000) * (1 + rand(-0.25, +0.25));
$value = rand(500, 1000) * (1 + (rand(-1, 1) / 4));
$salesValue = $invoiceValue = null;
$incomeOrExpenditure = rand(-1, 1);
if ($incomeOrExpenditure == -1) {
$expenditure = rand(-500, -1000) * (1 + rand(-0.25, +0.25));
$expenditure = rand(-500, -1000) * (1 + (rand(-1, 1) / 4));
$income = null;
} elseif ($incomeOrExpenditure == 1) {
$expenditure = rand(-500, -1000) * (1 + rand(-0.25, +0.25));
$expenditure = rand(-500, -1000) * (1 + (rand(-1, 1) / 4));
$income = rand(500, 1000) * (1 + rand(-0.25, +0.25));
} else {
$expenditure = null;
$income = rand(500, 1000) * (1 + rand(-0.25, +0.25));
$income = rand(500, 1000) * (1 + (rand(-1, 1) / 4));
}
$dataArray = [$year,
$period,

12
samples/Autofilter/10_Autofilter_selection_display.php
View File

@ -52,25 +52,25 @@ $row = 2;
foreach ($years as $year) {
foreach ($periods as $period) {
foreach ($countries as $country) {
$endDays = date('t', mktime(0, 0, 0, $period, 1, $year));
$endDays = date('t', mktime(0, 0, 0, $period, 1, (int) $year));
for ($i = 1; $i <= $endDays; ++$i) {
$eDate = Date::formattedPHPToExcel(
$year,
$period,
$i
);
$value = rand(500, 1000) * (1 + rand(-0.25, +0.25));
$value = rand(500, 1000) * (1 + (rand(-1, 1) / 4));
$salesValue = $invoiceValue = null;
$incomeOrExpenditure = rand(-1, 1);
if ($incomeOrExpenditure == -1) {
$expenditure = rand(-500, -1000) * (1 + rand(-0.25, +0.25));
$expenditure = rand(-500, -1000) * (1 + (rand(-1, 1) / 4));
$income = null;
} elseif ($incomeOrExpenditure == 1) {
$expenditure = rand(-500, -1000) * (1 + rand(-0.25, +0.25));
$income = rand(500, 1000) * (1 + rand(-0.25, +0.25));
$expenditure = rand(-500, -1000) * (1 + (rand(-1, 1) / 4));
$income = rand(500, 1000) * (1 + (rand(-1, 1) / 4));
} else {
$expenditure = null;
$income = rand(500, 1000) * (1 + rand(-0.25, +0.25));
$income = rand(500, 1000) * (1 + (rand(-1, 1) / 4));
}
$dataArray = [$year,
$period,

5
src/PhpSpreadsheet/Reader/BaseReader.php
View File

@ -55,6 +55,11 @@ abstract class BaseReader implements IReader
*/
protected $securityScanner;
public function __construct()
{
$this->readFilter = new DefaultReadFilter();
}
/**
* Read data only?
* If this is true, then the Reader will only read data values for cells, it will not read any formatting information.

2
src/PhpSpreadsheet/Reader/Csv.php
View File

@ -62,7 +62,7 @@ class Csv extends BaseReader
*/
public function __construct()
{
$this->readFilter = new DefaultReadFilter();
parent::__construct();
}
/**

2
src/PhpSpreadsheet/Reader/Gnumeric.php
View File

@ -36,7 +36,7 @@ class Gnumeric extends BaseReader
*/
public function __construct()
{
$this->readFilter = new DefaultReadFilter();
parent::__construct();
$this->referenceHelper = ReferenceHelper::getInstance();
$this->securityScanner = XmlScanner::getInstance($this);
}

2
src/PhpSpreadsheet/Reader/Html.php
View File

@ -128,7 +128,7 @@ class Html extends BaseReader
*/
public function __construct()
{
$this->readFilter = new DefaultReadFilter();
parent::__construct();
$this->securityScanner = XmlScanner::getInstance($this);
}

2
src/PhpSpreadsheet/Reader/Ods.php
View File

@ -25,7 +25,7 @@ class Ods extends BaseReader
*/
public function __construct()
{
$this->readFilter = new DefaultReadFilter();
parent::__construct();
$this->securityScanner = XmlScanner::getInstance($this);
}

2
src/PhpSpreadsheet/Reader/Slk.php
View File

@ -43,7 +43,7 @@ class Slk extends BaseReader
*/
public function __construct()
{
$this->readFilter = new DefaultReadFilter();
parent::__construct();
}
/**

2
src/PhpSpreadsheet/Reader/Xls.php
View File

@ -412,7 +412,7 @@ class Xls extends BaseReader
*/
public function __construct()
{
$this->readFilter = new DefaultReadFilter();
parent::__construct();
}
/**

2
src/PhpSpreadsheet/Reader/Xlsx.php
View File

@ -52,7 +52,7 @@ class Xlsx extends BaseReader
*/
public function __construct()
{
$this->readFilter = new DefaultReadFilter();
parent::__construct();
$this->referenceHelper = ReferenceHelper::getInstance();
$this->securityScanner = XmlScanner::getInstance($this);
}

2
src/PhpSpreadsheet/Reader/Xml.php
View File

@ -41,7 +41,7 @@ class Xml extends BaseReader
*/
public function __construct()
{
$this->readFilter = new DefaultReadFilter();
parent::__construct();
$this->securityScanner = XmlScanner::getInstance($this);
}