Fix deprecation warnings in PHP 8.2

This commit is contained in:
Kijin Sung 2023-05-01 00:05:56 +09:00
parent a1bd9cc2bc
commit 581097a9e3
3 changed files with 14 additions and 14 deletions

View file

@ -195,8 +195,8 @@ class ExtraItem
*/ */
function _getTypeValue($type, $value) function _getTypeValue($type, $value)
{ {
$value = trim($value); $value = trim($value ?? '');
if(!isset($value)) if($value === '')
{ {
return; return;
} }
@ -419,9 +419,9 @@ class ExtraItem
break; break;
// Phone Number // Phone Number
case 'tel' : case 'tel' :
$buff[] = '<input type="tel" name="' . $column_name . '[]" value="' . $value[0] . '" size="4" maxlength="4" class="tel rx_ev_tel1" />'; $buff[] = '<input type="tel" name="' . $column_name . '[]" value="' . ($value[0] ?? '') . '" size="4" maxlength="4" class="tel rx_ev_tel1" />';
$buff[] = '<input type="tel" name="' . $column_name . '[]" value="' . $value[1] . '" size="4" maxlength="4" class="tel rx_ev_tel2" />'; $buff[] = '<input type="tel" name="' . $column_name . '[]" value="' . ($value[1] ?? '') . '" size="4" maxlength="4" class="tel rx_ev_tel2" />';
$buff[] = '<input type="tel" name="' . $column_name . '[]" value="' . $value[2] . '" size="4" maxlength="4" class="tel rx_ev_tel3" />'; $buff[] = '<input type="tel" name="' . $column_name . '[]" value="' . ($value[2] ?? '') . '" size="4" maxlength="4" class="tel rx_ev_tel3" />';
break; break;
// Select Country Number // Select Country Number
case 'tel_intl' : case 'tel_intl' :
@ -433,7 +433,7 @@ class ExtraItem
if($country_info->calling_code) if($country_info->calling_code)
{ {
$selected = ''; $selected = '';
if(strval($value[0]) !== '' && $country_info->calling_code == $value[0]) if(strval($value[0] ?? '') !== '' && $country_info->calling_code == $value[0])
{ {
$selected = ' selected="selected"'; $selected = ' selected="selected"';
} }
@ -444,9 +444,9 @@ class ExtraItem
} }
} }
$buff[] = '</select>'; $buff[] = '</select>';
$buff[] = '<input type="tel" name="' . $column_name . '[]" value="' . $value[1] . '" size="4" maxlength="4" class="tel rx_ev_tel1" />'; $buff[] = '<input type="tel" name="' . $column_name . '[]" value="' . ($value[1] ?? '') . '" size="4" maxlength="4" class="tel rx_ev_tel1" />';
$buff[] = '<input type="tel" name="' . $column_name . '[]" value="' . $value[2] . '" size="4" maxlength="4" class="tel rx_ev_tel2" />'; $buff[] = '<input type="tel" name="' . $column_name . '[]" value="' . ($value[2] ?? '') . '" size="4" maxlength="4" class="tel rx_ev_tel2" />';
$buff[] = '<input type="tel" name="' . $column_name . '[]" value="' . $value[3] . '" size="4" maxlength="4" class="tel rx_ev_tel3" />'; $buff[] = '<input type="tel" name="' . $column_name . '[]" value="' . ($value[3] ?? '') . '" size="4" maxlength="4" class="tel rx_ev_tel3" />';
break; break;
// Select Country // Select Country
case 'country': case 'country':
@ -456,7 +456,7 @@ class ExtraItem
foreach($country_list as $country_info) foreach($country_list as $country_info)
{ {
$selected = ''; $selected = '';
if (strval($value[0]) !== '' && $country_info->iso_3166_1_alpha3 == $value) if (strval($value[0] ?? '') !== '' && $country_info->iso_3166_1_alpha3 == $value)
{ {
$selected = ' selected="selected"'; $selected = ' selected="selected"';
} }
@ -475,7 +475,7 @@ class ExtraItem
foreach ($enable_language as $lang_type) foreach ($enable_language as $lang_type)
{ {
$selected = ''; $selected = '';
if (strval($value) !== '' && $lang_type == $value) if (isset($value) && strval($value) !== '' && $lang_type === $value)
{ {
$selected = ' selected="selected"'; $selected = ' selected="selected"';
} }
@ -491,7 +491,7 @@ class ExtraItem
foreach ($timezone_list as $key => $time_name) foreach ($timezone_list as $key => $time_name)
{ {
$selected = ''; $selected = '';
if (strval($value) !== '' && $key == $value) if (isset($value) && strval($value) !== '' && $key === $value)
{ {
$selected = ' selected="selected"'; $selected = ' selected="selected"';
} }

View file

@ -864,7 +864,7 @@ class DocumentItem extends BaseObject
public function getTags() public function getTags()
{ {
$tag_list = array_map(function($str) { return escape(utf8_trim($str), false); }, explode(',', $this->get('tags'))); $tag_list = array_map(function($str) { return escape(utf8_trim($str), false); }, explode(',', $this->get('tags') ?? ''));
$tag_list = array_filter($tag_list, function($str) { return $str !== ''; }); $tag_list = array_filter($tag_list, function($str) { return $str !== ''; });
return array_unique($tag_list); return array_unique($tag_list);
} }

View file

@ -66,7 +66,7 @@ class poll_maker extends EditorHandler
$poll_data = $oPollModel->_getPollinfo($args->poll_srl); $poll_data = $oPollModel->_getPollinfo($args->poll_srl);
Context::set('poll_data', $poll_data); Context::set('poll_data', $poll_data);
Context::set('colorset', $args->colorset); Context::set('colorset', $args->colorset ?? null);
Context::set('poll_srl', $args->poll_srl); Context::set('poll_srl', $args->poll_srl);
Context::set('style', $args->style); Context::set('style', $args->style);