Changeset 143

Timestamp:

03/06/08 12:22:47 (10 months ago)

Author:

iteman

Message:

- Merged changes trunk r140:r142 into releases/release-2.1.0.

Location:

releases/release-2.1.0

Files:

• package.xml (modified) (2 diffs)
• src/Stagehand/TestRunner.php (modified) (1 diff)
• src/Stagehand/TestRunner/Collector/Common.php (modified) (1 diff)

releases/release-2.1.0/package.xml

@@ -16 +16 @@
   <active>yes</active>
  </lead>
- <date>2008-03-05</date>
- <time>11:37:00</time>
+ <date>2008-03-06</date>
+ <time>12:00:11</time>
  <version>
   <release>2.1.0</release>
@@ -233 +233 @@
     <api>stable</api>
    </stability>
-   <date>2008-03-05</date>
+   <date>2008-03-06</date>
    <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD License (revised)</license>
    <notes>A new release of Stagehand_TestRunner is now available.

releases/release-2.1.0/src/Stagehand/TestRunner.php

@@ -258 +258 @@
         }
 
-        $directory = null;
+        $directory = getcwd();
         $isRecursive = false;
         $color = false;

releases/release-2.1.0/src/Stagehand/TestRunner/Collector/Common.php

@@ -112 +112 @@
     public function collect()
     {
-        if (is_null($this->_targetPath)) {
-            $absoluteTargetPath = getcwd();
-        } else {
-            if (!file_exists($this->_targetPath)) {
-                if (preg_match("/{$this->_suffix}\.php\$/", $this->_targetPath)) {
-                    throw new Stagehand_TestRunner_Exception("The directory or file [ {$this->_targetPath} ] is not found.");
-                }
-
-                $this->_targetPath = "{$this->_targetPath}{$this->_suffix}.php";
-            }
-
-            $absoluteTargetPath = realpath($this->_targetPath);
-            if ($absoluteTargetPath === false) {
+        if (!file_exists($this->_targetPath)) {
+            if (preg_match("/{$this->_suffix}\.php\$/", $this->_targetPath)) {
                 throw new Stagehand_TestRunner_Exception("The directory or file [ {$this->_targetPath} ] is not found.");
             }
+
+            $this->_targetPath = "{$this->_targetPath}{$this->_suffix}.php";
+        }
+
+        $absoluteTargetPath = realpath($this->_targetPath);
+        if ($absoluteTargetPath === false) {
+            throw new Stagehand_TestRunner_Exception("The directory or file [ {$this->_targetPath} ] is not found.");
         }