diff --git a/composer.json b/composer.json
index edbdc5d23..579da7a47 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,7 @@
"roave/security-advisories": "dev-master",
"symfony/css-selector": "~4.0",
"symfony/dom-crawler": "~4.0",
- "vimeo/psalm": "~2.0"
+ "vimeo/psalm": "~3.0"
},
"suggest": {
"ext-apcu": "*"
diff --git a/composer.lock b/composer.lock
index 85840449a..1342e5101 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "7ad461aab7fb870894af46cb8d74b4ad",
+ "content-hash": "a15166ced7e0b716976ee6e7215b0881",
"packages": [
{
"name": "aws/aws-sdk-php",
@@ -7677,6 +7677,141 @@
}
],
"packages-dev": [
+ {
+ "name": "amphp/amp",
+ "version": "v2.1.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/amphp/amp.git",
+ "reference": "7075ef7d74dbd32626bfd31c976b23055c3ade6a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/amphp/amp/zipball/7075ef7d74dbd32626bfd31c976b23055c3ade6a",
+ "reference": "7075ef7d74dbd32626bfd31c976b23055c3ade6a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7"
+ },
+ "require-dev": {
+ "amphp/phpunit-util": "^1",
+ "friendsofphp/php-cs-fixer": "^2.3",
+ "phpstan/phpstan": "^0.8.5",
+ "phpunit/phpunit": "^6.0.9",
+ "react/promise": "^2"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Amp\\": "lib"
+ },
+ "files": [
+ "lib/functions.php",
+ "lib/Internal/functions.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Bob Weinand",
+ "email": "bobwei9@hotmail.com"
+ },
+ {
+ "name": "Niklas Keller",
+ "email": "me@kelunik.com"
+ },
+ {
+ "name": "Daniel Lowrey",
+ "email": "rdlowrey@php.net"
+ },
+ {
+ "name": "Aaron Piotrowski",
+ "email": "aaron@trowski.com"
+ }
+ ],
+ "description": "A non-blocking concurrency framework for PHP applications.",
+ "homepage": "http://amphp.org/amp",
+ "keywords": [
+ "async",
+ "asynchronous",
+ "awaitable",
+ "concurrency",
+ "event",
+ "event-loop",
+ "future",
+ "non-blocking",
+ "promise"
+ ],
+ "time": "2018-12-11T10:31:37+00:00"
+ },
+ {
+ "name": "amphp/byte-stream",
+ "version": "v1.5.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/amphp/byte-stream.git",
+ "reference": "6bbfcb6f47e92577e739586ba0c87e867be70a23"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/amphp/byte-stream/zipball/6bbfcb6f47e92577e739586ba0c87e867be70a23",
+ "reference": "6bbfcb6f47e92577e739586ba0c87e867be70a23",
+ "shasum": ""
+ },
+ "require": {
+ "amphp/amp": "^2"
+ },
+ "require-dev": {
+ "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"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Amp\\ByteStream\\": "lib"
+ },
+ "files": [
+ "lib/functions.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Niklas Keller",
+ "email": "me@kelunik.com"
+ },
+ {
+ "name": "Aaron Piotrowski",
+ "email": "aaron@trowski.com"
+ }
+ ],
+ "description": "A stream abstraction to make working with non-blocking I/O simple.",
+ "homepage": "http://amphp.org/byte-stream",
+ "keywords": [
+ "amp",
+ "amphp",
+ "async",
+ "io",
+ "non-blocking",
+ "stream"
+ ],
+ "time": "2018-12-27T18:08:06+00:00"
+ },
{
"name": "barryvdh/laravel-debugbar",
"version": "v3.2.2",
@@ -7941,6 +8076,94 @@
],
"time": "2018-05-16T17:37:13+00:00"
},
+ {
+ "name": "felixfbecker/advanced-json-rpc",
+ "version": "v3.0.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
+ "reference": "241c470695366e7b83672be04ea0e64d8085a551"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/241c470695366e7b83672be04ea0e64d8085a551",
+ "reference": "241c470695366e7b83672be04ea0e64d8085a551",
+ "shasum": ""
+ },
+ "require": {
+ "netresearch/jsonmapper": "^1.0",
+ "php": ">=7.0",
+ "phpdocumentor/reflection-docblock": "^4.0.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^6.0.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "AdvancedJsonRpc\\": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "ISC"
+ ],
+ "authors": [
+ {
+ "name": "Felix Becker",
+ "email": "felix.b@outlook.com"
+ }
+ ],
+ "description": "A more advanced JSONRPC implementation",
+ "time": "2018-09-10T08:58:41+00:00"
+ },
+ {
+ "name": "felixfbecker/language-server-protocol",
+ "version": "v1.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
+ "reference": "1bdd1bcc95428edf85ec04c7b558d0886c07280f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/1bdd1bcc95428edf85ec04c7b558d0886c07280f",
+ "reference": "1bdd1bcc95428edf85ec04c7b558d0886c07280f",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.0"
+ },
+ "require-dev": {
+ "phpstan/phpstan": "*",
+ "phpunit/phpunit": "^6.3",
+ "squizlabs/php_codesniffer": "^3.1"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "LanguageServerProtocol\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "ISC"
+ ],
+ "authors": [
+ {
+ "name": "Felix Becker",
+ "email": "felix.b@outlook.com"
+ }
+ ],
+ "description": "PHP classes for the Language Server Protocol",
+ "keywords": [
+ "language",
+ "microsoft",
+ "php",
+ "server"
+ ],
+ "time": "2018-09-25T11:42:25+00:00"
+ },
{
"name": "filp/whoops",
"version": "2.3.1",
@@ -8530,6 +8753,48 @@
],
"time": "2018-06-11T23:09:50+00:00"
},
+ {
+ "name": "netresearch/jsonmapper",
+ "version": "v1.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/cweiske/jsonmapper.git",
+ "reference": "3868fe1128ce1169228acdb623359dca74db5ef3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/3868fe1128ce1169228acdb623359dca74db5ef3",
+ "reference": "3868fe1128ce1169228acdb623359dca74db5ef3",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4",
+ "squizlabs/php_codesniffer": "~1.5"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "JsonMapper": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "OSL-3.0"
+ ],
+ "authors": [
+ {
+ "name": "Christian Weiske",
+ "email": "cweiske@cweiske.de",
+ "homepage": "http://github.com/cweiske/jsonmapper/",
+ "role": "Developer"
+ }
+ ],
+ "description": "Map nested JSON structures onto PHP classes",
+ "time": "2017-11-28T21:30:01+00:00"
+ },
{
"name": "nette/bootstrap",
"version": "v2.4.6",
@@ -10965,32 +11230,39 @@
},
{
"name": "vimeo/psalm",
- "version": "2.0.14",
+ "version": "3.0.15",
"source": {
"type": "git",
"url": "https://github.com/vimeo/psalm.git",
- "reference": "792144def40d678b7fa7c8a52da6cdbd34dd415a"
+ "reference": "c310a2dd86660944b3f15fb8486ab73d45066618"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vimeo/psalm/zipball/792144def40d678b7fa7c8a52da6cdbd34dd415a",
- "reference": "792144def40d678b7fa7c8a52da6cdbd34dd415a",
+ "url": "https://api.github.com/repos/vimeo/psalm/zipball/c310a2dd86660944b3f15fb8486ab73d45066618",
+ "reference": "c310a2dd86660944b3f15fb8486ab73d45066618",
"shasum": ""
},
"require": {
+ "amphp/amp": "^2.1",
+ "amphp/byte-stream": "^1.5",
"composer/xdebug-handler": "^1.1",
+ "felixfbecker/advanced-json-rpc": "^3.0.3",
+ "felixfbecker/language-server-protocol": "^1.2",
"muglug/package-versions-56": "1.2.4",
- "nikic/php-parser": "^4.0",
+ "netresearch/jsonmapper": "^1.0",
+ "nikic/php-parser": "^4.0.2 || ^4.1",
"openlss/lib-array2xml": "^0.0.10||^0.5.1",
"php": "^7.0",
- "php-cs-fixer/diff": "^1.2"
+ "php-cs-fixer/diff": "^1.2",
+ "symfony/console": "^3.0||^4.0",
+ "webmozart/glob": "^4.1",
+ "webmozart/path-util": "^2.3"
},
"provide": {
"psalm/psalm": "self.version"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.2",
- "php-coveralls/php-coveralls": "^2.0",
"phpunit/phpunit": "^6.0 || ^7.0",
"squizlabs/php_codesniffer": "^3.0"
},
@@ -10999,17 +11271,21 @@
},
"bin": [
"psalm",
- "psalter"
+ "psalter",
+ "psalm-language-server",
+ "psalm-plugin"
],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.x-dev",
+ "dev-master": "3.x-dev",
+ "dev-2.x": "2.x-dev",
"dev-1.x": "1.x-dev"
}
},
"autoload": {
"psr-4": {
+ "Psalm\\Plugin\\": "src/Psalm/Plugin",
"Psalm\\": "src/Psalm"
}
},
@@ -11028,7 +11304,7 @@
"inspection",
"php"
],
- "time": "2018-10-10T18:22:06+00:00"
+ "time": "2019-02-11T23:39:19+00:00"
},
{
"name": "webmozart/assert",
@@ -11080,6 +11356,99 @@
"validate"
],
"time": "2018-12-25T11:19:39+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"
+ },
+ {
+ "name": "webmozart/path-util",
+ "version": "2.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/webmozart/path-util.git",
+ "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
+ "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "webmozart/assert": "~1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.6",
+ "sebastian/version": "^1.0.1"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Webmozart\\PathUtil\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Bernhard Schussek",
+ "email": "bschussek@gmail.com"
+ }
+ ],
+ "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.",
+ "time": "2015-12-17T08:42:14+00:00"
}
],
"aliases": [],
diff --git a/psalm.xml b/psalm.xml
index b63ef4c16..210052a0e 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -97,6 +97,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+