Yii2: Move implementations to connector (#5173)

* Refactor functions from module to connector, keeping the module interface the same but moving implementations to the connector.

* Fixed nitpick CS

* Attempt to use Guzzle MockHandler instead of external service

* Fixed issues with test & phpbrowser configurability

Author: SamMousa

src/Codeception/Module/PhpBrowser.php

@@ -172,7 +172,9 @@ public function amHttpAuthenticated($username, $password)
     public function amOnUrl($url)
     {
         $host = Uri::retrieveHost($url);
-        $this->_reconfigure(['url' => $host]);
+        $config = $this->config;
+        $config['url'] = $host;
+        $this->_reconfigure($config);
         $page = substr($url, strlen($host));
         if ($page === '') {
             $page = '/';
@@ -186,7 +188,9 @@ public function amOnSubdomain($subdomain)
         $url = $this->config['url'];
         $url = preg_replace('~(https?:\/\/)(.*\.)(.*\.)~', "$1$3", $url); // removing current subdomain
         $url = preg_replace('~(https?:\/\/)(.*)~', "$1$subdomain.$2", $url); // inserting new
-        $this->_reconfigure(['url' => $url]);
+        $config = $this->config;
+        $config['url'] = $url;
+        $this->_reconfigure($config);
     }
 
     protected function onReconfigure()

tests/unit/Codeception/Module/PhpBrowserTest.php

@@ -4,6 +4,8 @@
 
 require_once 'tests/data/app/data.php';
 require_once __DIR__ . '/TestsForBrowsers.php';
+
+use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\Psr7\Response;
 
 class PhpBrowserTest extends TestsForBrowsers
@@ -19,7 +21,7 @@ protected function setUp()
     {
         $this->module = new \Codeception\Module\PhpBrowser(make_container());
         $url = 'http://localhost:8000';
-        $this->module->_setConfig(array('url' => $url));
+        $this->module->_setConfig(['url' => $url]);
         $this->module->_initialize();
         $this->module->_before($this->makeTest());
         if (class_exists('GuzzleHttp\Url')) {
@@ -280,7 +282,15 @@ public function testLocationHeaderDoesNotRedirectWhenStatusCodeIs201()
 
     public function testRedirectToAnotherDomainUsingSchemalessUrl()
     {
-        $this->module->amOnUrl('http://httpbin.org/redirect-to?url=//example.org/');
+
+        $this->module->_reconfigure([
+            'handler' => new MockHandler([
+                new Response(302, ['Location' => '//example.org/']),
+                new Response(200, [], 'Cool stuff')
+            ])
+        ]);
+        /** @var \GuzzleHttp\HandlerStack $handlerStack */
+        $this->module->amOnUrl('http://fictional.redirector/redirect-to?url=//example.org/');
         $currentUrl = $this->module->client->getHistory()->current()->getUri();
         $this->assertSame('http://example.org/', $currentUrl);
     }
@@ -481,7 +491,7 @@ public function testCookiesForDomain()
     {
         $this->skipForOldGuzzle();
 
-        $mock = new \GuzzleHttp\Handler\MockHandler([
+        $mock = new MockHandler([
             new Response(200, ['X-Foo' => 'Bar']),
         ]);
         $handler = \GuzzleHttp\HandlerStack::create($mock);