Merge branch '2.0'

* 2.0: [HotFix] Force object typehint Improve Mink installation docs
optimalship · Sep 10, 2019 · 39a108c · 39a108c
2 parents 509b2e2 + 04dfdcb
commit 39a108c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/docs/03_mink_integration.md b/docs/03_mink_integration.md
@@ -8,7 +8,7 @@ isolated driver to use for Symfony application testing.
 1. Require the packages needed for the driver using *Composer*:
 
 ```bash
-composer require --dev behat/mink-extension behat/mink-browserkit-driver
+composer require --dev behat/mink:^1.7@dev behat/mink-extension behat/mink-browserkit-driver
 ```
 
 2. Enable the bundled driver:

diff --git a/src/Context/Environment/Handler/ContextServiceEnvironmentHandler.php b/src/Context/Environment/Handler/ContextServiceEnvironmentHandler.php
@@ -65,7 +65,10 @@ public function buildEnvironment(Suite $suite): Environment
                 continue;
             }
 
-            $symfonyContexts[$serviceId] = get_class($this->getContainer()->get($serviceId));
+            /** @var object $service */
+            $service = $this->getContainer()->get($serviceId);
+
+            $symfonyContexts[$serviceId] = get_class($service);
         }
 
         $delegatedSuite = $this->cloneSuiteWithoutContexts($suite, array_keys($symfonyContexts));

diff --git a/src/Driver/SymfonyDriver.php b/src/Driver/SymfonyDriver.php
@@ -22,6 +22,7 @@ public function __construct(KernelInterface $kernel, string $baseUrl)
             ));
         }
 
+        /** @var object $testClient */
         $testClient = $kernel->getContainer()->get('test.client');
 
         if (!$testClient instanceof Client) {
-Original file line number
+Diff line change
@@ Expand Up @@
                 ));
             }
+            /** @var object $testClient */
             $testClient = $kernel->getContainer()->get('test.client');
             if (!$testClient instanceof Client) {
@@ Expand Down @@