Skip to content

Commit 96fa704

Browse files
nanasessnanasess
committed
Apply data/vendor/bin/rector process
1 parent bf85a6c commit 96fa704

File tree

9 files changed

+51
-27
lines changed

9 files changed

+51
-27
lines changed

‎data/class/SC_Display.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function setPrevURL()
7272
public function prepare($page, $is_admin = false)
7373
{
7474
if (!$this->deviceSeted || !is_null($this->view)) {
75-
$device = ($is_admin) ? DEVICE_TYPE_ADMIN : $this->detectDevice();
75+
$device = ($is_admin) ? DEVICE_TYPE_ADMIN : static::detectDevice();
7676
$this->setDevice($device);
7777
}
7878
$this->assignobj($page);

‎data/class/SC_Response.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function sendHeader()
6565
header($name.': '.$head);
6666
}
6767
if (strlen($this->statusCode) >= 1) {
68-
$this->sendHttpStatus($this->statusCode);
68+
static::sendHttpStatus($this->statusCode);
6969
}
7070
}
7171

‎data/class/helper/SC_Helper_DB.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public function sfGetRootId()
309309
$category_id = SC_Helper_DB_Ex::sfGetCategoryId($_GET['product_id'], $_GET['category_id']);
310310
// ROOTカテゴリIDの取得
311311
if (count($category_id) > 0) {
312-
$arrRet = $this->sfGetParentsArray('dtb_category', 'parent_category_id', 'category_id', $category_id);
312+
$arrRet = static::sfGetParentsArray('dtb_category', 'parent_category_id', 'category_id', $category_id);
313313
$root_id = $arrRet[0] ?? '';
314314
} else {
315315
$root_id = '';
@@ -344,7 +344,7 @@ public static function sfGetRollbackPoint($order_id, $use_point, $add_point, $or
344344
$rollback_point = $arrRet['point'];
345345

346346
// 対応状況がポイント利用対象の場合、使用ポイント分を戻す
347-
if (SC_Helper_Purchase_Ex::isUsePoint($order_status)) {
347+
if ((new SC_Helper_Purchase_Ex())->isUsePoint($order_status)) {
348348
$rollback_point += $use_point;
349349
}
350350

@@ -500,7 +500,7 @@ public function sfGetCatCombName($category_id)
500500
{
501501
// 商品が属するカテゴリIDを縦に取得
502502
$objQuery = SC_Query_Ex::getSingletonInstance();
503-
$arrCatID = $this->sfGetParentsArray('dtb_category', 'parent_category_id', 'category_id', $category_id);
503+
$arrCatID = static::sfGetParentsArray('dtb_category', 'parent_category_id', 'category_id', $category_id);
504504
$ConbName = '';
505505

506506
// カテゴリ名称を取得する
@@ -530,7 +530,7 @@ public function sfGetFirstCat($category_id)
530530
// 商品が属するカテゴリIDを縦に取得
531531
$objQuery = SC_Query_Ex::getSingletonInstance();
532532
$arrRet = [];
533-
$arrCatID = $this->sfGetParentsArray('dtb_category', 'parent_category_id', 'category_id', $category_id);
533+
$arrCatID = static::sfGetParentsArray('dtb_category', 'parent_category_id', 'category_id', $category_id);
534534
$arrRet['id'] = $arrCatID[0];
535535

536536
// カテゴリ名称を取得する
@@ -1565,9 +1565,9 @@ public function sfGetMakerId($product_id, $maker_id = 0, $closed = false)
15651565
$this->g_maker_on = true;
15661566
$maker_id = (int) $maker_id;
15671567
$product_id = (int) $product_id;
1568-
if (SC_Utils_Ex::sfIsInt($maker_id) && $maker_id != 0 && $this->sfIsRecord('dtb_maker', 'maker_id', $maker_id)) {
1568+
if (SC_Utils_Ex::sfIsInt($maker_id) && $maker_id != 0 && static::sfIsRecord('dtb_maker', 'maker_id', $maker_id)) {
15691569
$this->g_maker_id = [$maker_id];
1570-
} elseif (SC_Utils_Ex::sfIsInt($product_id) && $product_id != 0 && $this->sfIsRecord('dtb_products', 'product_id', $product_id, $status)) {
1570+
} elseif (SC_Utils_Ex::sfIsInt($product_id) && $product_id != 0 && static::sfIsRecord('dtb_products', 'product_id', $product_id, $status)) {
15711571
$objQuery = SC_Query_Ex::getSingletonInstance();
15721572
$maker_id = $objQuery->getCol('maker_id', 'dtb_products', 'product_id = ?', [$product_id]);
15731573
$this->g_maker_id = $maker_id;

‎data/class/helper/SC_Helper_Delivery.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ public function get($deliv_id, $has_deleted = false)
5757
$arrDeliv = $arrRet[0];
5858

5959
// お届け時間の取得
60-
$arrDeliv['deliv_time'] = $this->getDelivTime($deliv_id);
60+
$arrDeliv['deliv_time'] = static::getDelivTime($deliv_id);
6161

6262
// 配送料金の取得
63-
$arrDeliv['deliv_fee'] = $this->getDelivFeeList($deliv_id);
63+
$arrDeliv['deliv_fee'] = static::getDelivFeeList($deliv_id);
6464

6565
// 支払方法
66-
$arrDeliv['payment_ids'] = $this->getPayments($deliv_id);
66+
$arrDeliv['payment_ids'] = static::getPayments($deliv_id);
6767

6868
return $arrDeliv;
6969
}

‎data/class/helper/SC_Helper_PageLayout.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ public function setBlocPathTo($device_type_id = DEVICE_TYPE_PC, &$arrBlocs = [])
361361
foreach ($arrBlocs as $key => $value) {
362362
$arrBloc = &$arrBlocs[$key];
363363
$arrBloc['php_path'] = SC_Utils_Ex::isBlank($arrBloc['php_path']) ? '' : HTML_REALDIR.$arrBloc['php_path'];
364-
$bloc_dir = $this->getTemplatePath($device_type_id).BLOC_DIR;
364+
$bloc_dir = static::getTemplatePath($device_type_id).BLOC_DIR;
365365
$arrBloc['tpl_path'] = SC_Utils_Ex::isBlank($arrBloc['tpl_path']) ? '' : $bloc_dir.$arrBloc['tpl_path'];
366366
}
367367
}

‎data/class/helper/SC_Helper_Purchase.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -93,28 +93,28 @@ public function completeOrder($orderStatus = ORDER_NEW)
9393
}
9494

9595
$uniqId = $objSiteSession->getUniqId();
96-
$this->verifyChangeCart($uniqId, $objCartSession);
96+
static::verifyChangeCart($uniqId, $objCartSession);
9797

98-
$orderTemp = $this->getOrderTemp($uniqId);
98+
$orderTemp = static::getOrderTemp($uniqId);
9999

100100
$orderTemp['status'] = $orderStatus;
101101
$cartkey = $objCartSession->getKey();
102102
$order_id = $this->registerOrderComplete($orderTemp, $objCartSession, $cartkey);
103103
$isMultiple = self::isMultiple();
104-
$shippingTemp = &$this->getShippingTemp($isMultiple);
104+
$shippingTemp = &static::getShippingTemp($isMultiple);
105105
foreach ($shippingTemp as $shippingId => $val) {
106-
$this->registerShipmentItem($order_id, $shippingId, $val['shipment_item']);
106+
static::registerShipmentItem($order_id, $shippingId, $val['shipment_item']);
107107
}
108108

109-
$this->registerShipping($order_id, $shippingTemp);
109+
static::registerShipping($order_id, $shippingTemp);
110110
$objQuery->commit();
111111

112112
// 会員情報の最終購入日、購入合計を更新
113113
if ($customerId > 0) {
114114
SC_Customer_Ex::updateOrderSummary($customerId);
115115
}
116116

117-
$this->cleanupSession($order_id, $objCartSession, $objCustomer, $cartkey);
117+
static::cleanupSession($order_id, $objCartSession, $objCustomer, $cartkey);
118118

119119
GC_Utils_Ex::gfPrintLog('order complete. order_id='.$order_id);
120120
}
@@ -888,7 +888,7 @@ public function registerOrderComplete($orderParams, &$objCartSession, $cartKey)
888888
$orderParams['create_date'] = 'CURRENT_TIMESTAMP';
889889
$orderParams['update_date'] = 'CURRENT_TIMESTAMP';
890890

891-
$this->registerOrder($orderParams['order_id'], $orderParams);
891+
static::registerOrder($orderParams['order_id'], $orderParams);
892892

893893
// 詳細情報を取得
894894
$cartItems = $objCartSession->getCartList($cartKey, $orderParams['order_pref'] ?? 0, $orderParams['order_country_id'] ?? 0);
@@ -920,7 +920,7 @@ public function registerOrderComplete($orderParams, &$objCartSession, $cartKey)
920920
}
921921
$i++;
922922
}
923-
$this->registerOrderDetail($orderParams['order_id'], $arrDetail);
923+
static::registerOrderDetail($orderParams['order_id'], $arrDetail);
924924

925925
$objQuery->update(
926926
'dtb_order_temp',
@@ -1155,7 +1155,7 @@ public function getShippings($order_id, $has_items = true)
11551155
if ($has_items) {
11561156
foreach ($arrResults as $shipping_id => $value) {
11571157
$arrResults[$shipping_id]['shipment_item']
1158-
= &$this->getShipmentItems($order_id, $shipping_id);
1158+
= &static::getShipmentItems($order_id, $shipping_id);
11591159
}
11601160
}
11611161

@@ -1524,7 +1524,7 @@ public function checkDbAllPendingOrder()
15241524
if (!SC_Utils_Ex::isBlank($arrOrders)) {
15251525
foreach ($arrOrders as $arrOrder) {
15261526
$order_id = $arrOrder['order_id'];
1527-
SC_Helper_Purchase_Ex::cancelOrder($order_id, ORDER_CANCEL, true);
1527+
(new SC_Helper_Purchase_Ex())->cancelOrder($order_id, ORDER_CANCEL, true);
15281528
GC_Utils_Ex::gfPrintLog('order cancel.(time expire) order_id='.$order_id);
15291529
}
15301530
}
@@ -1553,10 +1553,10 @@ public function checkDbMyPendignOrder()
15531553
$target_time = strtotime('-'.$term.' sec');
15541554
$create_time = strtotime($arrOrder['create_date']);
15551555
if (SC_Utils_Ex::isBlank($cartKeys) && $target_time < $create_time) {
1556-
SC_Helper_Purchase_Ex::rollbackOrder($order_id, ORDER_CANCEL, true);
1556+
(new SC_Helper_Purchase_Ex())->rollbackOrder($order_id, ORDER_CANCEL, true);
15571557
GC_Utils_Ex::gfPrintLog('order rollback.(my pending) order_id='.$order_id);
15581558
} else {
1559-
SC_Helper_Purchase_Ex::cancelOrder($order_id, ORDER_CANCEL, true);
1559+
(new SC_Helper_Purchase_Ex())->cancelOrder($order_id, ORDER_CANCEL, true);
15601560
if ($target_time > $create_time) {
15611561
GC_Utils_Ex::gfPrintLog('order cancel.(my pending and time expire) order_id='.$order_id);
15621562
} else {
@@ -1565,7 +1565,7 @@ public function checkDbMyPendignOrder()
15651565
}
15661566
}
15671567
} else {
1568-
SC_Helper_Purchase_Ex::cancelOrder($order_id, ORDER_CANCEL, true);
1568+
(new SC_Helper_Purchase_Ex())->cancelOrder($order_id, ORDER_CANCEL, true);
15691569
GC_Utils_Ex::gfPrintLog('order cancel.(my old pending) order_id='.$order_id);
15701570
}
15711571
}
@@ -1592,10 +1592,10 @@ public function checkSessionPendingOrder()
15921592
$objCartSess = new SC_CartSession_Ex();
15931593
$cartKeys = $objCartSess->getKeys();
15941594
if (SC_Utils_Ex::isBlank($cartKeys)) {
1595-
SC_Helper_Purchase_Ex::rollbackOrder($order_id, ORDER_CANCEL, true);
1595+
(new SC_Helper_Purchase_Ex())->rollbackOrder($order_id, ORDER_CANCEL, true);
15961596
GC_Utils_Ex::gfPrintLog('order rollback.(session pending) order_id='.$order_id);
15971597
} else {
1598-
SC_Helper_Purchase_Ex::cancelOrder($order_id, ORDER_CANCEL, true);
1598+
(new SC_Helper_Purchase_Ex())->cancelOrder($order_id, ORDER_CANCEL, true);
15991599
GC_Utils_Ex::gfPrintLog('order rollback.(session pending and set card) order_id='.$order_id);
16001600
}
16011601
}

‎data/class/pages/contact/LC_Page_Contact.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
*/
3131
class LC_Page_Contact extends LC_Page_Ex
3232
{
33+
public $tpl_shopname;
34+
public $tpl_infoemail;
3335
/**
3436
* Page を初期化する.
3537
*

‎data/class/pages/guide/LC_Page_Guide_Kiyaku.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,24 @@
3030
*/
3131
class LC_Page_Guide_Kiyaku extends LC_Page_Ex
3232
{
33+
public $tpl_kiyaku_title;
34+
public $tpl_kiyaku_text;
35+
/**
36+
* @var int
37+
*/
38+
public $tpl_kiyaku_index;
39+
/**
40+
* @var int
41+
*/
42+
public $tpl_kiyaku_last_index;
43+
/**
44+
* @var bool
45+
*/
46+
public $tpl_kiyaku_is_first;
47+
/**
48+
* @var bool
49+
*/
50+
public $tpl_kiyaku_is_last;
3351
/**
3452
* Page を初期化する.
3553
*

‎data/class/pages/products/LC_Page_Products_Detail.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
*/
3131
class LC_Page_Products_Detail extends LC_Page_Ex
3232
{
33+
/**
34+
* @var mixed[]
35+
*/
36+
public $arrClassCat2;
3337
/** 商品ステータス */
3438
public $arrSTATUS;
3539

0 commit comments

Comments
 (0)