Remove unnecessary if-else statement.
This will become PHPUnit 4.2
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.
Merge branch '4.1'
Merge branch 'refactor-getLinesToBeCovered' of github.com:nubs/phpunit into refactoring/getLinesToBeCovered
More refactoring
Merge branch '4.1'
Mark a test as risky when its method is annotated with @todo
Merge branch '4.1'
Refinement of 560c99abb8b7db7f5d7ca72653126134c97b3ac1
Merge branch '4.1'
This is PHPUnit 4.2
Merge branch '4.1'
Merge branch '4.1'
Merge branch '4.1'
Merge branch '4.1'
Merge pull request #1211 from yvoyer/cleanup-unnecessary-if-else

Code cleanup: Remove unnecessary if-else statement.
Bump PHPUnit_MockObject dependency