Permalink
Browse files

merged 2.0

  • Loading branch information...
fabpot committed Apr 25, 2012
2 parents 52807f7 + 3e0a191 commit 774b1d53e73de4b8be24cbce81b50d60e1123c90
Showing with 2 additions and 2 deletions.
  1. +2 −2 Tests/ParserTest.php
View
@@ -118,8 +118,8 @@ public function testObjectsSupport()
public function testNonUtf8Exception()
{
- if (!function_exists('mb_detect_encoding')) {
- $this->markTestSkipped('Exceptions for non-utf8 charsets require the mb_detect_encoding() function.');
+ if (!function_exists('mb_detect_encoding') || !function_exists('iconv')) {
+ $this->markTestSkipped('Exceptions for non-utf8 charsets require the mb_detect_encoding() and iconv() functions.');
return;
}

0 comments on commit 774b1d5

Please sign in to comment.