Skip to content

Commit

Permalink
Merge branch 'feature/80-mocking-for-static-methods' of https://githu…
Browse files Browse the repository at this point in the history
…b.com/elliotchance/concise into feature/80-mocking-for-static-methods
  • Loading branch information
elliotchance committed Jul 26, 2014
2 parents e31f2b8 + 9a492a9 commit fcb74e4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions scripts/UpdateDocs.php
Expand Up @@ -31,6 +31,9 @@ function generateMarkdownItem($syntax, $description, $indent = '*')
return "$indent `$syntax` - $description\n";
}

/**
* @return string
*/
function generateMarkdownList(array $matchers)
{
$matchersDoc = '';
Expand Down
2 changes: 1 addition & 1 deletion src/Concise/Mock/PrototypeBuilder.php
Expand Up @@ -12,7 +12,7 @@ class PrototypeBuilder

/**
* Get the prototype for the method.
* @param ReflectionMethod $method
* @param \ReflectionMethod $method
* @return string
*/
public function getPrototype(\ReflectionMethod $method)
Expand Down
2 changes: 1 addition & 1 deletion src/Concise/Services/AssertionBuilder.php
Expand Up @@ -22,7 +22,7 @@ public function __construct(array $args)
}

/**
* @return Concise\Assertion
* @return Assertion
*/
public function getAssertion()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Concise/Syntax/MatcherParser.php
Expand Up @@ -80,7 +80,7 @@ protected function clearKeywordCache()
}

/**
* @param Concise\Matcher\AbstractMatcher $matcher
* @param \Concise\Matcher\AbstractMatcher $matcher
* @return boolean
*/
public function registerMatcher(\Concise\Matcher\AbstractMatcher $matcher)
Expand Down

0 comments on commit fcb74e4

Please sign in to comment.