Skip to content

Commit

Permalink
Merge pull request #262 from ergebnis/dependabot/composer/vimeo/psalm…
Browse files Browse the repository at this point in the history
…-3.11.2

Build(deps-dev): Bump vimeo/psalm from 3.10.1 to 3.11.2
  • Loading branch information
localheinz committed Apr 19, 2020
2 parents e996395 + 1e1efd5 commit a511a51
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 39 deletions.
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -34,7 +34,7 @@
"phpstan/phpstan-strict-rules": "~0.12.2",
"phpunit/phpunit": "^7.5.20",
"psalm/plugin-phpunit": "~0.10.0",
"vimeo/psalm": "^3.10.1"
"vimeo/psalm": "^3.11.2"
},
"config": {
"platform": {
Expand Down
81 changes: 45 additions & 36 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions src/Vendor/Composer/PackageHashNormalizer.php
Expand Up @@ -53,6 +53,7 @@ public function normalize(Json $json): Json
}

foreach ($objectProperties as $name => $value) {
/** @var array<string, string> $packages */
$packages = (array) $decoded->{$name};

if (0 === \count($packages)) {
Expand All @@ -74,9 +75,9 @@ public function normalize(Json $json): Json
*
* @see https://github.com/composer/composer/blob/1.6.2/src/Composer/Json/JsonManipulator.php#L110-L146
*
* @param string[] $packages
* @param array<string, string> $packages
*
* @return string[]
* @return array<string, string>
*/
private static function sortPackages(array $packages): array
{
Expand Down

0 comments on commit a511a51

Please sign in to comment.