Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
  [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
  [ticket/11513] Use PHPUnit from composer in .travis.yml.
  [ticket/11513] Update (all) composer dependencies.
  [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.

Conflicts:
	.travis.yml
	phpBB/composer.lock

tests/RUNNING_TESTS.txt

@@ -7,9 +7,14 @@ Prerequisites
 PHPUnit
 -------
 
-phpBB unit tests use PHPUnit framework. Version 3.5 or better is required
-to run the tests. PHPUnit prefers to be installed via PEAR; refer to
-http://www.phpunit.de/ for more information.
+phpBB unit tests use the PHPUnit framework (see http://www.phpunit.de for more
+information). Version 3.5 or higher is required to run the tests. PHPUnit can
+be installed via Composer together with other development dependencies as
+follows.
+
+    $ cd phpBB
+    $ php ../composer.phar install --dev
+    $ cd ..
 
 PHP extensions
 --------------
@@ -113,7 +118,7 @@ Running
 Once the prerequisites are installed, run the tests from the project root
 directory (above phpBB):
 
-    $ phpunit
+    $ phpBB/vendor/bin/phpunit
 
 Slow tests
 --------------
@@ -123,7 +128,7 @@ Thus these tests are in the `slow` group, which is excluded by default. You can
 enable slow tests by copying the phpunit.xml.all file to phpunit.xml. If you
 only want the slow tests, run:
 
-    $ phpunit --group slow
+    $ phpBB/vendor/bin/phpunit --group slow
 
 More Information
 ================