Merge pull request #248 from dsavina/feature/override-default-ini

Allow overriding default INI values in extensions

Author: moufmouf

build-and-test.sh

@@ -183,6 +183,12 @@ set -e
 # Let's check that the "xdebug.client_host" contains a value different from "no value"
 docker run --rm -e PHP_EXTENSION_XDEBUG=1 thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT} php -i | grep xdebug.client_host| grep -v "no value"
 
+# Let's check that "xdebug.mode" is set to "debug" by default
+docker run --rm -e PHP_EXTENSION_XDEBUG=1 thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT} php -i | grep xdebug.mode| grep "debug"
+
+# Let's check that "xdebug.mode" is properly overridden
+docker run --rm -e PHP_EXTENSION_XDEBUG=1 -e PHP_INI_XDEBUG__MODE=debug,coverage thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT} php -i | grep xdebug.mode| grep "debug,coverage"
+
 if [[ "${PHP_VERSION}" != "7.4" ]] && [[ "${PHP_VERSION}" != "8.0" ]]; then
   # Tests that blackfire + xdebug will output an error
   RESULT=`docker run --rm -e PHP_EXTENSION_XDEBUG=1 -e PHP_EXTENSION_BLACKFIRE=1 thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT} php -v 2>&1 | grep 'WARNING: Both Blackfire and Xdebug are enabled. This is not recommended as the PHP engine may not behave as expected. You should strongly consider disabling Xdebug or Blackfire.'`

utils/generate_conf.php

@@ -8,22 +8,6 @@
 
 // Reading environment variables from $_SERVER (because $_ENV is not necessarily populated, depending on variables_order directive):
 
-foreach ($_SERVER as $key => $value) {
-    if (strpos($key, 'PHP_INI_') === 0) {
-        $iniParam = substr($key, 8);
-        if ($iniParam !== 'SMTP') {
-            // SMTP is the only php.ini parameter that contains uppercase letters (!)
-            $iniParam = strtolower($iniParam);
-        }
-        $iniParam = str_replace('__', '.', $iniParam);
-        // Let's protect the value if this is a string.
-        if (!is_numeric($value) && $iniParam !== 'error_reporting') {
-            $value = '"'.str_replace('"', '\\"', $value).'"';
-        }
-        echo "$iniParam=$value\n";
-    }
-}
-
 if (enableExtension('xdebug')) {
     //echo "zend_extension=xdebug.so\n";
     echo "xdebug.client_host=".getenv('XDEBUG_CLIENT_HOST')."\n";
@@ -40,3 +24,19 @@
     //echo "extension=blackfire.so\n";
     echo "blackfire.agent_socket=tcp://$blackFireAgent:8707\n";
 }
+
+foreach ($_SERVER as $key => $value) {
+    if (strpos($key, 'PHP_INI_') === 0) {
+        $iniParam = substr($key, 8);
+        if ($iniParam !== 'SMTP') {
+            // SMTP is the only php.ini parameter that contains uppercase letters (!)
+            $iniParam = strtolower($iniParam);
+        }
+        $iniParam = str_replace('__', '.', $iniParam);
+        // Let's protect the value if this is a string.
+        if (!is_numeric($value) && $iniParam !== 'error_reporting') {
+            $value = '"'.str_replace('"', '\\"', $value).'"';
+        }
+        echo "$iniParam=$value\n";
+    }
+}