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

Merge branch 'master' into Named-Range-Alias-Cell-Collection

This commit is contained in:
Mark Baker 2022-05-01 22:09:26 +02:00 committed by GitHub
parent 4f7da29332 b38fa15c89
commit 9b99ebda27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 86 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -82,7 +82,7 @@
"dompdf/dompdf": "^1.0", "dompdf/dompdf": "^1.0",
"friendsofphp/php-cs-fixer": "^3.2", "friendsofphp/php-cs-fixer": "^3.2",
"jpgraph/jpgraph": "^4.0", "jpgraph/jpgraph": "^4.0",
"mpdf/mpdf": "8.0.17", "mpdf/mpdf": "8.1.1",
"phpcompatibility/php-compatibility": "^9.3", "phpcompatibility/php-compatibility": "^9.3",
"phpstan/phpstan": "^1.1", "phpstan/phpstan": "^1.1",
"phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-phpunit": "^1.0",

106
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "ed42c40a4281d97171980367f24d0a25", "content-hash": "2e09b120ad90fc0fbbc055e1f341910e",
"packages": [ "packages": [
{ {
"name": "ezyang/htmlpurifier", "name": "ezyang/htmlpurifier",
@ -1101,16 +1101,16 @@
}, },
{ {
"name": "dompdf/dompdf", "name": "dompdf/dompdf",
"version": "v1.2.1", "version": "v1.2.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/dompdf/dompdf.git", "url": "https://github.com/dompdf/dompdf.git",
"reference": "c6dfd9bb8b0040609f04754f729d4cb3016e0575" "reference": "5031045d9640b38cfc14aac9667470df09c9e090"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/dompdf/dompdf/zipball/c6dfd9bb8b0040609f04754f729d4cb3016e0575", "url": "https://api.github.com/repos/dompdf/dompdf/zipball/5031045d9640b38cfc14aac9667470df09c9e090",
"reference": "c6dfd9bb8b0040609f04754f729d4cb3016e0575", "reference": "5031045d9640b38cfc14aac9667470df09c9e090",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1121,6 +1121,8 @@
"php": "^7.1 || ^8.0" "php": "^7.1 || ^8.0"
}, },
"require-dev": { "require-dev": {
"ext-json": "*",
"ext-zip": "*",
"mockery/mockery": "^1.3", "mockery/mockery": "^1.3",
"phpunit/phpunit": "^7.5 || ^8 || ^9", "phpunit/phpunit": "^7.5 || ^8 || ^9",
"squizlabs/php_codesniffer": "^3.5" "squizlabs/php_codesniffer": "^3.5"
@ -1162,9 +1164,9 @@
"homepage": "https://github.com/dompdf/dompdf", "homepage": "https://github.com/dompdf/dompdf",
"support": { "support": {
"issues": "https://github.com/dompdf/dompdf/issues", "issues": "https://github.com/dompdf/dompdf/issues",
"source": "https://github.com/dompdf/dompdf/tree/v1.2.1" "source": "https://github.com/dompdf/dompdf/tree/v1.2.2"
}, },
"time": "2022-03-24T12:57:42+00:00" "time": "2022-04-27T13:50:54+00:00"
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
@ -1302,16 +1304,16 @@
}, },
{ {
"name": "mpdf/mpdf", "name": "mpdf/mpdf",
"version": "v8.0.17", "version": "v8.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mpdf/mpdf.git", "url": "https://github.com/mpdf/mpdf.git",
"reference": "5f64118317c8145c0abc606b310aa0a66808398a" "reference": "e511e89a66bdb066e3fbf352f00f4734d5064cbf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mpdf/mpdf/zipball/5f64118317c8145c0abc606b310aa0a66808398a", "url": "https://api.github.com/repos/mpdf/mpdf/zipball/e511e89a66bdb066e3fbf352f00f4734d5064cbf",
"reference": "5f64118317c8145c0abc606b310aa0a66808398a", "reference": "e511e89a66bdb066e3fbf352f00f4734d5064cbf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1320,6 +1322,8 @@
"myclabs/deep-copy": "^1.7", "myclabs/deep-copy": "^1.7",
"paragonie/random_compat": "^1.4|^2.0|^9.99.99", "paragonie/random_compat": "^1.4|^2.0|^9.99.99",
"php": "^5.6 || ^7.0 || ~8.0.0 || ~8.1.0", "php": "^5.6 || ^7.0 || ~8.0.0 || ~8.1.0",
"php-http/message-factory": "^1.0",
"psr/http-message": "^1.0",
"psr/log": "^1.0 || ^2.0", "psr/log": "^1.0 || ^2.0",
"setasign/fpdi": "^2.1" "setasign/fpdi": "^2.1"
}, },
@ -1373,7 +1377,7 @@
"type": "custom" "type": "custom"
} }
], ],
"time": "2022-01-20T10:51:40+00:00" "time": "2022-04-18T11:50:28+00:00"
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
@ -1793,6 +1797,60 @@
}, },
"time": "2020-10-14T08:32:19+00:00" "time": "2020-10-14T08:32:19+00:00"
}, },
{
"name": "php-http/message-factory",
"version": "v1.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-http/message-factory.git",
"reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1",
"reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1",
"shasum": ""
},
"require": {
"php": ">=5.4",
"psr/http-message": "^1.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": {
"psr-4": {
"Http\\Message\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Márk Sági-Kazár",
"email": "mark.sagikazar@gmail.com"
}
],
"description": "Factory interfaces for PSR-7 HTTP Message",
"homepage": "http://php-http.org",
"keywords": [
"factory",
"http",
"message",
"stream",
"uri"
],
"support": {
"issues": "https://github.com/php-http/message-factory/issues",
"source": "https://github.com/php-http/message-factory/tree/master"
},
"time": "2015-12-19T14:08:53+00:00"
},
{ {
"name": "phpcompatibility/php-compatibility", "name": "phpcompatibility/php-compatibility",
"version": "9.3.5", "version": "9.3.5",
@ -2084,16 +2142,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.5.4", "version": "1.6.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b" "reference": "6128620b98292e0b69ea6d799871d77163681c8e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/bbf68cae24f6dc023c607ea0f87da55dd9d55c2b", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6128620b98292e0b69ea6d799871d77163681c8e",
"reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b", "reference": "6128620b98292e0b69ea6d799871d77163681c8e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2119,7 +2177,7 @@
"description": "PHPStan - PHP Static Analysis Tool", "description": "PHPStan - PHP Static Analysis Tool",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/1.5.4" "source": "https://github.com/phpstan/phpstan/tree/1.6.3"
}, },
"funding": [ "funding": [
{ {
@ -2139,20 +2197,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-04-03T12:39:00+00:00" "time": "2022-04-28T11:27:53+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",
"version": "1.1.0", "version": "1.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git", "url": "https://github.com/phpstan/phpstan-phpunit.git",
"reference": "09133ce914f1388a8bb8c7f8573aaa3723cff52a" "reference": "4a3c437c09075736285d1cabb5c75bf27ed0bc84"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/09133ce914f1388a8bb8c7f8573aaa3723cff52a", "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/4a3c437c09075736285d1cabb5c75bf27ed0bc84",
"reference": "09133ce914f1388a8bb8c7f8573aaa3723cff52a", "reference": "4a3c437c09075736285d1cabb5c75bf27ed0bc84",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2189,9 +2247,9 @@
"description": "PHPUnit extensions and rules for PHPStan", "description": "PHPUnit extensions and rules for PHPStan",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues", "issues": "https://github.com/phpstan/phpstan-phpunit/issues",
"source": "https://github.com/phpstan/phpstan-phpunit/tree/1.1.0" "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.1.1"
}, },
"time": "2022-03-28T09:20:49+00:00" "time": "2022-04-20T15:24:25+00:00"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",

3
src/PhpSpreadsheet/Reader/Ods/Properties.php
View File

@ -26,10 +26,11 @@ class Properties
$this->setCoreProperties($docProps, $officePropertiesDC); $this->setCoreProperties($docProps, $officePropertiesDC);
} }
$officePropertyMeta = []; $officePropertyMeta = null;
if (isset($namespacesMeta['dc'])) { if (isset($namespacesMeta['dc'])) {
$officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']); $officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
} }
$officePropertyMeta = $officePropertyMeta ?? [];
foreach ($officePropertyMeta as $propertyName => $propertyValue) { foreach ($officePropertyMeta as $propertyName => $propertyValue) {
$this->setMetaProperties($namespacesMeta, $propertyValue, $propertyName, $docProps); $this->setMetaProperties($namespacesMeta, $propertyValue, $propertyName, $docProps);
} }

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

@ -99,7 +99,7 @@ class Properties
} }
/** /**
* @param array|false $array * @param null|array|false $array
* @param mixed $key * @param mixed $key
*/ */
private static function getArrayItem($array, $key = 0): ?SimpleXMLElement private static function getArrayItem($array, $key = 0): ?SimpleXMLElement