Prepare release
Prepare release
Prepare release
Fix dependencies
Prepare release
Prepare release
Use PHP_CodeCoverage 2.0 for PHPUnit 4.1
Prepare release
Remove duplicate array_unique call.

This is repeated two lines down.
Rename loop variable to match getLinesToBeUsed.

Trying to reduce the difference between these two methods.
Refactor getLinesToBeCovered to use simpler code from getLinesToBeUsed.

These two methods were very similar, but took two very different
approaches to how they were constructed.  The getLinesToBeUsed seemed
nicer to work with (fewer regex's specific to this function), so I
picked it as it the better of the two.

I'm not aware of any differences in behavior introduced by this change,
although the "TemplateMethods" bit referred to is something I am not
familiar with.

The main goal of this refactoring is to make it possible to increase
functionality of both @covers and @uses without doing so in incompatible
ways.  The common functionality should be able to be extracted out into
a shared method to help with this.
Fix skip message
Update --log-json test(s) for PHP 5.6
Merge branch '4.0' into 4.1
Merge branch '4.1'
Merge branch 'refactor-getLinesToBeCovered' of github.com:nubs/phpunit into refactoring/getLinesToBeCovered
More refactoring
Spread some @covers annotation goodness around
Merge branch '4.0' into 4.1
Merge branch '4.1'