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

Update PHP dependencies to fix security issues 

This fix CVE-2013-5958 and also
1861e33fe0
This commit is contained in:
Adrien Crivelli 2018-11-11 18:21:31 +11:00
parent b3877e59e4
commit 2fce5c4706
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
4 changed files with 505 additions and 537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1029
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

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

@ -1106,7 +1106,7 @@ class Xlsx extends BaseReader
], ],
(string) $dateGroupItem['dateTimeGrouping'] (string) $dateGroupItem['dateTimeGrouping']
) )
->setRuleType(Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP); ->setRuleType(Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP);
} }
} }
// Check for custom filters // Check for custom filters
@ -1123,7 +1123,7 @@ class Xlsx extends BaseReader
(string) $filterRule['operator'], (string) $filterRule['operator'],
(string) $filterRule['val'] (string) $filterRule['val']
) )
->setRuleType(Column\Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER); ->setRuleType(Column\Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER);
} }
} }
// Check for dynamic filters // Check for dynamic filters
@ -1137,7 +1137,7 @@ class Xlsx extends BaseReader
(string) $filterRule['val'], (string) $filterRule['val'],
(string) $filterRule['type'] (string) $filterRule['type']
) )
->setRuleType(Column\Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER); ->setRuleType(Column\Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
if (isset($filterRule['val'])) { if (isset($filterRule['val'])) {
$column->setAttribute('val', (string) $filterRule['val']); $column->setAttribute('val', (string) $filterRule['val']);
} }
@ -1162,7 +1162,7 @@ class Xlsx extends BaseReader
: Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM : Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM
) )
) )
->setRuleType(Column\Rule::AUTOFILTER_RULETYPE_TOPTENFILTER); ->setRuleType(Column\Rule::AUTOFILTER_RULETYPE_TOPTENFILTER);
} }
} }
} }

4
src/PhpSpreadsheet/Writer/Xls/Worksheet.php
View File

@ -1082,11 +1082,11 @@ class Worksheet extends BIFFwriter
$link_type = pack('V', $link_type); $link_type = pack('V', $link_type);
// Calculate the up-level dir count e.g.. (..\..\..\ == 3) // Calculate the up-level dir count e.g.. (..\..\..\ == 3)
$up_count = preg_match_all("/\\.\\.\\\/", $dir_long, $useless); $up_count = preg_match_all('/\\.\\.\\\\/', $dir_long, $useless);
$up_count = pack('v', $up_count); $up_count = pack('v', $up_count);
// Store the short dos dir name (null terminated) // Store the short dos dir name (null terminated)
$dir_short = preg_replace("/\\.\\.\\\/", '', $dir_long) . "\0"; $dir_short = preg_replace('/\\.\\.\\\\/', '', $dir_long) . "\0";
// Store the long dir name as a wchar string (non-null terminated) // Store the long dir name as a wchar string (non-null terminated)
$dir_long = $dir_long . "\0"; $dir_long = $dir_long . "\0";

1
tests/PhpSpreadsheetTests/Calculation/TextDataTest.php
View File

@ -2,7 +2,6 @@
namespace PhpOffice\PhpSpreadsheetTests\Calculation; namespace PhpOffice\PhpSpreadsheetTests\Calculation;
use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
use PhpOffice\PhpSpreadsheet\Calculation\Functions; use PhpOffice\PhpSpreadsheet\Calculation\Functions;
use PhpOffice\PhpSpreadsheet\Calculation\TextData; use PhpOffice\PhpSpreadsheet\Calculation\TextData;
use PhpOffice\PhpSpreadsheet\Shared\StringHelper; use PhpOffice\PhpSpreadsheet\Shared\StringHelper;