diff --git a/composer.json b/composer.json index 8a79e833..98e7ebb5 100644 --- a/composer.json +++ b/composer.json @@ -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": { diff --git a/composer.lock b/composer.lock index 2e3998c8..d45b1c96 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "97050be8ffb5c90399d72b186d9574e6", + "content-hash": "ccb89033e9890967dace6c9f21427e46", "packages": [ { "name": "ergebnis/json-printer", @@ -132,16 +132,16 @@ "packages-dev": [ { "name": "amphp/amp", - "version": "v2.4.1", + "version": "v2.4.2", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "2ac3b550c4997f2ec304faa63c8b2885079a2dc4" + "reference": "feca077369a47263b22156b3c6389e55f3809f24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/2ac3b550c4997f2ec304faa63c8b2885079a2dc4", - "reference": "2ac3b550c4997f2ec304faa63c8b2885079a2dc4", + "url": "https://api.github.com/repos/amphp/amp/zipball/feca077369a47263b22156b3c6389e55f3809f24", + "reference": "feca077369a47263b22156b3c6389e55f3809f24", "shasum": "" }, "require": { @@ -151,14 +151,15 @@ "amphp/php-cs-fixer-config": "dev-master", "amphp/phpunit-util": "^1", "ext-json": "*", - "phpstan/phpstan": "^0.8.5", + "jetbrains/phpstorm-stubs": "^2019.3", "phpunit/phpunit": "^6.0.9 | ^7", - "react/promise": "^2" + "react/promise": "^2", + "vimeo/psalm": "^3.9@dev" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -205,20 +206,20 @@ "non-blocking", "promise" ], - "time": "2020-02-10T18:10:57+00:00" + "time": "2020-04-04T15:05:26+00:00" }, { "name": "amphp/byte-stream", - "version": "v1.7.2", + "version": "v1.7.3", "source": { "type": "git", "url": "https://github.com/amphp/byte-stream.git", - "reference": "1e52f1752b2e20e2a7e464476ef887a2388e3832" + "reference": "b867505edb79dda8f253ca3c3a2bbadae4b16592" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/1e52f1752b2e20e2a7e464476ef887a2388e3832", - "reference": "1e52f1752b2e20e2a7e464476ef887a2388e3832", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/b867505edb79dda8f253ca3c3a2bbadae4b16592", + "reference": "b867505edb79dda8f253ca3c3a2bbadae4b16592", "shasum": "" }, "require": { @@ -228,10 +229,16 @@ "amphp/php-cs-fixer-config": "dev-master", "amphp/phpunit-util": "^1", "friendsofphp/php-cs-fixer": "^2.3", - "infection/infection": "^0.9.3", - "phpunit/phpunit": "^6" + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^6 || ^7 || ^8", + "vimeo/psalm": "^3.9@dev" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, "autoload": { "psr-4": { "Amp\\ByteStream\\": "lib" @@ -264,7 +271,7 @@ "non-blocking", "stream" ], - "time": "2020-01-29T18:22:23+00:00" + "time": "2020-04-04T16:56:54+00:00" }, { "name": "composer/ca-bundle", @@ -1337,16 +1344,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v1.6.0", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06" + "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06", - "reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/e0f1e33a71587aca81be5cffbb9746510e1fe04e", + "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e", "shasum": "" }, "require": { @@ -1357,8 +1364,8 @@ "php": ">=5.6" }, "require-dev": { - "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4", - "squizlabs/php_codesniffer": "~1.5" + "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4 || ~7.0", + "squizlabs/php_codesniffer": "~3.5" }, "type": "library", "autoload": { @@ -1379,20 +1386,20 @@ } ], "description": "Map nested JSON structures onto PHP classes", - "time": "2019-08-15T19:41:25+00:00" + "time": "2020-04-16T18:48:43+00:00" }, { "name": "nikic/php-parser", - "version": "v4.3.0", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc" + "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc", - "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120", + "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120", "shasum": "" }, "require": { @@ -1431,7 +1438,7 @@ "parser", "php" ], - "time": "2019-11-08T13:50:10+00:00" + "time": "2020-04-10T16:34:50+00:00" }, { "name": "ocramius/package-versions", @@ -4310,16 +4317,16 @@ }, { "name": "vimeo/psalm", - "version": "3.10.1", + "version": "3.11.2", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "eeed5ecccc10131397f0eb7ee6da810c0be3a7fc" + "reference": "d470903722cfcbc1cd04744c5491d3e6d13ec3d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/eeed5ecccc10131397f0eb7ee6da810c0be3a7fc", - "reference": "eeed5ecccc10131397f0eb7ee6da810c0be3a7fc", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/d470903722cfcbc1cd04744c5491d3e6d13ec3d9", + "reference": "d470903722cfcbc1cd04744c5491d3e6d13ec3d9", "shasum": "" }, "require": { @@ -4334,7 +4341,7 @@ "ext-tokenizer": "*", "felixfbecker/advanced-json-rpc": "^3.0.3", "felixfbecker/language-server-protocol": "^1.4", - "netresearch/jsonmapper": "^1.0", + "netresearch/jsonmapper": "^1.0 || ^2.0", "nikic/php-parser": "^4.3", "ocramius/package-versions": "^1.2", "openlss/lib-array2xml": "^1.0", @@ -4348,13 +4355,15 @@ "psalm/psalm": "self.version" }, "require-dev": { + "amphp/amp": "^2.4.2", "bamarni/composer-bin-plugin": "^1.2", "brianium/paratest": "^4.0.0", "ext-curl": "*", + "php-coveralls/php-coveralls": "^2.2", "phpmyadmin/sql-parser": "5.1.0", "phpspec/prophecy": ">=1.9.0", - "phpunit/phpunit": "^7.5.16 || ^8.5", - "psalm/plugin-phpunit": "^0.9", + "phpunit/phpunit": "^7.5.16 || ^8.5 || ^9.0", + "psalm/plugin-phpunit": "^0.10", "slevomat/coding-standard": "^5.0", "squizlabs/php_codesniffer": "^3.5", "symfony/process": "^4.3" @@ -4402,7 +4411,7 @@ "inspection", "php" ], - "time": "2020-03-23T11:40:30+00:00" + "time": "2020-04-13T12:47:11+00:00" }, { "name": "webmozart/assert", diff --git a/src/Vendor/Composer/PackageHashNormalizer.php b/src/Vendor/Composer/PackageHashNormalizer.php index 0ca46e2f..727cc2ca 100644 --- a/src/Vendor/Composer/PackageHashNormalizer.php +++ b/src/Vendor/Composer/PackageHashNormalizer.php @@ -53,6 +53,7 @@ public function normalize(Json $json): Json } foreach ($objectProperties as $name => $value) { + /** @var array $packages */ $packages = (array) $decoded->{$name}; if (0 === \count($packages)) { @@ -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 $packages * - * @return string[] + * @return array */ private static function sortPackages(array $packages): array {