Closes sebastianbergmann#2331

Author: sebastianbergmann

ChangeLog-4.8.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 4.8 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [4.8.33] - 2017-MM-DD
+
+### Fixed
+
+* Fixed [#2331](https://github.com/sebastianbergmann/phpunit/issues/2331): Boolean environment variable values specified in XML get mangled
+
 ## [4.8.32] - 2017-01-22
 
 ### Fixed

src/Util/Configuration.php

@@ -473,7 +473,11 @@ public function getPHPConfiguration()
                 $name  = (string) $var->getAttribute('name');
                 $value = (string) $var->getAttribute('value');
 
-                $result[$array][$name] = $this->getBoolean($value, $value);
+                if ($array !== 'env') {
+                    $result[$array][$name] = $this->getBoolean($value, $value);
+                } else {
+                    $result[$array][$name] = $value;
+                }
             }
         }
 

tests/Util/ConfigurationTest.php

@@ -277,7 +277,7 @@ public function testPHPConfigurationIsReadCorrectly()
             'ini'    => array('foo' => 'bar'),
             'const'  => array('FOO' => false, 'BAR' => true),
             'var'    => array('foo' => false),
-            'env'    => array('foo' => true),
+            'env'    => array('foo' => 'true'),
             'post'   => array('foo' => 'bar'),
             'get'    => array('foo' => 'bar'),
             'cookie' => array('foo' => 'bar'),
@@ -302,8 +302,8 @@ public function testPHPConfigurationIsHandledCorrectly()
         $this->assertEquals(false, FOO);
         $this->assertEquals(true, BAR);
         $this->assertEquals(false, $GLOBALS['foo']);
-        $this->assertEquals(true, $_ENV['foo']);
-        $this->assertEquals(true, getenv('foo'));
+        $this->assertEquals('true', $_ENV['foo']);
+        $this->assertEquals('true', getenv('foo'));
         $this->assertEquals('bar', $_POST['foo']);
         $this->assertEquals('bar', $_GET['foo']);
         $this->assertEquals('bar', $_COOKIE['foo']);
@@ -319,11 +319,11 @@ public function testPHPConfigurationIsHandledCorrectly()
      */
     public function testHandlePHPConfigurationDoesNotOverwrittenExistingEnvArrayVariables()
     {
-        $_ENV['foo'] = false;
+        $_ENV['foo'] = 'false';
         $this->configuration->handlePHPConfiguration();
 
-        $this->assertEquals(false, $_ENV['foo']);
-        $this->assertEquals(true, getenv('foo'));
+        $this->assertEquals('false', $_ENV['foo']);
+        $this->assertEquals('true', getenv('foo'));
     }
 
     /**
@@ -336,7 +336,7 @@ public function testHandlePHPConfigurationDoesNotOverriteVariablesFromPutEnv()
         putenv('foo=putenv');
         $this->configuration->handlePHPConfiguration();
 
-        $this->assertEquals(true, $_ENV['foo']);
+        $this->assertEquals('true', $_ENV['foo']);
         $this->assertEquals('putenv', getenv('foo'));
     }