Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '3.6'

  • Loading branch information...
commit b469478e752a53304877d9808227488b730304a7 2 parents e474302 + 4f27eff
@sebastianbergmann authored
View
2  PHPUnit/TextUI/Command.php
@@ -894,8 +894,6 @@ protected function showHelp()
-h|--help Prints this usage information.
--version Prints the version and exits.
- --debug Output debugging information.
-
EOT;
}
View
7 PHPUnit/Util/Configuration.php
@@ -346,9 +346,9 @@ public function getListenerConfiguration()
);
}
- if ($listener->childNodes->item(1) instanceof DOMElement &&
- $listener->childNodes->item(1)->tagName == 'arguments') {
- foreach ($listener->childNodes->item(1)->childNodes as $argument) {
+ foreach ($listener->childNodes as $node) {
+ if ($node instanceof DOMElement && $node->tagName == 'arguments') {
+ foreach ($node->childNodes as $argument) {
if ($argument instanceof DOMElement) {
if ($argument->tagName == 'file' ||
$argument->tagName == 'directory') {
@@ -358,6 +358,7 @@ public function getListenerConfiguration()
}
}
}
+ }
}
$result[] = array(
View
2  Tests/TextUI/help.phpt
@@ -65,5 +65,3 @@ Usage: phpunit [switches] UnitTest [UnitTest.php]
-h|--help Prints this usage information.
--version Prints the version and exits.
-
- --debug Output debugging information.
View
2  Tests/TextUI/help2.phpt
@@ -66,5 +66,3 @@ Usage: phpunit [switches] UnitTest [UnitTest.php]
-h|--help Prints this usage information.
--version Prints the version and exits.
-
- --debug Output debugging information.
View
10 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()
);
View
1  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>
Please sign in to comment.
Something went wrong with that request. Please try again.