Fixed some PHPDoc block mistakes #853

Merged
merged 1 commit into from Mar 9, 2013

Conversation

Projects
None yet
2 participants
Contributor

adam-lynch commented Mar 8, 2013

No description provided.

@whatthejeff whatthejeff and 1 other commented on an outdated diff Mar 8, 2013

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

whatthejeff Mar 8, 2013

Collaborator

What's this about?

@adam-lynch

adam-lynch Mar 8, 2013

Contributor

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

@whatthejeff whatthejeff and 1 other commented on an outdated diff Mar 8, 2013

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

whatthejeff Mar 8, 2013

Collaborator

Could you fix the whitespace here?

@whatthejeff whatthejeff and 1 other commented on an outdated diff Mar 8, 2013

PHPUnit/Framework/TestCase.php
@@ -1696,9 +1696,6 @@ public static function throwException(Exception $exception)
}
/**
- *
- *
- * @param mixed $value, ...
@whatthejeff

whatthejeff Mar 8, 2013

Collaborator

Why remove this?

@adam-lynch

adam-lynch Mar 8, 2013

Contributor

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

Contributor

adam-lynch commented Mar 8, 2013

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

Collaborator

whatthejeff commented Mar 8, 2013

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

Contributor

adam-lynch commented Mar 8, 2013

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.

Collaborator

whatthejeff commented Mar 8, 2013

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.

Contributor

adam-lynch commented Mar 8, 2013

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

Contributor

adam-lynch commented Mar 9, 2013

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

@whatthejeff whatthejeff added a commit that referenced this pull request Mar 9, 2013

@whatthejeff whatthejeff Merge pull request #853 from adam-lynch/patch-2
Fixed some PHPDoc block mistakes
77b96fb

@whatthejeff whatthejeff merged commit 77b96fb into sebastianbergmann:master Mar 9, 2013

Collaborator

whatthejeff commented Mar 9, 2013

Thanks for your patience, @adam-lynch :)

Contributor

adam-lynch commented Mar 9, 2013

Thanks for yours!

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