Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #853 from adam-lynch/patch-2

Fixed some PHPDoc block mistakes
  • Loading branch information...
commit 77b96fb65998bd36b54486a0bb0e417e9590ef1a 2 parents d9b0438 + cf444ca
@whatthejeff whatthejeff authored
Showing with 3 additions and 2 deletions.
  1. +3 −2 PHPUnit/Framework/TestCase.php
View
5 PHPUnit/Framework/TestCase.php
@@ -416,6 +416,7 @@ public function hasOutput()
/**
* @param string $expectedRegex
* @since Method available since Release 3.6.0
+ * @throws PHPUnit_Framework_Exception
*/
public function expectOutputRegex($expectedRegex)
{
@@ -973,6 +974,7 @@ public function runBare()
* Override to run the test and assert its state.
*
* @return mixed
+ * @throws Exception|PHPUnit_Framework_Exception
* @throws PHPUnit_Framework_Exception
*/
protected function runTest()
@@ -1697,8 +1699,6 @@ public static function throwException(Exception $exception)
}
/**
- *
- *
* @param mixed $value, ...
* @return PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls
* @since Method available since Release 3.0.0
@@ -1927,6 +1927,7 @@ public static function tearDownAfterClass()
*
* @param Exception $e
* @since Method available since Release 3.4.0
+ * @throws Exception
*/
protected function onNotSuccessfulTest(Exception $e)
{
Please sign in to comment.
Something went wrong with that request. Please try again.