bump PHPSpreadsheet major version (#5040)
This commit is contained in:
@@ -42,7 +42,7 @@
|
||||
"nelmio/cors-bundle": "^2.0",
|
||||
"onelogin/php-saml": "^4.0",
|
||||
"pagerfanta/pagerfanta": "^3.0",
|
||||
"phpoffice/phpspreadsheet": "^1.16",
|
||||
"phpoffice/phpspreadsheet": "^2.0",
|
||||
"phpoffice/phpword": "^1.0",
|
||||
"psr/container": "^2.0",
|
||||
"psr/log": "^3.0",
|
||||
|
||||
482
composer.lock
generated
482
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -18,17 +18,7 @@ use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
|
||||
|
||||
final class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder
|
||||
{
|
||||
/**
|
||||
* Bind value to a cell.
|
||||
*
|
||||
* @param Cell $cell Cell to bind value to
|
||||
* @param mixed $value Value to bind in cell
|
||||
*
|
||||
* @throws \PhpOffice\PhpSpreadsheet\Exception
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function bindValue(Cell $cell, $value = null)
|
||||
public function bindValue(Cell $cell, mixed $value): bool
|
||||
{
|
||||
if (\is_string($value)) {
|
||||
$value = StringHelper::sanitizeUTF8($value);
|
||||
@@ -44,7 +34,7 @@ final class AdvancedValueBinder extends DefaultValueBinder implements IValueBind
|
||||
|
||||
$amount = substr_count($value, "\n");
|
||||
$dimension = $cell->getWorksheet()->getRowDimension($cell->getRow());
|
||||
if ($dimension->getRowHeight() !== -1) {
|
||||
if ($dimension->getRowHeight() !== -1.0) {
|
||||
$defaultHeight = $cell->getWorksheet()->getDefaultRowDimension()->getRowHeight();
|
||||
$dimension->setRowHeight($defaultHeight * ($amount + 1));
|
||||
}
|
||||
|
||||
@@ -99,9 +99,6 @@
|
||||
"erusev/parsedown": {
|
||||
"version": "1.6.4"
|
||||
},
|
||||
"ezyang/htmlpurifier": {
|
||||
"version": "v4.13.0"
|
||||
},
|
||||
"fakerphp/faker": {
|
||||
"version": "v1.15.0"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user