Skip to content

Commit

Permalink
Merge branch '5.4' into 6.0
Browse files Browse the repository at this point in the history
* 5.4:
  Use mb_convert_encoding instead of utf8_decode
  [FrameworkBundle] Always add CacheCollectorPass
  Fix "Notice: Undefined index: headers" in messenger with Oracle
  [String] Fix ansi escape sequences regex
  Indicate support for doctrine/persistence 3
  [Routing] fix router base url when default uri has trailing slash
  Replace deprecated String.prototype.substr()
  • Loading branch information
derrabus committed Apr 22, 2022
2 parents 821883b + f5c0f6d commit 3d38cf8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Tests/Loader/XliffFileLoaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ public function testEncoding()
$loader = new XliffFileLoader();
$catalogue = $loader->load(__DIR__.'/../fixtures/encoding.xlf', 'en', 'domain1');

$this->assertEquals(utf8_decode('föö'), $catalogue->get('bar', 'domain1'));
$this->assertEquals(utf8_decode('bär'), $catalogue->get('foo', 'domain1'));
$this->assertEquals(mb_convert_encoding('föö', 'ISO-8859-1', 'UTF-8'), $catalogue->get('bar', 'domain1'));
$this->assertEquals(mb_convert_encoding('bär', 'ISO-8859-1', 'UTF-8'), $catalogue->get('foo', 'domain1'));
$this->assertEquals(
[
'source' => 'foo',
'notes' => [['content' => utf8_decode('bäz')]],
'notes' => [['content' => mb_convert_encoding('bäz', 'ISO-8859-1', 'UTF-8')]],
'id' => '1',
'file' => [
'original' => 'file.ext',
Expand Down

0 comments on commit 3d38cf8

Please sign in to comment.