yii\console\controllers\MessageController now sorts created message…

…s, even if there is no new one, while saving to PHP file

framework/CHANGELOG.md

@@ -5,6 +5,7 @@ Yii Framework 2 Change Log
 -----------------------
 
 - Bug #8322: `yii\behaviors\TimestampBehavior::touch()` now throws an exception if owner is new record (klimov-paul)
+- Enh #8070: `yii\console\controllers\MessageController` now sorts created messages, even if there is no new one, while saving to PHP file (klimov-paul)
 - Enh #8286: `yii\console\controllers\MessageController` improved allowing extraction of nested translator calls (klimov-paul)
 
 

framework/console/controllers/MessageController.php

@@ -412,13 +412,15 @@ protected function saveMessagesToPHP($messages, $dirName, $overwrite, $removeUnu
     protected function saveMessagesCategoryToPHP($messages, $fileName, $overwrite, $removeUnused, $sort, $category)
     {
         if (is_file($fileName)) {
-            $existingMessages = require($fileName);
+            $rawExistingMessages = require($fileName);
+            $existingMessages = $rawExistingMessages;
             sort($messages);
             ksort($existingMessages);
-            if (array_keys($existingMessages) == $messages) {
+            if (array_keys($existingMessages) === $messages && (!$sort || array_keys($rawExistingMessages) === $messages)) {
                 $this->stdout("Nothing new in \"$category\" category... Nothing to save.\n\n", Console::FG_GREEN);
                 return;
             }
+            unset($rawExistingMessages);
             $merged = [];
             $untranslated = [];
             foreach ($messages as $message) {