From 5ed306ed54f5f21ffa6f45a49a4d6d81f1f1af8a Mon Sep 17 00:00:00 2001 From: Eshin Kunishima Date: Sat, 30 Apr 2016 00:11:21 +0900 Subject: [PATCH] =?UTF-8?q?=E6=9B=B8=E3=81=8D=E6=8F=9B=E3=81=88=E3=82=92?= =?UTF-8?q?=E4=BC=B4=E3=81=86=20foreach=20=E3=81=A7=E3=83=AA=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=83=AC=E3=83=B3=E3=82=B9=E3=82=92=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wiki-common/lib/PukiWiki/File/FileUtility.php | 6 +++--- wiki-common/lib/PukiWiki/Listing.php | 6 +++--- wiki-common/lib/PukiWiki/Mailer.php | 4 ++-- .../PukiWiki/Renderer/Element/RootElement.php | 4 ++-- wiki-common/lib/PukiWiki/Search.php | 4 ++-- wiki-common/lib/PukiWiki/Spam/Spam.php | 4 ++-- wiki-common/lib/PukiWiki/Spam/SpamUtility.php | 6 +++--- wiki-common/plugin/htdigest.inc.php | 4 ++-- wiki-common/plugin/htmlinsert.inc.php | 18 +++++++++--------- wiki-common/plugin/vote.inc.php | 4 ++-- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/wiki-common/lib/PukiWiki/File/FileUtility.php b/wiki-common/lib/PukiWiki/File/FileUtility.php index 4d567a40..39b57607 100644 --- a/wiki-common/lib/PukiWiki/File/FileUtility.php +++ b/wiki-common/lib/PukiWiki/File/FileUtility.php @@ -205,11 +205,11 @@ private static function getHeadings($dir = DATA_DIR, $force = false){ // ページの索引でソート ksort($ret, SORT_NATURAL); - foreach ($ret as $initial=>$pages){ + foreach ($ret as $initial => &$pages){ // ページ名の「読み」でソート - asort($ret[$initial], SORT_NATURAL); + asort($pages, SORT_NATURAL); // 「読み」でソートしたやつを$headingに保存 - $heading[$func][$initial] = array_keys($ret[$initial]); + $heading[$func][$initial] = array_keys($pages); } unset($ret); diff --git a/wiki-common/lib/PukiWiki/Listing.php b/wiki-common/lib/PukiWiki/Listing.php index f3c55f85..ea67efc8 100644 --- a/wiki-common/lib/PukiWiki/Listing.php +++ b/wiki-common/lib/PukiWiki/Listing.php @@ -92,11 +92,11 @@ private static function getHeadings($type='wiki', $force = false){ // ページの索引でソート ksort($ret, SORT_NATURAL); - foreach ($ret as $initial=>$pages){ + foreach ($ret as $initial => &$pages){ // ページ名の「読み」でソート - asort($ret[$initial], SORT_NATURAL); + asort($pages, SORT_NATURAL); // 「読み」でソートしたやつを$headingに保存 - $heading[$type][$initial] = array_keys($ret[$initial]); + $heading[$type][$initial] = array_keys($pages); } unset($ret); diff --git a/wiki-common/lib/PukiWiki/Mailer.php b/wiki-common/lib/PukiWiki/Mailer.php index dd08e63a..d62dbfc7 100644 --- a/wiki-common/lib/PukiWiki/Mailer.php +++ b/wiki-common/lib/PukiWiki/Mailer.php @@ -49,8 +49,8 @@ function notify($subject, $message, $summary = array(), $summary_position = FALS if (! empty($summary)) { $_separator = empty($message) ? '' : self::SUMMRY_SEPARATOR . "\n"; - foreach($summary as $key => $value) { - $summary[$key] = $key . ': ' . $value . "\n"; + foreach($summary as $key => &$value) { + $value = $key . ': ' . $value . "\n"; } // Top or Bottom if ($summary_position) { diff --git a/wiki-common/lib/PukiWiki/Renderer/Element/RootElement.php b/wiki-common/lib/PukiWiki/Renderer/Element/RootElement.php index a8974976..011e1e6a 100644 --- a/wiki-common/lib/PukiWiki/Renderer/Element/RootElement.php +++ b/wiki-common/lib/PukiWiki/Renderer/Element/RootElement.php @@ -263,8 +263,8 @@ public function toString() private function comment($matches) { $comments = explode("\n", $matches[0]); - foreach ($comments as $key=>$comment) { - $comments[$key] = array_shift($this->comments); + foreach ($comments as &$comment) { + $comment = array_shift($this->comments); } $comment = join("\n", $comments); return ''; diff --git a/wiki-common/lib/PukiWiki/Search.php b/wiki-common/lib/PukiWiki/Search.php index 5140e85e..18d19a45 100644 --- a/wiki-common/lib/PukiWiki/Search.php +++ b/wiki-common/lib/PukiWiki/Search.php @@ -126,8 +126,8 @@ public static function do_search($word, $type = 'and', $non_format = FALSE, $bas // 検索ワードをパース $keys = self::get_search_words(preg_split('/\s+/', $word, -1, PREG_SPLIT_NO_EMPTY)); - foreach ($keys as $key=>$value) - $keys[$key] = '/' . $value . '/S'; + foreach ($keys as &$value) + $value = '/' . $value . '/S'; // AND:TRUE OR:FALSE $b_type = ($type == 'and'); diff --git a/wiki-common/lib/PukiWiki/Spam/Spam.php b/wiki-common/lib/PukiWiki/Spam/Spam.php index 9028dce8..8f95f1a8 100644 --- a/wiki-common/lib/PukiWiki/Spam/Spam.php +++ b/wiki-common/lib/PukiWiki/Spam/Spam.php @@ -590,11 +590,11 @@ public static function summarize_detail_badhost($progress = array()) // Shrink per list // From: 'A-1' => array('ie.to') // To: 'A-1' => 'ie.to' - foreach($blocked as $list => $lvalue) { + foreach($blocked as &$lvalue) { if (is_array($lvalue) && count($lvalue) == 1 && is_numeric(key($lvalue))) { - $blocked[$list] = current($lvalue); + $lvalue = current($lvalue); } } diff --git a/wiki-common/lib/PukiWiki/Spam/SpamUtility.php b/wiki-common/lib/PukiWiki/Spam/SpamUtility.php index 17650104..eeeaadf4 100644 --- a/wiki-common/lib/PukiWiki/Spam/SpamUtility.php +++ b/wiki-common/lib/PukiWiki/Spam/SpamUtility.php @@ -298,12 +298,12 @@ function array_unique_recursive($array = array()) if (! is_array($array)) return $array; $tmp = array(); - foreach($array as $key => $value){ + foreach($array as &$value){ if (is_array($value)) { - $array[$key] = self::array_unique_recursive($value); + $value = self::array_unique_recursive($value); } else { if (isset($tmp[$value])) { - unset($array[$key]); + unset($value); } else { $tmp[$value] = TRUE; } diff --git a/wiki-common/plugin/htdigest.inc.php b/wiki-common/plugin/htdigest.inc.php index b8e86d28..7c7972c6 100644 --- a/wiki-common/plugin/htdigest.inc.php +++ b/wiki-common/plugin/htdigest.inc.php @@ -325,7 +325,7 @@ function htdigest_save($username,$p_realm,$hash,$role) } $sw = FALSE; - foreach($lines as $no=>$line) { + foreach($lines as &$line) { $field = explode(':', trim($line)); if ($field[0] == $username && $field[1] == $p_realm) { if ($field[2] == $decrypted_hash) { @@ -333,7 +333,7 @@ function htdigest_save($username,$p_realm,$hash,$role) } $sw = TRUE; - $lines[$no] = $field[0].':'.$field[1].':'.$decrypted_hash."\n"; + $line = $field[0].':'.$field[1].':'.$decrypted_hash."\n"; break; } } diff --git a/wiki-common/plugin/htmlinsert.inc.php b/wiki-common/plugin/htmlinsert.inc.php index b15f2350..8bc59300 100644 --- a/wiki-common/plugin/htmlinsert.inc.php +++ b/wiki-common/plugin/htmlinsert.inc.php @@ -73,12 +73,12 @@ function parse_args_action($vars, $default_options) $options = $default_options; unset($vars['cmd']); // pukiwiki reserved key unset($vars['page']); // - foreach ($vars as $key => $val) { + foreach ($vars as $key => &$val) { if (isset($options[$key])) { $options[$key] = $val; - unset($vars[$key]); + unset($val); } else { - $vars[$key] = htmlsc($val); + $val = htmlsc($val); } } return array($page, $vars, $options); @@ -227,26 +227,26 @@ function replace_variables($body, $variables) return; } } - foreach ($values as $idx => $value) { + foreach ($values as $idx => &$value) { switch ($encs[$idx]) { case 'enc': - $values[$idx] = rawurlencode($value); + $value = rawurlencode($value); break; case 'utf8': $value = mb_convert_encoding($value, 'UTF-8', SOURCE_ENCODING); - $values[$idx] = rawurlencode($value); + $value = rawurlencode($value); break; case 'euc': $value = mb_convert_encoding($value, 'EUC', SOURCE_ENCODING); - $values[$idx] = rawurlencode($value); + $value = rawurlencode($value); break; case 'sjis': $value = mb_convert_encoding($value, 'SJIS', SOURCE_ENCODING); - $values[$idx] = rawurlencode($value); + $value = rawurlencode($value); break; case 'jis': $value = mb_convert_encoding($value, 'JIS', SOURCE_ENCODING); - $values[$idx] = rawurlencode($value); + $value = rawurlencode($value); break; case '': case 'raw': diff --git a/wiki-common/plugin/vote.inc.php b/wiki-common/plugin/vote.inc.php index 6b61642f..23c32004 100644 --- a/wiki-common/plugin/vote.inc.php +++ b/wiki-common/plugin/vote.inc.php @@ -207,11 +207,11 @@ function get_update_inline(&$lines, $vote_id, $choice_id) list($votes, $options) = $this->parse_args_inline($args, $this->default_options); if ($options['readonly']) return array(false, false, false, false); - foreach ($votes as $i => $vote) { + foreach ($votes as $i => &$vote) { list($choice, $count) = $vote; if ($i == $choice_id) { ++$count; - $votes[$i] = array($choice, $count); + $vote = array($choice, $count); } } $new_args = $this->restore_args_inline($votes, $options, $this->default_options);