- Merge [4618] and [4619].

pwfisher · Feb 10, 2009 · 8ce569d · 8ce569d
1 parent 36b06f3
commit 8ce569d
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 1 deletion.
diff --git a/PHPUnit/Framework/TestCase.php b/PHPUnit/Framework/TestCase.php
@@ -179,6 +179,11 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
      */
     protected $dataName = '';
 
+    /**
+     * @var    boolean
+     */
+    protected $useErrorHandler = NULL;
+
     /**
      * @var    boolean
      */
@@ -400,6 +405,40 @@ protected function setExpectedExceptionFromAnnotation()
         }
     }
 
+    /**
+     * @param boolean $useErrorHandler
+     * @since Method available since Release 3.4.0
+     */
+    public function setUseErrorHandler($useErrorHandler)
+    {
+        $this->useErrorHandler = $useErrorHandler;
+    }
+
+    /**
+     * @since Method available since Release 3.4.0
+     */
+    protected function setUseErrorHandlerFromAnnotation()
+    {
+        try {
+            $className        = get_class($this);
+            $class            = new ReflectionClass($className);
+            $classDocComment  = $class->getDocComment();
+            $method           = new ReflectionMethod($className, $this->name);
+            $methodDocComment = $method->getDocComment();
+
+            $useErrorHandler = PHPUnit_Util_Test::getErrorHandlerSettings(
+              $classDocComment, $methodDocComment
+            );
+
+            if ($useErrorHandler !== NULL) {
+                $this->setUseErrorHandler($useErrorHandler);
+            }
+        }
+
+        catch (ReflectionException $e) {
+        }
+    }
+
     /**
      * @param boolean $useOutputBuffering
      * @since Method available since Release 3.4.0
@@ -485,8 +524,14 @@ public function run(PHPUnit_Framework_TestResult $result = NULL)
         }
 
         $this->setExpectedExceptionFromAnnotation();
+        $this->setUseErrorHandlerFromAnnotation();
         $this->setUseOutputBufferingFromAnnotation();
 
+        if ($this->useErrorHandler !== NULL) {
+            $oldErrorHandlerSetting = $result->getConvertErrorsToExceptions();
+            $result->convertErrorsToExceptions($this->useErrorHandler);
+        }
+
         $this->result = $result;
 
         if ($this->runTestInSeparateProcess === TRUE &&
@@ -575,6 +620,10 @@ public function run(PHPUnit_Framework_TestResult $result = NULL)
             $result->run($this);
         }
 
+        if ($this->useErrorHandler !== NULL) {
+            $result->convertErrorsToExceptions($oldErrorHandlerSetting);
+        }
+
         $this->result = NULL;
 
         return $result;

diff --git a/PHPUnit/Framework/TestResult.php b/PHPUnit/Framework/TestResult.php
@@ -749,6 +749,17 @@ public function convertErrorsToExceptions($flag)
         }
     }
 
+    /**
+     * Returns the error-to-exception conversion setting.
+     *
+     * @return boolean
+     * @since  Method available since Release 3.4.0
+     */
+    public function getConvertErrorsToExceptions()
+    {
+        return $this->convertErrorsToExceptions;
+    }
+
     /**
      * Enables or disables the stopping when a failure or error occurs.
      *

diff --git a/PHPUnit/Tests/Framework/TestCaseTest.php b/PHPUnit/Tests/Framework/TestCaseTest.php
@@ -218,6 +218,9 @@ public function testWrongException()
         $this->assertEquals(1, count($result));
     }
 
+    /**
+     * @backupGlobals enabled
+     */
     public function testGlobalsBackupPre()
     {
         global $a;
@@ -280,6 +283,10 @@ public function testGlobalsBackupPost()
         $this->assertArrayNotHasKey('foo', $GLOBALS);
     }
 
+    /**
+     * @backupGlobals enabled
+     * @backupStaticAttributes enabled
+     */
     public function testStaticAttributesBackupPre()
     {
         $GLOBALS['singleton'] = Singleton::getInstance();

diff --git a/PHPUnit/Tests/phpunit.xml.dist b/PHPUnit/Tests/phpunit.xml.dist
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         syntaxCheck="false">
   <php>
     <var name="PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_ENABLED"
          value="false"/>

diff --git a/PHPUnit/Util/Test.php b/PHPUnit/Util/Test.php
@@ -67,6 +67,7 @@ class PHPUnit_Util_Test
     const REGEX_COVERS                   = '/@covers[\s]+([\!<>\:\.\w]+)([\s]+<extended>)?/';
     const REGEX_DATA_PROVIDER            = '/@dataProvider\s+([a-zA-Z0-9._:-\\\]+)/';
     const REGEX_DEPENDS                  = '/@depends\s+([a-zA-Z0-9._:-\\\]+)/';
+    const REGEX_USE_ERROR_HANDLER        = '/@errorHandler\s+([a-zA-Z0-9._-]+)/';
     const REGEX_EXPECTED_EXCEPTION       = '(@expectedException\s+([:.\w\\\]+)(?:[\t ]+(\S*))?(?:[\t ]+(\S*))?\s*$)m';
     const REGEX_GROUP                    = '/@group\s+([a-zA-Z0-9._-]+)/';
     const REGEX_USE_OUTPUT_BUFFERING     = '/@outputBuffering\s+([a-zA-Z0-9._-]+)/';
@@ -333,6 +334,21 @@ public static function getBackupSettings($classDocComment, $methodDocComment)
         );
     }
 
+    /**
+     * Returns the error handler settings for a test.
+     *
+     * @param  string $classDocComment
+     * @param  string $methodDocComment
+     * @return boolean
+     * @since  Method available since Release 3.4.0
+     */
+    public static function getErrorHandlerSettings($classDocComment, $methodDocComment)
+    {
+        return self::getSettings(
+          $classDocComment, $methodDocComment, self::REGEX_USE_ERROR_HANDLER
+        );
+    }
+
     /**
      * Returns the output buffering settings for a test.
      *