Merge branch '6.5' into 7.2

sebastianbergmann · Jun 18, 2018 · 3c50bbf · 3c50bbf
2 parents f224053 + d0dd8ce
commit 3c50bbf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Util/Configuration.php b/src/Util/Configuration.php
@@ -590,6 +590,8 @@ public function handlePHPConfiguration(): void
                 \putenv("{$name}={$value}");
             }
 
+            $value = \getenv($name);
+
             if (!isset($_ENV[$name])) {
                 $_ENV[$name] = $value;
             }

diff --git a/tests/Util/ConfigurationTest.php b/tests/Util/ConfigurationTest.php
@@ -351,8 +351,8 @@ public function testPHPConfigurationIsHandledCorrectly(): void
         $this->assertFalse(\FOO);
         $this->assertTrue(\BAR);
         $this->assertFalse($GLOBALS['foo']);
-        $this->assertTrue($_ENV['foo']);
-        $this->assertEquals('forced', \getenv('foo_force'));
+        $this->assertTrue((bool) $_ENV['foo']);
+        $this->assertEquals(1, \getenv('foo'));
         $this->assertEquals('bar', $_POST['foo']);
         $this->assertEquals('bar', $_GET['foo']);
         $this->assertEquals('bar', $_COOKIE['foo']);
@@ -399,7 +399,7 @@ public function testHandlePHPConfigurationDoesNotOverriteVariablesFromPutEnv():
         \putenv('foo=putenv');
         $this->configuration->handlePHPConfiguration();
 
-        $this->assertTrue($_ENV['foo']);
+        $this->assertEquals('putenv', $_ENV['foo']);
         $this->assertEquals('putenv', \getenv('foo'));
     }