php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-14 06:11:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #16910: Fix messages sorting on extract

Browse Source
This commit is contained in:
Andrew
2018-12-12 22:57:24 +03:00
committed by Alexander Makarov
parent d07e286dbd
commit c162bd7ae7
4 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -3,6 +3,7 @@ Yii Framework 2 Change Log
2.0.16 under development
------------------------
- Bug #16910: Fix messages sorting on extract (Groonya)
- Bug #15683: Fixed file as array uploading in MultipartFormDataParser (Groonya)
- Bug #16822: Create config dir recursively in message/config (Groonya)

4
framework/console/controllers/MessageController.php
View File

@ -722,7 +722,7 @@ EOD;
}
}
}
$merged = array_merge($todo, $merged);
$merged = array_merge($merged, $todo);
if ($sort) {
ksort($merged);
}
@ -825,7 +825,7 @@ EOD;
}
}
$merged = array_merge($todos, $merged);
$merged = array_merge($merged, $todos);
if ($sort) {
ksort($merged);
}

29
tests/framework/console/controllers/BaseMessageControllerTest.php
View File

@ -592,6 +592,35 @@ abstract class BaseMessageControllerTest extends TestCase
$this->assertArrayHasKey($positiveKey1, $messages);
$this->assertArrayHasKey($positiveKey2, $messages);
}
public function testMessagesSorting()
{
$category = 'test_order_category';
$key1 = 'key1';
$key2 = 'key2';
$sourceFileContent = "Yii::t('{$category}', '{$key1}');Yii::t('{$category}', '{$key2}');";
$this->createSourceFile($sourceFileContent);
$this->saveMessages([$key2 => 'already translated'], $category);
$this->saveConfigFile($this->getConfig([
'sort' => true,
]));
$this->runMessageControllerAction('extract', [$this->configFileName]);
$keys = array_keys($this->loadMessages($category));
$this->assertEquals([$key1, $key2], $keys, "The order of messages should be '{$key1}, {$key2}' when sort equals true");
$this->saveMessages([$key2 => 'already translated'], $category);
$this->saveConfigFile($this->getConfig([
'sort' => false,
]));
$this->runMessageControllerAction('extract', [$this->configFileName]);
$keys = array_keys($this->loadMessages($category));
$this->assertEquals([$key2, $key1], $keys, "The order of messages should be '{$key2}, {$key1}' when sort equals false and {$key1} was added later");
}
}
class MessageControllerMock extends MessageController

7
tests/framework/console/controllers/DbMessageControllerTest.php
View File

@ -186,4 +186,11 @@ class DbMessageControllerTest extends BaseMessageControllerTest
$this->assertArrayHasKey($obsoleteMessage, $messages, "Obsolete message should not be removed. Command output:\n\n" . $out);
$this->assertEquals($obsoleteTranslation, $messages[$obsoleteMessage], "Obsolete message was not marked properly. Command output:\n\n" . $out);
}
public function testMessagesSorting()
{
$this->markTestSkipped('There\'s no need to order messages for database');
}
}