Merge pull request #594 from austinhyde/listener-arguments-fix

sebastianbergmann · Jun 22, 2012 · d4efc6b · d4efc6b
2 parents 784fa73 + dd560a3
commit d4efc6b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/PHPUnit/Util/Configuration.php b/PHPUnit/Util/Configuration.php
@@ -344,9 +344,9 @@ public function getListenerConfiguration()
                 );
             }
 
-            if ($listener->childNodes->item(1) instanceof DOMElement &&
+            foreach ($listener->childNodes as $node) {
-                $listener->childNodes->item(1)->tagName == 'arguments') {
+              if ($node instanceof DOMElement && $node->tagName == 'arguments') {
-                foreach ($listener->childNodes->item(1)->childNodes as $argument) {
+                foreach ($node->childNodes as $argument) {
                     if ($argument instanceof DOMElement) {
                         if ($argument->tagName == 'file' ||
                             $argument->tagName == 'directory') {
@@ -356,6 +356,7 @@ public function getListenerConfiguration()
                         }
                     }
                 }
+              }
             }
 
             $result[] = array(

diff --git a/Tests/Util/ConfigurationTest.php b/Tests/Util/ConfigurationTest.php
@@ -205,7 +205,15 @@ public function testListenerConfigurationIsReadCorrectly()
               'class' => 'IncludePathListener',
               'file' => __FILE__,
               'arguments' => array()
-            )
+            ),
+            array(
+              'class' => 'CompactArgumentsListener',
+              'file' => '/CompactArgumentsListener.php',
+              'arguments' =>
+              array(
+                0 => 42
+              ),
+            ),
           ),
           $this->configuration->getListenerConfiguration()
         );

diff --git a/Tests/_files/configuration.xml b/Tests/_files/configuration.xml
@@ -71,6 +71,7 @@
       </arguments>
     </listener>
     <listener class="IncludePathListener" file="ConfigurationTest.php" />
+    <listener class="CompactArgumentsListener" file="/CompactArgumentsListener.php"><arguments><integer>42</integer></arguments></listener>
   </listeners>
 
   <logging>