tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FIX declarations matching PHPUnit_Framework_Assert

Browse Source 
FIX for phpunit error message: ERROR [Strict Notice]: Declaration of SapphireTest::assertNotContains() should be compatible with PHPUnit_Framework_Assert::assertNotContains, and the same error for assertContains()
This commit is contained in:
Michael Parkhill 2014-06-27 16:05:40 +12:00
parent 512c7140cc
commit 19e0d5e3d5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev/SapphireTest.php
View File

@ -508,10 +508,11 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
$haystack, $haystack,
$message = '', $message = '',
$ignoreCase = FALSE, $ignoreCase = FALSE,
$checkForObjectIdentity = TRUE $checkForObjectIdentity = TRUE,
$checkForNonObjectIdentity = false
) { ) {
if ($haystack instanceof DBField) $haystack = (string)$haystack; if ($haystack instanceof DBField) $haystack = (string)$haystack;
parent::assertContains($needle, $haystack, $message, $ignoreCase, $checkForObjectIdentity); parent::assertContains($needle, $haystack, $message, $ignoreCase, $checkForObjectIdentity, $checkForNonObjectIdentity);
} }
public static function assertNotContains( public static function assertNotContains(
@ -519,10 +520,11 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
$haystack, $haystack,
$message = '', $message = '',
$ignoreCase = FALSE, $ignoreCase = FALSE,
$checkForObjectIdentity = TRUE $checkForObjectIdentity = TRUE,
$checkForNonObjectIdentity = false
) { ) {
if ($haystack instanceof DBField) $haystack = (string)$haystack; if ($haystack instanceof DBField) $haystack = (string)$haystack;
parent::assertNotContains($needle, $haystack, $message, $ignoreCase, $checkForObjectIdentity); parent::assertNotContains($needle, $haystack, $message, $ignoreCase, $checkForObjectIdentity, $checkForNonObjectIdentity);
} }
/** /**