From fbcf9d021e51e9cf8000b61a2e7a02df62250c0e Mon Sep 17 00:00:00 2001
From: Kamil Kokot <kamil@kokot.me>
Date: Thu, 5 Nov 2020 21:56:46 +0100
Subject: [PATCH] Upgrade to Psalm v4.1.1

---
 composer.json                                    |  2 +-
 .../Handler/ContextServiceEnvironmentHandler.php | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index c94fba5..fb9e224 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "friends-of-behat/mink-extension": "^2.2",
         "friends-of-behat/page-object-extension": "^0.3.1",
         "friends-of-behat/service-container-extension": "^1.0",
-        "vimeo/psalm": "3.10.1",
+        "vimeo/psalm": "4.1.1",
         "sylius-labs/coding-standard": "^3.0",
         "symfony/browser-kit": "^4.4|^5.0",
         "symfony/framework-bundle": "^4.4|^5.0",
diff --git a/src/Context/Environment/Handler/ContextServiceEnvironmentHandler.php b/src/Context/Environment/Handler/ContextServiceEnvironmentHandler.php
index b9db9f2..7b9e628 100644
--- a/src/Context/Environment/Handler/ContextServiceEnvironmentHandler.php
+++ b/src/Context/Environment/Handler/ContextServiceEnvironmentHandler.php
@@ -87,29 +87,29 @@ final class ContextServiceEnvironmentHandler implements EnvironmentHandler
     /**
      * @throws EnvironmentIsolationException
      */
-    public function isolateEnvironment(Environment $uninitializedEnvironment, $testSubject = null): Environment
+    public function isolateEnvironment(Environment $environment, $testSubject = null): Environment
     {
-        $this->assertEnvironmentCanBeIsolated($uninitializedEnvironment, $testSubject);
+        $this->assertEnvironmentCanBeIsolated($environment, $testSubject);
 
-        $environment = new InitializedSymfonyExtensionEnvironment($uninitializedEnvironment->getSuite());
+        $isolatedEnvironment = new InitializedSymfonyExtensionEnvironment($environment->getSuite());
 
-        foreach ($uninitializedEnvironment->getServices() as $serviceId) {
+        foreach ($environment->getServices() as $serviceId) {
             /** @var Context $context */
             $context = $this->getContainer()->get($serviceId);
 
             $this->initializeContext($context);
 
-            $environment->registerContext($context);
+            $isolatedEnvironment->registerContext($context);
         }
 
         /** @var InitializedContextEnvironment $delegatedEnvironment */
-        $delegatedEnvironment = $this->decoratedEnvironmentHandler->isolateEnvironment($uninitializedEnvironment->getDelegatedEnvironment());
+        $delegatedEnvironment = $this->decoratedEnvironmentHandler->isolateEnvironment($environment->getDelegatedEnvironment());
 
         foreach ($delegatedEnvironment->getContexts() as $context) {
-            $environment->registerContext($context);
+            $isolatedEnvironment->registerContext($context);
         }
 
-        return $environment;
+        return $isolatedEnvironment;
     }
 
     private function initializeContext(Context $context): void