From b670189246f7d75477ccaa031b5bf6679f71454b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Sep 2020 05:09:40 +0000 Subject: [PATCH 1/3] composer(deps-dev): bump vimeo/psalm from 3.15 to 3.16 in /tools Bumps [vimeo/psalm](https://github.com/vimeo/psalm) from 3.15 to 3.16. - [Release notes](https://github.com/vimeo/psalm/releases) - [Commits](https://github.com/vimeo/psalm/compare/3.15...3.16) Signed-off-by: dependabot[bot] --- tools/composer.json | 2 +- tools/composer.lock | 47 ++++++++++++++++++++++++++++++--------------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/tools/composer.json b/tools/composer.json index 28532b24..1388bb56 100644 --- a/tools/composer.json +++ b/tools/composer.json @@ -6,7 +6,7 @@ "ergebnis/license": "~1.0.0", "ergebnis/php-cs-fixer-config": "^2.2.1", "psalm/plugin-phpunit": "~0.12.1", - "vimeo/psalm": "^3.15" + "vimeo/psalm": "^3.16" }, "config": { "platform": { diff --git a/tools/composer.lock b/tools/composer.lock index 0d8745b5..e4268ebe 100644 --- a/tools/composer.lock +++ b/tools/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": "ceb792d73ec24e4e067f6661be880547", + "content-hash": "f50e59401fcb4c98ce6e3d627d908f4a", "packages": [], "packages-dev": [ { @@ -228,16 +228,16 @@ }, { "name": "composer/semver", - "version": "1.5.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de" + "reference": "114f819054a2ea7db03287f5efb757e2af6e4079" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de", - "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de", + "url": "https://api.github.com/repos/composer/semver/zipball/114f819054a2ea7db03287f5efb757e2af6e4079", + "reference": "114f819054a2ea7db03287f5efb757e2af6e4079", "shasum": "" }, "require": { @@ -285,7 +285,21 @@ "validation", "versioning" ], - "time": "2020-01-13T12:06:48+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2020-09-09T09:34:06+00:00" }, { "name": "composer/xdebug-handler", @@ -2579,16 +2593,16 @@ }, { "name": "symfony/console", - "version": "v4.4.12", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "1f601a29fd7591a0316bffbc0d7550a5953c6c1c" + "reference": "b39fd99b9297b67fb7633b7d8083957a97e1e727" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/1f601a29fd7591a0316bffbc0d7550a5953c6c1c", - "reference": "1f601a29fd7591a0316bffbc0d7550a5953c6c1c", + "url": "https://api.github.com/repos/symfony/console/zipball/b39fd99b9297b67fb7633b7d8083957a97e1e727", + "reference": "b39fd99b9297b67fb7633b7d8083957a97e1e727", "shasum": "" }, "require": { @@ -2666,7 +2680,7 @@ "type": "tidelift" } ], - "time": "2020-08-17T07:39:58+00:00" + "time": "2020-09-02T07:07:21+00:00" }, { "name": "symfony/event-dispatcher", @@ -3705,16 +3719,16 @@ }, { "name": "vimeo/psalm", - "version": "3.15", + "version": "3.16", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "de6e7f324f44dde540ebe7ebd4eb481b97c86f30" + "reference": "d03e5ef057d6adc656c0ff7e166c50b73b4f48f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/de6e7f324f44dde540ebe7ebd4eb481b97c86f30", - "reference": "de6e7f324f44dde540ebe7ebd4eb481b97c86f30", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/d03e5ef057d6adc656c0ff7e166c50b73b4f48f3", + "reference": "d03e5ef057d6adc656c0ff7e166c50b73b4f48f3", "shasum": "" }, "require": { @@ -3727,6 +3741,7 @@ "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", + "ext-mbstring": "*", "ext-simplexml": "*", "ext-tokenizer": "*", "felixfbecker/advanced-json-rpc": "^3.0.3", @@ -3800,7 +3815,7 @@ "inspection", "php" ], - "time": "2020-09-01T22:09:30+00:00" + "time": "2020-09-15T13:39:50+00:00" }, { "name": "webmozart/assert", From b06a2e608f373aa9b41c25e8705269db3d1a945b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Tue, 22 Sep 2020 11:38:59 +0200 Subject: [PATCH 2/3] Fix: Rename parameter --- test/Util/Scenario.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Util/Scenario.php b/test/Util/Scenario.php index 645c31ed..7dc3e189 100644 --- a/test/Util/Scenario.php +++ b/test/Util/Scenario.php @@ -25,11 +25,11 @@ final class Scenario */ private $initialState; - public static function fromCommandInvocationAndInitialState(CommandInvocation $invocationStyle, State $initialState): self + public static function fromCommandInvocationAndInitialState(CommandInvocation $commandInvocation, State $initialState): self { $scenario = new self(); - $scenario->commandInvocation = $invocationStyle; + $scenario->commandInvocation = $commandInvocation; $scenario->initialState = $initialState; return $scenario; From aae5dd9263352308ef9bbb5d2c89e2ce77a0a4a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Tue, 22 Sep 2020 11:39:48 +0200 Subject: [PATCH 3/3] Fix: Extract private constructor --- test/Util/Scenario.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/test/Util/Scenario.php b/test/Util/Scenario.php index 7dc3e189..4c135f6a 100644 --- a/test/Util/Scenario.php +++ b/test/Util/Scenario.php @@ -25,14 +25,18 @@ final class Scenario */ private $initialState; - public static function fromCommandInvocationAndInitialState(CommandInvocation $commandInvocation, State $initialState): self + private function __construct(CommandInvocation $commandInvocation, State $initialState) { - $scenario = new self(); - - $scenario->commandInvocation = $commandInvocation; - $scenario->initialState = $initialState; + $this->commandInvocation = $commandInvocation; + $this->initialState = $initialState; + } - return $scenario; + public static function fromCommandInvocationAndInitialState(CommandInvocation $commandInvocation, State $initialState): self + { + return new self( + $commandInvocation, + $initialState + ); } public function directory(): Directory