From ccb73a965ff857906cfc0f91eb92515f96b82698 Mon Sep 17 00:00:00 2001 From: Marco Perone Date: Tue, 20 Oct 2020 17:00:57 +0200 Subject: [PATCH 1/2] upgrade psalm version to 4.0.1 --- composer.json | 2 +- composer.lock | 86 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 65 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index b46f720..67615b4 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "ext-json": "*", "composer-plugin-api": "^2.0.0", "ocramius/package-versions": "^1.9.0", - "vimeo/psalm": "^3.13.1" + "vimeo/psalm": "^4.0.1" }, "require-dev": { "composer/composer": "^2.0.0@alpha", diff --git a/composer.lock b/composer.lock index 36c1971..cbf1880 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": "071405caa6d3defb06edc8ebbdc6337b", + "content-hash": "ad9ca984d21c4f81efe283821b0eca34", "packages": [ { "name": "amphp/amp", @@ -383,6 +383,43 @@ ], "time": "2020-06-04T11:16:35+00:00" }, + { + "name": "dnoegel/php-xdg-base-dir", + "version": "v0.1.1", + "source": { + "type": "git", + "url": "https://github.com/dnoegel/php-xdg-base-dir.git", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35" + }, + "type": "library", + "autoload": { + "psr-4": { + "XdgBaseDir\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "implementation of xdg base directory specification for php", + "support": { + "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", + "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" + }, + "time": "2019-12-04T15:06:13+00:00" + }, { "name": "felixfbecker/advanced-json-rpc", "version": "v3.1.1", @@ -532,16 +569,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.6.0", + "version": "v4.10.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "c346bbfafe2ff60680258b631afb730d186ed864" + "reference": "658f1be311a230e0907f5dfe0213742aff0596de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c346bbfafe2ff60680258b631afb730d186ed864", - "reference": "c346bbfafe2ff60680258b631afb730d186ed864", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/658f1be311a230e0907f5dfe0213742aff0596de", + "reference": "658f1be311a230e0907f5dfe0213742aff0596de", "shasum": "" }, "require": { @@ -549,8 +586,8 @@ "php": ">=7.0" }, "require-dev": { - "ircmaxell/php-yacc": "0.0.5", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -558,7 +595,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.9-dev" } }, "autoload": { @@ -582,9 +619,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.6.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.2" }, - "time": "2020-07-02T17:12:47+00:00" + "time": "2020-09-26T10:30:38+00:00" }, { "name": "openlss/lib-array2xml", @@ -1717,16 +1754,16 @@ }, { "name": "vimeo/psalm", - "version": "3.13.1", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "afd8874a9e4562eac42a02de90e42e430c3a1db1" + "reference": "b1e2e30026936ef8d5bf6a354d1c3959b6231f44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/afd8874a9e4562eac42a02de90e42e430c3a1db1", - "reference": "afd8874a9e4562eac42a02de90e42e430c3a1db1", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/b1e2e30026936ef8d5bf6a354d1c3959b6231f44", + "reference": "b1e2e30026936ef8d5bf6a354d1c3959b6231f44", "shasum": "" }, "require": { @@ -1735,17 +1772,19 @@ "composer/package-versions-deprecated": "^1.8.0", "composer/semver": "^1.4 || ^2.0 || ^3.0", "composer/xdebug-handler": "^1.1", + "dnoegel/php-xdg-base-dir": "^0.1.1", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", + "ext-mbstring": "*", "ext-simplexml": "*", "ext-tokenizer": "*", "felixfbecker/advanced-json-rpc": "^3.0.3", "felixfbecker/language-server-protocol": "^1.4", "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0", - "nikic/php-parser": "4.3.* || 4.4.* || 4.5.* || 4.6.*", + "nikic/php-parser": "^4.10.1", "openlss/lib-array2xml": "^1.0", - "php": "^7.1.3|^8", + "php": "^7.3|^8", "sebastian/diff": "^3.0 || ^4.0", "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0", "webmozart/glob": "^4.1", @@ -1759,13 +1798,15 @@ "bamarni/composer-bin-plugin": "^1.2", "brianium/paratest": "^4.0.0", "ext-curl": "*", + "phpdocumentor/reflection-docblock": "^5", "phpmyadmin/sql-parser": "5.1.0", "phpspec/prophecy": ">=1.9.0", - "phpunit/phpunit": "^7.5.16 || ^8.5 || ^9.0", - "psalm/plugin-phpunit": "^0.10", + "phpunit/phpunit": "^9.0", + "psalm/plugin-phpunit": "^0.13", "slevomat/coding-standard": "^5.0", "squizlabs/php_codesniffer": "^3.5", - "symfony/process": "^4.3" + "symfony/process": "^4.3", + "weirdan/prophecy-shim": "^1.0 || ^2.0" }, "suggest": { "ext-igbinary": "^2.0.5" @@ -1780,7 +1821,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev", + "dev-master": "4.x-dev", + "dev-3.x": "3.x-dev", "dev-2.x": "2.x-dev", "dev-1.x": "1.x-dev" } @@ -1811,9 +1853,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/3.13.1" + "source": "https://github.com/vimeo/psalm/tree/4.0.1" }, - "time": "2020-07-30T19:42:34+00:00" + "time": "2020-10-20T13:40:17+00:00" }, { "name": "webmozart/assert", From 11498a393d6f401eff875750db3d491737fbdf20 Mon Sep 17 00:00:00 2001 From: Marco Perone Date: Tue, 20 Oct 2020 17:10:42 +0200 Subject: [PATCH 2/2] suppress Psalm errors on overriding Psalm\Config constructor --- psalm.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/psalm.xml b/psalm.xml index 43d6a89..136934e 100644 --- a/psalm.xml +++ b/psalm.xml @@ -33,5 +33,15 @@ + + + + + + + + + +