- Merge [3682].

sebastianbergmann · Sep 1, 2008 · 803a538 · 803a538
1 parent 12bf96c
commit 803a538
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/PHPUnit/TextUI/Command.php b/PHPUnit/TextUI/Command.php
@@ -304,11 +304,7 @@ protected static function handleArguments()
                 break;
 
                 case '--filter': {
-                    if (preg_match('/^[a-zA-Z0-9_]/', $option[1])) {
-                        $arguments['filter'] = '/' . $option[1] . '/';
-                    } else {
-                        $arguments['filter'] = $option[1];
-                    }
+                    $arguments['filter'] = $option[1];
                 }
                 break;
 

diff --git a/PHPUnit/TextUI/TestRunner.php b/PHPUnit/TextUI/TestRunner.php
@@ -775,6 +775,10 @@ protected function handleConfiguration(array &$arguments)
         $arguments['reportLowUpperBound']         = isset($arguments['reportLowUpperBound'])         ? $arguments['reportLowUpperBound']         : 35;
         $arguments['reportYUI']                   = isset($arguments['reportYUI'])                   ? $arguments['reportYUI']                   : TRUE;
         $arguments['stopOnFailure']               = isset($arguments['stopOnFailure'])               ? $arguments['stopOnFailure']               : FALSE;
+
+        if ($arguments['filter'] !== FALSE && preg_match('/^[a-zA-Z0-9_]/', $arguments['filter'])) {
+            $arguments['filter'] = '/' . $arguments['filter'] . '/';
+        }
     }
 }
 ?>