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

Replaced substr_compare with strncmp where possible

Browse Source
This commit is contained in:
Alexander Makarov
2014-07-30 02:32:27 +04:00
parent 3a1e0f3a5c
commit 100ba6c3ab
5 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,7 +332,7 @@ class MessageController extends Controller
ksort($existingMessages);
foreach ($existingMessages as $message => $translation) {
if (!isset($merged[$message]) && !isset($todo[$message]) && !$removeUnused) {
if (!empty($translation) && substr_compare($translation, '@@', 0, 2) === 0 && substr_compare($translation, '@@', -2) === 0) {
if (!empty($translation) && strncmp($translation, '@@', 2) === 0 && substr_compare($translation, '@@', -2) === 0) {
$todo[$message] = $translation;
} else {
$todo[$message] = '@@' . $translation . '@@';

2
framework/i18n/GettextMoFile.php
View File

@@ -109,7 +109,7 @@ class GettextMoFile extends GettextFile
$separatorPosition = strpos($id, chr(4));
if (($context && $separatorPosition !== false && !empty($id) && substr_compare($id, $context, 0, $separatorPosition) === 0) ||
if (($context && $separatorPosition !== false && strncmp($id, $context, $separatorPosition) === 0) ||
(!$context && $separatorPosition === false)) {
if ($separatorPosition !== false) {
$id = substr($id, $separatorPosition+1);

2
framework/i18n/MessageFormatter.php
View File

@@ -392,7 +392,7 @@ class MessageFormatter extends Component
}
$selector = trim($plural[$i++]);
if ($i == 1 && !empty($selector) && substr_compare($selector, 'offset:', 0, 7) === 0) {
if ($i == 1 && strncmp($selector, 'offset:', 7) === 0) {
$offset = (int) trim(mb_substr($selector, 7, ($pos = mb_strpos(str_replace(["\n", "\r", "\t"], ' ', $selector), ' ', 7)) - 7));
$selector = trim(mb_substr($selector, $pos + 1));
}