From 2baaf1a63a58e167aa743c64c1cd9535da922e6c Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Fri, 27 Jan 2012 05:48:11 -0500 Subject: [PATCH 1/2] Better fix for #466. --- ChangeLog.markdown | 1 + PHPUnit/Util/Configuration.php | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog.markdown b/ChangeLog.markdown index 305a9e27124..397c7a63769 100644 --- a/ChangeLog.markdown +++ b/ChangeLog.markdown @@ -7,6 +7,7 @@ PHPUnit 3.6.10 -------------- * Tests for which the execution is aborted due to a timeout are no longer shown as incomplete but as an error instead. +* Fixed the fix for #466. PHPUnit 3.6.9 ------------- diff --git a/PHPUnit/Util/Configuration.php b/PHPUnit/Util/Configuration.php index d5736e9a28e..966e0258fac 100644 --- a/PHPUnit/Util/Configuration.php +++ b/PHPUnit/Util/Configuration.php @@ -857,6 +857,11 @@ protected function getTestSuite(DOMElement $testSuiteNode) // Get the absolute path to the file $file = $fileIteratorFacade->getFilesAsArray($file); + + if (!isset($file[0])) { + continue; + } + $file = $file[0]; if ($fileNode->hasAttribute('phpVersion')) { From bb1c2302a254c7db0d50d2732ae67cb143a104a7 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Fri, 27 Jan 2012 05:49:14 -0500 Subject: [PATCH 2/2] Prepare release. --- package.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.xml b/package.xml index 92f0db96bf4..eb6487dc1a8 100644 --- a/package.xml +++ b/package.xml @@ -17,9 +17,9 @@ sebastian@phpunit.de yes - 2012-01-23 + 2012-01-27 - 3.6.9 + 3.6.10 3.6.0