CRM-19303 - Refactor getDefaultFileStorage() function

CRM/Utils/System/Base.php

@@ -552,50 +552,15 @@ public function getDefaultSiteSettings($dir) {
   /**
    * Determine the default location for file storage.
    *
-   * FIXME:
-   *  1. This was pulled out from a bigger function. It should be split
-   *     into even smaller pieces and marked abstract.
-   *  2. This would be easier to compute by a calling a CMS API, but
-   *     for whatever reason Civi gets it from config data.
-   *
    * @return array
    *   - url: string. ex: "http://example.com/sites/foo.com/files/civicrm"
    *   - path: string. ex: "/var/www/sites/foo.com/files/civicrm"
+   * @throws \CRM_Core_Exception
    */
   public function getDefaultFileStorage() {
-    global $civicrm_root;
     $config = CRM_Core_Config::singleton();
-    $baseURL = CRM_Utils_System::languageNegotiationURL($config->userFrameworkBaseURL, FALSE, TRUE);
-
-    $filesURL = NULL;
-    $filesPath = NULL;
-
-    if ($config->userFramework == 'Joomla') {
-      // gross hack
-      // we need to remove the administrator/ from the end
-      $tempURL = str_replace("/administrator/", "/", $baseURL);
-      $filesURL = $tempURL . "media/civicrm/";
-    }
-    elseif ($this->is_drupal) {
-      $siteName = $config->userSystem->parseDrupalSiteName($civicrm_root);
-      if ($siteName) {
-        $filesURL = $baseURL . "sites/$siteName/files/civicrm/";
-      }
-      else {
-        $filesURL = $baseURL . "sites/default/files/civicrm/";
-      }
-    }
-    elseif ($config->userFramework == 'UnitTests') {
-      $filesURL = $baseURL . "sites/default/files/civicrm/";
-    }
-    else {
-      throw new CRM_Core_Exception("Failed to locate default file storage ($config->userFramework)");
-    }
-
-    return array(
-      'url' => $filesURL,
-      'path' => CRM_Utils_File::baseFilePath(),
-    );
+    throw new CRM_Core_Exception("Failed to locate default file storage ($config->userFramework)");
+    return array();
   }
 
   /**

CRM/Utils/System/DrupalBase.php

@@ -568,4 +568,18 @@ public function parseDrupalSiteName($civicrm_root) {
     return $siteName;
   }
 
+  /**
+   * @inheritDoc
+   */
+  public function getDefaultFileStorage() {
+    $path = CRM_Utils_File::baseFilePath();
+    $drupalRoot = $this->cmsRootPath();
+    $url = CRM_Utils_System::url(trim(str_replace($drupalRoot, '', $path), '\\/'), NULL, TRUE);
+
+    return array(
+      'url' => CRM_Utils_File::addTrailingSlash($url, '/'),
+      'path' => $path,
+    );
+  }
+
 }

CRM/Utils/System/Joomla.php

@@ -827,4 +827,22 @@ public function synchronizeUsers() {
     );
   }
 
+  /**
+   * @inheritDoc
+   */
+  public function getDefaultFileStorage() {
+    $config = CRM_Core_Config::singleton();
+    $baseURL = CRM_Utils_System::languageNegotiationURL($config->userFrameworkBaseURL, FALSE, TRUE);
+
+    // gross hack
+    // we need to remove the administrator/ from the end
+    $tempURL = str_replace("/administrator/", "/", $baseURL);
+    $filesURL = $tempURL . "media/civicrm/";
+
+    return array(
+      'url' => $filesURL,
+      'path' => CRM_Utils_File::baseFilePath(),
+    );
+  }
+
 }

CRM/Utils/System/UnitTests.php

@@ -172,4 +172,16 @@ public function getLoginURL($destination = '') {
     throw new Exception("Method not implemented: getLoginURL");
   }
 
+  /**
+   * @inheritDoc
+   */
+  public function getDefaultFileStorage() {
+    $config = CRM_Core_Config::singleton();
+
+    return array(
+      'url' => $config->userFrameworkBaseURL . "sites/default/files/civicrm/",
+      'path' => CRM_Utils_File::baseFilePath(),
+    );
+  }
+
 }

CRM/Utils/System/WordPress.php

@@ -73,7 +73,7 @@ public function setTitle($title, $pageTitle = NULL) {
   }
 
   /**
-   * Moved from CRM_Utils_System_Base
+   * @inheritDoc
    */
   public function getDefaultFileStorage() {
     $config = CRM_Core_Config::singleton();