Dropped support for Guzzle 5

Author: Naktibalda

src/Codeception/Lib/Connector/Guzzle.php

@@ -77,7 +77,6 @@
 class PhpBrowser extends InnerBrowser implements Remote, MultiSession, RequiresPackage
 {
 
-    private $isGuzzlePsr7;
     protected $requiredFields = ['url'];
 
     protected $config = [
@@ -122,28 +121,18 @@ class PhpBrowser extends InnerBrowser implements Remote, MultiSession, RequiresP
 
     public function _requires()
     {
-        return ['GuzzleHttp\Client' => '"guzzlehttp/guzzle": ">=4.1.4 <7.0"'];
+        return ['GuzzleHttp\Client' => '"guzzlehttp/guzzle": ">=6.3.0 <7.0"'];
     }
 
     public function _initialize()
     {
         $this->_initializeSession();
     }
 
-    protected function guessGuzzleConnector()
-    {
-        if (class_exists('GuzzleHttp\Url')) {
-            $this->isGuzzlePsr7 = false;
-            return new \Codeception\Lib\Connector\Guzzle();
-        }
-        $this->isGuzzlePsr7 = true;
-        return new \Codeception\Lib\Connector\Guzzle6();
-    }
-
     public function _before(TestInterface $test)
     {
         if (!$this->client) {
-            $this->client = $this->guessGuzzleConnector();
+            $this->client = new Guzzle6();
         }
         $this->_prepareSession();
     }
@@ -231,7 +220,7 @@ public function _getResponseCode()
     public function _initializeSession()
     {
         // independent sessions need independent cookies
-        $this->client = $this->guessGuzzleConnector();
+        $this->client = new Guzzle6();
         $this->_prepareSession();
     }
 
@@ -249,22 +238,16 @@ public function _prepareSession()
         $this->headers = $this->config['headers'];
         $this->setCookiesFromOptions();
 
-        if ($this->isGuzzlePsr7) {
-            $defaults['base_uri'] = $this->config['url'];
-            $defaults['curl'] = $curlOptions;
-            $handler = Guzzle6::createHandler($this->config['handler']);
-            if ($handler && is_array($this->config['middleware'])) {
-                foreach ($this->config['middleware'] as $middleware) {
-                    $handler->push($middleware);
-                }
+        $defaults['base_uri'] = $this->config['url'];
+        $defaults['curl'] = $curlOptions;
+        $handler = Guzzle6::createHandler($this->config['handler']);
+        if ($handler && is_array($this->config['middleware'])) {
+            foreach ($this->config['middleware'] as $middleware) {
+                $handler->push($middleware);
             }
-            $defaults['handler'] = $handler;
-            $this->guzzle = new GuzzleClient($defaults);
-        } else {
-            $defaults['config']['curl'] = $curlOptions;
-            $this->guzzle = new GuzzleClient(['base_url' => $this->config['url'], 'defaults' => $defaults]);
-            $this->client->setBaseUri($this->config['url']);
         }
+        $defaults['handler'] = $handler;
+        $this->guzzle = new GuzzleClient($defaults);
 
         $this->client->setRefreshMaxInterval($this->config['refresh_max_interval']);
         $this->client->setClient($this->guzzle);