Merge branch 'MDL-37919-phpunit-exception' of git://github.com/mudrd8mz/moodle

diff --combined lib/setuplib.php
index 8063d0b,d3b8a7e..34ead8c
--- 1/lib/setuplib.php
--- 2/lib/setuplib.php
+++ b/lib/setuplib.php
@@@ -137,14 -137,23 +137,23 @@@ class moodle_exception extends Exceptio
  
          if (get_string_manager()->string_exists($errorcode, $module)) {
              $message = get_string($errorcode, $module, $a);
+             $haserrorstring = true;
          } else {
              $message = $module . '/' . $errorcode;
+             $haserrorstring = false;
          }
  
          if (defined('PHPUNIT_TEST') and PHPUNIT_TEST and $debuginfo) {
              $message = "$message ($debuginfo)";
          }
  
+         if (!$haserrorstring and defined('PHPUNIT_TEST') and PHPUNIT_TEST) {
+             // Append the contents of $a to $debuginfo so helpful information isn't lost.
+             // This emulates what {@link get_exception_info()} does. Unfortunately that
+             // function is not used by phpunit.
+             $message .= PHP_EOL.'$a contents: '.print_r($a, true);
+         }
+ 
          parent::__construct($message, 0);
      }
  }
@@@ -1140,8 -1149,8 +1149,8 @@@ function disable_output_buffering() 
   */
  function redirect_if_major_upgrade_required() {
      global $CFG;
 -    $lastmajordbchanges = 2012110201;
 -    if (empty($CFG->version) or (int)$CFG->version < $lastmajordbchanges or
 +    $lastmajordbchanges = 2013021100.01;
 +    if (empty($CFG->version) or (float)$CFG->version < $lastmajordbchanges or
              during_initial_install() or !empty($CFG->adminsetuppending)) {
          try {
              @session_get_instance()->terminate_current();