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

Merge pull request #3238 from mparkhill/3.1

Browse Source 
FIX declarations matching PHPUnit_Framework_Assert
This commit is contained in:
Simon Welsh 2014-08-07 21:30:04 +10:00
commit 61395b5618
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);
} }
/** /**