}
if (PHP_SAPI != 'cli') {
- $flags = ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE;
+ $flags = ENT_COMPAT;
+ // avoid warnings on php < 5.4...
+ if (defined('ENT_HTML401')) {
+ $flags = $flags | ENT_HTML401;
+ }
+ if (defined('ENT_SUBSTITUTE')) {
+ $flags = $flags | ENT_SUBSTITUTE;
+ }
if ($encoding != null) {
print "<PRE>\n".htmlentities($message, $flags, $encoding)."\n</PRE>";
} else {
{
$this->assertArrayHasKey($key, $out);
$expected = $out[$key];
- if (gettype($expected['value']) == 'array') {
+ if (gettype($expected) == 'array') {
$this->assertequals('array', gettype($val));
} else {
- $this->assertequals($expected['value'], $val);
+ $this->assertequals($expected, $val);
}
}