Upgrad PHP deps

This commit is contained in:
Adrien Crivelli 2020-06-28 16:29:13 +09:00
parent 65a94abeca
commit 321dfc7a3d
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
7 changed files with 535 additions and 367 deletions

View File

@ -53,10 +53,10 @@
"ext-xmlwriter": "*", "ext-xmlwriter": "*",
"ext-zip": "*", "ext-zip": "*",
"ext-zlib": "*", "ext-zlib": "*",
"maennchen/zipstream-php": "^2.1",
"markbaker/complex": "^1.4", "markbaker/complex": "^1.4",
"markbaker/matrix": "^1.2", "markbaker/matrix": "^1.2",
"psr/simple-cache": "^1.0", "psr/simple-cache": "^1.0"
"maennchen/zipstream-php": "^2.0"
}, },
"require-dev": { "require-dev": {
"dompdf/dompdf": "^0.8.5", "dompdf/dompdf": "^0.8.5",

886
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -219,9 +219,11 @@ class JpGraph implements IRenderer
break; break;
case 't': case 't':
$this->graph->legend->SetPos(0.5, 0.01, 'center', 'top'); // top $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top'); // top
break; break;
case 'b': case 'b':
$this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); // bottom $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); // bottom
break; break;
default: default:
$this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); // top-right $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); // top-right

View File

@ -4944,6 +4944,7 @@ class Xls extends BaseReader
// offset: var; size: $sz1; formula data for first condition (without size field) // offset: var; size: $sz1; formula data for first condition (without size field)
$formula1 = substr($recordData, $offset, $sz1); $formula1 = substr($recordData, $offset, $sz1);
$formula1 = pack('v', $sz1) . $formula1; // prepend the length $formula1 = pack('v', $sz1) . $formula1; // prepend the length
try { try {
$formula1 = $this->getFormulaFromStructure($formula1); $formula1 = $this->getFormulaFromStructure($formula1);
@ -4966,6 +4967,7 @@ class Xls extends BaseReader
// offset: var; size: $sz2; formula data for second condition (without size field) // offset: var; size: $sz2; formula data for second condition (without size field)
$formula2 = substr($recordData, $offset, $sz2); $formula2 = substr($recordData, $offset, $sz2);
$formula2 = pack('v', $sz2) . $formula2; // prepend the length $formula2 = pack('v', $sz2) . $formula2; // prepend the length
try { try {
$formula2 = $this->getFormulaFromStructure($formula2); $formula2 = $this->getFormulaFromStructure($formula2);
} catch (PhpSpreadsheetException $e) { } catch (PhpSpreadsheetException $e) {
@ -5763,6 +5765,7 @@ class Xls extends BaseReader
$size = 9; $size = 9;
$data = self::extractNumber(substr($formulaData, 1)); $data = self::extractNumber(substr($formulaData, 1));
$data = str_replace(',', '.', (string) $data); // in case non-English locale $data = str_replace(',', '.', (string) $data); // in case non-English locale
break; break;
case 0x20: // array constant case 0x20: // array constant
case 0x40: case 0x40:

View File

@ -318,21 +318,25 @@ class Font
// value 8.26 was found via interpolation by inspecting real Excel files with Calibri 11 font. // value 8.26 was found via interpolation by inspecting real Excel files with Calibri 11 font.
$columnWidth = (int) (8.26 * StringHelper::countCharacters($columnText)); $columnWidth = (int) (8.26 * StringHelper::countCharacters($columnText));
$columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size $columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size
break; break;
case 'Arial': case 'Arial':
// value 8 was set because of experience in different exports at Arial 10 font. // value 8 was set because of experience in different exports at Arial 10 font.
$columnWidth = (int) (8 * StringHelper::countCharacters($columnText)); $columnWidth = (int) (8 * StringHelper::countCharacters($columnText));
$columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size $columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
break; break;
case 'Verdana': case 'Verdana':
// value 8 was found via interpolation by inspecting real Excel files with Verdana 10 font. // value 8 was found via interpolation by inspecting real Excel files with Verdana 10 font.
$columnWidth = (int) (8 * StringHelper::countCharacters($columnText)); $columnWidth = (int) (8 * StringHelper::countCharacters($columnText));
$columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size $columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
break; break;
default: default:
// just assume Calibri // just assume Calibri
$columnWidth = (int) (8.26 * StringHelper::countCharacters($columnText)); $columnWidth = (int) (8.26 * StringHelper::countCharacters($columnText));
$columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size $columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size
break; break;
} }

View File

@ -192,6 +192,7 @@ class PPS
. pack('V', isset($this->startBlock) ? $this->startBlock : 0) // 120 . pack('V', isset($this->startBlock) ? $this->startBlock : 0) // 120
. pack('V', $this->Size) // 124 . pack('V', $this->Size) // 124
. pack('V', 0); // 128 . pack('V', 0); // 128
return $ret; return $ret;
} }

View File

@ -1250,6 +1250,7 @@ class Parser
throw new WriterException("')' token expected."); throw new WriterException("')' token expected.");
} }
$this->advance(); // eat the ")" $this->advance(); // eat the ")"
return $result; return $result;
} }
// if it's a reference // if it's a reference
@ -1350,6 +1351,7 @@ class Parser
$result = $this->createTree($function, $result, $num_args); $result = $this->createTree($function, $result, $num_args);
$this->advance(); // eat the ")" $this->advance(); // eat the ")"
return $result; return $result;
} }