Permalink
Browse files

Merge branch '3.7'

Conflicts:
	ChangeLog.md
  • Loading branch information...
2 parents 6afa752 + 54e0ae0 commit 740973e74e47d1a5d6c68fa634a5341642e10dd4 @edorian edorian committed Sep 24, 2012
Showing with 1 addition and 26 deletions.
  1. +1 −0 ChangeLog.md
  2. +0 −8 PHPUnit/TextUI/Command.php
  3. +0 −18 Tests/TextUI/positional-arguments.phpt
View
@@ -7,3 +7,4 @@ PHPUnit 3.8.0
-------------
* PHPUnit 3.8 is only supported on PHP 5.4.7 (or later).
+
@@ -514,14 +514,6 @@ protected function handleArguments(array $argv)
$this->handleCustomTestSuite();
if (!isset($this->arguments['test'])) {
- if (count($this->options[1]) > 2) {
- $this->showMessage(
- 'More than two positional arguments provided.',
- FALSE
- );
- $this->showHelp();
- exit(PHPUnit_TextUI_TestRunner::FAILURE_EXIT);
- }
if (isset($this->options[1][0])) {
$this->arguments['test'] = $this->options[1][0];
@@ -1,18 +0,0 @@
---TEST--
-phpunit FailureTest ../_files/FailureTest.php SomethingElse
---FILE--
-<?php
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = 'FailureTest';
-$_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/FailureTest.php';
-$_SERVER['argv'][4] = 'SomethingElse';
-
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
-PHPUnit_TextUI_Command::main();
-?>
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann.
-
-More than two positional arguments provided.
-
-Usage: %s

0 comments on commit 740973e

Please sign in to comment.