Merge branch 'develop-olympus' into develop

* develop-olympus:
  [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

Conflicts:
	.travis.yml
	composer.phar
	phpBB/composer.json
	phpBB/composer.lock
	tests/bootstrap.php

.travis.yml

@@ -15,8 +15,7 @@ before_script:
   - pyrus install --force phpunit/DbUnit
   - phpenv rehash
   - cd phpBB
-  - curl -s http://getcomposer.org/installer | php
+  - php ../composer.phar install --dev
-  - php composer.phar install
   - cd ../
 
 script:

phpBB/composer.json

@@ -1,5 +1,9 @@
 {
-    "require": {
+	"minimum-stability": "beta",
-        "symfony/event-dispatcher": "2.0.*"
+	"require": {
-    }
+		"symfony/event-dispatcher": "2.1.*"
+	},
+	"require-dev": {
+		"fabpot/goutte": "1.0.x-dev"
+	}
 }

phpBB/composer.lock

@@ -1,10 +1,54 @@
 {
-    "hash": "9bada3748ec2933fe0864dcfafbcd671",
+    "hash": "b2daff7465c71d924e915e72454ac266",
     "packages": [
         {
             "package": "symfony/event-dispatcher",
-            "version": "v2.0.10"
+            "version": "v2.1.0-BETA3"
         }
     ],
-    "aliases": []
+    "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/finder",
+            "version": "v2.1.0-BETA3"
+        },
+        {
+            "package": "symfony/process",
+            "version": "v2.1.0-BETA3"
+        }
+    ],
+    "aliases": [
+
+    ],
+    "minimum-stability": "beta",
+    "stability-flags": {
+        "fabpot/goutte": 20
+    }
 }

tests/test_framework/phpbb_functional_test_case.php

@@ -34,16 +34,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']))
@@ -52,7 +42,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
@@ -251,9 +244,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();
 			}