From bc8734f882b5388c5e39b8a7bec34e287429fb65 Mon Sep 17 00:00:00 2001 From: Umherirrender Date: Fri, 8 Dec 2017 14:55:06 +0100 Subject: [PATCH] RevisionTest: Use utf-8 as name in iconv utf8 is an alias that doesn't work with all PHP installations. Change-Id: Ief6e5d8b73c9b4a6614430b699f3399b8137689a --- tests/phpunit/includes/RevisionTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/phpunit/includes/RevisionTest.php b/tests/phpunit/includes/RevisionTest.php index 3d0556ea32..361984be45 100644 --- a/tests/phpunit/includes/RevisionTest.php +++ b/tests/phpunit/includes/RevisionTest.php @@ -491,25 +491,25 @@ class RevisionTest extends MediaWikiTestCase { ]; yield '(ISO-8859-1 encoding), string in string out' => [ 'ISO-8859-1', - iconv( 'utf8', 'ISO-8859-1', "1®Àþ1" ), + iconv( 'utf-8', 'ISO-8859-1', "1®Àþ1" ), [], '1®Àþ1', ]; yield '(ISO-8859-1 encoding), serialized object in with gzip flags returns string' => [ 'ISO-8859-1', - gzdeflate( iconv( 'utf8', 'ISO-8859-1', "4®Àþ4" ) ), + gzdeflate( iconv( 'utf-8', 'ISO-8859-1', "4®Àþ4" ) ), [ 'gzip' ], '4®Àþ4', ]; yield '(ISO-8859-1 encoding), serialized object in with object flags returns string' => [ 'ISO-8859-1', - serialize( new TitleValue( 0, iconv( 'utf8', 'ISO-8859-1', "3®Àþ3" ) ) ), + serialize( new TitleValue( 0, iconv( 'utf-8', 'ISO-8859-1', "3®Àþ3" ) ) ), [ 'object' ], '3®Àþ3', ]; yield '(ISO-8859-1 encoding), serialized object in with object & gzip flags returns string' => [ 'ISO-8859-1', - gzdeflate( serialize( new TitleValue( 0, iconv( 'utf8', 'ISO-8859-1', "2®Àþ2" ) ) ) ), + gzdeflate( serialize( new TitleValue( 0, iconv( 'utf-8', 'ISO-8859-1', "2®Àþ2" ) ) ) ), [ 'gzip', 'object' ], '2®Àþ2', ]; -- 2.20.1