Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2021-05-27 04:58:30 +0300
committerGitHub <noreply@github.com>2021-05-27 04:58:30 +0300
commitc973567705a0065fdd7d7c7b11b80f1f0f1be350 (patch)
tree89947dbce864ac48389c742fce31d30106eebada /core/Concurrency
parent70b05de003487a31495bb9927017606a2faab7dd (diff)
Update PHP extension requirements & deprecate Common::mb_* methods (#16754)
* Require polyfill for mbstring and iconv * remove mbstring methods from upgrade.php * remove checks for some php extensions * deprecate Common::mb_* methods, as we can directly use mb_* functions instead * updates expected test files * Directly use mb_* methods in favor of Common::mb_* * Update expected screenshot Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
Diffstat (limited to 'core/Concurrency')
-rw-r--r--core/Concurrency/Lock.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Concurrency/Lock.php b/core/Concurrency/Lock.php
index 2019c2955f..9959a533c9 100644
--- a/core/Concurrency/Lock.php
+++ b/core/Concurrency/Lock.php
@@ -82,11 +82,11 @@ class Lock
{
$this->lockKey = $this->lockKeyStart . $id;
- if (Common::mb_strlen($this->lockKey) > self::MAX_KEY_LEN) {
+ if (mb_strlen($this->lockKey) > self::MAX_KEY_LEN) {
// Lock key might be too long for DB column, so we hash it but leave the start of the original as well
// to make it more readable
$md5Len = 32;
- $this->lockKey = Common::mb_substr($id, 0, self::MAX_KEY_LEN - $md5Len - 1) . md5($id);
+ $this->lockKey = mb_substr($id, 0, self::MAX_KEY_LEN - $md5Len - 1) . md5($id);
}
$lockValue = substr(Common::generateUniqId(), 0, 12);