Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-10-26 07:56:07 +01:00
Code Issues Packages Projects Releases Activity

Fixed phpstan issues, composer update

Browse Source
This commit is contained in:
Matias Griese
2022-03-23 13:05:54 +02:00
parent c9271c80a7
commit 8f0443a73d
3 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
composer.lock generated
View File

@@ -730,16 +730,16 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "1.8.3", "version": "1.8.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85" "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
"reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -820,7 +820,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/1.8.3" "source": "https://github.com/guzzle/psr7/tree/1.8.5"
}, },
"funding": [ "funding": [
{ {
@@ -836,7 +836,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-10-05T13:56:00+00:00" "time": "2022-03-20T21:51:18+00:00"
}, },
{ {
"name": "itsgoingd/clockwork", "name": "itsgoingd/clockwork",
@@ -1230,16 +1230,16 @@
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
"version": "1.26.1", "version": "1.27.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Seldaek/monolog.git", "url": "https://github.com/Seldaek/monolog.git",
"reference": "c6b00f05152ae2c9b04a448f99c7590beb6042f5" "reference": "52ebd235c1f7e0d5e1b16464b695a28335f8e44a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/c6b00f05152ae2c9b04a448f99c7590beb6042f5", "url": "https://api.github.com/repos/Seldaek/monolog/zipball/52ebd235c1f7e0d5e1b16464b695a28335f8e44a",
"reference": "c6b00f05152ae2c9b04a448f99c7590beb6042f5", "reference": "52ebd235c1f7e0d5e1b16464b695a28335f8e44a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1300,7 +1300,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/Seldaek/monolog/issues", "issues": "https://github.com/Seldaek/monolog/issues",
"source": "https://github.com/Seldaek/monolog/tree/1.26.1" "source": "https://github.com/Seldaek/monolog/tree/1.27.0"
}, },
"funding": [ "funding": [
{ {
@@ -1312,7 +1312,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-05-28T08:32:12+00:00" "time": "2022-03-13T20:29:46+00:00"
}, },
{ {
"name": "multiavatar/multiavatar-php", "name": "multiavatar/multiavatar-php",
@@ -3491,16 +3491,16 @@
}, },
{ {
"name": "codeception/codeception", "name": "codeception/codeception",
"version": "4.1.30", "version": "4.1.31",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Codeception/Codeception.git", "url": "https://github.com/Codeception/Codeception.git",
"reference": "a035d77d070fa57fad438e07a65447aeca248c45" "reference": "15524571ae0686a7facc2eb1f40f600e5bbce9e5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Codeception/Codeception/zipball/a035d77d070fa57fad438e07a65447aeca248c45", "url": "https://api.github.com/repos/Codeception/Codeception/zipball/15524571ae0686a7facc2eb1f40f600e5bbce9e5",
"reference": "a035d77d070fa57fad438e07a65447aeca248c45", "reference": "15524571ae0686a7facc2eb1f40f600e5bbce9e5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3577,7 +3577,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/Codeception/Codeception/issues", "issues": "https://github.com/Codeception/Codeception/issues",
"source": "https://github.com/Codeception/Codeception/tree/4.1.30" "source": "https://github.com/Codeception/Codeception/tree/4.1.31"
}, },
"funding": [ "funding": [
{ {
@@ -3585,7 +3585,7 @@
"type": "open_collective" "type": "open_collective"
} }
], ],
"time": "2022-03-05T18:12:30+00:00" "time": "2022-03-13T17:07:08+00:00"
}, },
{ {
"name": "codeception/lib-asserts", "name": "codeception/lib-asserts",
@@ -4025,16 +4025,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "7.4.1", "version": "7.4.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79" "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4",
"reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79", "reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -4129,7 +4129,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/guzzle/issues", "issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.4.1" "source": "https://github.com/guzzle/guzzle/tree/7.4.2"
}, },
"funding": [ "funding": [
{ {
@@ -4145,7 +4145,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-12-06T18:43:05+00:00" "time": "2022-03-20T14:16:28+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
@@ -4686,16 +4686,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.4.8", "version": "1.4.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "2a6d6704b17c4db6190cc3104056c0aad740cb15" "reference": "898c479c39caa727bedf4311dd294a8f4e250e72"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/2a6d6704b17c4db6190cc3104056c0aad740cb15", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/898c479c39caa727bedf4311dd294a8f4e250e72",
"reference": "2a6d6704b17c4db6190cc3104056c0aad740cb15", "reference": "898c479c39caa727bedf4311dd294a8f4e250e72",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -4709,11 +4709,6 @@
"phpstan.phar" "phpstan.phar"
], ],
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
}
},
"autoload": { "autoload": {
"files": [ "files": [
"bootstrap.php" "bootstrap.php"
@@ -4726,7 +4721,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.4.8" "source": "https://github.com/phpstan/phpstan/tree/1.4.10"
}, },
"funding": [ "funding": [
{ {
@@ -4746,7 +4741,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-03-04T13:03:56+00:00" "time": "2022-03-14T10:25:45+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",
@@ -5118,16 +5113,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "9.5.18", "version": "9.5.19",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "1b5856028273bfd855e60a887278857d872ec67a" "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1b5856028273bfd855e60a887278857d872ec67a", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
"reference": "1b5856028273bfd855e60a887278857d872ec67a", "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -5157,7 +5152,7 @@
"sebastian/global-state": "^5.0.1", "sebastian/global-state": "^5.0.1",
"sebastian/object-enumerator": "^4.0.3", "sebastian/object-enumerator": "^4.0.3",
"sebastian/resource-operations": "^3.0.3", "sebastian/resource-operations": "^3.0.3",
"sebastian/type": "^2.3.4", "sebastian/type": "^3.0",
"sebastian/version": "^3.0.2" "sebastian/version": "^3.0.2"
}, },
"require-dev": { "require-dev": {
@@ -5205,7 +5200,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues", "issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.18" "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
}, },
"funding": [ "funding": [
{ {
@@ -5217,7 +5212,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-03-08T06:52:28+00:00" "time": "2022-03-15T09:57:31+00:00"
}, },
{ {
"name": "psr/http-client", "name": "psr/http-client",
@@ -6128,28 +6123,28 @@
}, },
{ {
"name": "sebastian/type", "name": "sebastian/type",
"version": "2.3.4", "version": "3.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/type.git", "url": "https://github.com/sebastianbergmann/type.git",
"reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914" "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914", "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
"reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914", "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.3" "php": ">=7.3"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^9.3" "phpunit/phpunit": "^9.5"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.3-dev" "dev-master": "3.0-dev"
} }
}, },
"autoload": { "autoload": {
@@ -6172,7 +6167,7 @@
"homepage": "https://github.com/sebastianbergmann/type", "homepage": "https://github.com/sebastianbergmann/type",
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/type/issues", "issues": "https://github.com/sebastianbergmann/type/issues",
"source": "https://github.com/sebastianbergmann/type/tree/2.3.4" "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
}, },
"funding": [ "funding": [
{ {
@@ -6180,7 +6175,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2021-06-15T12:49:02+00:00" "time": "2022-03-15T09:54:48+00:00"
}, },
{ {
"name": "sebastian/version", "name": "sebastian/version",

1
system/src/Grav/Common/Flex/Types/Pages/PageObject.php
View File

@@ -242,6 +242,7 @@ class PageObject extends FlexPageObject
{ {
/** @var PageCollection $siblings */ /** @var PageCollection $siblings */
$siblings = $variables['siblings']; $siblings = $variables['siblings'];
/** @var PageObject $sibling */
foreach ($siblings as $sibling) { foreach ($siblings as $sibling) {
$sibling->save(false); $sibling->save(false);
} }

6
system/src/Grav/Common/Twig/Extension/GravExtension.php
View File

@@ -550,9 +550,9 @@ class GravExtension extends AbstractExtension implements GlobalsInterface
} }
/** /**
* @param $str * @param string|mixed $str
* @param $search * @param string $search
* @param $replace * @param string $replace
* @return string|mixed * @return string|mixed
*/ */
public function replaceLastFilter($str, $search, $replace) public function replaceLastFilter($str, $search, $replace)