[ticket/10981] Modified functional framework to account for goutte changes

PHPBB3-10981

1 files changed, 6 insertions, 3 deletions

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 2b6a6aaf29..e1a45a1bc4 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -46,7 +46,10 @@ class phpbb_functional_test_case extends phpbb_test_case
 		}
 
 		$this->cookieJar = new CookieJar;
-		$this->client = new Goutte\Client(array(), array(), null, $this->cookieJar);
+		$this->client = new Goutte\Client(array(), null, $this->cookieJar);
+		// Reset the curl handle because it is 0 at this point and not a valid
+		// resource
+		$this->client->getClient()->getCurlMulti()->reset(true);
 		$this->root_url = self::$config['phpbb_functional_url'];
 		// Clear the language array so that things
 		// that were added in other tests are gone
@@ -191,9 +194,9 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$cookies = $this->cookieJar->all();
 		
 		// The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie
-		foreach ($cookies as $key => $cookie);
+		foreach ($cookies as $cookie);
 		{
-			if (substr($key, -4) == '_sid')
+			if (substr($cookie->getName(), -4) == '_sid')
 			{
 				$this->sid = $cookie->getValue();
 			}