Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fixed some PHPDoc block mistakes #853

Merged
merged 1 commit into from

2 participants

@adam-lynch

No description provided.

PHPUnit/Framework/TestCase.php
@@ -850,8 +851,9 @@ public function runBare()
$this->setUp();
$this->checkRequirements();
$this->assertPreConditions();
- $this->testResult = $this->runTest();
- $this->verifyMockObjects();
+ $this->testResult = $this->
+ ();$this->verifyMockObjects
@whatthejeff Collaborator

What's this about?

Accidental. I edited this file in my browser.

  1. Ctrl+F
  2. "runTest"
  3. enter assumed I could press enter to find the next one
  4. enter; which actually overrode the string "runTest" in the code with a new line
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
PHPUnit/Framework/TestCase.php
@@ -1263,14 +1265,12 @@ protected function iniSet($varName, $newValue)
}
/**
- * This method is a wrapper for the setlocale() function that automatically
- * resets the locale to its original value after the test is run.
- *
- * @param integer $category
- * @param string $locale
- * @throws PHPUnit_Framework_Exception
- * @since Method available since Release 3.1.0
- */
+ * This method is a wrapper for the setlocale() function that automatically
@whatthejeff Collaborator

Could you fix the whitespace here?

np

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
PHPUnit/Framework/TestCase.php
@@ -1696,9 +1696,6 @@ public static function throwException(Exception $exception)
}
/**
- *
- *
- * @param mixed $value, ...
@whatthejeff Collaborator

Why remove this?

Ah sorry. Didn't see the func_get_args() call

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@adam-lynch

Ok, it's probably because I did it in my browser. I'll sort it in my IDE. (whitespace)

@whatthejeff
Collaborator

Alright, can you also rebase and squash some of those commits after you fix the whitespace issue?

@adam-lynch

Ok, how's that now?

I added back in the @params for the method with the whitespace issue because I noticed it had a func_get_args() call too.

@whatthejeff
Collaborator

It's much closer now :)

The whitespace is still not quite right. We use four spaces to indent, but it looks like you are using a tab.

@adam-lynch

Ah ok. I'll complete this simple pull-request before I die hopefully :)

@adam-lynch

Ok, there we go. Just replaced all the tabs with four spaces, rebased & squashed

@whatthejeff whatthejeff merged commit 77b96fb into from
@whatthejeff
Collaborator

Thanks for your patience, @adam-lynch :)

@adam-lynch

Thanks for yours!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 9, 2013
  1. @adam-lynch
This page is out of date. Refresh to see the latest.
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()
@@ -1696,8 +1698,6 @@ public static function throwException(Exception $exception)
}
/**
- *
- *
* @param mixed $value, ...
* @return PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls
* @since Method available since Release 3.0.0
@@ -1926,6 +1926,7 @@ public static function tearDownAfterClass()
*
* @param Exception $e
* @since Method available since Release 3.4.0
+ * @throws Exception
*/
protected function onNotSuccessfulTest(Exception $e)
{
Something went wrong with that request. Please try again.