diff --git a/composer.json b/composer.json index 21903c1d..40630261 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "ergebnis/test-util": "~1.0.0", "jangregor/phpstan-prophecy": "~0.6.2", "phpstan/extension-installer": "^1.0.4", - "phpstan/phpstan": "~0.12.18", + "phpstan/phpstan": "~0.12.19", "phpstan/phpstan-deprecation-rules": "~0.12.2", "phpstan/phpstan-phpunit": "~0.12.8", "phpstan/phpstan-strict-rules": "~0.12.2", diff --git a/composer.lock b/composer.lock index 7f0e23e1..9d85cc3e 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": "55250ca78d0952769067556cfa1c9d1d", + "content-hash": "2785f93336283dabae21779d788d3e13", "packages": [ { "name": "ergebnis/json-normalizer", @@ -2159,21 +2159,24 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.18", + "version": "0.12.19", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "1ce27fe29c8660a27926127d350d53d80c4d4286" + "reference": "054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1ce27fe29c8660a27926127d350d53d80c4d4286", - "reference": "1ce27fe29c8660a27926127d350d53d80c4d4286", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d", + "reference": "054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d", "shasum": "" }, "require": { "php": "^7.1" }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, "bin": [ "phpstan", "phpstan.phar" @@ -2194,7 +2197,7 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", - "time": "2020-03-22T16:51:47+00:00" + "time": "2020-04-19T20:35:10+00:00" }, { "name": "phpstan/phpstan-deprecation-rules",