From 08d41c2ba10db5cac362a4d793ce28128e0bda48 Mon Sep 17 00:00:00 2001
From: Colin Mollenhour <colin@mollenhour.com>
Date: Wed, 10 Mar 2021 20:10:43 -0500
Subject: [PATCH] Improve Developer Mode (#1445)

* Enable Developer Mode by default for bundled development environment using environment variable. Relocate switch to Mage.php to allow for CLI.

* Fix SvenSniff style error. ;)
---
 .htaccess                       | 6 ++++++
 api.php                         | 6 ------
 app/Mage.php                    | 5 +++++
 dev/openmage/README.md          | 2 ++
 dev/openmage/docker-compose.yml | 1 +
 index.php                       | 6 ------
 index.php.sample                | 6 ------
 7 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.htaccess b/.htaccess
index 43b8f2802c9..3b50a77fac7 100644
--- a/.htaccess
+++ b/.htaccess
@@ -122,6 +122,12 @@
     RewriteRule .* - [L,R=405]
 
 <IfModule mod_setenvif.c>
+
+############################################
+## Enable Developer Mode based on OS environment variable
+
+    SetEnvIfExpr "osenv('MAGE_IS_DEVELOPER_MODE') == '1'" MAGE_IS_DEVELOPER_MODE=1
+
     <IfModule mod_headers.c>
 
         ############################################
diff --git a/api.php b/api.php
index 666fc918072..bc9d545a49e 100644
--- a/api.php
+++ b/api.php
@@ -49,12 +49,6 @@
     exit;
 }
 
-if (isset($_SERVER['MAGE_IS_DEVELOPER_MODE'])) {
-    Mage::setIsDeveloperMode(true);
-}
-
-#ini_set('display_errors', 1);
-
 Mage::$headersSentThrowsException = false;
 Mage::init('admin');
 Mage::app()->loadAreaPart(Mage_Core_Model_App_Area::AREA_GLOBAL, Mage_Core_Model_App_Area::PART_EVENTS);
diff --git a/app/Mage.php b/app/Mage.php
index 470e2cd4123..5cc5443a0a3 100644
--- a/app/Mage.php
+++ b/app/Mage.php
@@ -30,6 +30,11 @@
 
 Mage::register('original_include_path', get_include_path());
 
+if (!empty($_SERVER['MAGE_IS_DEVELOPER_MODE']) || !empty($_ENV['MAGE_IS_DEVELOPER_MODE'])) {
+    Mage::setIsDeveloperMode(true);
+    ini_set('display_errors', 1);
+}
+
 /**
  * Set include path
  */
diff --git a/dev/openmage/README.md b/dev/openmage/README.md
index 3adc35fa53c..a9d94f0e8f2 100644
--- a/dev/openmage/README.md
+++ b/dev/openmage/README.md
@@ -50,6 +50,8 @@ You can override some defaults using environment variables defined in a file tha
 - `ADMIN_EMAIL`
 - `ADMIN_USERNAME`
 - `ADMIN_PASSWORD`
+- `MAGE_IS_DEVELOPER_MODE`
+  - Set to 1 by default, set to 0 to disable
 
 Wiping
 ---
diff --git a/dev/openmage/docker-compose.yml b/dev/openmage/docker-compose.yml
index 9cc4058802e..b88fdc23fbe 100644
--- a/dev/openmage/docker-compose.yml
+++ b/dev/openmage/docker-compose.yml
@@ -11,6 +11,7 @@ services:
     environment:
       - ENABLE_SENDMAIL=true
       - XDEBUG_CONFIG=remote_connect_back=1 remote_enable=1 idekey=phpstorm
+      - MAGE_IS_DEVELOPER_MODE=1
     links:
       - mysql
 
diff --git a/index.php b/index.php
index 82ca46289da..ae4cb0be3ac 100644
--- a/index.php
+++ b/index.php
@@ -61,12 +61,6 @@
 
 #Varien_Profiler::enable();
 
-if (isset($_SERVER['MAGE_IS_DEVELOPER_MODE'])) {
-    Mage::setIsDeveloperMode(true);
-}
-
-#ini_set('display_errors', 1);
-
 umask(0);
 
 /* Store or website code */
diff --git a/index.php.sample b/index.php.sample
index d465c121c0b..3020ca31361 100644
--- a/index.php.sample
+++ b/index.php.sample
@@ -54,12 +54,6 @@ require_once $mageFilename;
 
 #Varien_Profiler::enable();
 
-if (isset($_SERVER['MAGE_IS_DEVELOPER_MODE'])) {
-    Mage::setIsDeveloperMode(true);
-}
-
-#ini_set('display_errors', 1);
-
 umask(0);
 
 $mageRunCode = isset($_SERVER['MAGE_RUN_CODE']) ? $_SERVER['MAGE_RUN_CODE'] : '';