From 8a078f99351780794a2ef9204f0fd6ec2062d47a Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 4 Sep 2017 11:31:10 +1000
Subject: [PATCH] CRM-18231 Remove need for define statement and replace with
 new setting not settable in UI and always use settings to get information

Switch to getMandatory function as per Tim's comment
---
 CRM/Admin/Form/Setting/Debugging.php               | 3 +--
 CRM/Core/Config.php                                | 9 +--------
 templates/CRM/common/civicrm.settings.php.template | 5 ++---
 tests/phpunit/CRM/Core/BAO/SettingTest.php         | 5 +++--
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/CRM/Admin/Form/Setting/Debugging.php b/CRM/Admin/Form/Setting/Debugging.php
index 5a065c567a..40d95b0ee7 100644
--- a/CRM/Admin/Form/Setting/Debugging.php
+++ b/CRM/Admin/Form/Setting/Debugging.php
@@ -54,8 +54,7 @@ class CRM_Admin_Form_Setting_Debugging extends CRM_Admin_Form_Setting {
     }
 
     parent::buildQuickForm();
-
-    if (defined('CIVICRM_ENVIRONMENT')) {
+    if (Civi::settings()->getMandatory('environment') !== NULL) {
       $element = $this->getElement('environment');
       $element->freeze();
       CRM_Core_Session::setStatus(ts('The environment settings have been disabled because it has been overridden in the settings file.'), ts('Environment settings'), 'info');
diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php
index 2a61e5eb30..bc567631b8 100644
--- a/CRM/Core/Config.php
+++ b/CRM/Core/Config.php
@@ -274,14 +274,7 @@ class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
       $environment = $env;
     }
     if ($reset || empty($environment)) {
-      if (defined('CIVICRM_ENVIRONMENT')) {
-        $environment = CIVICRM_ENVIRONMENT;
-        global $civicrm_setting;
-        $civicrm_setting[CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME]['environment'] = $environment;
-      }
-      else {
-        $environment = Civi::settings()->get('environment');
-      }
+      $environment = Civi::settings()->get('environment');
     }
     if (!$environment) {
       $environment = 'Production';
diff --git a/templates/CRM/common/civicrm.settings.php.template b/templates/CRM/common/civicrm.settings.php.template
index 1c3b64f0fd..b221f33f6e 100644
--- a/templates/CRM/common/civicrm.settings.php.template
+++ b/templates/CRM/common/civicrm.settings.php.template
@@ -313,11 +313,10 @@ if (!defined('CIVICRM_DOMAIN_ID')) {
  * Note the setting here must be value from the option group 'Environment', 
  * (see Administration > System Settings > Option Groups, Options beside Environment) 
  * which by default has three option values: 'Production', 'Staging', 'Development'. 
- * NB: defining a value from CIVICRM_ENVIRONMENT here prevents it from being set 
+ * NB: defining a value for environment here prevents it from being set
  * via the browser. 
  */ 
-
-// define( 'CIVICRM_ENVIRONMENT', 'Production' ); 
+// $civicrm_setting[CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME]['environment'] = 'Production'; 
 
 /**
  * Settings to enable external caching using a cache server.  This is an
diff --git a/tests/phpunit/CRM/Core/BAO/SettingTest.php b/tests/phpunit/CRM/Core/BAO/SettingTest.php
index bb1cad2c7b..4004fbb7dc 100644
--- a/tests/phpunit/CRM/Core/BAO/SettingTest.php
+++ b/tests/phpunit/CRM/Core/BAO/SettingTest.php
@@ -188,8 +188,9 @@ class CRM_Core_BAO_SettingTest extends CiviUnitTestCase {
     CRM_Core_BAO_Setting::setItem('Staging', CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME, 'environment');
     $values = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME, 'environment');
     $this->assertEquals('Staging', $values);
-
-    define('CIVICRM_ENVIRONMENT', 'Development');
+    global $civicrm_setting;
+    $civicrm_setting[CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME]['environment'] = 'Development';
+    Civi::service('settings_manager')->useMandatory();
     $environment = CRM_Core_Config::environment();
     $this->assertEquals('Development', $environment);
   }
-- 
2.25.1