CONTRIBUTING.md

@@ -39,12 +39,10 @@ $ git clone git://github.com/sebastianbergmann/phpunit.git
 $ cd phpunit
 ```
 
-Retrieve PHPUnit's dependencies using [Composer](http://getcomposer.org/):
+Retrieve PHPUnit's dependencies using [Composer](https://getcomposer.org/):
 
 ```bash
-$ wget http://getcomposer.org/composer.phar
-
-$ php composer.phar install
+$ composer install
 ```
 
 The `phpunit` script can be used to invoke the PHPUnit test runner:

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.32] - 2017-01-22
+
+### Fixed
+
+* Fixed [#2428](https://github.com/sebastianbergmann/phpunit/pull/2428): Nested arrays specificied in XML configuration file are not handled correctly
+
 ## [4.8.31] - 2016-12-09
 
 ### Fixed
@@ -221,6 +227,7 @@ New PHAR release due to updated dependencies
 * Made the argument check of `assertContains()` and `assertNotContains()` more strict to prevent undefined behavior such as [#1808](https://github.com/sebastianbergmann/phpunit/issues/1808)
 * Changed the name of the default group from `__nogroup__` to `default`
 
+[4.8.32]: https://github.com/sebastianbergmann/phpunit/compare/4.8.31...4.8.32
 [4.8.31]: https://github.com/sebastianbergmann/phpunit/compare/4.8.30...4.8.31
 [4.8.30]: https://github.com/sebastianbergmann/phpunit/compare/4.8.29...4.8.30
 [4.8.29]: https://github.com/sebastianbergmann/phpunit/compare/4.8.28...4.8.29

LICENSE

@@ -1,6 +1,6 @@
 PHPUnit
 
-Copyright (c) 2001-2016, Sebastian Bergmann <sebastian@phpunit.de>.
+Copyright (c) 2001-2017, Sebastian Bergmann <sebastian@phpunit.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

build.xml

@@ -28,7 +28,6 @@
 
     <target name="validate-composer-json" unless="validate-composer-json.done" description="Validate composer.json">
         <exec executable="${basedir}/build/tools/composer" failonerror="true" taskname="composer">
-            <env key="COMPOSER_DISABLE_XDEBUG_WARN" value="1"/>
             <arg value="validate"/>
             <arg value="--no-check-lock"/>
             <arg value="--strict"/>
@@ -44,7 +43,6 @@
 
     <target name="install-dependencies" unless="dependencies-installed" depends="-dependencies-installed,validate-composer-json" description="Install dependencies with Composer">
         <exec executable="${basedir}/build/tools/composer" taskname="composer">
-            <env key="COMPOSER_DISABLE_XDEBUG_WARN" value="1"/>
             <arg value="update"/>
             <arg value="--no-interaction"/>
             <arg value="--no-progress"/>
@@ -121,7 +119,6 @@
         <copy file="${basedir}/composer.json" tofile="${basedir}/composer.json.bak"/>
 
         <exec executable="${basedir}/build/tools/composer">
-            <env key="COMPOSER_DISABLE_XDEBUG_WARN" value="1"/>
             <arg value="require"/>
             <arg value="phpunit/dbunit:~1.4"/>
             <arg value="phpunit/phpunit-selenium:~1.4"/>
@@ -333,10 +330,7 @@
     </target>
 
     <target name="-phar-determine-version">
-        <exec executable="bash" outputproperty="version">
-            <arg value="-c"/>
-            <arg value="${basedir}/phpunit --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'"/>
-        </exec>
+        <exec executable="${basedir}/build/version.php" outputproperty="version" />
     </target>
 
     <target name="generate-project-documentation" depends="-phploc,-phpcs,-phpmd,-phpunit">
@@ -375,8 +369,10 @@
 
     <target name="-phpunit" depends="setup">
         <exec executable="${basedir}/phpunit" taskname="phpunit">
-            <arg value="--configuration"/>
-            <arg path="${basedir}/build/phpunit.xml"/>
+            <arg value="--coverage-xml"/>
+            <arg path="${basedir}/build/logfiles/coverage"/>
+            <arg value="--log-junit"/>
+            <arg path="${basedir}/build/logfiles/junit.xml"/>
         </exec>
     </target>
 </project>

build/binary-phar-autoload.php.in

@@ -6,15 +6,8 @@ if (__FILE__ == realpath($GLOBALS['_SERVER']['SCRIPT_NAME'])) {
     $execute = false;
 }
 
-define('__PHPUNIT_PHAR__', str_replace(DIRECTORY_SEPARATOR, '/', __FILE__));
-define('__PHPUNIT_PHAR_ROOT__', 'phar://___PHAR___');
-
-Phar::mapPhar('___PHAR___');
-
-___FILELIST___
-
 if ($execute) {
-    if (version_compare('5.3.3', PHP_VERSION, '>') && $argv[1] !== '--version') {
+    if (version_compare('5.3.3', PHP_VERSION, '>')) {
         fwrite(
             STDERR,
             sprintf(
@@ -27,7 +20,16 @@ if ($execute) {
 
         die(1);
     }
+}
 
+define('__PHPUNIT_PHAR__', str_replace(DIRECTORY_SEPARATOR, '/', __FILE__));
+define('__PHPUNIT_PHAR_ROOT__', 'phar://___PHAR___');
+
+Phar::mapPhar('___PHAR___');
+
+___FILELIST___
+
+if ($execute) {
     if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == '--manifest') {
         print file_get_contents(__PHPUNIT_PHAR_ROOT__ . '/manifest.txt');
         exit;

build/version.php

@@ -0,0 +1,13 @@
+#!/usr/bin/env php
+<?php
+require __DIR__ . '/../vendor/autoload.php';
+
+use SebastianBergmann\Version;
+
+$buffer  = file_get_contents(__DIR__ . '/../src/Runner/Version.php');
+$start   = strpos($buffer, 'new Version(\'') + strlen('new Version(\'');
+$end     = strpos($buffer, '\'', $start);
+$version = substr($buffer, $start, $end - $start);
+$version = new Version($version, __DIR__ . '/../');
+
+print $version->getVersion();

phpunit

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-if (version_compare('5.3.3', PHP_VERSION, '>') && $argv[1] !== '--version') {
+if (version_compare('5.3.3', PHP_VERSION, '>')) {
     fwrite(
         STDERR,
         sprintf(
@@ -39,9 +39,9 @@ unset($file);
 
 if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
     fwrite(STDERR,
-        'You need to set up the project dependencies using the following commands:' . PHP_EOL .
-        'wget http://getcomposer.org/composer.phar' . PHP_EOL .
-        'php composer.phar install' . PHP_EOL
+        'You need to set up the project dependencies using Composer:' . PHP_EOL . PHP_EOL .
+        '    composer install' . PHP_EOL . PHP_EOL .
+        'You can learn all about Composer on https://getcomposer.org/.' . PHP_EOL
     );
 
     die(1);

src/Runner/Version.php

@@ -8,6 +8,8 @@
  * file that was distributed with this source code.
  */
 
+use SebastianBergmann\Version;
+
 /**
  * This class defines the current version of PHPUnit.
  *
@@ -30,7 +32,7 @@ public static function id()
         }
 
         if (self::$version === null) {
-            $version       = new SebastianBergmann\Version('4.8.31', dirname(dirname(__DIR__)));
+            $version       = new Version('4.8.32', dirname(dirname(__DIR__)));
             self::$version = $version->getVersion();
         }
 

src/TextUI/Command.php

@@ -924,7 +924,7 @@ protected function showHelp()
 Test Selection Options:
 
   --filter <pattern>        Filter which tests to run.
-  --testsuite <pattern>     Filter which testsuite to run.
+  --testsuite <name>        Filter which testsuite to run.
   --group ...               Only runs tests from the specified group(s).
   --exclude-group ...       Exclude tests from the specified group(s).
   --list-groups             List available test groups.

src/Util/XML.php

@@ -222,17 +222,20 @@ public static function xmlToVariable(DOMElement $element)
             case 'array':
                 $variable = array();
 
-                foreach ($element->getElementsByTagName('element') as $element) {
-                    $item = $element->childNodes->item(0);
+                foreach ($element->childNodes as $entry) {
+                    if (!$entry instanceof DOMElement || $entry->tagName !== 'element') {
+                        continue;
+                    }
+                    $item = $entry->childNodes->item(0);
 
                     if ($item instanceof DOMText) {
-                        $item = $element->childNodes->item(1);
+                        $item = $entry->childNodes->item(1);
                     }
 
                     $value = self::xmlToVariable($item);
 
-                    if ($element->hasAttribute('key')) {
-                        $variable[(string) $element->getAttribute('key')] = $value;
+                    if ($entry->hasAttribute('key')) {
+                        $variable[(string) $entry->getAttribute('key')] = $value;
                     } else {
                         $variable[] = $value;
                     }

tests/TextUI/help.phpt

@@ -34,7 +34,7 @@ Logging Options:
 Test Selection Options:
 
   --filter <pattern>        Filter which tests to run.
-  --testsuite <pattern>     Filter which testsuite to run.
+  --testsuite <name>        Filter which testsuite to run.
   --group ...               Only runs tests from the specified group(s).
   --exclude-group ...       Exclude tests from the specified group(s).
   --list-groups             List available test groups.

tests/TextUI/help2.phpt

@@ -35,7 +35,7 @@ Logging Options:
 Test Selection Options:
 
   --filter <pattern>        Filter which tests to run.
-  --testsuite <pattern>     Filter which testsuite to run.
+  --testsuite <name>        Filter which testsuite to run.
   --group ...               Only runs tests from the specified group(s).
   --exclude-group ...       Exclude tests from the specified group(s).
   --list-groups             List available test groups.

tests/Util/XMLTest.php

@@ -342,4 +342,22 @@ public function testLoadBoolean()
     {
         PHPUnit_Util_XML::load(false);
     }
+
+    public function testNestedXmlToVariable()
+    {
+        $xml = '<array><element key="a"><array><element key="b"><string>foo</string></element></array></element><element key="c"><string>bar</string></element></array>';
+        $dom = new DOMDocument();
+        $dom->loadXML($xml);
+
+        $expected = array(
+            'a' => array(
+                'b' => 'foo',
+            ),
+            'c' => 'bar',
+        );
+
+        $actual = PHPUnit_Util_XML::xmlToVariable($dom->documentElement);
+
+        $this->assertSame($expected, $actual);
+    }
 }