Merge pull request #14844 from chamilwijesooriya/issue-1135

[civicrm-core.git] / CRM / Core / Config / Runtime.php

diff --git a/CRM/Core/Config/Runtime.php b/CRM/Core/Config/Runtime.php
index a9c39f3e33901f7eec14de17ab763c843b7c017b..d64c5ce5f94319ca6f4e3080c5fc0017ed67414e 100644 (file)
--- a/CRM/Core/Config/Runtime.php
+++ b/CRM/Core/Config/Runtime.php
@@ -73,13 +73,6 @@ class CRM_Core_Config_Runtime extends CRM_Core_Config_MagicMerge {
    */
   public $cleanURL;
 
-  /**
-   * @var string
-   */
-  public $configAndLogDir;
-
-  public $templateCompileDir;
-
   /**
    * The root directory of our template tree.
    * @var string
@@ -95,20 +88,6 @@ class CRM_Core_Config_Runtime extends CRM_Core_Config_MagicMerge {
     }
     $this->dsn = defined('CIVICRM_DSN') ? CIVICRM_DSN : NULL;
 
-    if (!defined('CIVICRM_TEMPLATE_COMPILEDIR') && $loadFromDB) {
-      $this->fatal('You need to define CIVICRM_TEMPLATE_COMPILEDIR in civicrm.settings.php');
-    }
-
-    if (defined('CIVICRM_TEMPLATE_COMPILEDIR')) {
-      $this->configAndLogDir = CRM_Utils_File::baseFilePath() . 'ConfigAndLog' . DIRECTORY_SEPARATOR;
-      CRM_Utils_File::createDir($this->configAndLogDir);
-      CRM_Utils_File::restrictAccess($this->configAndLogDir);
-
-      $this->templateCompileDir = defined('CIVICRM_TEMPLATE_COMPILEDIR') ? CRM_Utils_File::addTrailingSlash(CIVICRM_TEMPLATE_COMPILEDIR) : NULL;
-      CRM_Utils_File::createDir($this->templateCompileDir);
-      CRM_Utils_File::restrictAccess($this->templateCompileDir);
-    }
-
     if (!defined('CIVICRM_UF')) {
       $this->fatal('You need to define CIVICRM_UF in civicrm.settings.php');
     }
@@ -133,7 +112,7 @@ class CRM_Core_Config_Runtime extends CRM_Core_Config_MagicMerge {
       $this->cleanURL = 0;
     }
 
-    $this->templateDir = array(dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR);
+    $this->templateDir = [dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR];
 
     $this->initialized = 1;
   }
@@ -152,7 +131,7 @@ class CRM_Core_Config_Runtime extends CRM_Core_Config_MagicMerge {
    * Include custom PHP and template paths
    */
   public function includeCustomPath() {
-    $customProprtyName = array('customPHPPathDir', 'customTemplateDir');
+    $customProprtyName = ['customPHPPathDir', 'customTemplateDir'];
     foreach ($customProprtyName as $property) {
       $value = $this->getSettings()->get($property);
       if (!empty($value)) {
@@ -173,14 +152,19 @@ class CRM_Core_Config_Runtime extends CRM_Core_Config_MagicMerge {
    */
   public static function getId() {
     if (!isset(Civi::$statics[__CLASS__]['id'])) {
-      Civi::$statics[__CLASS__]['id'] = md5(implode(\CRM_Core_DAO::VALUE_SEPARATOR, array(
-        defined('CIVICRM_DOMAIN_ID') ? CIVICRM_DOMAIN_ID : 1, // e.g. one database, multi URL
-        parse_url(CIVICRM_DSN, PHP_URL_PATH), // e.g. one codebase, multi database
-        \CRM_Utils_Array::value('SCRIPT_FILENAME', $_SERVER, ''), // e.g. CMS vs extern vs installer
-        \CRM_Utils_Array::value('HTTP_HOST', $_SERVER, ''), // e.g. name-based vhosts
-        \CRM_Utils_Array::value('SERVER_PORT', $_SERVER, ''), // e.g. port-based vhosts
+      Civi::$statics[__CLASS__]['id'] = md5(implode(\CRM_Core_DAO::VALUE_SEPARATOR, [
+        // e.g. one database, multi URL
+        defined('CIVICRM_DOMAIN_ID') ? CIVICRM_DOMAIN_ID : 1,
+        // e.g. one codebase, multi database
+        parse_url(CIVICRM_DSN, PHP_URL_PATH),
+        // e.g. CMS vs extern vs installer
+        \CRM_Utils_Array::value('SCRIPT_FILENAME', $_SERVER, ''),
+        // e.g. name-based vhosts
+        \CRM_Utils_Array::value('HTTP_HOST', $_SERVER, ''),
+        // e.g. port-based vhosts
+        \CRM_Utils_Array::value('SERVER_PORT', $_SERVER, ''),
         // Depending on deployment arch, these signals *could* be redundant, but who cares?
-      )));
+      ]));
     }
     return Civi::$statics[__CLASS__]['id'];
   }