Merge pull request #266 from thekid/refactor/env-server

Replace $_ENV with $_SERVER

Author: thekid

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
       with:
         php-version: ${{ matrix.php-versions }}
         extensions: com_dotnet
-        ini-values: date.timezone=Europe/Berlin, variables_order=EGPCS
+        ini-values: date.timezone=Europe/Berlin
 
     - name: Setup Problem Matchers for PHP
       run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"

src/main/php/lang/Environment.class.php

@@ -14,7 +14,7 @@ abstract class Environment {
    * @return bool
    */
   private static function xdgCompliant() {
-    foreach ($_ENV as $name => $value) {
+    foreach ($_SERVER as $name => $value) {
       if (0 === strncmp($name, 'XDG_', 4)) return true;
     }
     return false;
@@ -29,15 +29,15 @@ private static function xdgCompliant() {
    * @return  [:string]
    */
   public static function variables($filter= null) {
-    if (null === $filter) return $_ENV;
+    if (null === $filter) return $_SERVER;
 
     $r= [];
     if (is_array($filter)) {
       foreach ($filter as $name) {
-        isset($_ENV[$name]) && $r[$name]= $_ENV[$name];
+        isset($_SERVER[$name]) && $r[$name]= $_SERVER[$name];
       }
     } else {
-      foreach ($_ENV as $name => $value) {
+      foreach ($_SERVER as $name => $value) {
         preg_match($filter, $name) && $r[$name]= $value;
       }
     }
@@ -82,10 +82,10 @@ public static function export($variables) {
     foreach ($variables as $name => $value) {
       if (null === $value) {
         putenv($name);
-        unset($_ENV[$name]);
+        unset($_SERVER[$name]);
       } else {
         putenv($name.'='.$value);
-        $_ENV[$name]= $value;
+        $_SERVER[$name]= $value;
       }
     }
   }

src/test/php/net/xp_framework/unittest/core/EnvironmentSet.class.php

@@ -21,10 +21,10 @@ public function __construct($variables) {
       $this->original[$name]= getenv($name);
       if (null === $value) {
         putenv($name);
-        unset($_ENV[$name]);
+        unset($_SERVER[$name]);
       } else {
         putenv($name.'='.$value);
-        $_ENV[$name]= $value;
+        $_SERVER[$name]= $value;
       }
     }
   }
@@ -34,10 +34,10 @@ public function close() {
     foreach ($this->original as $name => $value) {
       if (false === $value) {
         putenv($name);
-        unset($_ENV[$name]);
+        unset($_SERVER[$name]);
       } else {
         putenv($name.'='.$value);
-        $_ENV[$name]= $value;
+        $_SERVER[$name]= $value;
       }
     }
   }

src/test/php/net/xp_framework/unittest/core/EnvironmentTest.class.php

@@ -9,7 +9,7 @@ class EnvironmentTest extends \unittest\TestCase {
   #[BeforeClass]
   public static function clearXDG() {
     $remove= [];
-    foreach ($_ENV as $variable => $value) {
+    foreach ($_SERVER as $variable => $value) {
       if (0 === strncmp('XDG_', $variable, 4)) $remove[$variable]= null;
     }
     self::$set= new EnvironmentSet($remove);