Dependabot Updates 20230801 (#3667)

Combine updates to phpunit, php-cs-fixer, and phpstan in one package, with some source changes due to phpstan.
This commit is contained in:
oleibman
2023-08-01 10:27:26 -07:00
committed by GitHub
parent d6e2e242ad
commit 3400110e24
3 changed files with 33 additions and 32 deletions
Generated
+18 -17
View File
@@ -1239,16 +1239,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v3.20.0",
"version": "v3.22.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "0e8249e0b15e2bc022fbbd1090ce29d071481e69"
"reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/0e8249e0b15e2bc022fbbd1090ce29d071481e69",
"reference": "0e8249e0b15e2bc022fbbd1090ce29d071481e69",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/92b019f6c8d79aa26349d0db7671d37440dc0ff3",
"reference": "92b019f6c8d79aa26349d0db7671d37440dc0ff3",
"shasum": ""
},
"require": {
@@ -1272,6 +1272,7 @@
"symfony/stopwatch": "^5.4 || ^6.0"
},
"require-dev": {
"facile-it/paraunit": "^1.3 || ^2.0",
"justinrainbow/json-schema": "^5.2",
"keradus/cli-executor": "^2.0",
"mikey179/vfsstream": "^1.6.11",
@@ -1323,7 +1324,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.20.0"
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.22.0"
},
"funding": [
{
@@ -1331,7 +1332,7 @@
"type": "github"
}
],
"time": "2023-06-27T20:22:39+00:00"
"time": "2023-07-16T23:08:06+00:00"
},
{
"name": "masterminds/html5",
@@ -1999,16 +2000,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.10.22",
"version": "1.10.26",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "97d694dfd4ceb57bcce4e3b38548f13ea62e4287"
"reference": "5d660cbb7e1b89253a47147ae44044f49832351f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/97d694dfd4ceb57bcce4e3b38548f13ea62e4287",
"reference": "97d694dfd4ceb57bcce4e3b38548f13ea62e4287",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/5d660cbb7e1b89253a47147ae44044f49832351f",
"reference": "5d660cbb7e1b89253a47147ae44044f49832351f",
"shasum": ""
},
"require": {
@@ -2057,7 +2058,7 @@
"type": "tidelift"
}
],
"time": "2023-06-30T20:04:11+00:00"
"time": "2023-07-19T12:44:37+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
@@ -2431,16 +2432,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.6.9",
"version": "9.6.10",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "a9aceaf20a682aeacf28d582654a1670d8826778"
"reference": "a6d351645c3fe5a30f5e86be6577d946af65a328"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778",
"reference": "a9aceaf20a682aeacf28d582654a1670d8826778",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328",
"reference": "a6d351645c3fe5a30f5e86be6577d946af65a328",
"shasum": ""
},
"require": {
@@ -2514,7 +2515,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.10"
},
"funding": [
{
@@ -2530,7 +2531,7 @@
"type": "tidelift"
}
],
"time": "2023-06-11T06:13:56+00:00"
"time": "2023-07-10T04:04:23+00:00"
},
{
"name": "psr/cache",
+7 -7
View File
@@ -292,11 +292,11 @@ class Ods extends BaseReader
Settings::getLibXmlLoaderOptions()
);
$officeNs = $dom->lookupNamespaceUri('office');
$tableNs = $dom->lookupNamespaceUri('table');
$textNs = $dom->lookupNamespaceUri('text');
$xlinkNs = $dom->lookupNamespaceUri('xlink');
$styleNs = $dom->lookupNamespaceUri('style');
$officeNs = (string) $dom->lookupNamespaceUri('office');
$tableNs = (string) $dom->lookupNamespaceUri('table');
$textNs = (string) $dom->lookupNamespaceUri('text');
$xlinkNs = (string) $dom->lookupNamespaceUri('xlink');
$styleNs = (string) $dom->lookupNamespaceUri('style');
$pageSettings->readStyleCrossReferences($dom);
@@ -668,9 +668,9 @@ class Ods extends BaseReader
Settings::getLibXmlLoaderOptions()
);
//$xlinkNs = $dom->lookupNamespaceUri('xlink');
$configNs = $dom->lookupNamespaceUri('config');
$configNs = (string) $dom->lookupNamespaceUri('config');
//$oooNs = $dom->lookupNamespaceUri('ooo');
$officeNs = $dom->lookupNamespaceUri('office');
$officeNs = (string) $dom->lookupNamespaceUri('office');
$settings = $dom->getElementsByTagNameNS($officeNs, 'settings')
->item(0);
if ($settings !== null) {
@@ -11,22 +11,22 @@ class PageSettings
/**
* @var string
*/
private $officeNs;
private $officeNs = '';
/**
* @var string
*/
private $stylesNs;
private $stylesNs = '';
/**
* @var string
*/
private $stylesFo;
private $stylesFo = '';
/**
* @var string
*/
private $tableNs;
private $tableNs = '';
/**
* @var string[]
@@ -55,10 +55,10 @@ class PageSettings
private function setDomNameSpaces(DOMDocument $styleDom): void
{
$this->officeNs = $styleDom->lookupNamespaceUri('office');
$this->stylesNs = $styleDom->lookupNamespaceUri('style');
$this->stylesFo = $styleDom->lookupNamespaceUri('fo');
$this->tableNs = $styleDom->lookupNamespaceUri('table');
$this->officeNs = (string) $styleDom->lookupNamespaceUri('office');
$this->stylesNs = (string) $styleDom->lookupNamespaceUri('style');
$this->stylesFo = (string) $styleDom->lookupNamespaceUri('fo');
$this->tableNs = (string) $styleDom->lookupNamespaceUri('table');
}
private function readPageSettingStyles(DOMDocument $styleDom): void