Merge remote-tracking branch 'Fyorl/ticket/10981' into develop-olympus

* Fyorl/ticket/10981:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer

.travis.yml

@@ -15,6 +15,9 @@ before_script:
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
   - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; else pyrus install --force phpunit/DbUnit; fi"
   - phpenv rehash
+  - cd phpBB
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then php ../composer.phar install --dev; fi"
+  - cd ..
 
 script:
   - phpunit --configuration travis/phpunit-$DB-travis.xml

phpBB/composer.json

@@ -0,0 +1,6 @@
+{
+	"minimum-stability": "beta",
+	"require-dev": {
+		"fabpot/goutte": "1.0.x-dev"
+	}
+}

phpBB/composer.lock

@@ -0,0 +1,55 @@
+{
+    "hash": "a5d02c59e3a91c84c1a96aca0f1ae81a",
+    "packages": [
+
+    ],
+    "packages-dev": [
+        {
+            "package": "fabpot/goutte",
+            "version": "dev-master",
+            "alias-pretty-version": "1.0.x-dev",
+            "alias-version": "1.0.9999999.9999999-dev"
+        },
+        {
+            "package": "fabpot/goutte",
+            "version": "dev-master",
+            "source-reference": "c2ea8d9a6682d14482e57ede2371001b8a5238d2",
+            "commit-date": "1340264258"
+        },
+        {
+            "package": "guzzle/guzzle",
+            "version": "v2.6.6"
+        },
+        {
+            "package": "symfony/browser-kit",
+            "version": "v2.1.0-BETA3"
+        },
+        {
+            "package": "symfony/css-selector",
+            "version": "v2.1.0-BETA3"
+        },
+        {
+            "package": "symfony/dom-crawler",
+            "version": "v2.1.0-BETA3"
+        },
+        {
+            "package": "symfony/event-dispatcher",
+            "version": "v2.1.0-BETA3"
+        },
+        {
+            "package": "symfony/finder",
+            "version": "v2.1.0-BETA3"
+        },
+        {
+            "package": "symfony/process",
+            "version": "v2.1.0-BETA3"
+        }
+    ],
+    "aliases": [
+
+    ],
+    "minimum-stability": "beta",
+    "stability-flags": {
+        "fabpot/goutte": 20
+    }
+}

tests/bootstrap.php

@@ -22,5 +22,20 @@ require_once 'test_framework/phpbb_database_test_connection_manager.php';
 
 if (version_compare(PHP_VERSION, '5.3.0-dev', '>='))
 {
+	if (getenv('PHPBB_NO_COMPOSER_AUTOLOAD'))
+	{
+		if (getenv('PHPBB_AUTOLOAD'))
+		{
+			require(getenv('PHPBB_AUTOLOAD'));
+		}
+	}
+	else
+	{
+		if (!file_exists($phpbb_root_path . 'vendor/autoload.php'))
+		{
+			trigger_error('You have not set up composer dependencies. See http://getcomposer.org/.', E_USER_ERROR);
+		}
+		require($phpbb_root_path . 'vendor/autoload.php');
+	}
 	require_once 'test_framework/phpbb_functional_test_case.php';
 }

tests/test_framework/phpbb_functional_test_case.php

@@ -30,16 +30,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 	static protected $config = array();
 	static protected $already_installed = false;
 
-	static public function setUpBeforeClass()
-	{
-		if (!extension_loaded('phar'))
-		{
-			self::markTestSkipped('phar extension is not loaded');
-		}
-
-		require_once 'phar://' . __DIR__ . '/../../vendor/goutte.phar';
-	}
-
 	public function setUp()
 	{
 		if (!isset(self::$config['phpbb_functional_url']))
@@ -48,7 +38,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
@@ -193,9 +186,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();
 			}