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

phpBB/composer.json

@@ -1,5 +1,9 @@
 {
-    "require": {
-        "symfony/event-dispatcher": "2.0.*"
-    }
+	"minimum-stability": "beta",
+	"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
+    }
 }