Clientbase
/
PhpSpreadsheet
mirror of https://github.com/basemaster/PhpSpreadsheet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sync composer.lock (#3075) 

When I cloned this morning, composer gave me a message that the lock file was not up to date with the latest changes in composer.json. I do not understand why, but it suggested to run `composer update`, which I did. This led to a handful of problems with php-cs-fixer, all fixed with changes to doc-blocks, and phpstan (only Writer/Xls/Worksheet required a change to code). We would presumably have had these problems at the start of next month when dependabot did its thing, so fix them now.
This commit is contained in:
oleibman 2022-09-20 08:37:00 -07:00 committed by GitHub
parent a2b2984104
commit 53e0828d49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 87 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "9a7fc81b4223c114749fc07401fb4b6f",
"content-hash": "5062910e2e463ba84b1c753c58624ca9",
"packages": [
{
"name": "ezyang/htmlpurifier",
@ -1194,16 +1194,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v3.10.0",
"version": "v3.11.0",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe"
"reference": "7dcdea3f2f5f473464e835be9be55283ff8cfdc3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe",
"reference": "76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/7dcdea3f2f5f473464e835be9be55283ff8cfdc3",
"reference": "7dcdea3f2f5f473464e835be9be55283ff8cfdc3",
"shasum": ""
},
"require": {
@ -1271,7 +1271,7 @@
"description": "A tool to automatically fix PHP code style",
"support": {
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
"source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.10.0"
"source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.11.0"
},
"funding": [
{
@ -1279,7 +1279,7 @@
"type": "github"
}
],
"time": "2022-08-17T22:13:10+00:00"
"time": "2022-09-01T18:24:51+00:00"
},
{
"name": "masterminds/html5",
@ -1534,16 +1534,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.14.0",
"version": "v4.15.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
"reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
"reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
"reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
"shasum": ""
},
"require": {
@ -1584,9 +1584,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0"
"source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
},
"time": "2022-05-31T20:59:12+00:00"
"time": "2022-09-04T07:30:47+00:00"
},
{
"name": "paragonie/random_compat",
@ -1957,16 +1957,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.8.2",
"version": "1.8.5",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c"
"reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/c53312ecc575caf07b0e90dee43883fdf90ca67c",
"reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6598a5ff12ca4499a836815e08b4d77a2ddeb20",
"reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20",
"shasum": ""
},
"require": {
@ -1990,9 +1990,13 @@
"MIT"
],
"description": "PHPStan - PHP Static Analysis Tool",
"keywords": [
"dev",
"static analysis"
],
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/1.8.2"
"source": "https://github.com/phpstan/phpstan/tree/1.8.5"
},
"funding": [
{
@ -2003,16 +2007,12 @@
"url": "https://github.com/phpstan",
"type": "github"
},
{
"url": "https://www.patreon.com/phpstan",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
"type": "tidelift"
}
],
"time": "2022-07-20T09:57:31+00:00"
"time": "2022-09-07T16:05:32+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
@ -2068,16 +2068,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "9.2.16",
"version": "9.2.17",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "2593003befdcc10db5e213f9f28814f5aa8ac073"
"reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2593003befdcc10db5e213f9f28814f5aa8ac073",
"reference": "2593003befdcc10db5e213f9f28814f5aa8ac073",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
"reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
"shasum": ""
},
"require": {
@ -2133,7 +2133,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.16"
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
},
"funding": [
{
@ -2141,7 +2141,7 @@
"type": "github"
}
],
"time": "2022-08-20T05:26:47+00:00"
"time": "2022-08-30T12:24:04+00:00"
},
{
"name": "phpunit/php-file-iterator",
@ -2386,16 +2386,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.5.23",
"version": "9.5.24",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "888556852e7e9bbeeedb9656afe46118765ade34"
"reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/888556852e7e9bbeeedb9656afe46118765ade34",
"reference": "888556852e7e9bbeeedb9656afe46118765ade34",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
"reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
"shasum": ""
},
"require": {
@ -2424,7 +2424,7 @@
"sebastian/global-state": "^5.0.1",
"sebastian/object-enumerator": "^4.0.3",
"sebastian/resource-operations": "^3.0.3",
"sebastian/type": "^3.0",
"sebastian/type": "^3.1",
"sebastian/version": "^3.0.2"
},
"suggest": {
@ -2468,7 +2468,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.23"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24"
},
"funding": [
{
@ -2480,7 +2480,7 @@
"type": "github"
}
],
"time": "2022-08-22T14:01:36+00:00"
"time": "2022-08-30T07:42:16+00:00"
},
{
"name": "psr/cache",
@ -2901,16 +2901,16 @@
},
{
"name": "sebastian/comparator",
"version": "4.0.6",
"version": "4.0.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
"reference": "55f4261989e546dc112258c7a75935a81a7ce382"
"reference": "fa0f136dd2334583309d32b62544682ee972b51a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
"reference": "55f4261989e546dc112258c7a75935a81a7ce382",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
"reference": "fa0f136dd2334583309d32b62544682ee972b51a",
"shasum": ""
},
"require": {
@ -2963,7 +2963,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/comparator/issues",
"source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
"source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
},
"funding": [
{
@ -2971,7 +2971,7 @@
"type": "github"
}
],
"time": "2020-10-26T15:49:45+00:00"
"time": "2022-09-14T12:41:17+00:00"
},
{
"name": "sebastian/complexity",
@ -3161,16 +3161,16 @@
},
{
"name": "sebastian/exporter",
"version": "4.0.4",
"version": "4.0.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
"reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
"reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
"reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
"reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
"shasum": ""
},
"require": {
@ -3226,7 +3226,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/exporter/issues",
"source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
"source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
},
"funding": [
{
@ -3234,7 +3234,7 @@
"type": "github"
}
],
"time": "2021-11-11T14:18:36+00:00"
"time": "2022-09-14T06:03:37+00:00"
},
{
"name": "sebastian/global-state",
@ -3589,16 +3589,16 @@
},
{
"name": "sebastian/type",
"version": "3.0.0",
"version": "3.2.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/type.git",
"reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
"reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
"reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
"url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
"reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
"shasum": ""
},
"require": {
@ -3610,7 +3610,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.0-dev"
"dev-master": "3.2-dev"
}
},
"autoload": {
@ -3633,7 +3633,7 @@
"homepage": "https://github.com/sebastianbergmann/type",
"support": {
"issues": "https://github.com/sebastianbergmann/type/issues",
"source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
"source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
},
"funding": [
{
@ -3641,7 +3641,7 @@
"type": "github"
}
],
"time": "2022-03-15T09:54:48+00:00"
"time": "2022-09-12T14:47:03+00:00"
},
{
"name": "sebastian/version",
@ -3826,16 +3826,16 @@
},
{
"name": "symfony/console",
"version": "v5.4.11",
"version": "v5.4.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "535846c7ee6bc4dd027ca0d93220601456734b10"
"reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/535846c7ee6bc4dd027ca0d93220601456734b10",
"reference": "535846c7ee6bc4dd027ca0d93220601456734b10",
"url": "https://api.github.com/repos/symfony/console/zipball/c072aa8f724c3af64e2c7a96b796a4863d24dba1",
"reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1",
"shasum": ""
},
"require": {
@ -3905,7 +3905,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v5.4.11"
"source": "https://github.com/symfony/console/tree/v5.4.12"
},
"funding": [
{
@ -3921,7 +3921,7 @@
"type": "tidelift"
}
],
"time": "2022-07-22T10:42:43+00:00"
"time": "2022-08-17T13:18:05+00:00"
},
{
"name": "symfony/deprecation-contracts",
@ -4156,16 +4156,16 @@
},
{
"name": "symfony/filesystem",
"version": "v5.4.11",
"version": "v5.4.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd"
"reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/6699fb0228d1bc35b12aed6dd5e7455457609ddd",
"reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/2d67c1f9a1937406a9be3171b4b22250c0a11447",
"reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447",
"shasum": ""
},
"require": {
@ -4200,7 +4200,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/filesystem/tree/v5.4.11"
"source": "https://github.com/symfony/filesystem/tree/v5.4.12"
},
"funding": [
{
@ -4216,7 +4216,7 @@
"type": "tidelift"
}
],
"time": "2022-07-20T13:00:38+00:00"
"time": "2022-08-02T13:48:16+00:00"
},
{
"name": "symfony/finder",
@ -5047,16 +5047,16 @@
},
{
"name": "symfony/string",
"version": "v5.4.11",
"version": "v5.4.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322"
"reference": "2fc515e512d721bf31ea76bd02fe23ada4640058"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/5eb661e49ad389e4ae2b6e4df8d783a8a6548322",
"reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322",
"url": "https://api.github.com/repos/symfony/string/zipball/2fc515e512d721bf31ea76bd02fe23ada4640058",
"reference": "2fc515e512d721bf31ea76bd02fe23ada4640058",
"shasum": ""
},
"require": {
@ -5113,7 +5113,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v5.4.11"
"source": "https://github.com/symfony/string/tree/v5.4.12"
},
"funding": [
{
@ -5129,7 +5129,7 @@
"type": "tidelift"
}
],
"time": "2022-07-24T16:15:25+00:00"
"time": "2022-08-12T17:03:11+00:00"
},
{
"name": "tecnickcom/tcpdf",

2
phpstan-baseline.neon
View File

@ -2912,7 +2912,7 @@ parameters:
-
message: "#^Cannot access offset 1 on array\\|false\\.$#"
count: 2
count: 1
path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
-

2
src/PhpSpreadsheet/Calculation/Information/Value.php
View File

@ -240,7 +240,7 @@ class Value
*
* @param null|mixed $value The value you want converted
*
* @return number N converts values listed in the following table
* @return number|string N converts values listed in the following table
* If value is or refers to N returns
* A number That number value
* A date The Excel serialized number of that date

10
src/PhpSpreadsheet/Cell/Cell.php
View File

@ -313,8 +313,6 @@ class Cell
* Set old calculated value (cached).
*
* @param mixed $originalValue Value
*
* @return Cell
*/
public function setCalculatedValue($originalValue): self
{
@ -352,8 +350,6 @@ class Cell
* Set cell data type.
*
* @param string $dataType see DataType::TYPE_*
*
* @return Cell
*/
public function setDataType($dataType): self
{
@ -447,8 +443,6 @@ class Cell
/**
* Set Hyperlink.
*
* @return Cell
*/
public function setHyperlink(?Hyperlink $hyperlink = null): self
{
@ -556,8 +550,6 @@ class Cell
/**
* Re-bind parent.
*
* @return Cell
*/
public function rebindParent(Worksheet $parent): self
{
@ -650,8 +642,6 @@ class Cell
/**
* Set index to cellXf.
*
* @return Cell
*/
public function setXfIndex(int $indexValue): self
{

2
src/PhpSpreadsheet/Style/Color.php
View File

@ -387,8 +387,6 @@ class Color extends Supervisor
* @param int $colorIndex Index entry point into the colour array
* @param bool $background Flag to indicate whether default background or foreground colour
* should be returned if the indexed colour doesn't exist
*
* @return Color
*/
public static function indexedColor($colorIndex, $background = false, ?array $palette = null): self
{

1
src/PhpSpreadsheet/Worksheet/CellIterator.php
View File

@ -8,6 +8,7 @@ use PhpOffice\PhpSpreadsheet\Collection\Cells;
/**
* @template TKey
*
* @implements Iterator<TKey, Cell>
*/
abstract class CellIterator implements Iterator

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

@ -732,7 +732,6 @@ class Xls extends BaseWriter
} elseif ($dataProp['type']['data'] == 0x1E) { // null-terminated string prepended by dword string length
// Null-terminated string
$dataProp['data']['data'] .= chr(0);
// @phpstan-ignore-next-line
++$dataProp['data']['length'];
// Complete the string with null string for being a %4
$dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4) == 4 ? 0 : (4 - $dataProp['data']['length'] % 4));
@ -750,7 +749,6 @@ class Xls extends BaseWriter
} else {
$dataSection_Content .= $dataProp['data']['data'];
// @phpstan-ignore-next-line
$dataSection_Content_Offset += 4 + $dataProp['data']['length'];
}
}

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

@ -2405,10 +2405,12 @@ class Worksheet extends BIFFwriter
for ($i = 0; $i < $width; ++$i) {
/** @phpstan-ignore-next-line */
$color = imagecolorsforindex($image, imagecolorat($image, $i, $j));
foreach (['red', 'green', 'blue'] as $key) {
$color[$key] = $color[$key] + (int) round((255 - $color[$key]) * $color['alpha'] / 127);
if ($color !== false) {
foreach (['red', 'green', 'blue'] as $key) {
$color[$key] = $color[$key] + (int) round((255 - $color[$key]) * $color['alpha'] / 127);
}
$data .= chr($color['blue']) . chr($color['green']) . chr($color['red']);
}
$data .= chr($color['blue']) . chr($color['green']) . chr($color['red']);
}
if (3 * $width % 4) {
$data .= str_repeat("\x00", 4 - 3 * $width % 4);

1
tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FormulaTextTest.php
View File

@ -11,6 +11,7 @@ class FormulaTextTest extends AllSetupTeardown
{
/**
* @param mixed $value
*
* @dataProvider providerFormulaText
*/
public function testFormulaText(string $expectedResult, $value): void

2
tests/PhpSpreadsheetTests/Helper/SampleTest.php
View File

@ -9,7 +9,9 @@ class SampleTest extends TestCase
{
/**
* @runInSeparateProcess
*
* @preserveGlobalState disabled
*
* @dataProvider providerSample
*/
public function testSample(string $sample): void

3
tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php
View File

@ -31,6 +31,7 @@ class WorksheetTest extends TestCase
/**
* @param string $title
* @param string $expectMessage
*
* @dataProvider setTitleInvalidProvider
*/
public function testSetTitleInvalid($title, $expectMessage): void
@ -89,6 +90,7 @@ class WorksheetTest extends TestCase
/**
* @param string $codeName
* @param string $expectMessage
*
* @dataProvider setCodeNameInvalidProvider
*/
public function testSetCodeNameInvalid($codeName, $expectMessage): void
@ -153,6 +155,7 @@ class WorksheetTest extends TestCase
* @param string $expectTitle
* @param string $expectCell
* @param string $expectCell2
*
* @dataProvider extractSheetTitleProvider
*/
public function testExtractSheetTitle($range, $expectTitle, $expectCell, $expectCell2): void