Merge branch 'MDL-49841-master' of git://github.com/andrewnicols/moodle

lib/behat/classes/behat_command.php

@@ -205,7 +205,7 @@ class behat_command {
     }
 
     /**
-     * Has the site installed composer with --dev option
+     * Has the site installed composer.
      * @return bool
      */
     public static function are_behat_dependencies_installed() {

lib/phpunit/bootstraplib.php

@@ -50,7 +50,7 @@ function phpunit_bootstrap_error($errorcode, $text = '') {
             $text = 'Error: '.$text;
             break;
         case PHPUNIT_EXITCODE_PHPUNITMISSING:
-            $text = "Can not find PHPUnit library, to install use: php composer.phar install --dev";
+            $text = "Can not find PHPUnit library, to install use: php composer.phar install";
             break;
         case PHPUNIT_EXITCODE_PHPUNITWRONG:
             $text = 'Moodle requires PHPUnit 3.6.x, '.$text.' is not compatible';

lib/phpunit/readme.md

@@ -15,7 +15,7 @@ Composer is a dependency manager for PHP projects.
 It installs PHP libraries into /vendor/ subdirectory inside your moodle dirroot.
 
 1. install Composer - [http://getcomposer.org/doc/00-intro.md](http://getcomposer.org/doc/00-intro.md)
-2. install PHUnit and dependencies - go to your Moodle dirroot and execute `php composer.phar install --dev`
+2. install PHUnit and dependencies - go to your Moodle dirroot and execute `php composer.phar install`
 
 
 Configure your server
@@ -53,4 +53,4 @@ How to add more tests?
 
 Windows support
 ---------------
-* use `\` instead of `/` in paths in examples above
+* use `\` instead of `/` in paths in examples above

lib/testing/lib.php

@@ -172,8 +172,6 @@ function testing_error($errorcode, $text = '') {
 /**
  * Updates the composer installer and the dependencies.
  *
- * Includes --dev dependencies.
- *
  * @return void exit() if something goes wrong
  */
 function testing_update_composer_dependencies() {