veyra/friends-of-behat-symfony-extension
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Upgrade to Psalm v4.1.1

Browse Source
This commit is contained in:
Kamil Kokot
2020-11-05 21:56:46 +01:00
parent 4c5052954b
commit fbcf9d021e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -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",

16
src/Context/Environment/Handler/ContextServiceEnvironmentHandler.php
View File

@@ -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