[6.1] Variables from non natural environment

.gitignore

@@ -20,6 +20,7 @@
 /web.config
 /.php-cs-fixer.cache
 /media
+.env
 
 # Template CSS files generated by NPM
 /installation/template/css

administrator/components/com_config/src/Model/ApplicationModel.php

@@ -80,6 +80,15 @@ public function getForm($data = [], $loadData = true)
             return false;
         }
 
+        // Check for parameters provided by $_ENV
+        $envMap   = Factory::getContainer()->get('config.env-map');
+        $usedEnvs = array_intersect_key($envMap, $_ENV);
+
+        foreach ($usedEnvs as $fieldName) {
+            $form->setFieldAttribute($fieldName, 'readonly', 'true');
+            $form->setFieldAttribute($fieldName, 'required', 'false');
+        }
+
         return $form;
     }
 

administrator/components/com_config/src/View/Application/HtmlView.php

@@ -110,6 +110,20 @@ public function display($tpl = null)
         // Bind data
         if ($this->form && $this->data) {
             $this->form->bind($this->data);
+
+            // Check for parameters provided by $_ENV
+            $fromEnv  = [];
+            $envMap   = Factory::getContainer()->get('config.env-map');
+            $usedEnvs = array_intersect_key($envMap, $_ENV);
+
+            foreach ($usedEnvs as $fieldName) {
+                $fromEnv[] = Text::_($this->form->getFieldAttribute($fieldName, 'label'));
+            }
+
+            if ($fromEnv) {
+                Factory::getApplication()
+                    ->enqueueMessage(Text::sprintf('COM_CONFIG_FIELDS_FROM_ENV', implode(', ', $fromEnv)));
+            }
         }
 
         // Get the params for com_users.

administrator/includes/framework.php

@@ -47,7 +47,7 @@
 $config = new JConfig();
 
 // Set the error_reporting, and adjust a global Error Handler
-switch ($config->error_reporting) {
+switch ($_ENV['JOOMLA_ERROR_REPORTING'] ?? $config->error_reporting) {
     case 'default':
     case '-1':
         break;
@@ -71,13 +71,13 @@
         break;
 
     default:
-        error_reporting($config->error_reporting);
+        error_reporting($_ENV['JOOMLA_ERROR_REPORTING'] ?? $config->error_reporting);
         ini_set('display_errors', 1);
 
         break;
 }
 
-\define('JDEBUG', $config->debug);
+\define('JDEBUG', (($_ENV['JOOMLA_DEBUG'] ?? '') === 'true' || $config->debug));
 
 // Check deprecation logging
 if (empty($config->log_deprecated)) {

administrator/language/en-GB/com_config.ini

@@ -212,6 +212,7 @@ COM_CONFIG_FIELD_WEBSERVICES_CORS_OFF_LABEL="Enable CORS"
 COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_HEADERS_DESC="Specifies the header(s) sent back in response to a preflight request. Default: Content-Type,X-Joomla-Token"
 COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_METHODS_DESC="Specifies the Web service method(s) allowed to access on this site, sent back in response to a preflight request. Default: all methods available for the requested route."
 COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_ORIGIN_DESC="Specifies the origin allowed to access Web services on this site, sent back in response to a preflight request. Default: * (=all)."
+COM_CONFIG_FIELDS_FROM_ENV="The following parameters are provided by environment variables: <strong>%s</strong>. And therefore cannot be changed."
 COM_CONFIG_FIELDSET_TAGS_LABEL="Tags"
 COM_CONFIG_FILTER_OPTION_SELECT_EXTENSION="- Select Extension -"
 COM_CONFIG_FRONTEDITING_DESC="Joomla can show an overlay in the public front–end, visible only to users with edit privileges, to directly modify the configuration of each module and/or menu displayed on the site. Set to \"None\" to disable this feature."

api/includes/framework.php

@@ -47,7 +47,7 @@
 $config = new JConfig();
 
 // Set the error_reporting
-switch ($config->error_reporting) {
+switch ($_ENV['JOOMLA_ERROR_REPORTING'] ?? $config->error_reporting) {
     case 'default':
     case '-1':
         break;
@@ -71,13 +71,13 @@
         break;
 
     default:
-        error_reporting($config->error_reporting);
+        error_reporting($_ENV['JOOMLA_ERROR_REPORTING'] ?? $config->error_reporting);
         ini_set('display_errors', 1);
 
         break;
 }
 
-\define('JDEBUG', $config->debug);
+\define('JDEBUG', (($_ENV['JOOMLA_DEBUG'] ?? '') === 'true' || $config->debug));
 
 // Check deprecation logging
 if (empty($config->log_deprecated)) {

composer.json

@@ -102,7 +102,8 @@
     "phpseclib/bcmath_compat": "^2.0.3",
     "jfcherng/php-diff": "^6.16.2",
     "php-tuf/php-tuf": "^1.0.3",
-    "php-debugbar/php-debugbar": "^2.1.6"
+    "php-debugbar/php-debugbar": "^2.1.6",
+    "vlucas/phpdotenv": "^5.6"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.6.22",

includes/framework.php

@@ -48,7 +48,7 @@
 $config = new JConfig();
 
 // Set the error_reporting, and adjust a global Error Handler
-switch ($config->error_reporting) {
+switch ($_ENV['JOOMLA_ERROR_REPORTING'] ?? $config->error_reporting) {
     case 'default':
     case '-1':
         break;
@@ -72,14 +72,14 @@
         break;
 
     default:
-        error_reporting($config->error_reporting);
+        error_reporting($_ENV['JOOMLA_ERROR_REPORTING'] ?? $config->error_reporting);
         ini_set('display_errors', 1);
 
         break;
 }
 
 if (!\defined('JDEBUG')) {
-    \define('JDEBUG', $config->debug);
+    \define('JDEBUG', (($_ENV['JOOMLA_DEBUG'] ?? '') === 'true' || $config->debug));
 }
 
 // Check deprecation logging