Yaffs site version 1.1

[yaffs-website] / vendor / drush / drush / tests / Unish / UnishTestCase.php

diff --git a/vendor/drush/drush/tests/Unish/UnishTestCase.php b/vendor/drush/drush/tests/Unish/UnishTestCase.php
index 37fe9806cd1462135ed931144d7b3559108232f5..e9ae4ab8d7598505090becb4598552720015cd70 100644 (file)
--- a/vendor/drush/drush/tests/Unish/UnishTestCase.php
+++ b/vendor/drush/drush/tests/Unish/UnishTestCase.php
@@ -263,7 +263,14 @@ abstract class UnishTestCase extends \PHPUnit_Framework_TestCase {
     return parse_url(UNISH_DB_URL, PHP_URL_SCHEME);
   }
 
-  function setUpDrupal($num_sites = 1, $install = FALSE, $version_string = UNISH_DRUPAL_MAJOR_VERSION, $profile = NULL) {
+  function defaultInstallationVerion() {
+    return UNISH_DRUPAL_MAJOR_VERSION . UNISH_DRUPAL_MINOR_VERSION;
+  }
+
+  function setUpDrupal($num_sites = 1, $install = FALSE, $version_string = NULL, $profile = NULL) {
+    if (!$version_string) {
+      $version_string = UNISH_DRUPAL_MAJOR_VERSION;
+    }
     $sites_subdirs_all = array('dev', 'stage', 'prod', 'retired', 'elderly', 'dead', 'dust');
     $sites_subdirs = array_slice($sites_subdirs_all, 0, $num_sites);
     $root = $this->webroot();
@@ -315,7 +322,10 @@ abstract class UnishTestCase extends \PHPUnit_Framework_TestCase {
     return self::$sites;
   }
 
-  function fetchInstallDrupal($env = 'dev', $install = FALSE, $version_string = UNISH_DRUPAL_MAJOR_VERSION, $profile = NULL, $separate_roots = FALSE) {
+  function fetchInstallDrupal($env = 'dev', $install = FALSE, $version_string = NULL, $profile = NULL, $separate_roots = FALSE) {
+    if (!$version_string) {
+      $version_string = UNISH_DRUPAL_MAJOR_VERSION;
+    }
     $root = $this->webroot();
     $uri = $separate_roots ? "default" : "$env";
     $options = array();