Fix issue #920 #1147

Closed
wants to merge 2 commits into
from

3 participants

@tiyowan

Remove PHP_CodeCoverage_Filter::getInstance() methods from Bootstrap.php and reimplement the same functionality in phpunit.xml. This enables unit tests to work with the newer PHPUnit version 3.6.10 and PHP_CodeCoverage 1.1.2, as well as older versions PHPUnit (PHPUnit 3.5.14/PHP_CodeCoverage 1.0.4)

Signed-off-by: tiyowan tiyowan@gmail.com

@tiyowan tiyowan Fix issue #920
Remove PHP_CodeCoverage_Filter::getInstance() methoda from Bootstrap.php
and reimplement the same functionality in phpunit.xml. This enables unit
tests to work with the newer PHPUnit version 3.6.10 and PHP_CodeCoverage
1.1.2, as well as older versions PHPUnit (PHPUnit 3.5.14/PHP_CodeCoverage
1.0.4)

Signed-off-by: tiyowan <tiyowan@gmail.com>
2160372
@narfbg narfbg and 1 other commented on an outdated diff Mar 8, 2012
@@ -14,4 +14,17 @@
</testsuite>
</testsuites>
+ <filters>
@narfbg
narfbg added a line comment Mar 8, 2012

Use tabs for indentation. Other lines as well. :)

@tiyowan
tiyowan added a line comment Mar 9, 2012

Oops, let me rectify that.

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

Could we merge #1055 first, then this one, so we did not make a conflict. In those pull i just commented out that lines. If we could remove them, like this one, that will be cleaner.

@narfbg

@toopay If both pull requests would change the same chunks of code, it doesn't matter which one is merged first - the other will be in conflict.

@toopay toopay added a commit that referenced this pull request Mar 9, 2012
@toopay toopay Add tiyowan suggestion #1147 a03cbc5
@tiyowan

If #1055 is going to take awhile to merge, could we merge this one first and resolve the conflicts later? Because this is just a minor fix that's sort of critical, since it prevents unit tests from running at all.

@tiyowan

@narfbg How about merging in the one with a fix and then @toopay's work that adds support for travis?

@tiyowan tiyowan Fix indentation
Signed-off-by: tiyowan <tiyowan@gmail.com>
bb40516
@tiyowan

Can we pull this in? It'd be nice to close this issue before I move on to writing some unit tests for form_validation.php.

Thanks

@narfbg

@tiyowan Sorry, but I'm not really familiar with unit tests, so I can't properly review related pull requests.

@philsturgeon ?

@tiyowan

@narfbg Ah ok, well, the way to test this is to check whether the tests run without a getInstance() fatal error using phpunit versions 3.5/3.6.

@toopay

@tiyowan I already put all your changes here, into #1055. The only different from your pull here from mine which submitted two weeks ago, essentially, i was not deleting those lines. I let them there, and just commented them out. And yes, it blocking the test to be run, in some version of phpunit, which unfortunately, the one used by the travis workers. This pull can be closed now, if you dont mind.

@tiyowan

@toopay no worries, I'll close this one. But we need to get your pull in because it's really important to fix the fact that the unit tests can't even run because of some versions of phpunit. If your changes don't go in, I'll reopen this.

@tiyowan tiyowan closed this Mar 9, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment