From ecc418d69d2758147d3af3c2cae8f07ba122c73e Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 26 Nov 2020 12:27:39 +0100
Subject: [PATCH] Update psalm
---
composer.json | 2 +-
composer.lock | 74 ++++++++++-----------------------------------------
2 files changed, 15 insertions(+), 61 deletions(-)
diff --git a/composer.json b/composer.json
index 7317451..8350be5 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
"phpstan/phpstan": "^0.12.33",
"phpstan/phpstan-phpunit": "^0.12.13",
"symfony/phpunit-bridge": "^4.4",
- "vimeo/psalm": "^3.12"
+ "vimeo/psalm": "^4.2.1"
},
"repositories": [
{
diff --git a/composer.lock b/composer.lock
index d0baed6..9adda81 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": "5227374a1466c1714c54f09ac009773a",
+ "content-hash": "caa98612a9be53306e841b43291445b7",
"packages": [
{
"name": "adldap2/adldap2",
@@ -8133,16 +8133,16 @@
},
{
"name": "vimeo/psalm",
- "version": "3.18.2",
+ "version": "4.2.1",
"source": {
"type": "git",
"url": "https://github.com/vimeo/psalm.git",
- "reference": "19aa905f7c3c7350569999a93c40ae91ae4e1626"
+ "reference": "ea9cb72143b77e7520c52fa37290bd8d8bc88fd9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vimeo/psalm/zipball/19aa905f7c3c7350569999a93c40ae91ae4e1626",
- "reference": "19aa905f7c3c7350569999a93c40ae91ae4e1626",
+ "url": "https://api.github.com/repos/vimeo/psalm/zipball/ea9cb72143b77e7520c52fa37290bd8d8bc88fd9",
+ "reference": "ea9cb72143b77e7520c52fa37290bd8d8bc88fd9",
"shasum": ""
},
"require": {
@@ -8161,12 +8161,11 @@
"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.* || ^4.8",
+ "nikic/php-parser": "^4.10.1",
"openlss/lib-array2xml": "^1.0",
- "php": "^7.1.3|^8",
+ "php": "^7.1|^8",
"sebastian/diff": "^3.0 || ^4.0",
"symfony/console": "^3.4.17 || ^4.1.6 || ^5.0",
- "webmozart/glob": "^4.1",
"webmozart/path-util": "^2.3"
},
"provide": {
@@ -8177,11 +8176,12 @@
"bamarni/composer-bin-plugin": "^1.2",
"brianium/paratest": "^4.0.0",
"ext-curl": "*",
- "phpdocumentor/reflection-docblock": "^4.3.4 || ^5",
+ "php": "^7.3|^8",
+ "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.11",
+ "phpunit/phpunit": "^9.0",
+ "psalm/plugin-phpunit": "^0.13",
"slevomat/coding-standard": "^5.0",
"squizlabs/php_codesniffer": "^3.5",
"symfony/process": "^4.3",
@@ -8200,7 +8200,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"
}
@@ -8229,54 +8230,7 @@
"inspection",
"php"
],
- "time": "2020-10-20T13:48:22+00:00"
- },
- {
- "name": "webmozart/glob",
- "version": "4.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/webmozart/glob.git",
- "reference": "3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/webmozart/glob/zipball/3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe",
- "reference": "3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe",
- "shasum": ""
- },
- "require": {
- "php": "^5.3.3|^7.0",
- "webmozart/path-util": "^2.2"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.6",
- "sebastian/version": "^1.0.1",
- "symfony/filesystem": "^2.5"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Webmozart\\Glob\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Bernhard Schussek",
- "email": "bschussek@gmail.com"
- }
- ],
- "description": "A PHP implementation of Ant's glob.",
- "time": "2015-12-29T11:14:33+00:00"
+ "time": "2020-11-20T14:56:53+00:00"
},
{
"name": "webmozart/path-util",
--
GitLab