diff --git a/composer.json b/composer.json
index 492c6bd6ded..593f0ff9511 100644
--- a/composer.json
+++ b/composer.json
@@ -76,8 +76,8 @@
"ezyang/htmlpurifier": "^4.6",
"cebe/markdown": "~1.0.0 | ~1.1.0 | ~1.2.0",
"bower-asset/jquery": "3.7.*@stable | 3.6.*@stable | 3.5.*@stable | 3.4.*@stable | 3.3.*@stable | 3.2.*@stable | 3.1.*@stable | 2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
- "bower-asset/inputmask": "~3.2.2 | ~3.3.5 | ~5.0.8 ",
- "bower-asset/punycode": "1.3.* | 2.2.*",
+ "bower-asset/inputmask": "^5.0.8 ",
+ "bower-asset/punycode": "^2.2",
"bower-asset/yii2-pjax": "~2.0.1",
"paragonie/random_compat": ">=1"
},
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index dc032ca138a..8306ab21373 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -11,6 +11,8 @@ Yii Framework 2 Change Log
2.0.50 under development
------------------------
+- Bug #13920: Fixed erroneous validation for specific cases (tim-fischer-maschinensucher)
+- Bug #19927: Fixed `console\controllers\MessageController` when saving translations to database: fixed FK error when adding new string and language at the same time, checking/regenerating all missing messages and dropping messages for unused languages (atrandafir)
- Enh #12743: Added new methods `BaseActiveRecord::loadRelations()` and `BaseActiveRecord::loadRelationsFor()` to eager load related models for existing primary model instances (PowerGamer1)
diff --git a/framework/assets/yii.activeForm.js b/framework/assets/yii.activeForm.js
index b12f812c37d..5b9ce4aaec2 100644
--- a/framework/assets/yii.activeForm.js
+++ b/framework/assets/yii.activeForm.js
@@ -395,9 +395,11 @@
data: $form.serialize() + extData,
dataType: data.settings.ajaxDataType,
complete: function (jqXHR, textStatus) {
+ currentAjaxRequest = null;
$form.trigger(events.ajaxComplete, [jqXHR, textStatus]);
},
beforeSend: function (jqXHR, settings) {
+ currentAjaxRequest = jqXHR;
$form.trigger(events.ajaxBeforeSend, [jqXHR, settings]);
},
success: function (msgs) {
@@ -563,6 +565,9 @@
return;
}
+ if (currentAjaxRequest !== null) {
+ currentAjaxRequest.abort();
+ }
if (data.settings.timer !== undefined) {
clearTimeout(data.settings.timer);
}
@@ -929,4 +934,7 @@
$form.find(attribute.input).attr('aria-invalid', hasError ? 'true' : 'false');
}
}
+
+ var currentAjaxRequest = null;
+
})(window.jQuery);
diff --git a/framework/composer.json b/framework/composer.json
index e6da7d26d9e..0b27d62ff1a 100644
--- a/framework/composer.json
+++ b/framework/composer.json
@@ -71,8 +71,8 @@
"ezyang/htmlpurifier": "^4.6",
"cebe/markdown": "~1.0.0 | ~1.1.0 | ~1.2.0",
"bower-asset/jquery": "3.7.*@stable | 3.6.*@stable | 3.5.*@stable | 3.4.*@stable | 3.3.*@stable | 3.2.*@stable | 3.1.*@stable | 2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
- "bower-asset/inputmask": "~3.2.2 | ~3.3.5 | ~5.0.8 ",
- "bower-asset/punycode": "1.3.* | 2.2.*",
+ "bower-asset/inputmask": "^5.0.8 ",
+ "bower-asset/punycode": "^2.2",
"bower-asset/yii2-pjax": "~2.0.1",
"paragonie/random_compat": ">=1"
},
diff --git a/framework/console/controllers/MessageController.php b/framework/console/controllers/MessageController.php
index 4650cec797a..fb4e012f523 100644
--- a/framework/console/controllers/MessageController.php
+++ b/framework/console/controllers/MessageController.php
@@ -353,17 +353,7 @@ protected function saveMessagesToDb($messages, $db, $sourceMessageTable, $messag
foreach ($rows as $row) {
$currentMessages[$row['category']][$row['id']] = $row['message'];
}
-
- $currentLanguages = [];
- $rows = (new Query())->select(['language'])->from($messageTable)->groupBy('language')->all($db);
- foreach ($rows as $row) {
- $currentLanguages[] = $row['language'];
- }
- $missingLanguages = [];
- if (!empty($currentLanguages)) {
- $missingLanguages = array_diff($languages, $currentLanguages);
- }
-
+
$new = [];
$obsolete = [];
@@ -372,89 +362,130 @@ protected function saveMessagesToDb($messages, $db, $sourceMessageTable, $messag
if (isset($currentMessages[$category])) {
$new[$category] = array_diff($msgs, $currentMessages[$category]);
+ // obsolete messages per category
$obsolete += array_diff($currentMessages[$category], $msgs);
} else {
$new[$category] = $msgs;
}
}
-
+
+ // obsolete categories
foreach (array_diff(array_keys($currentMessages), array_keys($messages)) as $category) {
$obsolete += $currentMessages[$category];
}
if (!$removeUnused) {
foreach ($obsolete as $pk => $msg) {
+ // skip already marked unused
if (strncmp($msg, '@@', 2) === 0 && substr($msg, -2) === '@@') {
unset($obsolete[$pk]);
}
}
- }
-
- $obsolete = array_keys($obsolete);
+ }
+
$this->stdout('Inserting new messages...');
- $savedFlag = false;
+ $insertCount = 0;
foreach ($new as $category => $msgs) {
foreach ($msgs as $msg) {
- $savedFlag = true;
- $lastPk = $db->schema->insert($sourceMessageTable, ['category' => $category, 'message' => $msg]);
- foreach ($languages as $language) {
- $db->createCommand()
- ->insert($messageTable, ['id' => $lastPk['id'], 'language' => $language])
- ->execute();
- }
- }
- }
-
- if (!empty($missingLanguages)) {
- $updatedMessages = [];
- $rows = (new Query())->select(['id', 'category', 'message'])->from($sourceMessageTable)->all($db);
- foreach ($rows as $row) {
- $updatedMessages[$row['category']][$row['id']] = $row['message'];
- }
- foreach ($updatedMessages as $category => $msgs) {
- foreach ($msgs as $id => $msg) {
- $savedFlag = true;
- foreach ($missingLanguages as $language) {
- $db->createCommand()
- ->insert($messageTable, ['id' => $id, 'language' => $language])
- ->execute();
- }
- }
+ $insertCount++;
+ $db->schema->insert($sourceMessageTable, ['category' => $category, 'message' => $msg]);
}
}
-
- $this->stdout($savedFlag ? "saved.\n" : "Nothing to save.\n");
+
+ $this->stdout($insertCount ? "{$insertCount} saved.\n" : "Nothing to save.\n");
+
$this->stdout($removeUnused ? 'Deleting obsoleted messages...' : 'Updating obsoleted messages...');
if (empty($obsolete)) {
$this->stdout("Nothing obsoleted...skipped.\n");
- return;
}
- if ($removeUnused) {
- $db->createCommand()
- ->delete($sourceMessageTable, ['in', 'id', $obsolete])
- ->execute();
- $this->stdout("deleted.\n");
- } elseif ($markUnused) {
- $rows = (new Query())
- ->select(['id', 'message'])
- ->from($sourceMessageTable)
- ->where(['in', 'id', $obsolete])
- ->all($db);
-
- foreach ($rows as $row) {
- $db->createCommand()->update(
- $sourceMessageTable,
- ['message' => '@@' . $row['message'] . '@@'],
- ['id' => $row['id']]
- )->execute();
+ if ($obsolete) {
+ if ($removeUnused) {
+ $affected = $db->createCommand()
+ ->delete($sourceMessageTable, ['in', 'id', array_keys($obsolete)])
+ ->execute();
+ $this->stdout("{$affected} deleted.\n");
+ } elseif ($markUnused) {
+ $marked=0;
+ $rows = (new Query())
+ ->select(['id', 'message'])
+ ->from($sourceMessageTable)
+ ->where(['in', 'id', array_keys($obsolete)])
+ ->all($db);
+
+ foreach ($rows as $row) {
+ $marked++;
+ $db->createCommand()->update(
+ $sourceMessageTable,
+ ['message' => '@@' . $row['message'] . '@@'],
+ ['id' => $row['id']]
+ )->execute();
+ }
+ $this->stdout("{$marked} updated.\n");
+ } else {
+ $this->stdout("kept untouched.\n");
}
- $this->stdout("updated.\n");
- } else {
- $this->stdout("kept untouched.\n");
}
+
+ // get fresh message id list
+ $freshMessagesIds = [];
+ $rows = (new Query())->select(['id'])->from($sourceMessageTable)->all($db);
+ foreach ($rows as $row) {
+ $freshMessagesIds[] = $row['id'];
+ }
+
+ $this->stdout("Generating missing rows...");
+ $generatedMissingRows = [];
+
+ foreach ($languages as $language) {
+ $count = 0;
+
+ // get list of ids of translations for this language
+ $msgRowsIds = [];
+ $msgRows = (new Query())->select(['id'])->from($messageTable)->where([
+ 'language'=>$language,
+ ])->all($db);
+ foreach ($msgRows as $row) {
+ $msgRowsIds[] = $row['id'];
+ }
+
+ // insert missing
+ foreach ($freshMessagesIds as $id) {
+ if (!in_array($id, $msgRowsIds)) {
+ $db->createCommand()
+ ->insert($messageTable, ['id' => $id, 'language' => $language])
+ ->execute();
+ $count++;
+ }
+ }
+ if ($count) {
+ $generatedMissingRows[] = "{$count} for {$language}";
+ }
+ }
+
+ $this->stdout($generatedMissingRows ? implode(", ", $generatedMissingRows).".\n" : "Nothing to do.\n");
+
+ $this->stdout("Dropping unused languages...");
+ $droppedLanguages=[];
+
+ $currentLanguages = [];
+ $rows = (new Query())->select(['language'])->from($messageTable)->groupBy('language')->all($db);
+ foreach ($rows as $row) {
+ $currentLanguages[] = $row['language'];
+ }
+
+ foreach ($currentLanguages as $currentLanguage) {
+ if (!in_array($currentLanguage, $languages)) {
+ $deleted=$db->createCommand()->delete($messageTable, "language=:language", [
+ 'language'=>$currentLanguage,
+ ])->execute();
+ $droppedLanguages[] = "removed {$deleted} rows for $currentLanguage";
+ }
+ }
+
+ $this->stdout($droppedLanguages ? implode(", ", $droppedLanguages).".\n" : "Nothing to do.\n");
}
/**
diff --git a/framework/console/controllers/ServeController.php b/framework/console/controllers/ServeController.php
index 68a7e50c286..d02c982042e 100644
--- a/framework/console/controllers/ServeController.php
+++ b/framework/console/controllers/ServeController.php
@@ -80,7 +80,7 @@ public function actionIndex($address = 'localhost')
}
$this->stdout("Quit the server with CTRL-C or COMMAND-C.\n");
- passthru('"' . PHP_BINARY . '"' . " -S {$address} -t \"{$documentRoot}\" $router");
+ passthru('"' . PHP_BINARY . '"' . " -S {$address} -t \"{$documentRoot}\" \"$router\"");
}
/**
diff --git a/framework/messages/config.php b/framework/messages/config.php
index 93845f2e0a9..6028328f315 100644
--- a/framework/messages/config.php
+++ b/framework/messages/config.php
@@ -15,8 +15,7 @@
'languages' => [
'af', 'ar', 'az', 'be', 'bg', 'bs', 'ca', 'cs', 'da', 'de', 'el', 'es', 'et', 'fa', 'fi', 'fr', 'he', 'hi',
'pt-BR', 'ro', 'hr', 'hu', 'hy', 'id', 'it', 'ja', 'ka', 'kk', 'ko', 'kz', 'lt', 'lv', 'ms', 'nb-NO', 'nl',
- 'pl', 'pt', 'ru', 'sk', 'sl', 'sr', 'sr-Latn', 'sv', 'tg', 'th', 'tr', 'uk', 'uz', 'uz-Cy', 'vi', 'zh-CN',
- 'zh-TW'
+ 'pl', 'pt', 'ru', 'sk', 'sl', 'sr', 'sr-Latn', 'sv', 'tg', 'th', 'tr', 'uk', 'uz', 'uz-Cy', 'vi', 'zh', 'zh-TW'
],
// string, the name of the function for translating messages.
// Defaults to 'Yii::t'. This is used as a mark to find the messages to be
diff --git a/framework/widgets/MaskedInputAsset.php b/framework/widgets/MaskedInputAsset.php
index 57748be86f8..473f4315ffa 100644
--- a/framework/widgets/MaskedInputAsset.php
+++ b/framework/widgets/MaskedInputAsset.php
@@ -21,7 +21,7 @@ class MaskedInputAsset extends AssetBundle
{
public $sourcePath = '@bower/inputmask/dist';
public $js = [
- 'jquery.inputmask.bundle.js',
+ 'jquery.inputmask.js',
];
public $depends = [
'yii\web\YiiAsset',
diff --git a/tests/js/data/yii.activeForm.html b/tests/js/data/yii.activeForm.html
index d44c9f1282b..d278be5b8b8 100644
--- a/tests/js/data/yii.activeForm.html
+++ b/tests/js/data/yii.activeForm.html
@@ -48,3 +48,15 @@
+
diff --git a/tests/js/tests/yii.activeForm.test.js b/tests/js/tests/yii.activeForm.test.js
index 16671239ea3..f79599b0747 100644
--- a/tests/js/tests/yii.activeForm.test.js
+++ b/tests/js/tests/yii.activeForm.test.js
@@ -27,6 +27,21 @@ describe('yii.activeForm', function () {
var script = new vm.Script(code);
var context = new vm.createContext({window: window, document: window.document, yii: yii});
script.runInContext(context);
+ /** This is a workaround for a jsdom issue, that prevents :hidden and :visible from working as expected.
+ * @see https://github.com/jsdom/jsdom/issues/1048 */
+ context.window.Element.prototype.getClientRects = function () {
+ var node = this;
+ while(node) {
+ if(node === document) {
+ break;
+ }
+ if (!node.style || node.style.display === 'none' || node.style.visibility === 'hidden') {
+ return [];
+ }
+ node = node.parentNode;
+ }
+ return [{width: 100, height: 100}];
+ };
}
var activeFormHtml = fs.readFileSync('tests/js/data/yii.activeForm.html', 'utf-8');
@@ -117,6 +132,60 @@ describe('yii.activeForm', function () {
assert.isFalse($activeForm.data('yiiActiveForm').validated);
});
});
+
+ describe('with ajax validation', function () {
+ describe('with rapid validation of multiple fields', function () {
+ it('should cancel overlapping ajax requests and not display outdated validation results', function () {
+ $activeForm = $('#w3');
+ $activeForm.yiiActiveForm([{
+ id: 'test-text2',
+ input: '#test-text2',
+ container: '.field-test-text2',
+ enableAjaxValidation: true
+ }, {
+ id: 'test-text3',
+ input: '#test-text3',
+ container: '.field-test-text3',
+ enableAjaxValidation: true
+ }], {
+ validationUrl: ''
+ });
+
+ let requests = [];
+ function fakeAjax(object) {
+ const request = {
+ jqXHR: {
+ abort: function () {
+ request.aborted = true;
+ }
+ },
+ aborted: false,
+ respond: function (response) {
+ if (this.aborted) {
+ return;
+ }
+ object.success(response);
+ object.complete(this.jqXHR, '');
+ }
+ };
+ requests.push(request);
+ object.beforeSend(request.jqXHR, '');
+ }
+
+ const ajaxStub = sinon.stub($, 'ajax', fakeAjax);
+ $activeForm.yiiActiveForm('validateAttribute', 'test-text2');
+ assert.isTrue(requests.length === 1);
+ $activeForm.yiiActiveForm('validateAttribute', 'test-text3');
+ // When validateAttribute was called on text2, its value was valid.
+ // The value of text3 wasn't.
+ requests[0].respond({'test-text3': ['Field cannot be empty']});
+ // When validateAttribute was called on text3, its value was valid.
+ requests[1].respond([]);
+ assert.isTrue($activeForm.find('.field-test-text3').hasClass('has-success'));
+ ajaxStub.restore();
+ });
+ });
+ })
});
describe('resetForm method', function () {