diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index f4ec4fd77d..a329eff1c3 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -16,7 +16,6 @@ 'no_superfluous_phpdoc_tags' => false, // 副作用があるため 'increment_style' => false, // 強制しなくて良い 'yoda_style' => false, // 強制しなくて良い - 'trailing_comma_in_multiline' => false, // `, ]` となるケースを防ぐため // @Symfony:risky のうち、以下のルールを無効化 'psr_autoloading' => false, // PSR-4 に準拠していないため diff --git a/data/class/SC_CartSession.php b/data/class/SC_CartSession.php index b457ea576b..645d997646 100644 --- a/data/class/SC_CartSession.php +++ b/data/class/SC_CartSession.php @@ -289,7 +289,7 @@ public function setPrevURL($url, $excludePaths = []) { // 前頁として記録しないページを指定する。 $arrExclude = [ - '/shopping/' + '/shopping/', ]; $arrExclude = array_merge($arrExclude, $excludePaths); $exclude = false; diff --git a/data/class/SC_Fpdf.php b/data/class/SC_Fpdf.php index d7429f6b71..f3094b468b 100644 --- a/data/class/SC_Fpdf.php +++ b/data/class/SC_Fpdf.php @@ -77,7 +77,7 @@ public function __construct($download, $title, $tpl_pdf = 'nouhinsyo1.pdf') $this->arrMessage = [ 'このたびはお買上げいただきありがとうございます。', '下記の内容にて納品させていただきます。', - 'ご確認くださいますよう、お願いいたします。' + 'ご確認くださいますよう、お願いいたします。', ]; // SJISフォント diff --git a/data/class/SC_Response.php b/data/class/SC_Response.php index d3e75ef10a..331edd818b 100644 --- a/data/class/SC_Response.php +++ b/data/class/SC_Response.php @@ -364,7 +364,7 @@ public static function sendHttpStatus($statusCode) 503 => 'Service Unavailable', // サービス利用不可 504 => 'Gateway Timeout', // ゲートウェイタイムアウト 505 => 'HTTP Version Not Supported', // サポートしていないHTTPバージョン - 509 => 'Bandwidth Limit Exceeded' // 帯域幅制限超過 + 509 => 'Bandwidth Limit Exceeded', // 帯域幅制限超過 ]; if (isset($messages[$statusCode])) { if ($httpVersion !== '1.1') { diff --git a/data/class/SC_SendMail.php b/data/class/SC_SendMail.php index e8aa371a81..64905df724 100644 --- a/data/class/SC_SendMail.php +++ b/data/class/SC_SendMail.php @@ -168,7 +168,7 @@ public function setHost($host) $this->host = $host; $arrHost = [ 'host' => $this->host, - 'port' => $this->port + 'port' => $this->port, ]; // PEAR::Mailを使ってメール送信オブジェクト作成 $this->objMail = &Mail::factory('smtp', $arrHost); @@ -185,7 +185,7 @@ public function setPort($port) $this->port = $port; $arrHost = [ 'host' => $this->host, - 'port' => $this->port + 'port' => $this->port, ]; // PEAR::Mailを使ってメール送信オブジェクト作成 $this->objMail = &Mail::factory('smtp', $arrHost); diff --git a/data/class/api/SC_Api_Operation.php b/data/class/api/SC_Api_Operation.php index 0019f9572f..8053fac26b 100644 --- a/data/class/api/SC_Api_Operation.php +++ b/data/class/api/SC_Api_Operation.php @@ -369,8 +369,8 @@ public static function doApiAction($arrPost) // 実行成功 $arrResponseValidSection = ['Request' => [ 'IsValid' => 'True', - $operation_name.'Request' => $arrOperationRequestValid - ] + $operation_name.'Request' => $arrOperationRequestValid, + ], ]; $response_outer = $operation_name.'Response'; SC_Api_Utils_Ex::printApiLog('Operation SUCCESS', $start_time, $response_outer); @@ -382,8 +382,8 @@ public static function doApiAction($arrPost) } $arrResponseValidSection = ['Request' => [ 'IsValid' => 'False', - 'Errors' => ['Error' => $arrResponseErrorSection] - ] + 'Errors' => ['Error' => $arrResponseErrorSection], + ], ]; if (is_object($objApiOperation)) { $response_outer = $operation_name.'Response'; @@ -416,7 +416,7 @@ protected static function getOperationRequestEcho($arrParam, $start_time) { $arrRet = [ 'HTTPHeaders' => ['Header' => ['_attributes' => ['Name' => 'UserAgent', - 'Value' => htmlspecialchars($_SERVER['HTTP_USER_AGENT'])]]], + 'Value' => htmlspecialchars($_SERVER['HTTP_USER_AGENT']), ]]], 'RequestId' => $start_time, 'Arguments' => [], ]; diff --git a/data/class/api/SC_Api_Utils.php b/data/class/api/SC_Api_Utils.php index a39073a6b3..6767a779ae 100644 --- a/data/class/api/SC_Api_Utils.php +++ b/data/class/api/SC_Api_Utils.php @@ -235,9 +235,9 @@ public static function sendResponseXml($response_outer_name, &$arrResponse) 'encoding' => 'UTF-8', 'rootName' => $response_outer_name, 'rootAttributes' => ['xmlns' => self::API_XMLNS.ECCUBE_VERSION, - 'xml:lang' => self::API_XML_LANG], + 'xml:lang' => self::API_XML_LANG, ], 'defaultTagName' => 'Response', - 'attributesArray' => '_attributes' + 'attributesArray' => '_attributes', ]; $objSerializer = new XML_Serializer($options); diff --git a/data/class/api/operations/BrowseNodeLookup.php b/data/class/api/operations/BrowseNodeLookup.php index 28f929cbfa..8be9786d19 100644 --- a/data/class/api/operations/BrowseNodeLookup.php +++ b/data/class/api/operations/BrowseNodeLookup.php @@ -72,14 +72,14 @@ public function doAction($arrParam) 'BrowseNodeId' => $category_id, 'Name' => $arrCategory['category_name'], 'PageURL' => HTTP_URL.'products/list.php?category_id='.$arrCategory['category_id'], - 'has_children' => count($arrChildren) > 0 + 'has_children' => count($arrChildren) > 0, ]; } else { $arrData = [ 'BrowseNodeId' => $category_id, 'Name' => 'ホーム', 'PageURL' => HTTP_URL, - 'has_children' => count($arrChildren) > 0 + 'has_children' => count($arrChildren) > 0, ]; } @@ -90,7 +90,7 @@ public function doAction($arrParam) 'BrowseNodeId' => $category['category_id'], 'Name' => $category['category_name'], 'PageURL' => HTTP_URL.'products/list.php?category_id='.$category['category_id'], - 'has_children' => $category['has_children'] + 'has_children' => $category['has_children'], ]; } } diff --git a/data/class/api/operations/CartAdd.php b/data/class/api/operations/CartAdd.php index 4c868cc17f..1703c8e64c 100644 --- a/data/class/api/operations/CartAdd.php +++ b/data/class/api/operations/CartAdd.php @@ -40,7 +40,7 @@ class API_CartAdd extends SC_Api_Abstract_Ex public function doAction($arrParam) { $this->arrResponse = [ - 'Version' => ECCUBE_VERSION]; + 'Version' => ECCUBE_VERSION, ]; return true; } diff --git a/data/class/api/operations/CartClear.php b/data/class/api/operations/CartClear.php index 514e450bc4..fb1c0df218 100644 --- a/data/class/api/operations/CartClear.php +++ b/data/class/api/operations/CartClear.php @@ -40,7 +40,7 @@ class API_CartClear extends SC_Api_Abstract_Ex public function doAction($arrParam) { $this->arrResponse = [ - 'Version' => ECCUBE_VERSION]; + 'Version' => ECCUBE_VERSION, ]; return true; } diff --git a/data/class/api/operations/CartCreate.php b/data/class/api/operations/CartCreate.php index b5a9355e6e..3d8c1d9b7f 100644 --- a/data/class/api/operations/CartCreate.php +++ b/data/class/api/operations/CartCreate.php @@ -40,7 +40,7 @@ class API_CartCreate extends SC_Api_Abstract_Ex public function doAction($arrParam) { $this->arrResponse = [ - 'Version' => ECCUBE_VERSION]; + 'Version' => ECCUBE_VERSION, ]; return true; } diff --git a/data/class/api/operations/CartGet.php b/data/class/api/operations/CartGet.php index 1b32f6d436..a9c966d6a4 100644 --- a/data/class/api/operations/CartGet.php +++ b/data/class/api/operations/CartGet.php @@ -40,7 +40,7 @@ class API_CartGet extends SC_Api_Abstract_Ex public function doAction($arrParam) { $this->arrResponse = [ - 'Version' => ECCUBE_VERSION]; + 'Version' => ECCUBE_VERSION, ]; return true; } diff --git a/data/class/api/operations/CartModify.php b/data/class/api/operations/CartModify.php index 4cd288f0f0..285a697b43 100644 --- a/data/class/api/operations/CartModify.php +++ b/data/class/api/operations/CartModify.php @@ -40,7 +40,7 @@ class API_CartModify extends SC_Api_Abstract_Ex public function doAction($arrParam) { $this->arrResponse = [ - 'Version' => ECCUBE_VERSION]; + 'Version' => ECCUBE_VERSION, ]; return true; } diff --git a/data/class/api/operations/GetVersion.php b/data/class/api/operations/GetVersion.php index 00f47c0f31..b25656ab52 100644 --- a/data/class/api/operations/GetVersion.php +++ b/data/class/api/operations/GetVersion.php @@ -40,7 +40,7 @@ class API_GetVersion extends SC_Api_Abstract_Ex public function doAction($arrParam) { $this->arrResponse = [ - 'Version' => ECCUBE_VERSION]; + 'Version' => ECCUBE_VERSION, ]; return true; } diff --git a/data/class/api/operations/ItemSearch.php b/data/class/api/operations/ItemSearch.php index 6c45d1a0ea..ca66ca55b5 100644 --- a/data/class/api/operations/ItemSearch.php +++ b/data/class/api/operations/ItemSearch.php @@ -75,7 +75,7 @@ public function doAction($arrParam) $arrData[] = [ 'product_id' => $val['product_id'], 'DetailPageURL' => HTTP_URL.'products/detail.php?product_id='.$val['product_id'], - 'ItemAttributes' => $val + 'ItemAttributes' => $val, ]; } $this->setResponse('Item', $arrData); @@ -188,7 +188,7 @@ protected function getSearchCondition($arrSearchData) 'arrval' => [], 'where_category' => '', 'arrvalCategory' => [], - 'orderby' => '' + 'orderby' => '', ]; // カテゴリからのWHERE文字列取得 diff --git a/data/class/batch/SC_Batch_Update.php b/data/class/batch/SC_Batch_Update.php index a3e9f4ff58..fd4c280a7b 100644 --- a/data/class/batch/SC_Batch_Update.php +++ b/data/class/batch/SC_Batch_Update.php @@ -61,7 +61,7 @@ public function execute($target = '.') $arrLog = [ 'err' => [], 'ok' => [], - 'buckup_path' => $bkupPath + 'buckup_path' => $bkupPath, ]; if (!is_writable($bkupPath) || !is_writable($bkupPathFile)) { diff --git a/data/class/db/SC_DB_DBFactory.php b/data/class/db/SC_DB_DBFactory.php index 695d265111..d272e21e54 100644 --- a/data/class/db/SC_DB_DBFactory.php +++ b/data/class/db/SC_DB_DBFactory.php @@ -73,7 +73,7 @@ public function getDSN($dsn = '') 'protocol' => 'tcp', 'hostspec' => DB_SERVER, 'port' => DB_PORT, - 'database' => DB_NAME + 'database' => DB_NAME, ]; } else { return ''; diff --git a/data/class/db/SC_DB_MasterData.php b/data/class/db/SC_DB_MasterData.php index 5738da7d40..5b232f9db6 100644 --- a/data/class/db/SC_DB_MasterData.php +++ b/data/class/db/SC_DB_MasterData.php @@ -110,7 +110,7 @@ public function registMasterData($name, $columns, $masterData, $autoCommit = tru foreach ($masterData as $key => $val) { $sqlVal = [$columns[0] => (string) $key, $columns[1] => (string) $val, - $columns[2] => (string) $i]; + $columns[2] => (string) $i, ]; $this->objQuery->insert($name, $sqlVal); $i++; } diff --git a/data/class/helper/SC_Helper_DB.php b/data/class/helper/SC_Helper_DB.php index b1a5bbf2f4..0f2d855b39 100644 --- a/data/class/helper/SC_Helper_DB.php +++ b/data/class/helper/SC_Helper_DB.php @@ -684,7 +684,7 @@ public function addProductBeforCategories($category_id, $product_id) $objQuery = SC_Query_Ex::getSingletonInstance(); $sqlval = ['category_id' => $category_id, - 'product_id' => $product_id]; + 'product_id' => $product_id, ]; $arrSql = []; $arrSql['rank'] = '(SELECT COALESCE(MAX(rank), 0) FROM dtb_product_categories sub WHERE category_id = ?) + 1'; @@ -707,7 +707,7 @@ public function addProductBeforCategories($category_id, $product_id) public function addProductAfterCategories($category_id, $product_id) { $sqlval = ['category_id' => $category_id, - 'product_id' => $product_id]; + 'product_id' => $product_id, ]; $objQuery = SC_Query_Ex::getSingletonInstance(); diff --git a/data/class/helper/SC_Helper_Mobile.php b/data/class/helper/SC_Helper_Mobile.php index 6396cea665..11d1b5c83c 100644 --- a/data/class/helper/SC_Helper_Mobile.php +++ b/data/class/helper/SC_Helper_Mobile.php @@ -73,7 +73,7 @@ class SC_Helper_Mobile 'zip' => 'application/zip', 'doc' => 'application/msword', 'xls' => 'application/vnd.ms-excel', - 'ppt' => 'application/vnd.ms-powerpoint' + 'ppt' => 'application/vnd.ms-powerpoint', ]; /** diff --git a/data/class/helper/SC_Helper_Plugin.php b/data/class/helper/SC_Helper_Plugin.php index f340ed5664..0c3432c65b 100644 --- a/data/class/helper/SC_Helper_Plugin.php +++ b/data/class/helper/SC_Helper_Plugin.php @@ -311,7 +311,7 @@ public function setHeadNaviBlocs(&$arrBlocs) foreach ($this->arrHeadNaviBlocsByPlugin as $key => $value) { $arrBlocs[] = [ 'target_id' => $value, - 'php_path' => $key + 'php_path' => $key, ]; } } diff --git a/data/class/helper/SC_Helper_Purchase.php b/data/class/helper/SC_Helper_Purchase.php index 17716a5cc2..2b7aff1384 100644 --- a/data/class/helper/SC_Helper_Purchase.php +++ b/data/class/helper/SC_Helper_Purchase.php @@ -829,7 +829,7 @@ public function registerOrderComplete($orderParams, &$objCartSession, $cartKey) // 不要な変数を unset $unsets = [ 'mailmaga_flg', 'deliv_check', 'point_check', 'password', - 'reminder', 'reminder_answer', 'mail_flag', 'session' + 'reminder', 'reminder_answer', 'mail_flag', 'session', ]; foreach ($unsets as $unset) { unset($orderParams[$unset]); diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php index 5866a8a5c2..8a9d42fe1c 100644 --- a/data/class/helper/SC_Helper_TaxRule.php +++ b/data/class/helper/SC_Helper_TaxRule.php @@ -246,7 +246,7 @@ public static function getTaxRule($product_id = 0, $product_class_id = 0, $pref_ $arrRequest = ['product_id' => $product_id, 'product_class_id' => $product_class_id, 'pref_id' => $pref_id, - 'country_id' => $country_id]; + 'country_id' => $country_id, ]; // 地域設定を優先するが、システムパラメーターなどに設定を持っていくか // 後に書いてあるほど優先される、詳細後述MEMO参照 diff --git a/data/class/helper/SC_Helper_Transform.php b/data/class/helper/SC_Helper_Transform.php index 3c64901dfb..0f2b855386 100644 --- a/data/class/helper/SC_Helper_Transform.php +++ b/data/class/helper/SC_Helper_Transform.php @@ -710,7 +710,7 @@ protected function lfSetError($selector, $type, $err_msg = null) $this->arrErr[] = [ 'selector' => $selector, 'type' => $type, - 'err_msg' => $err_msg + 'err_msg' => $err_msg, ]; } } diff --git a/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php b/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php index 0bcda88f4e..f4ed45b79c 100644 --- a/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php +++ b/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php @@ -251,7 +251,7 @@ public function getProduct($product_id) $return = [ 'product_id' => $arrProduct['product_id'], 'main_list_image' => $arrProduct['main_list_image'], - 'name' => $arrProduct['name'] + 'name' => $arrProduct['name'], ]; return $return; diff --git a/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php b/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php index f3c45d96c0..bd76fac38a 100644 --- a/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php +++ b/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php @@ -182,7 +182,7 @@ public function createWhere(&$objFormParam, &$objDb) return [ 'where' => $where, - 'bind' => $bind + 'bind' => $bind, ]; } diff --git a/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php b/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php index a5100cf7bd..52a8da9d96 100644 --- a/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php +++ b/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php @@ -88,7 +88,7 @@ public function action() $objLayout->lfDelPageData($this->page_id, $this->device_type_id); SC_Response_Ex::reload(['device_type_id' => $this->device_type_id, - 'msg' => 'on'], true); + 'msg' => 'on', ], true); SC_Response_Ex::actionExit(); } } diff --git a/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php b/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php index f5906fb321..e02555a400 100644 --- a/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php +++ b/data/class/pages/admin/design/LC_Page_Admin_Design_UpDown.php @@ -151,7 +151,7 @@ public function lfCheckError(&$objFormParam, &$objUpFile) $arrIgnoreCode = ['admin', MOBILE_DEFAULT_TEMPLATE_NAME, SMARTPHONE_DEFAULT_TEMPLATE_NAME, - DEFAULT_TEMPLATE_NAME]; + DEFAULT_TEMPLATE_NAME, ]; if (in_array($template_code, $arrIgnoreCode)) { $arrErr['template_code'] = '※ このテンプレートコードは使用できません。
'; } diff --git a/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php b/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php index 794a440721..e9183973c2 100644 --- a/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php +++ b/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php @@ -92,7 +92,7 @@ class LC_Page_Admin_Order_Edit extends LC_Page_Admin_Order_Ex 'quantity', 'price', 'tax_rate', - 'tax_rule' + 'tax_rule', ]; /** @@ -508,7 +508,7 @@ public function setMultipleItemTo(&$objFormParam) 'multiple_classcategory_name1', 'multiple_classcategory_name2', 'multiple_price', - 'multiple_quantity']; + 'multiple_quantity', ]; $arrMultipleParams = $objFormParam->getSwapArray($arrMultipleKey); /* @@ -684,7 +684,7 @@ public function lfCheckError(&$objFormParam) $day = $arrValues['shipping_date_day'][$key_index]; $objError = new SC_CheckError_Ex(['shipping_date_year' => $year, 'shipping_date_month' => $month, - 'shipping_date_day' => $day]); + 'shipping_date_day' => $day, ]); $objError->doFunc(['お届け日', 'shipping_date_year', 'shipping_date_month', 'shipping_date_day'], ['CHECK_DATE']); $arrErrDate['shipping_date_year'][$key_index] = $objError->arrErr['shipping_date_year']; } @@ -696,7 +696,7 @@ public function lfCheckError(&$objFormParam) $day = $arrValues['order_birth_day']; $objError = new SC_CheckError_Ex(['order_birth_year' => $year, 'order_birth_month' => $month, - 'order_birth_day' => $day]); + 'order_birth_day' => $day, ]); $objError->doFunc(['生年月日', 'order_birth_year', 'order_birth_month', 'order_birth_day'], ['CHECK_BIRTHDAY']); $arrErrTemp['order_birth_year'] = $objError->arrErr['order_birth_year']; @@ -811,7 +811,7 @@ public function doRegister($order_id, &$objPurchase, &$objFormParam, &$message, 'classcategory_name1', 'classcategory_name2', 'tax_rate', - 'tax_rule' + 'tax_rule', ]); // 変更しようとしている商品情報とDBに登録してある商品情報を比較することで、更新すべき数量を計算 diff --git a/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php b/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php index f097a13ab1..afb5adb38a 100644 --- a/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php +++ b/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php @@ -1053,7 +1053,7 @@ public function lfRegistProduct(&$objUpFile, &$objDownFile, $arrList) 'main_list_comment', 'main_comment', 'deliv_fee', 'comment1', 'comment2', 'comment3', 'comment4', 'comment5', 'comment6', - 'sale_limit', 'deliv_date_id', 'maker_id', 'note']; + 'sale_limit', 'deliv_date_id', 'maker_id', 'note', ]; $arrList = SC_Utils_Ex::arrayDefineIndexes($arrList, $checkArray); // INSERTする値を作成する。 diff --git a/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php b/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php index 450be8c74b..676595e6b0 100644 --- a/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php +++ b/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php @@ -479,7 +479,7 @@ public function doPreEdit(&$objFormParam) $arrKeys = ['classcategory_id1', 'classcategory_id2', 'product_code', 'classcategory_name1', 'classcategory_name2', 'stock', 'stock_unlimited', 'price01', 'price02', - 'product_type_id', 'down_filename', 'down_realfilename', 'upload_index', 'tax_rate' + 'product_type_id', 'down_filename', 'down_realfilename', 'upload_index', 'tax_rate', ]; $arrFormValues = $objFormParam->getSwapArray($arrKeys); // フォームの規格1, 規格2をキーにした配列を生成 diff --git a/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php b/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php index 9b94ed2eb3..11ecb6cefb 100644 --- a/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php +++ b/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php @@ -502,7 +502,7 @@ public function lfCheckErrorDetail($item, $arrErr) $where, [$parent_category_id, $item['category_id'], - $item['category_name']]); + $item['category_name'], ]); if ($exists) { $arrErr['category_name'] = '※ 既に同名のカテゴリが存在します。'; } diff --git a/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php b/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php index 89ed6bab8c..e94f1bc1d5 100644 --- a/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php +++ b/data/class/pages/admin/system/LC_Page_Admin_System_Editdb.php @@ -151,7 +151,7 @@ public function lfGetTargetData(&$objFormParam) $param = ['indexflag' => $arrIndexFlag[$i], 'indexflag_new' => $arrIndexFlagNew[$i], 'table_name' => $arrTableName[$i], - 'column_name' => $arrColumnName[$i]]; + 'column_name' => $arrColumnName[$i], ]; $objErr = new SC_CheckError_Ex($param); $objErr->doFunc(['インデックス('.$i.')', 'indexflag', INT_LEN], ['NUM_CHECK']); $objErr->doFunc(['インデックス変更後('.$i.')', 'indexflag_new', INT_LEN], ['NUM_CHECK']); diff --git a/data/class/pages/admin/system/LC_Page_Admin_System_Parameter.php b/data/class/pages/admin/system/LC_Page_Admin_System_Parameter.php index 4945af6e91..2a869cc12f 100644 --- a/data/class/pages/admin/system/LC_Page_Admin_System_Parameter.php +++ b/data/class/pages/admin/system/LC_Page_Admin_System_Parameter.php @@ -140,7 +140,7 @@ public function errorCheck(&$arrKeys, &$arrForm) $objErr = new SC_CheckError_Ex($arrForm); for ($i = 0; $i < count($arrKeys); $i++) { $objErr->doFunc([$arrKeys[$i], - $arrForm[$arrKeys[$i]]], + $arrForm[$arrKeys[$i]], ], ['EXIST_CHECK_REVERSE', 'EVAL_CHECK']); } diff --git a/data/class/pages/forgot/LC_Page_Forgot.php b/data/class/pages/forgot/LC_Page_Forgot.php index 7578a67b43..9817d4ae5d 100644 --- a/data/class/pages/forgot/LC_Page_Forgot.php +++ b/data/class/pages/forgot/LC_Page_Forgot.php @@ -203,7 +203,7 @@ public function lfCheckForgotSecret(&$arrForm, &$arrReminder) .' AND name01 = ? AND name02 = ?' .' AND status = 2 AND del_flg = 0'; $arrVal = [$arrForm['email'], $arrForm['email'], - $arrForm['name01'], $arrForm['name02']]; + $arrForm['name01'], $arrForm['name02'], ]; $result = $objQuery->select($cols, $table, $where, $arrVal); if (isset($result[0]['reminder']) && isset($arrReminder[$result[0]['reminder']]) && $result[0]['reminder'] == $arrForm['reminder']) { diff --git a/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php b/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php index f2ac6de2bf..96744c2401 100644 --- a/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php +++ b/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php @@ -51,7 +51,7 @@ public function init() $this->httpCacheControl('nocache'); $this->validUrl = [MYPAGE_DELIVADDR_URLPATH, DELIV_URLPATH, - MULTIPLE_URLPATH]; + MULTIPLE_URLPATH, ]; } /** diff --git a/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php b/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php index d5f931b6ee..5a3efff133 100644 --- a/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php +++ b/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php @@ -40,7 +40,7 @@ class LC_Page_Mypage_DownLoad extends LC_Page_Ex * Application/octet-streamで対応出来ないファイルタイプのみ拡張子をキーに記述する * 拡張子が本配列に存在しない場合は $defaultContentTypeを利用する */ public $arrContentType = ['apk' => 'application/vnd.android.package-archive', - 'pdf' => 'application/pdf' + 'pdf' => 'application/pdf', ]; /** diff --git a/data/class/pages/products/LC_Page_Products_List.php b/data/class/pages/products/LC_Page_Products_List.php index dbf64a1bfd..c97724b129 100644 --- a/data/class/pages/products/LC_Page_Products_List.php +++ b/data/class/pages/products/LC_Page_Products_List.php @@ -121,7 +121,7 @@ public function action() $this->arrSearchData = [ 'category_id' => $this->lfGetCategoryId((int) $this->arrForm['category_id']), 'maker_id' => (int) $this->arrForm['maker_id'], - 'name' => $this->arrForm['name'] + 'name' => $this->arrForm['name'], ]; $this->orderby = $this->arrForm['orderby']; @@ -375,7 +375,7 @@ public function lfGetSearchCondition($arrSearchData) 'where' => '', 'arrval' => [], 'where_category' => '', - 'arrvalCategory' => [] + 'arrvalCategory' => [], ]; // カテゴリからのWHERE文字列取得 diff --git a/data/class/pages/shopping/LC_Page_Shopping_Deliv.php b/data/class/pages/shopping/LC_Page_Shopping_Deliv.php index 7e0b98e801..29266a84d2 100644 --- a/data/class/pages/shopping/LC_Page_Shopping_Deliv.php +++ b/data/class/pages/shopping/LC_Page_Shopping_Deliv.php @@ -186,7 +186,7 @@ public function action() 'tel01' => $objCustomer->getValue('tel01'), 'tel02' => $objCustomer->getValue('tel02'), 'tel03' => $objCustomer->getValue('tel03'), - ] + ], ]; $this->arrAddr = array_merge($addr, $objAddress->getList($objCustomer->getValue('customer_id'))); $this->tpl_addrmax = count($this->arrAddr) - 1; // 会員の住所をカウントしない diff --git a/data/class/pages/shopping/LC_Page_Shopping_Multiple.php b/data/class/pages/shopping/LC_Page_Shopping_Multiple.php index ecfb9fd737..e38fd4fc70 100644 --- a/data/class/pages/shopping/LC_Page_Shopping_Multiple.php +++ b/data/class/pages/shopping/LC_Page_Shopping_Multiple.php @@ -207,7 +207,7 @@ public function getDelivAddrs(&$objCustomer, &$objPurchase, &$objAddress) 'tel01' => $objCustomer->getValue('tel01'), 'tel02' => $objCustomer->getValue('tel02'), 'tel03' => $objCustomer->getValue('tel03'), - ] + ], ]; $arrAddrs = array_merge($addr, $objAddress->getList($objCustomer->getValue('customer_id'))); foreach ($arrAddrs as $val) { diff --git a/data/class/pages/upgrade/LC_Page_Upgrade_Download.php b/data/class/pages/upgrade/LC_Page_Upgrade_Download.php index e0b7ab6c08..6bab00d412 100644 --- a/data/class/pages/upgrade/LC_Page_Upgrade_Download.php +++ b/data/class/pages/upgrade/LC_Page_Upgrade_Download.php @@ -119,7 +119,7 @@ public function process() 'eccube_url' => HTTP_URL, 'public_key' => sha1($public_key.$sha1_key), 'sha1_key' => $sha1_key, - 'patch_code' => 'latest' + 'patch_code' => 'latest', ]; break; default: @@ -127,7 +127,7 @@ public function process() 'eccube_url' => HTTP_URL, 'public_key' => sha1($public_key.$sha1_key), 'sha1_key' => $sha1_key, - 'product_id' => $this->objForm->getValue('product_id') + 'product_id' => $this->objForm->getValue('product_id'), ]; break; } @@ -278,7 +278,7 @@ public function updateMdlTable($objRet) $arrUpdate = [ 'module_code' => $objRet->product_code, 'module_name' => $objRet->product_name, - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ]; $objQuery->update($table, $arrUpdate, $where, [$objRet->product_id]); } else { @@ -288,7 +288,7 @@ public function updateMdlTable($objRet) 'module_name' => $objRet->product_name, 'auto_update_flg' => '0', 'create_date' => 'CURRENT_TIMESTAMP', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ]; $objQuery->insert($table, $arrInsert); } @@ -306,7 +306,7 @@ public function updateMdlTable($objRet) public function notifyDownload($mode, $arrCookies) { $arrPOSTParams = [ - 'eccube_url' => HTTP_URL + 'eccube_url' => HTTP_URL, ]; $objReq = $this->request($mode.'_commit', $arrPOSTParams, $arrCookies); diff --git a/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php b/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php index 1369662257..1aa4c14839 100644 --- a/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php +++ b/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php @@ -84,7 +84,7 @@ public function process() 'eccube_url' => HTTP_URL, 'public_key' => sha1($public_key.$sha1_key), 'sha1_key' => $sha1_key, - 'ver' => ECCUBE_VERSION + 'ver' => ECCUBE_VERSION, ]; $objReq = $this->request('products_list', $arrPostData); @@ -144,7 +144,7 @@ public function process() 'eccube_url' => HTTP_URL, 'public_key' => sha1($public_key.$sha1_key), 'sha1_key' => $sha1_key, - 'ver' => '2.13.17' // 2.13系も取得する + 'ver' => '2.13.17', // 2.13系も取得する ]; $objReq = $this->request('products_list', $arrPostData); diff --git a/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php b/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php index c1f805c8cb..22649c52a6 100644 --- a/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php +++ b/data/class/pages/upgrade/helper/LC_Upgrade_Helper_Json.php @@ -8,7 +8,7 @@ class LC_Upgrade_Helper_Json 'status' => null, 'errcode' => null, 'msg' => null, - 'data' => [] + 'data' => [], ]; /** diff --git a/data/class/plugin/SC_Plugin_Installer.php b/data/class/plugin/SC_Plugin_Installer.php index 8705a2a3c7..15937a46a1 100644 --- a/data/class/plugin/SC_Plugin_Installer.php +++ b/data/class/plugin/SC_Plugin_Installer.php @@ -144,7 +144,7 @@ public function copyFile($src, $dist) { $this->arrInstallData['copy_file'][] = [ 'src' => $src, - 'dist' => $dist + 'dist' => $dist, ]; } @@ -152,21 +152,21 @@ public function copyDirectory($src, $dist) { $this->arrInstallData['copy_directory'][] = [ 'src' => $src, - 'dist' => $dist + 'dist' => $dist, ]; } public function removeFile($dist) { $this->arrInstallData['remove_file'][] = [ - 'dist' => $dist + 'dist' => $dist, ]; } public function removeDirectory($dist) { $this->arrInstallData['remove_directory'][] = [ - 'dist' => $dist + 'dist' => $dist, ]; } @@ -174,7 +174,7 @@ public function sql($sql, array $params = []) { $this->arrInstallData['sql'][] = [ 'sql' => $sql, - 'params' => $params + 'params' => $params, ]; } @@ -210,7 +210,7 @@ public function insert($table, $arrVal, $arrSql = [], $arrSqlVal = [], $from = ' 'arrSql' => $arrSql, 'arrSqlVal' => $arrSqlVal, 'form' => $from, - 'arrFromVal' => $arrFromVal + 'arrFromVal' => $arrFromVal, ]; } @@ -222,7 +222,7 @@ public function update($table, $arrVal, $where = '', $arrWhereVal = [], $arrRawS 'where' => $where, 'arrWhereVal' => $arrWhereVal, 'arrRawSql' => $arrRawSql, - 'arrRawSqlVal' => $arrRawSqlVal + 'arrRawSqlVal' => $arrRawSqlVal, ]; } diff --git a/data/class/plugin/SC_Plugin_Util.php b/data/class/plugin/SC_Plugin_Util.php index a63dddc652..bb6ba47ba9 100644 --- a/data/class/plugin/SC_Plugin_Util.php +++ b/data/class/plugin/SC_Plugin_Util.php @@ -223,7 +223,7 @@ public static function checkExtension($key) $arrRequireExtension = [ '2.12.0' => ['dom'], '2.12.1' => ['dom'], - '2.12.2' => ['dom'] + '2.12.2' => ['dom'], ]; // 必須拡張モジュールのチェック $arrErr = []; diff --git a/data/class/sessionfactory/SC_SessionFactory_UseCookie.php b/data/class/sessionfactory/SC_SessionFactory_UseCookie.php index 1675578498..2062cb3ee5 100644 --- a/data/class/sessionfactory/SC_SessionFactory_UseCookie.php +++ b/data/class/sessionfactory/SC_SessionFactory_UseCookie.php @@ -52,7 +52,7 @@ public function initSession() 'domain' => DOMAIN_NAME, 'secure' => $this->getSecureOption(), 'httponly' => true, - 'samesite' => '' + 'samesite' => '', ]; if ($this->getSecureOption()) { $params['samesite'] = 'None'; // require secure option diff --git a/data/module/Calendar/Calendar.php b/data/module/Calendar/Calendar.php index 70f6db4ea2..809df81759 100644 --- a/data/module/Calendar/Calendar.php +++ b/data/module/Calendar/Calendar.php @@ -279,7 +279,7 @@ public function toArray($stamp = null) 'day' => $this->cE->stampToDay($stamp), 'hour' => $this->cE->stampToHour($stamp), 'minute' => $this->cE->stampToMinute($stamp), - 'second' => $this->cE->stampToSecond($stamp) + 'second' => $this->cE->stampToSecond($stamp), ]; } diff --git a/data/module/Calendar/Validator.php b/data/module/Calendar/Validator.php index 1f9d349139..bbb561d2ec 100644 --- a/data/module/Calendar/Validator.php +++ b/data/module/Calendar/Validator.php @@ -83,7 +83,7 @@ public function __construct(&$calendar) public function isValid() { $checks = ['isValidYear', 'isValidMonth', 'isValidDay', - 'isValidHour', 'isValidMinute', 'isValidSecond']; + 'isValidHour', 'isValidMinute', 'isValidSecond', ]; $valid = true; foreach ($checks as $check) { if (!$this->{$check}()) { diff --git a/data/module/HTTP/Request.php b/data/module/HTTP/Request.php index 94ca2e5c4e..b55823bfbd 100644 --- a/data/module/HTTP/Request.php +++ b/data/module/HTTP/Request.php @@ -634,7 +634,7 @@ public function addFile($inputName, $fileName, $contentType = 'application/octet $this->addHeader('Content-Type', 'multipart/form-data'); $this->_postFiles[$inputName] = [ 'name' => $fileName, - 'type' => $contentType + 'type' => $contentType, ]; return true; @@ -1347,7 +1347,7 @@ public function _parseCookie($headervalue) 'expires' => null, 'domain' => null, 'path' => null, - 'secure' => false + 'secure' => false, ]; // Only a name=value pair diff --git a/data/module/SOAP/Base.php b/data/module/SOAP/Base.php index e8f5943986..c49add5146 100644 --- a/data/module/SOAP/Base.php +++ b/data/module/SOAP/Base.php @@ -152,7 +152,7 @@ public function &_getfault() class SOAP_Base extends SOAP_Base_Object { public $_XMLSchema = ['http://www.w3.org/2001/XMLSchema', - 'http://www.w3.org/1999/XMLSchema']; + 'http://www.w3.org/1999/XMLSchema', ]; public $_XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema'; // load types into typemap array @@ -203,7 +203,7 @@ class SOAP_Base extends SOAP_Base_Object 'positiveInteger' => 'integer', 'anyType' => 'string', 'anyURI' => 'string', - 'QName' => 'string' + 'QName' => 'string', ], 'http://www.w3.org/1999/XMLSchema' => [ 'i4' => 'integer', @@ -216,13 +216,13 @@ class SOAP_Base extends SOAP_Base_Object 'timeInstant' => 'string', 'base64Binary' => 'string', 'base64' => 'string', - 'ur-type' => 'string' + 'ur-type' => 'string', ], 'http://schemas.xmlsoap.org/soap/encoding/' => [ 'base64' => 'string', 'array' => 'array', 'Array' => 'array', - 'Struct' => 'array'] + 'Struct' => 'array', ], ]; /** @@ -250,7 +250,7 @@ class SOAP_Base extends SOAP_Base_Object '<' => '<', '>' => '>', "'" => ''', - '"' => '"']; + '"' => '"', ]; public $_doconversion = false; @@ -330,7 +330,7 @@ public function _resetNamespaces() 'http://schemas.xmlsoap.org/soap/envelope/' => self::SOAPENVPrefix(), 'http://www.w3.org/2001/XMLSchema' => 'xsd', 'http://www.w3.org/2001/XMLSchema-instance' => 'xsi', - 'http://schemas.xmlsoap.org/soap/encoding/' => self::SOAPENCPrefix()]; + 'http://schemas.xmlsoap.org/soap/encoding/' => self::SOAPENCPrefix(), ]; } /** @@ -806,7 +806,7 @@ public function _decode($soapval) } elseif (isset($return->{$item->name})) { $return->{$item->name} = [ $return->{$item->name}, - $this->_decode($item) + $this->_decode($item), ]; } elseif (is_array($return)) { $return[] = $this->_decode($item); @@ -832,7 +832,7 @@ public function _decode($soapval) if (method_exists($return, '__set_attribute')) { foreach ($soapval->attributes as $key => $value) { call_user_func_array([&$return, - '__set_attribute'], + '__set_attribute', ], [$key, $value]); } } diff --git a/data/module/SOAP/Parser.php b/data/module/SOAP/Parser.php index cbdd393572..7ee8ae53e1 100644 --- a/data/module/SOAP/Parser.php +++ b/data/module/SOAP/Parser.php @@ -267,7 +267,7 @@ public function _startElement($parser, $name, $attrs) 'type_namespace' => '', 'cdata' => '', 'pos' => $pos, - 'id' => '']; + 'id' => '', ]; // Parent/child/depth determinations. diff --git a/data/module/SOAP/Server.php b/data/module/SOAP/Server.php index b21e3b1c99..6a53cd3685 100644 --- a/data/module/SOAP/Server.php +++ b/data/module/SOAP/Server.php @@ -83,7 +83,7 @@ class SOAP_Server extends SOAP_Base 'style' => 'rpc', 'parameters' => 0, 'http_status_success' => '200 OK', - 'http_status_fault' => '500 SOAP Fault']; + 'http_status_fault' => '500 SOAP Fault', ]; public function __construct($options = null) { diff --git a/data/module/SOAP/Transport/HTTP.php b/data/module/SOAP/Transport/HTTP.php index f03b1a5921..b988171293 100644 --- a/data/module/SOAP/Transport/HTTP.php +++ b/data/module/SOAP/Transport/HTTP.php @@ -273,7 +273,7 @@ public function _parseHeaders($headers) $cookie = ['expires' => null, 'domain' => $this->urlparts['host'], 'path' => null, - 'secure' => false]; + 'secure' => false, ]; if (!strpos($headervalue, ';')) { // Only a name=value pair. diff --git a/data/module/SOAP/Transport/SMTP.php b/data/module/SOAP/Transport/SMTP.php index 06537cb8c7..d0c7d5aca7 100644 --- a/data/module/SOAP/Transport/SMTP.php +++ b/data/module/SOAP/Transport/SMTP.php @@ -149,7 +149,7 @@ public function send($msg, $options = []) 'port' => $this->port, 'username' => $this->username, 'password' => $this->password, - 'auth' => $this->auth + 'auth' => $this->auth, ]; $mailer = new Mail_smtp($mailer_params); $result = $mailer->send($this->urlparts['path'], $headers, $out); diff --git a/data/module/SOAP/Value.php b/data/module/SOAP/Value.php index 9342987ecf..75e9ea94f7 100644 --- a/data/module/SOAP/Value.php +++ b/data/module/SOAP/Value.php @@ -247,7 +247,7 @@ public function __construct($name = '', $type = 'application/octet-stream', 'disposition' => $filename, 'content_type' => $type, 'encoding' => 'base64', - 'cid' => $cid]; + 'cid' => $cid, ]; } /** diff --git a/data/module/SOAP/WSDL.php b/data/module/SOAP/WSDL.php index abc05499d4..204ae605bb 100644 --- a/data/module/SOAP/WSDL.php +++ b/data/module/SOAP/WSDL.php @@ -134,7 +134,7 @@ class SOAP_WSDL extends SOAP_Base 'or', 'php_user_filter', 'print', 'private', 'protected', 'public', 'require', 'require_once', 'return', 'static', 'switch', 'this', 'throw', - 'try', 'unset', 'use', 'var', 'while', 'xor']; + 'try', 'unset', 'use', 'var', 'while', 'xor', ]; /** * Regular expressions for invalid PHP labels. @@ -2162,7 +2162,7 @@ public function _parse($object, $schemaNamespace, $service_name) $thisMessage[$partName] = [ 'name' => $partName, 'type' => $typeName, - 'namespace' => $nsPrefix + 'namespace' => $nsPrefix, ]; } } @@ -2186,13 +2186,13 @@ public function _parse($object, $schemaNamespace, $service_name) case 'in': $thisPortType[$operationName]['input'] = [ 'message' => $operationName.'Request', - 'namespace' => $this->tnsPrefix]; + 'namespace' => $this->tnsPrefix, ]; break; case 'out': $thisPortType[$operationName]['output'] = [ 'message' => $operationName.'Response', - 'namespace' => $this->tnsPrefix]; + 'namespace' => $this->tnsPrefix, ]; break; } } @@ -2225,20 +2225,20 @@ public function _generateBindingsAndServices($schemaNamespace, $service_name, 'namespace' => $this->tnsPrefix, 'style' => 'rpc', 'transport' => SCHEMA_SOAP_HTTP, - 'operations' => []]; + 'operations' => [], ]; $thisBinding = &$this->wsdl->bindings[$service_name.'Binding']; foreach ($this->wsdl->portTypes[$service_name.'Port'] as $operationName => $operationData) { $thisBinding['operations'][$operationName] = [ 'soapAction' => $schemaNamespace.'#'.$operationName, - 'style' => $thisBinding['style']]; + 'style' => $thisBinding['style'], ]; foreach (['input', 'output'] as $messageType) { if (isset($operationData[$messageType])) { $thisBinding['operations'][$operationName][$messageType] = [ 'use' => 'encoded', 'namespace' => $schemaNamespace, - 'encodingStyle' => SOAP_SCHEMA_ENCODING]; + 'encodingStyle' => SOAP_SCHEMA_ENCODING, ]; } } } @@ -2260,8 +2260,8 @@ public function _generateBindingsAndServices($schemaNamespace, $service_name, 'namespace' => $this->tnsPrefix, 'address' => ['location' => ($https ? 'https://' : 'http://'). $_SERVER['SERVER_NAME'].$_SERVER['PHP_SELF']. - (isset($_SERVER['QUERY_STRING']) ? '?'.$_SERVER['QUERY_STRING'] : '')], - 'type' => 'soap']; + (isset($_SERVER['QUERY_STRING']) ? '?'.$_SERVER['QUERY_STRING'] : ''), ], + 'type' => 'soap', ]; } // Set service @@ -2274,7 +2274,7 @@ public function _generateBindingsAndServices($schemaNamespace, $service_name, $this->wsdl->definition = [ 'name' => $service_name, 'targetNamespace' => $this->wsdl->namespaces[$this->tnsPrefix], - 'xmlns' => SCHEMA_WSDL]; + 'xmlns' => SCHEMA_WSDL, ]; foreach ($this->wsdl->namespaces as $nsPrefix => $namespace) { $this->wsdl->definition['xmlns:'.$nsPrefix] = $namespace; diff --git a/data/module/fpdi/japanese.php b/data/module/fpdi/japanese.php index dc0abb369c..c51811cfb2 100644 --- a/data/module/fpdi/japanese.php +++ b/data/module/fpdi/japanese.php @@ -11,7 +11,7 @@ 'Z' => 578, '[' => 316, '\\' => 614, ']' => 316, '^' => 529, '_' => 500, '`' => 387, 'a' => 509, 'b' => 566, 'c' => 478, 'd' => 565, 'e' => 503, 'f' => 337, 'g' => 549, 'h' => 580, 'i' => 275, 'j' => 266, 'k' => 544, 'l' => 276, 'm' => 854, 'n' => 579, 'o' => 550, 'p' => 578, 'q' => 566, 'r' => 410, 's' => 444, 't' => 340, 'u' => 575, 'v' => 512, 'w' => 760, - 'x' => 503, 'y' => 529, 'z' => 453, '{' => 326, '|' => 380, '}' => 326, '~' => 387]; + 'x' => 503, 'y' => 529, 'z' => 453, '{' => 326, '|' => 380, '}' => 326, '~' => 387, ]; class PDF_Japanese extends Fpdi { diff --git a/tests/class/Common_TestCase.php b/tests/class/Common_TestCase.php index 410d5db0d4..f33e17af2e 100644 --- a/tests/class/Common_TestCase.php +++ b/tests/class/Common_TestCase.php @@ -76,7 +76,7 @@ protected function checkMailCatcherStatus() { try { $context = stream_context_create([ - 'http' => ['ignore_errors' => true] + 'http' => ['ignore_errors' => true], ]); $response = file_get_contents(TEST_MAILCATCHER_URL.'/messages', false, $context); @@ -102,8 +102,8 @@ protected function resetEmails() $context = stream_context_create( [ 'http' => [ - 'method' => 'DELETE' - ] + 'method' => 'DELETE', + ], ] ); diff --git a/tests/class/SC_CartSession/SC_CartSessionTest.php b/tests/class/SC_CartSession/SC_CartSessionTest.php index ac8adcfff4..5f68689974 100644 --- a/tests/class/SC_CartSession/SC_CartSessionTest.php +++ b/tests/class/SC_CartSession/SC_CartSessionTest.php @@ -57,7 +57,7 @@ public function testAddProductWithMultipleProductType() $this->assertEquals( [ PRODUCT_TYPE_NORMAL, - PRODUCT_TYPE_DOWNLOAD + PRODUCT_TYPE_DOWNLOAD, ], $product_type_ids, '商品種別は通常商品とダウンロード商品' diff --git a/tests/class/SC_CartSession/SC_CartSession_TestBase.php b/tests/class/SC_CartSession/SC_CartSession_TestBase.php index 317633d9e8..37f1985469 100644 --- a/tests/class/SC_CartSession/SC_CartSession_TestBase.php +++ b/tests/class/SC_CartSession/SC_CartSession_TestBase.php @@ -33,7 +33,7 @@ protected function setUpProductClass() 'price02' => '1500', 'stock' => '99', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => 'CURRENT_TIMESTAMP', @@ -44,7 +44,7 @@ protected function setUpProductClass() 'price02' => '2500', 'creator_id' => '1', 'stock_unlimited' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => 'CURRENT_TIMESTAMP', @@ -55,8 +55,8 @@ protected function setUpProductClass() 'price02' => '2000', 'creator_id' => '1', 'stock_unlimited' => '1', - 'del_flg' => '1' - ] + 'del_flg' => '1', + ], ]; $this->objQuery->delete('dtb_products_class'); @@ -79,15 +79,15 @@ protected function setUpClassCategory() 'classcategory_id' => '1001', 'class_id' => '1', 'creator_id' => '1', - 'name' => 'cat1001' + 'name' => 'cat1001', ], [ 'update_date' => 'CURRENT_TIMESTAMP', 'classcategory_id' => '1002', 'class_id' => '1', 'creator_id' => '1', - 'name' => 'cat1002' - ] + 'name' => 'cat1002', + ], ]; // classcategory_id=0のものは削除しない @@ -117,7 +117,7 @@ protected function setUpProducts() 'deliv_date_id' => '1', 'del_flg' => '0', 'creator_id' => '1', - 'status' => '1' + 'status' => '1', ], [ 'update_date' => 'CURRENT_TIMESTAMP', @@ -132,7 +132,7 @@ protected function setUpProducts() 'deliv_date_id' => '2', 'del_flg' => '0', 'creator_id' => '1', - 'status' => '2' + 'status' => '2', ], [ 'update_date' => 'CURRENT_TIMESTAMP', @@ -148,8 +148,8 @@ protected function setUpProducts() 'deliv_date_id' => '1', 'del_flg' => '1', 'creator_id' => '1', - 'status' => '1' - ] + 'status' => '1', + ], ]; $this->objQuery->delete('dtb_products'); @@ -169,15 +169,15 @@ protected function setUpProductStatus() 'product_status_id' => '1', 'product_id' => '1001', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => 'CURRENT_TIMESTAMP', 'product_status_id' => '1', 'product_id' => '1002', 'creator_id' => '1', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ]; $this->objQuery->delete('dtb_product_status'); @@ -206,7 +206,7 @@ protected function setUpBigProductClass() 'price02' => $i, 'stock' => '99', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ]; $this->objQuery->insert('dtb_products_class', $item); } @@ -237,7 +237,7 @@ protected function setUpBigProducts() 'deliv_date_id' => '1', 'del_flg' => '0', 'creator_id' => '1', - 'status' => '1' + 'status' => '1', ]; $this->objQuery->insert('dtb_products', $item); } diff --git a/tests/class/SC_CartSession/SC_CartSession_getCartListTest.php b/tests/class/SC_CartSession/SC_CartSession_getCartListTest.php index 8220d8e934..f63476ec0f 100644 --- a/tests/class/SC_CartSession/SC_CartSession_getCartListTest.php +++ b/tests/class/SC_CartSession/SC_CartSession_getCartListTest.php @@ -73,7 +73,7 @@ public function testGetCartList商品を1つ追加した場合合計数は1($car public function testGetCartList商品を1つ追加した場合商品データを返す($cartList) { $this->expected = [ - 'product_id' => '1001', 'product_code_min' => 'code1001', 'product_code_max' => 'code1001', 'name' => '製品名1001', 'comment1' => 'コメント10011', 'comment2' => 'コメント10012', 'comment3' => 'コメント10013', 'main_list_comment' => 'リストコメント1001', 'main_image' => '1001.jpg', 'main_list_image' => '1001-main.jpg', 'price01_min' => '1500', 'price01_max' => '1500', 'price02_min' => '1500', 'price02_max' => '1500', 'stock_min' => '99', 'stock_max' => '99', 'stock_unlimited_min' => '0', 'stock_unlimited_max' => '0', 'deliv_date_id' => '1', 'status' => '1', 'del_flg' => '0', 'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'maker_id' => null, 'comment4' => null, 'comment5' => null, 'comment6' => null, 'note' => null, 'main_comment' => 'メインコメント1001', 'main_large_image' => null, 'sub_title1' => null, 'sub_comment1' => null, 'sub_image1' => null, 'sub_large_image1' => null, 'sub_title2' => null, 'sub_comment2' => null, 'sub_image2' => null, 'sub_large_image2' => null, 'sub_title3' => null, 'sub_comment3' => null, 'sub_image3' => null, 'sub_large_image3' => null, 'sub_title4' => null, 'sub_comment4' => null, 'sub_image4' => null, 'sub_large_image4' => null, 'sub_title5' => null, 'sub_comment5' => null, 'sub_image5' => null, 'sub_large_image5' => null, 'sub_title6' => null, 'sub_comment6' => null, 'sub_image6' => null, 'sub_large_image6' => null, 'creator_id' => '1', 'point_rate' => '0', 'deliv_fee' => null, 'maker_name' => null, 'stock' => '99', 'stock_unlimited' => '0', 'sale_limit' => null, 'price01' => '1500', 'price02' => '1500', 'product_code' => 'code1001', 'product_class_id' => '1001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => 'cat1001', 'rank1' => null, 'class_name1' => '味', 'class_id1' => '1', 'classcategory_id1' => '1001', 'classcategory_id2' => '1002', 'classcategory_name2' => 'cat1002', 'rank2' => null, 'class_name2' => '味', 'class_id2' => '1', 'price01_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500) + 'product_id' => '1001', 'product_code_min' => 'code1001', 'product_code_max' => 'code1001', 'name' => '製品名1001', 'comment1' => 'コメント10011', 'comment2' => 'コメント10012', 'comment3' => 'コメント10013', 'main_list_comment' => 'リストコメント1001', 'main_image' => '1001.jpg', 'main_list_image' => '1001-main.jpg', 'price01_min' => '1500', 'price01_max' => '1500', 'price02_min' => '1500', 'price02_max' => '1500', 'stock_min' => '99', 'stock_max' => '99', 'stock_unlimited_min' => '0', 'stock_unlimited_max' => '0', 'deliv_date_id' => '1', 'status' => '1', 'del_flg' => '0', 'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'maker_id' => null, 'comment4' => null, 'comment5' => null, 'comment6' => null, 'note' => null, 'main_comment' => 'メインコメント1001', 'main_large_image' => null, 'sub_title1' => null, 'sub_comment1' => null, 'sub_image1' => null, 'sub_large_image1' => null, 'sub_title2' => null, 'sub_comment2' => null, 'sub_image2' => null, 'sub_large_image2' => null, 'sub_title3' => null, 'sub_comment3' => null, 'sub_image3' => null, 'sub_large_image3' => null, 'sub_title4' => null, 'sub_comment4' => null, 'sub_image4' => null, 'sub_large_image4' => null, 'sub_title5' => null, 'sub_comment5' => null, 'sub_image5' => null, 'sub_large_image5' => null, 'sub_title6' => null, 'sub_comment6' => null, 'sub_image6' => null, 'sub_large_image6' => null, 'creator_id' => '1', 'point_rate' => '0', 'deliv_fee' => null, 'maker_name' => null, 'stock' => '99', 'stock_unlimited' => '0', 'sale_limit' => null, 'price01' => '1500', 'price02' => '1500', 'product_code' => 'code1001', 'product_class_id' => '1001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => 'cat1001', 'rank1' => null, 'class_name1' => '味', 'class_id1' => '1', 'classcategory_id1' => '1001', 'classcategory_id2' => '1002', 'classcategory_name2' => 'cat1002', 'rank2' => null, 'class_name2' => '味', 'class_id2' => '1', 'price01_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), // ,'create_date' => '2014-05-04 12:20:29' // ,'update_date' => '2014-05-04 12:20:29' ]; diff --git a/tests/class/SC_CheckError/SC_CheckError_ALL_EXIST_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_ALL_EXIST_CHECKTest.php index 399bd04f31..9f4e9c7619 100644 --- a/tests/class/SC_CheckError/SC_CheckError_ALL_EXIST_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_ALL_EXIST_CHECKTest.php @@ -20,7 +20,7 @@ public function testALLEXISTCHECK() $this->arrForm = [ self::FORM_NAME1 => 2019, self::FORM_NAME2 => '05', - self::FORM_NAME3 => 'a' + self::FORM_NAME3 => 'a', ]; $this->expected = []; @@ -33,7 +33,7 @@ public function testALLEXISTCHECKWithEmpty() $this->arrForm = [ self::FORM_NAME1 => '', self::FORM_NAME2 => '', - self::FORM_NAME3 => '' + self::FORM_NAME3 => '', ]; $this->expected = []; @@ -46,10 +46,10 @@ public function testALLEXISTCHECKWithNull() $this->arrForm = [ self::FORM_NAME1 => 'a', self::FORM_NAME2 => null, - self::FORM_NAME3 => null + self::FORM_NAME3 => null, ]; $this->expected = [ - self::FORM_NAME1 => '※ ALL_EXIST_CHECKは全ての項目を入力して下さい。
' + self::FORM_NAME1 => '※ ALL_EXIST_CHECKは全ての項目を入力して下さい。
', ]; $this->scenario(); @@ -61,7 +61,7 @@ public function testALLEXISTCHECKWithZero() $this->arrForm = [ self::FORM_NAME1 => '0', self::FORM_NAME2 => '0', - self::FORM_NAME3 => '0' + self::FORM_NAME3 => '0', ]; $this->expected = []; @@ -74,19 +74,19 @@ public function testALLEXISTCHECKWithErrorExists() $this->arrForm = [ self::FORM_NAME1 => 'a', self::FORM_NAME2 => '', - self::FORM_NAME3 => '' + self::FORM_NAME3 => '', ]; $this->objErr = new SC_CheckError_Ex($this->arrForm); $this->objErr->doFunc( ['label', self::FORM_NAME1, self::FORM_NAME2, self::FORM_NAME3], [ 'NUM_CHECK', - $this->target_func + $this->target_func, ] ); $this->expected = [ - self::FORM_NAME1 => '※ labelは数字で入力してください。
' + self::FORM_NAME1 => '※ labelは数字で入力してください。
', ]; $this->verify('既存のエラーがある場合はエラーチェックしない'); diff --git a/tests/class/SC_CheckError/SC_CheckError_CHECK_BIRTHDAYTest.php b/tests/class/SC_CheckError/SC_CheckError_CHECK_BIRTHDAYTest.php index e737c35779..a916cdbb6e 100644 --- a/tests/class/SC_CheckError/SC_CheckError_CHECK_BIRTHDAYTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_CHECK_BIRTHDAYTest.php @@ -34,7 +34,7 @@ public function testCHECKBIRTHDAY() $this->arrForm = [ self::FORM_NAME1 => $this->year, self::FORM_NAME2 => $this->month, - self::FORM_NAME3 => $this->day + self::FORM_NAME3 => $this->day, ]; $this->expected = []; @@ -47,7 +47,7 @@ public function testCHECKBIRTHDAYWithEmpty() $this->arrForm = [ self::FORM_NAME1 => '2019', self::FORM_NAME2 => '', - self::FORM_NAME3 => '' + self::FORM_NAME3 => '', ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_BIRTHDAYは全ての項目を入力して下さい。
']; @@ -60,7 +60,7 @@ public function testCHECKBIRTHDAYWithNull() $this->arrForm = [ self::FORM_NAME1 => '2019', self::FORM_NAME2 => null, - self::FORM_NAME3 => null + self::FORM_NAME3 => null, ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_BIRTHDAYは全ての項目を入力して下さい。
']; @@ -73,7 +73,7 @@ public function testCHECKBIRTHDAYWithZero() $this->arrForm = [ self::FORM_NAME1 => '0', self::FORM_NAME2 => '0', - self::FORM_NAME3 => '0' + self::FORM_NAME3 => '0', ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_BIRTHDAY(年)は1901以上で入力してください。
']; @@ -86,7 +86,7 @@ public function testCHECKBIRTHDAYWithInvalid() $this->arrForm = [ self::FORM_NAME1 => 2001, self::FORM_NAME2 => '2', - self::FORM_NAME3 => '29' + self::FORM_NAME3 => '29', ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_BIRTHDAYが正しくありません。
']; @@ -101,7 +101,7 @@ public function testCHECKBIRTHDAYWithMaxYear() $this->arrForm = [ self::FORM_NAME1 => $now->format('Y'), self::FORM_NAME2 => $this->month, - self::FORM_NAME3 => $this->day + self::FORM_NAME3 => $this->day, ]; $this->scenario(); $this->actual = $this->objErr->arrErr[self::FORM_NAME1]; @@ -113,7 +113,7 @@ public function testCHECKBIRTHDAYWithMinYear() $this->arrForm = [ self::FORM_NAME1 => BIRTH_YEAR - 1, self::FORM_NAME2 => $this->month, - self::FORM_NAME3 => $this->day + self::FORM_NAME3 => $this->day, ]; $this->scenario(); $this->actual = $this->objErr->arrErr[self::FORM_NAME1]; diff --git a/tests/class/SC_CheckError/SC_CheckError_CHECK_DATE2Test.php b/tests/class/SC_CheckError/SC_CheckError_CHECK_DATE2Test.php index 8f1acf13b2..86f5fe84f4 100644 --- a/tests/class/SC_CheckError/SC_CheckError_CHECK_DATE2Test.php +++ b/tests/class/SC_CheckError/SC_CheckError_CHECK_DATE2Test.php @@ -52,7 +52,7 @@ public function testCHECKDATE2() self::FORM_NAME3 => $this->day, self::FORM_NAME4 => $this->hour, self::FORM_NAME5 => $this->minute, - self::FORM_NAME6 => $this->second + self::FORM_NAME6 => $this->second, ]; $this->expected = []; @@ -68,7 +68,7 @@ public function testCHECKDATE2WithEmpty() self::FORM_NAME3 => $this->day, self::FORM_NAME4 => $this->hour, self::FORM_NAME5 => $this->minute, - self::FORM_NAME6 => $this->second + self::FORM_NAME6 => $this->second, ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_DATE2は全ての項目を入力して下さい。
']; @@ -84,7 +84,7 @@ public function testCHECKDATE2WithNull() self::FORM_NAME3 => $this->day, self::FORM_NAME4 => $this->hour, self::FORM_NAME5 => null, - self::FORM_NAME6 => $this->second + self::FORM_NAME6 => $this->second, ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_DATE2は全ての項目を入力して下さい。
']; @@ -100,7 +100,7 @@ public function testCHECKDATE2WithZero() self::FORM_NAME3 => '0', self::FORM_NAME4 => '0', self::FORM_NAME5 => '0', - self::FORM_NAME6 => '0' + self::FORM_NAME6 => '0', ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_DATE2が正しくありません。
']; @@ -116,7 +116,7 @@ public function testCHECKDATE2WithInvalid() self::FORM_NAME3 => '29', self::FORM_NAME4 => '0', self::FORM_NAME5 => '0', - self::FORM_NAME6 => '0' + self::FORM_NAME6 => '0', ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_DATE2が正しくありません。
']; diff --git a/tests/class/SC_CheckError/SC_CheckError_CHECK_DATE3Test.php b/tests/class/SC_CheckError/SC_CheckError_CHECK_DATE3Test.php index 9336e3ed05..037e6a8a27 100644 --- a/tests/class/SC_CheckError/SC_CheckError_CHECK_DATE3Test.php +++ b/tests/class/SC_CheckError/SC_CheckError_CHECK_DATE3Test.php @@ -28,7 +28,7 @@ public function testCHECKDATE3() { $this->arrForm = [ self::FORM_NAME1 => $this->year, - self::FORM_NAME2 => $this->month + self::FORM_NAME2 => $this->month, ]; $this->expected = []; @@ -40,7 +40,7 @@ public function testCHECKDATE3WithEmpty() { $this->arrForm = [ self::FORM_NAME1 => $this->year, - self::FORM_NAME2 => '' + self::FORM_NAME2 => '', ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_DATE3は全ての項目を入力して下さい。
']; @@ -52,7 +52,7 @@ public function testCHECKDATE3WithNull() { $this->arrForm = [ self::FORM_NAME1 => null, - self::FORM_NAME2 => $this->month + self::FORM_NAME2 => $this->month, ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_DATE3は全ての項目を入力して下さい。
']; @@ -64,7 +64,7 @@ public function testCHECKDATE3WithZero() { $this->arrForm = [ self::FORM_NAME1 => '0', - self::FORM_NAME2 => '0' + self::FORM_NAME2 => '0', ]; $this->expected = []; @@ -76,7 +76,7 @@ public function testCHECKDATE3WithInvalid() { $this->arrForm = [ self::FORM_NAME1 => 2001, - self::FORM_NAME2 => '13' + self::FORM_NAME2 => '13', ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_DATE3が正しくありません。
']; diff --git a/tests/class/SC_CheckError/SC_CheckError_CHECK_DATETest.php b/tests/class/SC_CheckError/SC_CheckError_CHECK_DATETest.php index 976c5c68f9..0bba68c266 100644 --- a/tests/class/SC_CheckError/SC_CheckError_CHECK_DATETest.php +++ b/tests/class/SC_CheckError/SC_CheckError_CHECK_DATETest.php @@ -34,7 +34,7 @@ public function testCHECKDATE() $this->arrForm = [ self::FORM_NAME1 => $this->year, self::FORM_NAME2 => $this->month, - self::FORM_NAME3 => $this->day + self::FORM_NAME3 => $this->day, ]; $this->expected = []; @@ -47,7 +47,7 @@ public function testCHECKDATEWithEmpty() $this->arrForm = [ self::FORM_NAME1 => '2019', self::FORM_NAME2 => '', - self::FORM_NAME3 => '' + self::FORM_NAME3 => '', ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_DATEは全ての項目を入力して下さい。
']; @@ -60,7 +60,7 @@ public function testCHECKDATEWithNull() $this->arrForm = [ self::FORM_NAME1 => '2019', self::FORM_NAME2 => null, - self::FORM_NAME3 => null + self::FORM_NAME3 => null, ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_DATEは全ての項目を入力して下さい。
']; @@ -73,7 +73,7 @@ public function testCHECKDATEWithZero() $this->arrForm = [ self::FORM_NAME1 => '0', self::FORM_NAME2 => '0', - self::FORM_NAME3 => '0' + self::FORM_NAME3 => '0', ]; $this->expected = []; @@ -86,7 +86,7 @@ public function testCHECKDATEWithInvalid() $this->arrForm = [ self::FORM_NAME1 => 2001, self::FORM_NAME2 => '2', - self::FORM_NAME3 => '29' + self::FORM_NAME3 => '29', ]; $this->expected = [self::FORM_NAME1 => '※ CHECK_DATEが正しくありません。
']; diff --git a/tests/class/SC_CheckError/SC_CheckError_CHECK_REGIST_CUSTOMER_EMAILTest.php b/tests/class/SC_CheckError/SC_CheckError_CHECK_REGIST_CUSTOMER_EMAILTest.php index e7e3aea7f0..b48e9e7fc7 100644 --- a/tests/class/SC_CheckError/SC_CheckError_CHECK_REGIST_CUSTOMER_EMAILTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_CHECK_REGIST_CUSTOMER_EMAILTest.php @@ -20,7 +20,7 @@ protected function setUp() 'name01' => $this->faker->lastName, 'name02' => $this->faker->firstName, 'email' => $this->email, - 'secret_key' => uniqid() + 'secret_key' => uniqid(), ] ); } @@ -54,7 +54,7 @@ public function testCHECKREGISTCUSTOMEREMAILWithExpired() { SC_Helper_Customer_Ex::sfEditCustomerData( [ - 'del_flg' => 1 + 'del_flg' => 1, ], $this->customer_id ); diff --git a/tests/class/SC_CheckError/SC_CheckError_CHECK_SET_TERM2Test.php b/tests/class/SC_CheckError/SC_CheckError_CHECK_SET_TERM2Test.php index c9561cf6d7..9f89765ef2 100644 --- a/tests/class/SC_CheckError/SC_CheckError_CHECK_SET_TERM2Test.php +++ b/tests/class/SC_CheckError/SC_CheckError_CHECK_SET_TERM2Test.php @@ -97,7 +97,7 @@ public function testCHECKSETTERM2() self::FORM_NAME11 => $this->end_day, self::FORM_NAME12 => $this->end_hour, self::FORM_NAME13 => $this->end_month, - self::FORM_NAME14 => $this->end_second + self::FORM_NAME14 => $this->end_second, ]; $this->expected = []; @@ -119,7 +119,7 @@ public function testCHECKSETTERM2WithEmpty() self::FORM_NAME11 => $this->end_day, self::FORM_NAME12 => $this->end_hour, self::FORM_NAME13 => $this->end_month, - self::FORM_NAME14 => $this->end_second + self::FORM_NAME14 => $this->end_second, ]; $this->expected = [self::FORM_NAME3 => '※ startを正しく指定してください。
']; @@ -141,12 +141,12 @@ public function testCHECKSETTERM2WithNull() self::FORM_NAME11 => $this->end_day, self::FORM_NAME12 => $this->end_hour, self::FORM_NAME13 => $this->end_month, - self::FORM_NAME14 => $this->end_second + self::FORM_NAME14 => $this->end_second, ]; $this->expected = [ self::FORM_NAME3 => '※ startを正しく指定してください。
', - self::FORM_NAME9 => '※ endを正しく指定してください。
' + self::FORM_NAME9 => '※ endを正しく指定してください。
', ]; $this->scenario(); @@ -167,12 +167,12 @@ public function testCHECKSETTERM2WithZero() self::FORM_NAME11 => '0', self::FORM_NAME12 => '0', self::FORM_NAME13 => '0', - self::FORM_NAME14 => '0' + self::FORM_NAME14 => '0', ]; $this->expected = [ self::FORM_NAME3 => '※ startとendの期間指定が不正です。
', - self::FORM_NAME9 => '※ endを正しく指定してください。
' + self::FORM_NAME9 => '※ endを正しく指定してください。
', ]; $this->scenario(); @@ -193,7 +193,7 @@ public function testCHECKSETTERM2WithInvalid() self::FORM_NAME11 => '29', self::FORM_NAME12 => 0, self::FORM_NAME13 => 0, - self::FORM_NAME14 => 0 + self::FORM_NAME14 => 0, ]; $this->expected = [self::FORM_NAME9 => '※ endを正しく指定してください。
']; @@ -215,7 +215,7 @@ public function testCHECKSETTERM2WithReverse() self::FORM_NAME11 => '29', self::FORM_NAME12 => 0, self::FORM_NAME13 => 0, - self::FORM_NAME14 => 0 + self::FORM_NAME14 => 0, ]; $this->expected = [self::FORM_NAME3 => '※ startとendの期間指定が不正です。
']; @@ -245,7 +245,7 @@ public function scenario() self::FORM_NAME11, self::FORM_NAME12, self::FORM_NAME13, - self::FORM_NAME14 + self::FORM_NAME14, ], [$this->target_func] ); diff --git a/tests/class/SC_CheckError/SC_CheckError_CHECK_SET_TERM3Test.php b/tests/class/SC_CheckError/SC_CheckError_CHECK_SET_TERM3Test.php index 8dc5771ba5..716562a857 100644 --- a/tests/class/SC_CheckError/SC_CheckError_CHECK_SET_TERM3Test.php +++ b/tests/class/SC_CheckError/SC_CheckError_CHECK_SET_TERM3Test.php @@ -61,7 +61,7 @@ public function testCHECKSETTERM3WithEmpty() self::FORM_NAME3 => $this->start_year, self::FORM_NAME4 => $this->start_month, self::FORM_NAME5 => $this->end_year, - self::FORM_NAME6 => '' + self::FORM_NAME6 => '', ]; $this->expected = [self::FORM_NAME5 => '※ endを正しく指定してください。
']; @@ -75,12 +75,12 @@ public function testCHECKSETTERM3WithNull() self::FORM_NAME3 => '2019', self::FORM_NAME4 => null, self::FORM_NAME5 => '2019', - self::FORM_NAME6 => null + self::FORM_NAME6 => null, ]; $this->expected = [ self::FORM_NAME3 => '※ startを正しく指定してください。
', - self::FORM_NAME5 => '※ endを正しく指定してください。
' + self::FORM_NAME5 => '※ endを正しく指定してください。
', ]; $this->scenario(); @@ -98,7 +98,7 @@ public function testCHECKSETTERM3WithZero() $this->expected = [ self::FORM_NAME3 => '※ startを正しく指定してください。
', - self::FORM_NAME5 => '※ endを正しく指定してください。
' + self::FORM_NAME5 => '※ endを正しく指定してください。
', ]; $this->scenario(); @@ -111,7 +111,7 @@ public function testCHECKSETTERM3WithInvalid() self::FORM_NAME3 => '2000', self::FORM_NAME4 => '2', self::FORM_NAME5 => '2001', - self::FORM_NAME6 => '13' + self::FORM_NAME6 => '13', ]; $this->expected = [self::FORM_NAME5 => '※ endを正しく指定してください。
']; @@ -126,7 +126,7 @@ public function testCHECKSETTERM3WithReverse() self::FORM_NAME3 => '2001', self::FORM_NAME4 => '2', self::FORM_NAME5 => '2000', - self::FORM_NAME6 => '2' + self::FORM_NAME6 => '2', ]; $this->expected = [self::FORM_NAME3 => '※ startとendの期間指定が不正です。
']; @@ -148,7 +148,7 @@ public function scenario() self::FORM_NAME3, self::FORM_NAME4, self::FORM_NAME5, - self::FORM_NAME6 + self::FORM_NAME6, ], [$this->target_func] ); @@ -159,7 +159,7 @@ public function scenario() self::FORM_NAME3, self::FORM_NAME4, self::FORM_NAME5, - self::FORM_NAME6 + self::FORM_NAME6, ], [$this->target_func] ); diff --git a/tests/class/SC_CheckError/SC_CheckError_CHECK_SET_TERMTest.php b/tests/class/SC_CheckError/SC_CheckError_CHECK_SET_TERMTest.php index ad6f837503..2a7f4e0ac9 100644 --- a/tests/class/SC_CheckError/SC_CheckError_CHECK_SET_TERMTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_CHECK_SET_TERMTest.php @@ -59,7 +59,7 @@ public function testCHECKSETTERM() self::FORM_NAME5 => $this->start_day, self::FORM_NAME6 => $this->end_year, self::FORM_NAME7 => $this->end_month, - self::FORM_NAME8 => $this->end_day + self::FORM_NAME8 => $this->end_day, ]; $this->expected = []; @@ -75,7 +75,7 @@ public function testCHECKSETTERMWithEmpty() self::FORM_NAME5 => $this->start_day, self::FORM_NAME6 => '', self::FORM_NAME7 => $this->end_month, - self::FORM_NAME8 => $this->end_day + self::FORM_NAME8 => $this->end_day, ]; $this->expected = [self::FORM_NAME6 => '※ endを正しく指定してください。
']; @@ -91,12 +91,12 @@ public function testCHECKSETTERMWithNull() self::FORM_NAME5 => null, self::FORM_NAME6 => '2019', self::FORM_NAME7 => null, - self::FORM_NAME8 => null + self::FORM_NAME8 => null, ]; $this->expected = [ self::FORM_NAME3 => '※ startを正しく指定してください。
', - self::FORM_NAME6 => '※ endを正しく指定してください。
' + self::FORM_NAME6 => '※ endを正しく指定してください。
', ]; $this->scenario(); @@ -111,12 +111,12 @@ public function testCHECKSETTERMWithZero() self::FORM_NAME5 => '0', self::FORM_NAME6 => '0', self::FORM_NAME7 => '0', - self::FORM_NAME8 => '0' + self::FORM_NAME8 => '0', ]; $this->expected = [ self::FORM_NAME3 => '※ startを正しく指定してください。
', - self::FORM_NAME6 => '※ endを正しく指定してください。
' + self::FORM_NAME6 => '※ endを正しく指定してください。
', ]; $this->scenario(); @@ -131,7 +131,7 @@ public function testCHECKSETTERMWithInvalid() self::FORM_NAME5 => '29', self::FORM_NAME6 => '2001', self::FORM_NAME7 => '2', - self::FORM_NAME8 => '29' + self::FORM_NAME8 => '29', ]; $this->expected = [self::FORM_NAME6 => '※ endを正しく指定してください。
']; @@ -148,7 +148,7 @@ public function testCHECKSETTERMWithReverse() self::FORM_NAME5 => '28', self::FORM_NAME6 => '2000', self::FORM_NAME7 => '2', - self::FORM_NAME8 => '28' + self::FORM_NAME8 => '28', ]; $this->expected = [self::FORM_NAME3 => '※ startとendの期間指定が不正です。
']; @@ -172,7 +172,7 @@ public function scenario() self::FORM_NAME5, self::FORM_NAME6, self::FORM_NAME7, - self::FORM_NAME8 + self::FORM_NAME8, ], [$this->target_func] ); @@ -185,7 +185,7 @@ public function scenario() self::FORM_NAME5, self::FORM_NAME6, self::FORM_NAME7, - self::FORM_NAME8 + self::FORM_NAME8, ], [$this->target_func] ); diff --git a/tests/class/SC_CheckError/SC_CheckError_DOMAIN_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_DOMAIN_CHECKTest.php index 045b6da8b9..cd7c18acfe 100644 --- a/tests/class/SC_CheckError/SC_CheckError_DOMAIN_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_DOMAIN_CHECKTest.php @@ -15,7 +15,7 @@ protected function setUp() public function testDOMAINCHECK() { $this->arrForm = [ - self::FORM_NAME => '.'.$this->faker->domainName // 行頭に . を含める必要がある + self::FORM_NAME => '.'.$this->faker->domainName, // 行頭に . を含める必要がある ]; $this->expected = ''; diff --git a/tests/class/SC_CheckError/SC_CheckError_EMAIL_CHAR_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_EMAIL_CHAR_CHECKTest.php index a307c326b6..61d9d2dfa8 100644 --- a/tests/class/SC_CheckError/SC_CheckError_EMAIL_CHAR_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_EMAIL_CHAR_CHECKTest.php @@ -42,7 +42,7 @@ public function testEMAILCHARCHECKWithNull() public function testEMAILCHARCHECKWithRegex() { $this->arrForm = [ - self::FORM_NAME => $this->faker->regexify('^[a-zA-Z0-9_@\+\?-]+$') + self::FORM_NAME => $this->faker->regexify('^[a-zA-Z0-9_@\+\?-]+$'), ]; $this->expected = ''; $this->scenario(); @@ -53,7 +53,7 @@ public function testEMAILCHARCHECKWithError() { $email = $this->faker->randomNumber().'='.$this->faker->userName.'@'.$this->faker->safeEmailDomain; $this->arrForm = [ - self::FORM_NAME => $email + self::FORM_NAME => $email, ]; $this->expected = '※ EMAIL_CHAR_CHECKに使用する文字を正しく入力してください。
'; diff --git a/tests/class/SC_CheckError/SC_CheckError_EMAIL_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_EMAIL_CHECKTest.php index e56e63dfdd..d29be60555 100644 --- a/tests/class/SC_CheckError/SC_CheckError_EMAIL_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_EMAIL_CHECKTest.php @@ -51,7 +51,7 @@ public function testEMAILCHECKWithNull() public function testEMAILCHECKWithLoose() { $this->arrForm = [ - self::FORM_NAME => $this->faker->userName.'.@'.$this->faker->safeEmailDomain + self::FORM_NAME => $this->faker->userName.'.@'.$this->faker->safeEmailDomain, ]; $this->expected = ''; @@ -62,7 +62,7 @@ public function testEMAILCHECKWithLoose() public function testEMAILCHECKWithLoose2() { $this->arrForm = [ - self::FORM_NAME => $this->faker->randomNumber().'..'.$this->faker->userName.'@'.$this->faker->safeEmailDomain + self::FORM_NAME => $this->faker->randomNumber().'..'.$this->faker->userName.'@'.$this->faker->safeEmailDomain, ]; $this->expected = ''; @@ -78,7 +78,7 @@ public function testEMAILCHECKWithMaxlength() $localpart = $this->faker->regexify('[a-z]{'.$localpartLength.'}'); $this->arrForm = [ - self::FORM_NAME => $localpart.$domainPart + self::FORM_NAME => $localpart.$domainPart, ]; $this->expected = ''; @@ -94,7 +94,7 @@ public function testEMAILCHECKWithMaxlengthError() $localpart = $this->faker->regexify('[a-z]{'.$localpartLength.'}'); $this->arrForm = [ - self::FORM_NAME => $localpart.$domainPart + self::FORM_NAME => $localpart.$domainPart, ]; $this->expected = '※ EMAIL_CHECKは256字以下で入力してください。
'; diff --git a/tests/class/SC_CheckError/SC_CheckError_EVAL_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_EVAL_CHECKTest.php index 124ea3c296..729395a51c 100644 --- a/tests/class/SC_CheckError/SC_CheckError_EVAL_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_EVAL_CHECKTest.php @@ -60,7 +60,7 @@ public function testEVALCHECKWithErrorExists() [self::FORM_NAME, self::FORM_NAME], [ 'NUM_CHECK', - $this->target_func + $this->target_func, ] ); diff --git a/tests/class/SC_CheckError/SC_CheckError_FILE_EXIST_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_FILE_EXIST_CHECKTest.php index ec6b45bd38..f425c9bb6f 100644 --- a/tests/class/SC_CheckError/SC_CheckError_FILE_EXIST_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_FILE_EXIST_CHECKTest.php @@ -54,8 +54,8 @@ public function scenario() { $_FILES = [ self::FORM_NAME => [ - 'size' => $this->fileSize - ] + 'size' => $this->fileSize, + ], ]; $this->arrForm = []; $this->objErr = new SC_CheckError_Ex($this->arrForm); diff --git a/tests/class/SC_CheckError/SC_CheckError_FILE_EXT_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_FILE_EXT_CHECKTest.php index d476550a12..9d803c06e5 100644 --- a/tests/class/SC_CheckError/SC_CheckError_FILE_EXT_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_FILE_EXT_CHECKTest.php @@ -68,8 +68,8 @@ public function scenario() { $_FILES = [ self::FORM_NAME => [ - 'name' => $this->fileName - ] + 'name' => $this->fileName, + ], ]; $this->arrForm = []; $this->objErr = new SC_CheckError_Ex($this->arrForm); diff --git a/tests/class/SC_CheckError/SC_CheckError_FILE_NAME_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_FILE_NAME_CHECKTest.php index 0ed291042c..20ddcc535b 100644 --- a/tests/class/SC_CheckError/SC_CheckError_FILE_NAME_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_FILE_NAME_CHECKTest.php @@ -56,8 +56,8 @@ public function scenario() { $_FILES = [ self::FORM_NAME => [ - 'name' => $this->fileName - ] + 'name' => $this->fileName, + ], ]; $this->arrForm = []; $this->objErr = new SC_CheckError_Ex($this->arrForm); diff --git a/tests/class/SC_CheckError/SC_CheckError_FILE_SIZE_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_FILE_SIZE_CHECKTest.php index 2bea4ba8cb..378a42ff50 100644 --- a/tests/class/SC_CheckError/SC_CheckError_FILE_SIZE_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_FILE_SIZE_CHECKTest.php @@ -70,8 +70,8 @@ public function scenario() { $_FILES = [ self::FORM_NAME => [ - 'size' => $this->fileSize - ] + 'size' => $this->fileSize, + ], ]; $this->arrForm = []; $this->objErr = new SC_CheckError_Ex($this->arrForm); diff --git a/tests/class/SC_CheckError/SC_CheckError_FULL_EXIST_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_FULL_EXIST_CHECKTest.php index e8d92eacfd..88a3c7baab 100644 --- a/tests/class/SC_CheckError/SC_CheckError_FULL_EXIST_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_FULL_EXIST_CHECKTest.php @@ -20,7 +20,7 @@ public function testFULLEXISTCHECK() $this->arrForm = [ self::FORM_NAME1 => 2019, self::FORM_NAME2 => '05', - self::FORM_NAME3 => 'a' + self::FORM_NAME3 => 'a', ]; $this->expected = []; @@ -33,10 +33,10 @@ public function testFULLEXISTCHECKWithEmpty() $this->arrForm = [ self::FORM_NAME1 => '', self::FORM_NAME2 => '', - self::FORM_NAME3 => '' + self::FORM_NAME3 => '', ]; $this->expected = [ - self::FORM_NAME1 => '※ FULL_EXIST_CHECKが入力されていません。
' + self::FORM_NAME1 => '※ FULL_EXIST_CHECKが入力されていません。
', ]; $this->scenario(); @@ -48,10 +48,10 @@ public function testFULLEXISTCHECKWithNull() $this->arrForm = [ self::FORM_NAME1 => 'a', self::FORM_NAME2 => null, - self::FORM_NAME3 => null + self::FORM_NAME3 => null, ]; $this->expected = [ - self::FORM_NAME1 => '※ FULL_EXIST_CHECKが入力されていません。
' + self::FORM_NAME1 => '※ FULL_EXIST_CHECKが入力されていません。
', ]; $this->scenario(); @@ -63,7 +63,7 @@ public function testFULLEXISTCHECKWithZero() $this->arrForm = [ self::FORM_NAME1 => '0', self::FORM_NAME2 => '0', - self::FORM_NAME3 => '0' + self::FORM_NAME3 => '0', ]; $this->expected = []; @@ -76,19 +76,19 @@ public function testFULLEXISTCHECKWithErrorExists() $this->arrForm = [ self::FORM_NAME1 => 'a', self::FORM_NAME2 => '', - self::FORM_NAME3 => '' + self::FORM_NAME3 => '', ]; $this->objErr = new SC_CheckError_Ex($this->arrForm); $this->objErr->doFunc( ['label', self::FORM_NAME1, self::FORM_NAME2, self::FORM_NAME3], [ 'NUM_CHECK', - $this->target_func + $this->target_func, ] ); $this->expected = [ - self::FORM_NAME1 => '※ labelは数字で入力してください。
' + self::FORM_NAME1 => '※ labelは数字で入力してください。
', ]; $this->verify('既存のエラーがある場合はエラーチェックしない'); diff --git a/tests/class/SC_CheckError/SC_CheckError_IP_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_IP_CHECKTest.php index 1c3b55cdc8..3880fad484 100644 --- a/tests/class/SC_CheckError/SC_CheckError_IP_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_IP_CHECKTest.php @@ -42,7 +42,7 @@ public function testIPCHECKWithNull() public function testIPCHECKWithError() { $this->arrForm = [ - self::FORM_NAME => '256.123.123.123' + self::FORM_NAME => '256.123.123.123', ]; $this->expected = '※ IP_CHECKに正しい形式のIPアドレスを入力してください。
'; @@ -53,7 +53,7 @@ public function testIPCHECKWithError() public function testIPCHECKWithMultiple() { $this->arrForm = [ - self::FORM_NAME => "{$this->faker->ipv4}\n{$this->faker->ipv4}\r\n{$this->faker->ipv4}\n\n{$this->faker->ipv4}" + self::FORM_NAME => "{$this->faker->ipv4}\n{$this->faker->ipv4}\r\n{$this->faker->ipv4}\n\n{$this->faker->ipv4}", ]; $this->expected = ''; @@ -64,7 +64,7 @@ public function testIPCHECKWithMultiple() public function testIPCHECKWithMultipleError() { $this->arrForm = [ - self::FORM_NAME => "{$this->faker->ipv4}\n256.11.1.1\r\n{$this->faker->ipv4}\n\n{$this->faker->ipv4}" + self::FORM_NAME => "{$this->faker->ipv4}\n256.11.1.1\r\n{$this->faker->ipv4}\n\n{$this->faker->ipv4}", ]; $this->expected = '※ IP_CHECKに正しい形式のIPアドレスを入力してください。
'; diff --git a/tests/class/SC_CheckError/SC_CheckError_ONE_EXIST_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_ONE_EXIST_CHECKTest.php index 45ca57a0ae..fff92f6c26 100644 --- a/tests/class/SC_CheckError/SC_CheckError_ONE_EXIST_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_ONE_EXIST_CHECKTest.php @@ -20,7 +20,7 @@ public function testONEEXISTCHECK() $this->arrForm = [ self::FORM_NAME1 => 2019, self::FORM_NAME2 => '05', - self::FORM_NAME3 => 'a' + self::FORM_NAME3 => 'a', ]; $this->expected = []; @@ -33,10 +33,10 @@ public function testONEEXISTCHECKWithEmpty() $this->arrForm = [ self::FORM_NAME1 => '', self::FORM_NAME2 => '', - self::FORM_NAME3 => '' + self::FORM_NAME3 => '', ]; $this->expected = [ - self::FORM_NAME1 => '※ ONE_EXIST_CHECKが入力されていません。
' + self::FORM_NAME1 => '※ ONE_EXIST_CHECKが入力されていません。
', ]; $this->scenario(); @@ -48,7 +48,7 @@ public function testONEEXISTCHECKWithNull() $this->arrForm = [ self::FORM_NAME1 => 'a', self::FORM_NAME2 => null, - self::FORM_NAME3 => null + self::FORM_NAME3 => null, ]; $this->expected = []; @@ -61,7 +61,7 @@ public function testONEEXISTCHECKWithZero() $this->arrForm = [ self::FORM_NAME1 => '0', self::FORM_NAME2 => '0', - self::FORM_NAME3 => '0' + self::FORM_NAME3 => '0', ]; $this->expected = []; @@ -74,19 +74,19 @@ public function testONEEXISTCHECKWithErrorExists() $this->arrForm = [ self::FORM_NAME1 => 'a', self::FORM_NAME2 => '', - self::FORM_NAME3 => '' + self::FORM_NAME3 => '', ]; $this->objErr = new SC_CheckError_Ex($this->arrForm); $this->objErr->doFunc( ['label', self::FORM_NAME1, self::FORM_NAME2, self::FORM_NAME3], [ 'NUM_CHECK', - $this->target_func + $this->target_func, ] ); $this->expected = [ - self::FORM_NAME1 => '※ labelは数字で入力してください。
' + self::FORM_NAME1 => '※ labelは数字で入力してください。
', ]; $this->verify('既存のエラーがある場合はエラーチェックしない'); diff --git a/tests/class/SC_CheckError/SC_CheckError_PASSWORD_CHAR_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_PASSWORD_CHAR_CHECKTest.php index f91b100491..e88c67a825 100644 --- a/tests/class/SC_CheckError/SC_CheckError_PASSWORD_CHAR_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_PASSWORD_CHAR_CHECKTest.php @@ -51,7 +51,7 @@ public function testPASSWORDCHARCHECKWithNull() public function testPASSWORDCHARCHECKWithFaker() { $this->arrForm = [ - self::FORM_NAME => $this->faker->password(8, 99).'1' + self::FORM_NAME => $this->faker->password(8, 99).'1', ]; $this->expected = ''; $this->scenario(); @@ -61,7 +61,7 @@ public function testPASSWORDCHARCHECKWithFaker() public function testPASSWORDCHARCHECKWithAlphabetOnly() { $this->arrForm = [ - self::FORM_NAME => 'password' + self::FORM_NAME => 'password', ]; $this->expected = '※ PASSWORD_CHAR_CHECKは英数字をそれぞれ1種類使用し、8文字以上で入力してください。
'; @@ -72,7 +72,7 @@ public function testPASSWORDCHARCHECKWithAlphabetOnly() public function testPASSWORDCHARCHECKWithNumberOnly() { $this->arrForm = [ - self::FORM_NAME => '12345678' + self::FORM_NAME => '12345678', ]; $this->expected = '※ PASSWORD_CHAR_CHECKは英数字をそれぞれ1種類使用し、8文字以上で入力してください。
'; @@ -83,7 +83,7 @@ public function testPASSWORDCHARCHECKWithNumberOnly() public function testPASSWORDCHARCHECKWithMinute() { $this->arrForm = [ - self::FORM_NAME => $this->faker->password(6, 7) + self::FORM_NAME => $this->faker->password(6, 7), ]; $this->expected = '※ PASSWORD_CHAR_CHECKは英数字をそれぞれ1種類使用し、8文字以上で入力してください。
'; diff --git a/tests/class/SC_CheckError/SC_CheckError_PROHIBITED_STR_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_PROHIBITED_STR_CHECKTest.php index 1eaf01e762..3a8f7ba4fb 100644 --- a/tests/class/SC_CheckError/SC_CheckError_PROHIBITED_STR_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_PROHIBITED_STR_CHECKTest.php @@ -19,7 +19,7 @@ protected function setUp() public function testPROHIBITEDSTRCHECK() { $this->arrForm = [ - self::FORM_NAME => 'ddd' + self::FORM_NAME => 'ddd', ]; $this->expected = ''; diff --git a/tests/class/SC_CheckError/SC_CheckError_TEL_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_TEL_CHECKTest.php index f6fb9e8276..95e7489325 100644 --- a/tests/class/SC_CheckError/SC_CheckError_TEL_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_TEL_CHECKTest.php @@ -25,7 +25,7 @@ public function testTELCHECK() $this->arrForm = [ self::FORM_NAME1 => '056375', self::FORM_NAME2 => '1', - self::FORM_NAME3 => '2222' + self::FORM_NAME3 => '2222', ]; $this->expected = []; @@ -38,7 +38,7 @@ public function testTELCHECKWithNumber() $this->arrForm = [ self::FORM_NAME1 => 5637, self::FORM_NAME2 => 1111, - self::FORM_NAME3 => 2222 + self::FORM_NAME3 => 2222, ]; $this->expected = []; @@ -51,7 +51,7 @@ public function testTELCHECKWithEmpty() $this->arrForm = [ self::FORM_NAME1 => '', self::FORM_NAME2 => '', - self::FORM_NAME3 => '' + self::FORM_NAME3 => '', ]; $this->expected = []; @@ -64,7 +64,7 @@ public function testTELCHECKWithNull() $this->arrForm = [ self::FORM_NAME1 => null, self::FORM_NAME2 => null, - self::FORM_NAME3 => null + self::FORM_NAME3 => null, ]; $this->expected = []; @@ -77,7 +77,7 @@ public function testTELCHECKWithLastEmpty() $this->arrForm = [ self::FORM_NAME1 => '090', self::FORM_NAME2 => 1111, - self::FORM_NAME3 => '' + self::FORM_NAME3 => '', ]; $this->expected = [self::FORM_NAME1 => '※ TEL_CHECKは全ての項目を入力してください。
']; @@ -90,7 +90,7 @@ public function testTELCHECKWithAlpha() $this->arrForm = [ self::FORM_NAME1 => '111', self::FORM_NAME2 => 'aaa', - self::FORM_NAME3 => 11 + self::FORM_NAME3 => 11, ]; $this->expected = [self::FORM_NAME2 => '※ TEL_CHECK2は数字で入力してください。
']; @@ -103,7 +103,7 @@ public function testTELCHECKWithMaxlength() $this->arrForm = [ self::FORM_NAME1 => '1111', self::FORM_NAME2 => '22222', - self::FORM_NAME3 => '3333' + self::FORM_NAME3 => '3333', ]; $this->expected = [self::FORM_NAME3 => '※ TEL_CHECKは12文字以内で入力してください。
']; @@ -116,7 +116,7 @@ public function testTELCHECKWithItemMaxlength() $this->arrForm = [ self::FORM_NAME1 => '1234567', self::FORM_NAME2 => '7', - self::FORM_NAME3 => '333' + self::FORM_NAME3 => '333', ]; $this->expected = [self::FORM_NAME1 => '※ TEL_CHECK1は6字以内で入力してください。
']; diff --git a/tests/class/SC_CheckError/SC_CheckError_TOP_EXIST_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_TOP_EXIST_CHECKTest.php index c0740a46b0..a7d3be88b1 100644 --- a/tests/class/SC_CheckError/SC_CheckError_TOP_EXIST_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_TOP_EXIST_CHECKTest.php @@ -20,7 +20,7 @@ public function testTOPEXISTCHECK() $this->arrForm = [ self::FORM_NAME1 => 2019, self::FORM_NAME2 => '05', - self::FORM_NAME3 => 'a' + self::FORM_NAME3 => 'a', ]; $this->expected = []; @@ -33,7 +33,7 @@ public function testTOPEXISTCHECKWithEmpty() $this->arrForm = [ self::FORM_NAME1 => '', self::FORM_NAME2 => '', - self::FORM_NAME3 => '' + self::FORM_NAME3 => '', ]; $this->expected = []; @@ -46,10 +46,10 @@ public function testTOPEXISTCHECKWithNull() $this->arrForm = [ self::FORM_NAME1 => null, self::FORM_NAME2 => 'a', - self::FORM_NAME3 => null + self::FORM_NAME3 => null, ]; $this->expected = [ - self::FORM_NAME1 => '※ TOP_EXIST_CHECKは先頭の項目から順番に入力して下さい。
' + self::FORM_NAME1 => '※ TOP_EXIST_CHECKは先頭の項目から順番に入力して下さい。
', ]; $this->scenario(); @@ -61,7 +61,7 @@ public function testTOPEXISTCHECKWithZero() $this->arrForm = [ self::FORM_NAME1 => '0', self::FORM_NAME2 => '0', - self::FORM_NAME3 => '0' + self::FORM_NAME3 => '0', ]; $this->expected = []; @@ -74,19 +74,19 @@ public function testTOPEXISTCHECKWithErrorExists() $this->arrForm = [ self::FORM_NAME1 => 'a', self::FORM_NAME2 => '', - self::FORM_NAME3 => '' + self::FORM_NAME3 => '', ]; $this->objErr = new SC_CheckError_Ex($this->arrForm); $this->objErr->doFunc( ['label', self::FORM_NAME1, self::FORM_NAME2, self::FORM_NAME3], [ 'NUM_CHECK', - $this->target_func + $this->target_func, ] ); $this->expected = [ - self::FORM_NAME1 => '※ labelは数字で入力してください。
' + self::FORM_NAME1 => '※ labelは数字で入力してください。
', ]; $this->verify('既存のエラーがある場合はエラーチェックしない'); diff --git a/tests/class/SC_CheckError/SC_CheckError_URL_CHECKTest.php b/tests/class/SC_CheckError/SC_CheckError_URL_CHECKTest.php index 4263b447ec..e244f2d57b 100644 --- a/tests/class/SC_CheckError/SC_CheckError_URL_CHECKTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_URL_CHECKTest.php @@ -42,7 +42,7 @@ public function testURLCHECKWithNull() public function testURLCHECKWithError() { $this->arrForm = [ - self::FORM_NAME => 'ftp://'.$this->faker->safeEmailDomain.'/' + self::FORM_NAME => 'ftp://'.$this->faker->safeEmailDomain.'/', ]; $this->expected = '※ URL_CHECKを正しく入力してください。
'; diff --git a/tests/class/SC_CheckError/SC_CheckError_createParamTest.php b/tests/class/SC_CheckError/SC_CheckError_createParamTest.php index 13c8fcb557..99bb9c12f6 100644 --- a/tests/class/SC_CheckError/SC_CheckError_createParamTest.php +++ b/tests/class/SC_CheckError/SC_CheckError_createParamTest.php @@ -48,7 +48,7 @@ public function testArrParamIsCaracter() $this->objErr->doFunc(['EXIST_CHECK', 'aabbcc_1234'], ['EXIST_CHECK']); $this->expected = [self::FORM_NAME => [0 => 'A', 1 => 'B', 2 => 'C'], - 'aabbcc_1234' => '']; + 'aabbcc_1234' => '', ]; $this->actual = $this->objErr->arrParam; $this->assertEquals($this->expected, $this->actual); } diff --git a/tests/class/SC_Date/SC_Date_getZeroMonthTest.php b/tests/class/SC_Date/SC_Date_getZeroMonthTest.php index 7d2720fe50..1cb425d349 100644 --- a/tests/class/SC_Date/SC_Date_getZeroMonthTest.php +++ b/tests/class/SC_Date/SC_Date_getZeroMonthTest.php @@ -49,7 +49,7 @@ public function testGetZeroMonth要素の数が12の配列を返す() public function testGetZeroMonth0をつけた月の配列を返す() { - $this->expected = ['01' => '01', '02' => '02', '03' => '03', '04' => '04', '05' => '05', '06' => '06', '07' => '07', '08' => '08', '09' => '09', '10' => '10', '11' => '11', '12' => '12' + $this->expected = ['01' => '01', '02' => '02', '03' => '03', '04' => '04', '05' => '05', '06' => '06', '07' => '07', '08' => '08', '09' => '09', '10' => '10', '11' => '11', '12' => '12', ]; $this->actual = $this->objDate->getZeroMonth(); diff --git a/tests/class/SC_Date/SC_Date_isHolidayTest.php b/tests/class/SC_Date/SC_Date_isHolidayTest.php index ebefbd9637..08cbe1c365 100644 --- a/tests/class/SC_Date/SC_Date_isHolidayTest.php +++ b/tests/class/SC_Date/SC_Date_isHolidayTest.php @@ -42,7 +42,7 @@ protected function setUp() 'creator_id' => '1', 'create_date' => '2013-02-14 11:22:33', 'update_date' => '2013-02-14 22:11:33', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'holiday_id' => '2', @@ -53,14 +53,14 @@ protected function setUp() 'creator_id' => '1', 'create_date' => '2013-02-15 11:22:33', 'update_date' => '2013-02-16 22:11:33', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ]; // 休みの曜日を登録 $baseInfo = [ 'id' => '1', 'regular_holiday_ids' => '0|6', // 土日を休みに登録 - 'update_date' => '2013-02-14 22:11:33' + 'update_date' => '2013-02-14 22:11:33', ]; $objQuery->delete('dtb_holiday'); diff --git a/tests/class/SC_FormParamTest.php b/tests/class/SC_FormParamTest.php index e993a79677..f8f5334472 100644 --- a/tests/class/SC_FormParamTest.php +++ b/tests/class/SC_FormParamTest.php @@ -25,7 +25,7 @@ public function testCheckError() $this->actual = $this->objFormParam->checkError(); $this->expected = [ - 'name01' => '※ お名前(姓)が入力されていません。
' + 'name01' => '※ お名前(姓)が入力されていません。
', ]; $this->verify(); @@ -43,8 +43,8 @@ public function testConvParam() 'keyname' => 'name01', 'disp_name' => 'お名前(姓)', 'length' => STEXT_LEN, - 'value' => 'アイウエオ' - ] + 'value' => 'アイウエオ', + ], ]; $this->verify(); @@ -68,7 +68,7 @@ public function testGetDbArray() $this->objFormParam->setParam( [ 'name01' => 'あ', - 'name02' => 'い' + 'name02' => 'い', ] ); @@ -85,14 +85,14 @@ public function testGetSwapArray() $this->objFormParam->setParam( [ 'name01' => ['test01' => 'ああ'], - 'name02' => ['test02' => 'い'] + 'name02' => ['test02' => 'い'], ] ); $this->actual = $this->objFormParam->getSwapArray(); $this->expected = [ 'test01' => ['name01' => 'ああ'], - 'test02' => ['name02' => 'い'] + 'test02' => ['name02' => 'い'], ]; $this->verify(); } @@ -106,7 +106,7 @@ public function testSetParamWithSeq() $this->expected = [ 'name01' => 'あ', - 'name02' => 'い' + 'name02' => 'い', ]; $this->verify(); } @@ -118,7 +118,7 @@ public function testToLower() $this->objFormParam->setParam( [ 'name01' => 'A', - 'name02' => 'B' + 'name02' => 'B', ] ); $this->objFormParam->toLower('name01'); @@ -126,7 +126,7 @@ public function testToLower() $this->expected = [ 'name01' => 'a', - 'name02' => 'B' + 'name02' => 'B', ]; $this->verify(); } @@ -139,9 +139,9 @@ public function testRecursionCheck() [ 'name01' => [ ['ああ', ''], - ['うう', 'ええ'] + ['うう', 'ええ'], ], - 'name02' => [['アアア'], ['アアア']] + 'name02' => [['アアア'], ['アアア']], ] ); $this->objFormParam->convParam(); @@ -183,7 +183,7 @@ public function testGetValueWithDefault() $this->objFormParam->setParam( [ 'name01' => '', - 'name02' => ['', ''] + 'name02' => ['', ''], ] ); $this->assertEquals('あ', $this->objFormParam->getValue('name01', 'あ')); @@ -198,9 +198,9 @@ public function testTrimParam() [ 'name01' => [ [' ああ ', ''], - ["\tうう", "\n\nええ"] + ["\tうう", "\n\nええ"], ], - 'name02' => [['あああ'], ['あああ ']] + 'name02' => [['あああ'], ['あああ ']], ] ); $this->objFormParam->trimParam(true); @@ -217,9 +217,9 @@ public function testTrimParamWithWideSpace() [ 'name01' => [ [' ああ ', ''], - ["\tうう", "\n\nええ"] + ["\tうう", "\n\nええ"], ], - 'name02' => [['あああ'], ['あああ ']] + 'name02' => [['あああ'], ['あああ ']], ] ); $this->objFormParam->trimParam(false); @@ -370,13 +370,13 @@ public function testGetSearchArray() $this->objFormParam->setParam( [ 'name01' => 'あ', - 'name02' => 'い' + 'name02' => 'い', ] ); $this->expected = [ 'name01' => 'あ', - 'name02' => 'い' + 'name02' => 'い', ]; $this->actual = $this->objFormParam->getSearchArray('name'); @@ -393,12 +393,12 @@ public function testRemoveParam() $this->objFormParam->setParam( [ 'name01' => 'あ', - 'name02' => 'い' + 'name02' => 'い', ] ); $this->expected = [ - 'name02' => 'い' + 'name02' => 'い', ]; $this->actual = $this->objFormParam->getSearchArray('name'); @@ -460,7 +460,7 @@ public function testCheckErrorWithArrCHeck() 'CHANGE_LOWER', 'FILE_EXISTS', 'DOWN_FILE_EXISTS', - 'XXXXXXXXXX' + 'XXXXXXXXXX', ]; foreach ($arrCheck as $key => $check) { @@ -485,7 +485,7 @@ public function testCheckErrorWithArrCHeck() 'FILE_EXISTS_key' => '※ FILE_EXISTSのファイルが存在しません。', 'DOWN_FILE_EXISTS_key' => '※ DOWN_FILE_EXISTSのファイルが存在しません。', 'XXXXXXXXXX_key' => '※※ エラーチェック形式(XXXXXXXXXX)には対応していません ※※ ', - 'NUM_COUNT_CHECK_key' => '※ NUM_COUNT_CHECKは50桁で入力して下さい。' + 'NUM_COUNT_CHECK_key' => '※ NUM_COUNT_CHECKは50桁で入力して下さい。', ]; $this->actual = @$this->objFormParam->checkError(false); $this->verify(); diff --git a/tests/class/SC_Product/SC_Product_TestBase.php b/tests/class/SC_Product/SC_Product_TestBase.php index 8a3345a79a..cf66d84c59 100644 --- a/tests/class/SC_Product/SC_Product_TestBase.php +++ b/tests/class/SC_Product/SC_Product_TestBase.php @@ -33,7 +33,7 @@ protected function setUpProductClass() 'price02' => '1500', 'stock' => '99', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => 'CURRENT_TIMESTAMP', @@ -44,7 +44,7 @@ protected function setUpProductClass() 'price02' => '2500', 'creator_id' => '1', 'stock_unlimited' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => 'CURRENT_TIMESTAMP', @@ -55,8 +55,8 @@ protected function setUpProductClass() 'price02' => '2000', 'creator_id' => '1', 'stock_unlimited' => '1', - 'del_flg' => '1' - ] + 'del_flg' => '1', + ], ]; $this->objQuery->delete('dtb_products_class'); @@ -113,7 +113,7 @@ protected function setUpClassCategory() 'creator_id' => '1', 'name' => 'cat1002', 'rank' => 2, - ] + ], ]; // classcategory_id=0のものは削除しない @@ -143,7 +143,7 @@ protected function setUpProducts() 'deliv_date_id' => '1', 'del_flg' => '0', 'creator_id' => '1', - 'status' => '1' + 'status' => '1', ], [ 'update_date' => 'CURRENT_TIMESTAMP', @@ -158,7 +158,7 @@ protected function setUpProducts() 'deliv_date_id' => '2', 'del_flg' => '0', 'creator_id' => '1', - 'status' => '2' + 'status' => '2', ], [ 'update_date' => 'CURRENT_TIMESTAMP', @@ -174,8 +174,8 @@ protected function setUpProducts() 'deliv_date_id' => '1', 'del_flg' => '1', 'creator_id' => '1', - 'status' => '1' - ] + 'status' => '1', + ], ]; $this->objQuery->delete('dtb_products'); @@ -195,15 +195,15 @@ protected function setUpProductStatus() 'product_status_id' => '1', 'product_id' => '1001', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => 'CURRENT_TIMESTAMP', 'product_status_id' => '1', 'product_id' => '1002', 'creator_id' => '1', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ]; $this->objQuery->delete('dtb_product_status'); diff --git a/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php b/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php index 34da5502b4..f06a96fac2 100644 --- a/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php +++ b/tests/class/SC_Product/SC_Product_getDetailAndProductsClassTest.php @@ -25,7 +25,7 @@ public function testGetDetailAndProductsClass商品規格IDの商品情報と規 $arrRet = $this->objQuery->getCol('update_date', 'dtb_products', 'product_id = 1001'); $this->expected = [ - 'product_id' => '1001', 'product_code_min' => 'code1001', 'product_code_max' => 'code1001', 'name' => '製品名1001', 'comment1' => 'コメント10011', 'comment2' => 'コメント10012', 'comment3' => 'コメント10013', 'main_list_comment' => 'リストコメント1001', 'main_image' => '1001.jpg', 'main_list_image' => '1001-main.jpg', 'price01_min' => '1500', 'price01_max' => '1500', 'price02_min' => '1500', 'price02_max' => '1500', 'stock_min' => '99', 'stock_max' => '99', 'stock_unlimited_min' => '0', 'stock_unlimited_max' => '0', 'deliv_date_id' => '1', 'status' => '1', 'del_flg' => '0', 'update_date' => $arrRet[0], 'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'maker_id' => null, 'comment4' => null, 'comment5' => null, 'comment6' => null, 'note' => null, 'main_comment' => 'メインコメント1001', 'main_large_image' => null, 'sub_title1' => null, 'sub_comment1' => null, 'sub_image1' => null, 'sub_large_image1' => null, 'sub_title2' => null, 'sub_comment2' => null, 'sub_image2' => null, 'sub_large_image2' => null, 'sub_title3' => null, 'sub_comment3' => null, 'sub_image3' => null, 'sub_large_image3' => null, 'sub_title4' => null, 'sub_comment4' => null, 'sub_image4' => null, 'sub_large_image4' => null, 'sub_title5' => null, 'sub_comment5' => null, 'sub_image5' => null, 'sub_large_image5' => null, 'sub_title6' => null, 'sub_comment6' => null, 'sub_image6' => null, 'sub_large_image6' => null, 'creator_id' => '1', 'create_date' => $arrRet[0], 'point_rate' => '0', 'deliv_fee' => null, 'maker_name' => null, 'stock' => '99', 'stock_unlimited' => '0', 'sale_limit' => null, 'price01' => '1500', 'price02' => '1500', 'product_code' => 'code1001', 'product_class_id' => '1001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => 'cat1001', 'rank1' => '1', 'class_name1' => '味', 'class_id1' => '1', 'classcategory_id1' => '1001', 'classcategory_id2' => '1002', 'classcategory_name2' => 'cat1002', 'rank2' => '2', 'class_name2' => '味', 'class_id2' => '1', 'price01_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500) + 'product_id' => '1001', 'product_code_min' => 'code1001', 'product_code_max' => 'code1001', 'name' => '製品名1001', 'comment1' => 'コメント10011', 'comment2' => 'コメント10012', 'comment3' => 'コメント10013', 'main_list_comment' => 'リストコメント1001', 'main_image' => '1001.jpg', 'main_list_image' => '1001-main.jpg', 'price01_min' => '1500', 'price01_max' => '1500', 'price02_min' => '1500', 'price02_max' => '1500', 'stock_min' => '99', 'stock_max' => '99', 'stock_unlimited_min' => '0', 'stock_unlimited_max' => '0', 'deliv_date_id' => '1', 'status' => '1', 'del_flg' => '0', 'update_date' => $arrRet[0], 'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'maker_id' => null, 'comment4' => null, 'comment5' => null, 'comment6' => null, 'note' => null, 'main_comment' => 'メインコメント1001', 'main_large_image' => null, 'sub_title1' => null, 'sub_comment1' => null, 'sub_image1' => null, 'sub_large_image1' => null, 'sub_title2' => null, 'sub_comment2' => null, 'sub_image2' => null, 'sub_large_image2' => null, 'sub_title3' => null, 'sub_comment3' => null, 'sub_image3' => null, 'sub_large_image3' => null, 'sub_title4' => null, 'sub_comment4' => null, 'sub_image4' => null, 'sub_large_image4' => null, 'sub_title5' => null, 'sub_comment5' => null, 'sub_image5' => null, 'sub_large_image5' => null, 'sub_title6' => null, 'sub_comment6' => null, 'sub_image6' => null, 'sub_large_image6' => null, 'creator_id' => '1', 'create_date' => $arrRet[0], 'point_rate' => '0', 'deliv_fee' => null, 'maker_name' => null, 'stock' => '99', 'stock_unlimited' => '0', 'sale_limit' => null, 'price01' => '1500', 'price02' => '1500', 'product_code' => 'code1001', 'product_class_id' => '1001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => 'cat1001', 'rank1' => '1', 'class_name1' => '味', 'class_id1' => '1', 'classcategory_id1' => '1001', 'classcategory_id2' => '1002', 'classcategory_name2' => 'cat1002', 'rank2' => '2', 'class_name2' => '味', 'class_id2' => '1', 'price01_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), ]; $this->actual = $this->objProducts->getDetailAndProductsClass('1001'); diff --git a/tests/class/SC_Product/SC_Product_getDetailTest.php b/tests/class/SC_Product/SC_Product_getDetailTest.php index e726c42b5c..4955061383 100644 --- a/tests/class/SC_Product/SC_Product_getDetailTest.php +++ b/tests/class/SC_Product/SC_Product_getDetailTest.php @@ -25,7 +25,7 @@ public function testGetDetail商品IDの詳細情報を返す() $arrRet = $this->objQuery->getCol('update_date', 'dtb_products', 'product_id = 1001'); $this->expected = [ - 'product_id' => '1001', 'product_code_min' => 'code1001', 'product_code_max' => 'code1001', 'name' => '製品名1001', 'comment1' => 'コメント10011', 'comment2' => 'コメント10012', 'comment3' => 'コメント10013', 'main_list_comment' => 'リストコメント1001', 'main_image' => '1001.jpg', 'main_list_image' => '1001-main.jpg', 'price01_min' => '1500', 'price01_max' => '1500', 'price02_min' => '1500', 'price02_max' => '1500', 'stock_min' => '99', 'stock_max' => '99', 'stock_unlimited_min' => '0', 'stock_unlimited_max' => '0', 'deliv_date_id' => '1', 'status' => '1', 'del_flg' => '0', 'update_date' => $arrRet[0], 'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'maker_id' => null, 'comment4' => null, 'comment5' => null, 'comment6' => null, 'note' => null, 'main_comment' => 'メインコメント1001', 'main_large_image' => null, 'sub_title1' => null, 'sub_comment1' => null, 'sub_image1' => null, 'sub_large_image1' => null, 'sub_title2' => null, 'sub_comment2' => null, 'sub_image2' => null, 'sub_large_image2' => null, 'sub_title3' => null, 'sub_comment3' => null, 'sub_image3' => null, 'sub_large_image3' => null, 'sub_title4' => null, 'sub_comment4' => null, 'sub_image4' => null, 'sub_large_image4' => null, 'sub_title5' => null, 'sub_comment5' => null, 'sub_image5' => null, 'sub_large_image5' => null, 'sub_title6' => null, 'sub_comment6' => null, 'sub_image6' => null, 'sub_large_image6' => null, 'creator_id' => '1', 'create_date' => $arrRet[0], 'point_rate' => '0', 'deliv_fee' => null, 'maker_name' => null + 'product_id' => '1001', 'product_code_min' => 'code1001', 'product_code_max' => 'code1001', 'name' => '製品名1001', 'comment1' => 'コメント10011', 'comment2' => 'コメント10012', 'comment3' => 'コメント10013', 'main_list_comment' => 'リストコメント1001', 'main_image' => '1001.jpg', 'main_list_image' => '1001-main.jpg', 'price01_min' => '1500', 'price01_max' => '1500', 'price02_min' => '1500', 'price02_max' => '1500', 'stock_min' => '99', 'stock_max' => '99', 'stock_unlimited_min' => '0', 'stock_unlimited_max' => '0', 'deliv_date_id' => '1', 'status' => '1', 'del_flg' => '0', 'update_date' => $arrRet[0], 'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'maker_id' => null, 'comment4' => null, 'comment5' => null, 'comment6' => null, 'note' => null, 'main_comment' => 'メインコメント1001', 'main_large_image' => null, 'sub_title1' => null, 'sub_comment1' => null, 'sub_image1' => null, 'sub_large_image1' => null, 'sub_title2' => null, 'sub_comment2' => null, 'sub_image2' => null, 'sub_large_image2' => null, 'sub_title3' => null, 'sub_comment3' => null, 'sub_image3' => null, 'sub_large_image3' => null, 'sub_title4' => null, 'sub_comment4' => null, 'sub_image4' => null, 'sub_large_image4' => null, 'sub_title5' => null, 'sub_comment5' => null, 'sub_image5' => null, 'sub_large_image5' => null, 'sub_title6' => null, 'sub_comment6' => null, 'sub_image6' => null, 'sub_large_image6' => null, 'creator_id' => '1', 'create_date' => $arrRet[0], 'point_rate' => '0', 'deliv_fee' => null, 'maker_name' => null, ]; $this->actual = $this->objProducts->getDetail('1001'); diff --git a/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php b/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php index 553ccc10de..7a88e6631b 100644 --- a/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php +++ b/tests/class/SC_Product/SC_Product_getListByProductIdsTest.php @@ -36,8 +36,8 @@ public function testGetListByProductIds指定の商品IDで情報を取得する $this->expected = [ '1001' => [ - 'product_id' => '1001', 'product_code_min' => 'code1001', 'product_code_max' => 'code1001', 'name' => '製品名1001', 'comment1' => 'コメント10011', 'comment2' => 'コメント10012', 'comment3' => 'コメント10013', 'main_list_comment' => 'リストコメント1001', 'main_image' => '1001.jpg', 'main_list_image' => '1001-main.jpg', 'price01_min' => '1500', 'price01_max' => '1500', 'price02_min' => '1500', 'price02_max' => '1500', 'stock_min' => '99', 'stock_max' => '99', 'stock_unlimited_min' => '0', 'stock_unlimited_max' => '0', 'deliv_date_id' => '1', 'status' => '1', 'del_flg' => '0', 'update_date' => $arrRet[0], 'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500) - ] + 'product_id' => '1001', 'product_code_min' => 'code1001', 'product_code_max' => 'code1001', 'name' => '製品名1001', 'comment1' => 'コメント10011', 'comment2' => 'コメント10012', 'comment3' => 'コメント10013', 'main_list_comment' => 'リストコメント1001', 'main_image' => '1001.jpg', 'main_list_image' => '1001-main.jpg', 'price01_min' => '1500', 'price01_max' => '1500', 'price02_min' => '1500', 'price02_max' => '1500', 'stock_min' => '99', 'stock_max' => '99', 'stock_unlimited_min' => '0', 'stock_unlimited_max' => '0', 'deliv_date_id' => '1', 'status' => '1', 'del_flg' => '0', 'update_date' => $arrRet[0], 'price01_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price01_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_min_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_max_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), + ], ]; $this->actual = $this->objProducts->getListByProductIds($this->objQuery, $arrProductId); diff --git a/tests/class/SC_Product/SC_Product_getProductsClassByProductIdsTest.php b/tests/class/SC_Product/SC_Product_getProductsClassByProductIdsTest.php index 197bd5aecb..6bbe75e282 100644 --- a/tests/class/SC_Product/SC_Product_getProductsClassByProductIdsTest.php +++ b/tests/class/SC_Product/SC_Product_getProductsClassByProductIdsTest.php @@ -34,8 +34,8 @@ public function testGetProductsClassByProductIds指定の商品IDの情報を返 { $this->expected = [ 0 => [ - 'product_id' => '1001', 'del_flg' => '0', 'point_rate' => '0', 'stock' => '99', 'stock_unlimited' => '0', 'sale_limit' => null, 'price01' => '1500', 'price02' => '1500', 'product_code' => 'code1001', 'product_class_id' => '1001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => 'cat1001', 'rank1' => '1', 'class_name1' => '味', 'class_id1' => '1', 'classcategory_id1' => '1001', 'classcategory_id2' => '1002', 'classcategory_name2' => 'cat1002', 'rank2' => '2', 'class_name2' => '味', 'class_id2' => '1' - ] + 'product_id' => '1001', 'del_flg' => '0', 'point_rate' => '0', 'stock' => '99', 'stock_unlimited' => '0', 'sale_limit' => null, 'price01' => '1500', 'price02' => '1500', 'product_code' => 'code1001', 'product_class_id' => '1001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => 'cat1001', 'rank1' => '1', 'class_name1' => '味', 'class_id1' => '1', 'classcategory_id1' => '1001', 'classcategory_id2' => '1002', 'classcategory_name2' => 'cat1002', 'rank2' => '2', 'class_name2' => '味', 'class_id2' => '1', + ], ]; $productIds = ['1001', '2001']; @@ -49,11 +49,11 @@ public function testGetProductsClassByProductIds削除商品含む商品情報 { $this->expected = [ 0 => [ - 'product_id' => '1001', 'del_flg' => '0', 'point_rate' => '0', 'stock' => '99', 'stock_unlimited' => '0', 'sale_limit' => null, 'price01' => '1500', 'price02' => '1500', 'product_code' => 'code1001', 'product_class_id' => '1001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => 'cat1001', 'rank1' => '1', 'class_name1' => '味', 'class_id1' => '1', 'classcategory_id1' => '1001', 'classcategory_id2' => '1002', 'classcategory_name2' => 'cat1002', 'rank2' => '2', 'class_name2' => '味', 'class_id2' => '1' + 'product_id' => '1001', 'del_flg' => '0', 'point_rate' => '0', 'stock' => '99', 'stock_unlimited' => '0', 'sale_limit' => null, 'price01' => '1500', 'price02' => '1500', 'product_code' => 'code1001', 'product_class_id' => '1001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => 'cat1001', 'rank1' => '1', 'class_name1' => '味', 'class_id1' => '1', 'classcategory_id1' => '1001', 'classcategory_id2' => '1002', 'classcategory_name2' => 'cat1002', 'rank2' => '2', 'class_name2' => '味', 'class_id2' => '1', ], 1 => [ - 'product_id' => '2001', 'del_flg' => '1', 'point_rate' => '0', 'stock' => null, 'stock_unlimited' => '1', 'sale_limit' => null, 'price01' => null, 'price02' => '2000', 'product_code' => 'code2001', 'product_class_id' => '2001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => null, 'rank1' => 0, 'class_name1' => null, 'class_id1' => null, 'classcategory_id1' => '0', 'classcategory_id2' => '0', 'classcategory_name2' => null, 'rank2' => 0, 'class_name2' => null, 'class_id2' => null - ] + 'product_id' => '2001', 'del_flg' => '1', 'point_rate' => '0', 'stock' => null, 'stock_unlimited' => '1', 'sale_limit' => null, 'price01' => null, 'price02' => '2000', 'product_code' => 'code2001', 'product_class_id' => '2001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => null, 'rank1' => 0, 'class_name1' => null, 'class_id1' => null, 'classcategory_id1' => '0', 'classcategory_id2' => '0', 'classcategory_name2' => null, 'rank2' => 0, 'class_name2' => null, 'class_id2' => null, + ], ]; $productIds = ['1001', '2001']; diff --git a/tests/class/SC_Product/SC_Product_getProductsClassByQueryTest.php b/tests/class/SC_Product/SC_Product_getProductsClassByQueryTest.php index e580b91e84..752a4e36c4 100644 --- a/tests/class/SC_Product/SC_Product_getProductsClassByQueryTest.php +++ b/tests/class/SC_Product/SC_Product_getProductsClassByQueryTest.php @@ -23,8 +23,8 @@ public function testGetProductsClassByQueryクエリに該当する商品情報 { $this->expected = [ 0 => [ - 'product_id' => '1001', 'del_flg' => '0', 'point_rate' => '0', 'stock' => '99', 'stock_unlimited' => '0', 'sale_limit' => null, 'price01' => '1500', 'price02' => '1500', 'product_code' => 'code1001', 'product_class_id' => '1001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => 'cat1001', 'rank1' => '1', 'class_name1' => '味', 'class_id1' => '1', 'classcategory_id1' => '1001', 'classcategory_id2' => '1002', 'classcategory_name2' => 'cat1002', 'rank2' => '2', 'class_name2' => '味', 'class_id2' => '1' - ] + 'product_id' => '1001', 'del_flg' => '0', 'point_rate' => '0', 'stock' => '99', 'stock_unlimited' => '0', 'sale_limit' => null, 'price01' => '1500', 'price02' => '1500', 'product_code' => 'code1001', 'product_class_id' => '1001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => 'cat1001', 'rank1' => '1', 'class_name1' => '味', 'class_id1' => '1', 'classcategory_id1' => '1001', 'classcategory_id2' => '1002', 'classcategory_name2' => 'cat1002', 'rank2' => '2', 'class_name2' => '味', 'class_id2' => '1', + ], ]; $this->objQuery->setWhere('product_id = ?'); diff --git a/tests/class/SC_Product/SC_Product_getProductsClassTest.php b/tests/class/SC_Product/SC_Product_getProductsClassTest.php index 1f5399be86..bdcd551a61 100644 --- a/tests/class/SC_Product/SC_Product_getProductsClassTest.php +++ b/tests/class/SC_Product/SC_Product_getProductsClassTest.php @@ -22,7 +22,7 @@ protected function tearDown() public function testGetProductsClass商品規格IDから規格情報を返す() { $this->expected = [ - 'product_id' => '1001', 'del_flg' => '0', 'point_rate' => '0', 'stock' => '99', 'stock_unlimited' => '0', 'sale_limit' => null, 'price01' => '1500', 'price02' => '1500', 'product_code' => 'code1001', 'product_class_id' => '1001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => 'cat1001', 'rank1' => '1', 'class_name1' => '味', 'class_id1' => '1', 'classcategory_id1' => '1001', 'classcategory_id2' => '1002', 'classcategory_name2' => 'cat1002', 'rank2' => '2', 'class_name2' => '味', 'class_id2' => '1', 'price01_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500) + 'product_id' => '1001', 'del_flg' => '0', 'point_rate' => '0', 'stock' => '99', 'stock_unlimited' => '0', 'sale_limit' => null, 'price01' => '1500', 'price02' => '1500', 'product_code' => 'code1001', 'product_class_id' => '1001', 'product_type_id' => '1', 'down_filename' => null, 'down_realfilename' => null, 'classcategory_name1' => 'cat1001', 'rank1' => '1', 'class_name1' => '味', 'class_id1' => '1', 'classcategory_id1' => '1001', 'classcategory_id2' => '1002', 'classcategory_name2' => 'cat1002', 'rank2' => '2', 'class_name2' => '味', 'class_id2' => '1', 'price01_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), 'price02_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(1500), ]; $this->actual = $this->objProducts->getProductsClass('1001'); diff --git a/tests/class/SC_Query_Test.php b/tests/class/SC_Query_Test.php index 8c9613368a..ff47dec6a8 100644 --- a/tests/class/SC_Query_Test.php +++ b/tests/class/SC_Query_Test.php @@ -105,7 +105,7 @@ public function testGetAll() $this->expected = [['id' => '1', 'column1' => '1', 'column2' => '2', - 'column3' => 'f']]; + 'column3' => 'f', ]]; $this->actual = $this->objQuery->getAll('SELECT * FROM test_table WHERE id = ?', [1]); $this->verify(); @@ -122,7 +122,7 @@ public function testSelect() $this->expected = [['id' => '1', 'column1' => '1', 'column2' => '2', - 'column3' => 'f']]; + 'column3' => 'f', ]]; $this->actual = $this->objQuery->setWhere('id = ?') ->setOrder('id') @@ -192,7 +192,7 @@ public function testQuery1() $this->expected = [['id' => '1', 'column1' => '1', 'column2' => '1', - 'column3' => 'f']]; + 'column3' => 'f', ]]; $this->actual = $this->objQuery->getAll('SELECT * FROM test_table'); @@ -207,12 +207,12 @@ public function testInsert() ['id' => '1', 'column1' => '1', 'column2' => '1', - 'column3' => 'f']); + 'column3' => 'f', ]); $this->expected = [['id' => '1', 'column1' => '1', 'column2' => '1', - 'column3' => 'f']]; + 'column3' => 'f', ]]; $this->actual = $this->objQuery->getAll('SELECT * FROM test_table'); @@ -235,7 +235,7 @@ public function testQuery2() $this->expected = [['id' => '1', 'column1' => '2', 'column2' => '2', - 'column3' => 'f']]; + 'column3' => 'f', ]]; $this->actual = $this->objQuery->getAll('SELECT * FROM test_table'); @@ -251,12 +251,12 @@ public function testUpdate() ['id' => '1', 'column1' => '2', 'column2' => '2', - 'column3' => 'f'], + 'column3' => 'f', ], 'id = ?', [1]); $this->expected = [['id' => '1', 'column1' => '2', 'column2' => '2', - 'column3' => 'f']]; + 'column3' => 'f', ]]; $this->actual = $this->objQuery->getAll('SELECT * FROM test_table'); diff --git a/tests/class/SC_Response/SC_ResponseSendRedirectWithHeaderTest.php b/tests/class/SC_Response/SC_ResponseSendRedirectWithHeaderTest.php index 5a2e67c8ca..35c7750a24 100644 --- a/tests/class/SC_Response/SC_ResponseSendRedirectWithHeaderTest.php +++ b/tests/class/SC_Response/SC_ResponseSendRedirectWithHeaderTest.php @@ -10,7 +10,7 @@ public static function setUpBeforeClass() { $spec = [ 1 => ['file', '/dev/null', 'w'], - 2 => ['file', '/dev/null', 'w'] + 2 => ['file', '/dev/null', 'w'], ]; if (!self::$server = @proc_open('exec php -S 127.0.0.1:8085', $spec, $pipes, __DIR__.'/'.self::FIXTURES_DIR)) { diff --git a/tests/class/SC_Response/SC_ResponseWithHeaderTest.php b/tests/class/SC_Response/SC_ResponseWithHeaderTest.php index b95e9b0aca..1d4cc5c9ca 100644 --- a/tests/class/SC_Response/SC_ResponseWithHeaderTest.php +++ b/tests/class/SC_Response/SC_ResponseWithHeaderTest.php @@ -10,7 +10,7 @@ public static function setUpBeforeClass() { $spec = [ 1 => ['file', '/dev/null', 'w'], - 2 => ['file', '/dev/null', 'w'] + 2 => ['file', '/dev/null', 'w'], ]; if (!self::$server = @proc_open('exec php -S 127.0.0.1:8085', $spec, $pipes, __DIR__.'/'.self::FIXTURES_DIR)) { @@ -32,8 +32,8 @@ public function testReload() $context = stream_context_create( [ 'http' => [ - 'follow_location' => false - ] + 'follow_location' => false, + ], ] ); $actual = file_get_contents('http://127.0.0.1:8085/sc_response_reload.php', false, $context); diff --git a/tests/class/SC_SendMailTest.php b/tests/class/SC_SendMailTest.php index 409337b8af..5f1b8eeab2 100644 --- a/tests/class/SC_SendMailTest.php +++ b/tests/class/SC_SendMailTest.php @@ -129,14 +129,14 @@ public function testGetRecip() $this->objSendMail->backend = 'smtp'; $this->expected = [ - 'To' => 'to@example.com' + 'To' => 'to@example.com', ]; $this->actual = $this->objSendMail->getRecip(); $this->verify(); $this->objSendMail->backend = 'sendmail'; $this->expected = [ - 'To' => 'to@example.com' + 'To' => 'to@example.com', ]; $this->actual = $this->objSendMail->getRecip(); $this->verify(); @@ -154,7 +154,7 @@ public function testGetBackendParams() $objSite = $objDb->sfGetBasisData(); $this->expected = [ - '-f '.$objSite['email04'] + '-f '.$objSite['email04'], ]; $this->actual = $this->objSendMail->getBackendParams('mail'); $this->verify(); diff --git a/tests/class/SC_UploadFileTest.php b/tests/class/SC_UploadFileTest.php index 061b27682b..d20a112315 100644 --- a/tests/class/SC_UploadFileTest.php +++ b/tests/class/SC_UploadFileTest.php @@ -24,8 +24,8 @@ protected function setUp() 'main_image' => [ 'name' => 'ice500.jpg', 'tmp_name' => $this->tempDir.'/ice500.jpg', - 'error' => UPLOAD_ERR_OK - ] + 'error' => UPLOAD_ERR_OK, + ], ]; } @@ -162,8 +162,8 @@ public function testMoveTempDownloadFile() 'down_file' => [ 'name' => 'ice500.jpg', 'tmp_name' => $this->tempDir.'/ice500.jpg', - 'error' => UPLOAD_ERR_OK - ] + 'error' => UPLOAD_ERR_OK, + ], ]; $this->objUpFile->addFile('ダウンロードファイル', 'down_file', ['jpg'], IMAGE_SIZE, false, 0, 0, false); @@ -180,8 +180,8 @@ public function testMoveTempDownloadFileWithFileExists() 'down_file' => [ 'name' => 'ice500.jpg', 'tmp_name' => $this->tempDir.'/ice500.jpg', - 'error' => UPLOAD_ERR_OK - ] + 'error' => UPLOAD_ERR_OK, + ], ]; $this->objUpFile->addFile('ダウンロードファイル', 'down_file', ['jpg'], IMAGE_SIZE, false, 0, 0, false); @@ -210,13 +210,13 @@ public function testSetHiddenFileList() $this->objUpFile->setHiddenFileList( [ 'temp_main_image' => 'ice500.jpg', - 'save_main_image' => 'ice500.jpg' + 'save_main_image' => 'ice500.jpg', ] ); $this->expected = [ 'temp_main_image' => 'ice500.jpg', - 'save_main_image' => 'ice500.jpg' + 'save_main_image' => 'ice500.jpg', ]; $this->actual = $this->objUpFile->getHiddenFileList(); $this->verify(); @@ -235,8 +235,8 @@ public function testGetFormFileList() 'real_filepath' => $this->tempDir.'/ice500.jpg', 'width' => 0, 'height' => 0, - 'disp_name' => '詳細-メイン画像' - ] + 'disp_name' => '詳細-メイン画像', + ], ]; $this->actual = $this->objUpFile->getFormFileList('/temp', '/save'); $this->verify(); @@ -260,8 +260,8 @@ public function testGetFormFileWithSaveFile() 'real_filepath' => $this->saveDir.'/ice500.jpg', 'width' => 0, 'height' => 0, - 'disp_name' => '詳細-メイン画像' - ] + 'disp_name' => '詳細-メイン画像', + ], ]; $this->actual = $this->objUpFile->getFormFileList('/temp', '/save'); $this->verify(); @@ -284,8 +284,8 @@ public function testGetFormFileListWithRealSize() 'real_filepath' => $this->tempDir.'/ice500.jpg', 'width' => 500, 'height' => 500, - 'disp_name' => '詳細-メイン画像' - ] + 'disp_name' => '詳細-メイン画像', + ], ]; $this->actual = $this->objUpFile->getFormFileList('/temp', '/save', true); $this->verify(); @@ -308,7 +308,7 @@ public function testCheckExistsWithNotupload() $this->objUpFile->addFile('詳細-メイン画像', 'main_image', ['jpg'], IMAGE_SIZE, true, 0, 0, false); $this->expected = [ - 'main_image' => '※ 詳細-メイン画像がアップロードされていません。
' + 'main_image' => '※ 詳細-メイン画像がアップロードされていません。
', ]; $this->actual = $this->objUpFile->checkExists('main_image'); $this->verify(); @@ -350,8 +350,8 @@ public function testMakeTempFileWithDownloadfile() 'down_file' => [ 'name' => 'ice500.jpg', 'tmp_name' => $this->tempDir.'/ice500.jpg', - 'error' => UPLOAD_ERR_OK - ] + 'error' => UPLOAD_ERR_OK, + ], ]; $this->objUpFile->addFile('ダウンロードファイル', 'down_file', ['jpg'], IMAGE_SIZE, false, 0, 0, false); @@ -379,8 +379,8 @@ public function testGetFormDownloadFileList() 'down_file' => [ 'name' => 'ice500.jpg', 'tmp_name' => $this->tempDir.'/ice500.jpg', - 'error' => UPLOAD_ERR_OK - ] + 'error' => UPLOAD_ERR_OK, + ], ]; $this->objUpFile->addFile('ダウンロードファイル', 'down_file', ['jpg'], IMAGE_SIZE, false, 0, 0, false); $this->objUpFile->makeTempDownFile('down_file'); @@ -394,8 +394,8 @@ public function testGetFormDownloadFileWithSaveFile() 'down_file' => [ 'name' => 'ice500.jpg', 'tmp_name' => $this->tempDir.'/ice500.jpg', - 'error' => UPLOAD_ERR_OK - ] + 'error' => UPLOAD_ERR_OK, + ], ]; $this->objUpFile->addFile('ダウンロードファイル', 'down_file', ['jpg'], IMAGE_SIZE, false, 0, 0, false); @@ -411,8 +411,8 @@ public function testDeleteDownloadFile() 'down_file' => [ 'name' => 'ice500.jpg', 'tmp_name' => $this->tempDir.'/ice500.jpg', - 'error' => UPLOAD_ERR_OK - ] + 'error' => UPLOAD_ERR_OK, + ], ]; $this->objUpFile->addFile('ダウンロードファイル', 'down_file', ['jpg'], IMAGE_SIZE, false, 0, 0, false); diff --git a/tests/class/fixtures/plugin/PrefilterTransformPlugin/plugin_info.php b/tests/class/fixtures/plugin/PrefilterTransformPlugin/plugin_info.php index 13e9538748..2fbfafa227 100644 --- a/tests/class/fixtures/plugin/PrefilterTransformPlugin/plugin_info.php +++ b/tests/class/fixtures/plugin/PrefilterTransformPlugin/plugin_info.php @@ -10,6 +10,6 @@ class plugin_info public static $AUTHOR = 'dummy'; public static $DESCRIPTION = 'dummy'; public static $HOOK_POINTS = [ - ['prefilterTransform', 'prefilterTransform'] + ['prefilterTransform', 'prefilterTransform'], ]; } diff --git a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php index 317e6c75af..a53b1199df 100644 --- a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php +++ b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_TestBase.php @@ -41,7 +41,7 @@ protected function setUpAddress() 'tel03' => '0000', 'fax01' => '111', 'fax02' => '1111', - 'fax03' => '1111' + 'fax03' => '1111', ], [ 'other_deliv_id' => '1001', @@ -60,8 +60,8 @@ protected function setUpAddress() 'tel03' => '0000', 'fax01' => '111', 'fax02' => '1111', - 'fax03' => '1111' - ] + 'fax03' => '1111', + ], ]; $this->objQuery->delete('dtb_other_deliv'); diff --git a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getAddressTest.php b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getAddressTest.php index eb1c772fb2..0493c3cf7c 100644 --- a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getAddressTest.php +++ b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getAddressTest.php @@ -64,7 +64,7 @@ public function testgetAddressTest会員の登録配送先が該当テーブル 'fax03' => '1111', 'country_id' => null, 'company_name' => null, - 'zipcode' => null + 'zipcode' => null, ]; $this->actual = $this->objAddress->getAddress($other_deliv_id, $customer_id); diff --git a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getListTest.php b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getListTest.php index 37565a4d3f..1524ce36c3 100644 --- a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getListTest.php +++ b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_getListTest.php @@ -43,8 +43,8 @@ public function testgetListTest会員が該当テーブルに存在するかつs 'fax03' => '1111', 'country_id' => null, 'company_name' => null, - 'zipcode' => null - ] + 'zipcode' => null, + ], ]; $this->actual = $this->objAddress->getList($customer_id, $startno); @@ -76,7 +76,7 @@ public function testgetListTest会員が該当テーブルに存在する場合 'fax03' => '1111', 'country_id' => null, 'company_name' => null, - 'zipcode' => null + 'zipcode' => null, ], [ 'other_deliv_id' => '1000', @@ -98,8 +98,8 @@ public function testgetListTest会員が該当テーブルに存在する場合 'fax03' => '1111', 'country_id' => null, 'company_name' => null, - 'zipcode' => null - ] + 'zipcode' => null, + ], ]; $this->actual = $this->objAddress->getList($customer_id); diff --git a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php index b8ada744ec..dbfecbc1c5 100644 --- a/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php +++ b/tests/class/helper/SC_Helper_Address/SC_Helper_Address_registAddressTest.php @@ -94,7 +94,7 @@ public function testregistAddressTest会員の登録配送先を更新する() 'fax03' => '1114', 'country_id' => null, 'company_name' => null, - 'zipcode' => null + 'zipcode' => null, ]; $objQuery = &SC_Query_Ex::getSingletonInstance(); $this->objAddress->registAddress($arrSql); diff --git a/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_TestBase.php b/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_TestBase.php index 4807e58c36..6dce39cdf4 100644 --- a/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_TestBase.php +++ b/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_TestBase.php @@ -58,7 +58,7 @@ protected function setUpBestProducts() 'creator_id' => '1', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'best_id' => '1002', @@ -70,7 +70,7 @@ protected function setUpBestProducts() 'creator_id' => '1', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '1' + 'del_flg' => '1', ], [ 'best_id' => '1003', @@ -82,8 +82,8 @@ protected function setUpBestProducts() 'creator_id' => '3', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ]; $this->objQuery->delete('dtb_best_products'); diff --git a/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getBestProductsTest.php b/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getBestProductsTest.php index e8c9a15ce3..0a3e18d356 100644 --- a/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getBestProductsTest.php +++ b/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getBestProductsTest.php @@ -64,7 +64,7 @@ public function testGetBestProductsおすすめIDが存在する場合対応し 'rank' => '1', 'title' => 'タイトルですよ', 'comment' => 'コメントですよ', - 'del_flg' => '0' + 'del_flg' => '0', ]; $result = SC_Helper_BestProducts_Ex::getBestProducts($best_id); @@ -73,7 +73,7 @@ public function testGetBestProductsおすすめIDが存在する場合対応し 'rank', 'title', 'comment', - 'del_flg' + 'del_flg', ]); $this->verify(); @@ -100,7 +100,7 @@ public function testGetBestProducts削除済みでかつhasDeletedがtrueの場 'rank' => '2', 'title' => 'タイトルですよ', 'comment' => 'コメントですよ', - 'del_flg' => '1' + 'del_flg' => '1', ]; $result = SC_Helper_BestProducts_Ex::getBestProducts($best_id, true); @@ -109,7 +109,7 @@ public function testGetBestProducts削除済みでかつhasDeletedがtrueの場 'rank', 'title', 'comment', - 'del_flg' + 'del_flg', ]); $this->verify(); diff --git a/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getByRankTest.php b/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getByRankTest.php index dd54508ff2..24c7abf032 100755 --- a/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getByRankTest.php +++ b/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getByRankTest.php @@ -64,7 +64,7 @@ public function testGetByRankランクが存在する場合対応した結果を 'category_id' => '0', 'title' => 'タイトルですよ', 'comment' => 'コメントですよ', - 'del_flg' => '0' + 'del_flg' => '0', ]; $result = SC_Helper_BestProducts_Ex::getByRank($rank); @@ -74,7 +74,7 @@ public function testGetByRankランクが存在する場合対応した結果を 'category_id', 'title', 'comment', - 'del_flg' + 'del_flg', ]); $this->verify(); @@ -101,7 +101,7 @@ public function testGetByRankランクが存在かつHasDeletedの場合対応 'category_id' => '0', 'title' => 'タイトルですよ', 'comment' => 'コメントですよ', - 'del_flg' => '1' + 'del_flg' => '1', ]; $result = SC_Helper_BestProducts_Ex::getByRank($rank, true); @@ -111,7 +111,7 @@ public function testGetByRankランクが存在かつHasDeletedの場合対応 'category_id', 'title', 'comment', - 'del_flg' + 'del_flg', ]); $this->verify(); diff --git a/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getListTest.php b/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getListTest.php index 88b788fadc..e2823a1053 100755 --- a/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getListTest.php +++ b/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_getListTest.php @@ -68,7 +68,7 @@ public function testGetListデータがある場合想定した結果が返る() 'creator_id' => '1', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' + 'del_flg' => '0', ], 1 => [ 'best_id' => '1003', @@ -80,8 +80,8 @@ public function testGetListデータがある場合想定した結果が返る() 'creator_id' => '3', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ]; $this->actual = SC_Helper_BestProducts_Ex::getList(); @@ -103,7 +103,7 @@ public function testGetList一覧取得hasDeleteをtrueにした場合削除済 'creator_id' => '1', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' + 'del_flg' => '0', ], 1 => [ 'best_id' => '1002', @@ -115,7 +115,7 @@ public function testGetList一覧取得hasDeleteをtrueにした場合削除済 'creator_id' => '1', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '1' + 'del_flg' => '1', ], 2 => [ 'best_id' => '1003', @@ -127,8 +127,8 @@ public function testGetList一覧取得hasDeleteをtrueにした場合削除済 'creator_id' => '3', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ]; $this->actual = SC_Helper_BestProducts_Ex::getList(0, 0, true); @@ -150,8 +150,8 @@ public function testGetListページングが想定した結果が返る表示 'creator_id' => '3', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ]; $this->actual = SC_Helper_BestProducts_Ex::getList(1, 2); @@ -173,8 +173,8 @@ public function testGetListページングが想定した結果が返る表示 'creator_id' => '1', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ]; $this->actual = SC_Helper_BestProducts_Ex::getList(1, 0); diff --git a/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_saveBestProductsTest.php b/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_saveBestProductsTest.php index cae6d4cd08..9682d7fffe 100755 --- a/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_saveBestProductsTest.php +++ b/tests/class/helper/SC_Helper_BestProducts/SC_Helper_BestProducts_saveBestProductsTest.php @@ -55,7 +55,7 @@ public function testSaveBestProductsベストIDがある場合更新される() 'creator_id' => '2', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' + 'del_flg' => '0', ]; $result = SC_Helper_BestProducts_Ex::saveBestProducts($sqlVal); @@ -68,7 +68,7 @@ public function testSaveBestProductsベストIDがある場合更新される() 'comment' => 'コメントですよ1001', 'creator_id' => '1', // 変わらない 'create_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' + 'del_flg' => '0', ]; $this->actual = SC_Helper_BestProducts_Ex::getBestProducts('1001'); @@ -83,7 +83,7 @@ public function testSaveBestProductsベストIDがある場合更新される() 'comment', 'creator_id', 'create_date', - 'del_flg' + 'del_flg', ] ); @@ -101,7 +101,7 @@ public function testSaveBestProductsベストIDがない場合インサートさ 'title' => 'タイトルですよ1004', 'comment' => 'コメントですよ1004', 'creator_id' => '3', - 'del_flg' => '0' + 'del_flg' => '0', ]; $best_id = SC_Helper_BestProducts_Ex::saveBestProducts($sqlVal); @@ -113,7 +113,7 @@ public function testSaveBestProductsベストIDがない場合インサートさ 'title' => 'タイトルですよ1004', 'comment' => 'コメントですよ1004', 'creator_id' => '3', - 'del_flg' => '0' + 'del_flg' => '0', ]; $arrRet = SC_Helper_BestProducts_Ex::getBestProducts($best_id); @@ -125,7 +125,7 @@ public function testSaveBestProductsベストIDがない場合インサートさ 'title', 'comment', 'creator_id', - 'del_flg' + 'del_flg', ] ); @@ -143,7 +143,7 @@ public function testSaveBestProductsインサート処理でrankがsetされて 'title' => 'タイトルですよ5', 'comment' => 'コメントですよ5', 'creator_id' => '3', - 'del_flg' => '0' + 'del_flg' => '0', ]; $best_id = SC_Helper_BestProducts_Ex::saveBestProducts($sqlVal); diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_TestBase.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_TestBase.php index d3b7d1dc93..c48b22adbc 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_TestBase.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_TestBase.php @@ -54,7 +54,7 @@ protected function setUpNews() 'news_title' => 'ニュース情報01', 'rank' => '1', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => '2000-01-01 00:00:00', @@ -62,7 +62,7 @@ protected function setUpNews() 'news_title' => 'ニュース情報02', 'rank' => '2', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => '2000-01-01 00:00:00', @@ -70,8 +70,8 @@ protected function setUpNews() 'news_title' => 'ニュース情報03', 'rank' => '3', 'creator_id' => '1', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ]; $this->objQuery->delete('dtb_news'); @@ -147,7 +147,7 @@ protected function setUpBasisData() 'latitude' => '30.0001', 'longitude' => '45.0001', 'downloadable_days' => '10', - 'downloadable_days_unlimited' => '0' + 'downloadable_days_unlimited' => '0', ]; $this->objQuery->delete('dtb_baseinfo'); diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCountCategoryTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCountCategoryTest.php index 16b378dd24..e97cad5790 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCountCategoryTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCountCategoryTest.php @@ -70,7 +70,7 @@ public function testSfCountCategoryWithNoStockHidden() 'dtb_products_class', [ 'stock' => 0, - 'stock_unlimited' => 0 + 'stock_unlimited' => 0, ], 'product_id = ?', [$this->product_id]); $this->objDb->updateProductCategories($this->category_ids, $this->product_id); diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCountMakerTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCountMakerTest.php index 817296634a..e64a80d75f 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCountMakerTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCountMakerTest.php @@ -71,7 +71,7 @@ public function setUpMakers() 'creator_id' => 2, 'create_date' => 'CURRENT_TIMESTAMP', 'update_date' => 'CURRENT_TIMESTAMP', - 'del_flg' => '0' + 'del_flg' => '0', ]; $this->objQuery->insert('dtb_maker', $maker); $this->objQuery->update('dtb_products', ['maker_id' => $maker['maker_id']], 'product_id = ?', [$this->product_ids[$i]]); diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCreateBasisDataCacheTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCreateBasisDataCacheTest.php index 540ab00843..d46e3cbfe9 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCreateBasisDataCacheTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCreateBasisDataCacheTest.php @@ -53,7 +53,7 @@ public function testsfCreateBasisDataCache_ファイル操作に成功した場 } $arrData = [ 'id' => '1', - 'company_name' => 'testshop' + 'company_name' => 'testshop', ]; $this->expected = true; $this->actual = $this->helper->sfCreateBasisDataCache(); @@ -68,7 +68,7 @@ public static function sfGetBasisData($force = false) { $arrData = [ 'id' => '1', - 'company_name' => 'testshop' + 'company_name' => 'testshop', ]; return $arrData; diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisCountTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisCountTest.php index ed40669404..1a237fe150 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisCountTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisCountTest.php @@ -58,7 +58,7 @@ public function testSfGetBasisCount_baseinfoのデータが2行の場合_2を返 $this->setUpBasisData(); $baseinfo = [ 'id' => 2, - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ]; $this->objQuery->insert('dtb_baseinfo', $baseinfo); $this->expected = 2; diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataTest.php index dddeee6fe4..d6318ff64e 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataTest.php @@ -114,7 +114,7 @@ public function testsfGetBasisData_条件を指定しない場合_baseinfoを全 'downloadable_days' => '10', 'downloadable_days_unlimited' => '0', 'zipcode' => null, - 'law_zipcode' => null + 'law_zipcode' => null, ]; $this->actual = $this->helper->sfGetBasisData(true); $this->verify(); @@ -218,7 +218,7 @@ public function testsfGetBasisData_forceがfalseの場合_キャッシュを返 'country_id' => null, 'law_country_id' => null, 'zipcode' => null, - 'law_zipcode' => null + 'law_zipcode' => null, ]; $this->actual = $this->helper->sfGetBasisData(false); $this->verify(); diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetCategoryIdTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetCategoryIdTest.php index 5131502a88..8080d58a89 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetCategoryIdTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetCategoryIdTest.php @@ -57,7 +57,7 @@ public function sfGetCategoryIdWithProductVisibleProvider() [1, true, true, '商品公開かつ closed = true はカテゴリIDを返す'], [2, true, true, '商品非公開かつ closed = true はカテゴリIDを返す'], [1, false, true, '商品公開かつ closed = false はカテゴリIDを返す'], - [2, false, false, '商品非公開かつ closed = false は空の配列を返す'] + [2, false, false, '商品非公開かつ closed = false は空の配列を返す'], ]; } diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetCategoryListTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetCategoryListTest.php index 58e098c970..ea7243df5d 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetCategoryListTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetCategoryListTest.php @@ -18,7 +18,7 @@ public function testSfGetCategoryList() $this->actual = $this->objDb->sfGetCategoryList('category_id = '.$category_id); $this->expected = [ - $category_id => '>>お菓子' + $category_id => '>>お菓子', ]; $this->verify(); @@ -31,7 +31,7 @@ public function testSfGetCategoryListCheckProductCount() $this->expected = [ 1 => '>食品', - 3 => '>>お菓子' + 3 => '>>お菓子', ]; $this->verify(); @@ -44,7 +44,7 @@ public function testSfGetCategoryListChangeHeader() $this->expected = [ 1 => '+食品', - 3 => '++お菓子' + 3 => '++お菓子', ]; $this->verify(); diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetIDValueListTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetIDValueListTest.php index 5b58c5803a..324fd8043a 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetIDValueListTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetIDValueListTest.php @@ -45,7 +45,7 @@ public function setUpMaker() 'creator_id' => 2, 'create_date' => 'CURRENT_TIMESTAMP', 'update_date' => 'CURRENT_TIMESTAMP', - 'del_flg' => '0' + 'del_flg' => '0', ]; $this->objQuery->insert('dtb_maker', $maker); $this->makers[$maker['maker_id']] = $maker['name']; diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetLevelCatListTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetLevelCatListTest.php index 3c66f0a8d1..19c1377d22 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetLevelCatListTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetLevelCatListTest.php @@ -60,7 +60,7 @@ private function createCategory() 5 => ['category_id' => 6, 'category_name' => 'カテゴリ6', 'parent_category_id' => 1, 'level' => 2, 'rank' => 6, 'creator_id' => 2, 'update_date' => 'CURRENT_TIMESTAMP', 'create_date' => 'CURRENT_TIMESTAMP', 'del_flg' => 0], 6 => ['category_id' => 7, 'category_name' => 'カテゴリ7', 'parent_category_id' => 3, 'level' => 3, 'rank' => 7, 'creator_id' => 2, 'update_date' => 'CURRENT_TIMESTAMP', 'create_date' => 'CURRENT_TIMESTAMP', 'del_flg' => 0], 7 => ['category_id' => 8, 'category_name' => 'カテゴリ8', 'parent_category_id' => 7, 'level' => 4, 'rank' => 8, 'creator_id' => 2, 'update_date' => 'CURRENT_TIMESTAMP', 'create_date' => 'CURRENT_TIMESTAMP', 'del_flg' => 0], - 8 => ['category_id' => 9, 'category_name' => 'カテゴリ9', 'parent_category_id' => 8, 'level' => 5, 'rank' => 9, 'creator_id' => 2, 'update_date' => 'CURRENT_TIMESTAMP', 'create_date' => 'CURRENT_TIMESTAMP', 'del_flg' => 0] + 8 => ['category_id' => 9, 'category_name' => 'カテゴリ9', 'parent_category_id' => 8, 'level' => 5, 'rank' => 9, 'creator_id' => 2, 'update_date' => 'CURRENT_TIMESTAMP', 'create_date' => 'CURRENT_TIMESTAMP', 'del_flg' => 0], ]; foreach ($categories as $category) { $this->objQuery->insert('dtb_category', $category); diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetMakerIdTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetMakerIdTest.php index 50b60d5a42..393ffe3ae3 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetMakerIdTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetMakerIdTest.php @@ -62,7 +62,7 @@ public function sfGetMakerIdWithProductVisibleProvider() [1, true, true, '商品公開かつ closed = true はメーカーIDを返す'], [2, true, true, '商品非公開かつ closed = true はメーカーIDを返す'], [1, false, true, '商品公開かつ closed = false はメーカーIDを返す'], - [2, false, false, '商品非公開かつ closed = false は空の配列を返す'] + [2, false, false, '商品非公開かつ closed = false は空の配列を返す'], ]; } @@ -108,7 +108,7 @@ public function setUpMakers() 'creator_id' => 2, 'create_date' => 'CURRENT_TIMESTAMP', 'update_date' => 'CURRENT_TIMESTAMP', - 'del_flg' => '0' + 'del_flg' => '0', ]; $this->objQuery->insert('dtb_maker', $maker); $this->objQuery->update('dtb_products', ['maker_id' => $maker['maker_id']], 'product_id = ?', [$this->product_ids[$i]]); diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetMultiCatTreeTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetMultiCatTreeTest.php index 9b59337c08..136def9c5f 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetMultiCatTreeTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetMultiCatTreeTest.php @@ -14,7 +14,7 @@ public function testSfGetMultiCatTree() $this->expected = [ [1, 4], - [6] + [6], ]; $this->actual = array_map(function ($category_root) { return array_map(function ($category) { @@ -32,7 +32,7 @@ public function testSfGetMultiCatTreeCheckProductCount() $this->expected = [ [1], - [6] + [6], ]; $this->actual = array_map(function ($category_root) { return array_map(function ($category) { diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetRollbackPointTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetRollbackPointTest.php index 4f0b202c68..4d65963775 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetRollbackPointTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetRollbackPointTest.php @@ -38,7 +38,7 @@ public function sfGetRollbackPointProvider() [$use_point, $add_point, ORDER_BACK_ORDER, $use_point, '利用ポイントのみ加算される'], [$use_point, $add_point, ORDER_DELIV, $use_point - $add_point, '利用ポイントは加算, 加算ポイントは減算される'], [$use_point, $add_point, ORDER_PRE_END, $use_point, '利用ポイントのみ加算される'], - [$use_point, $add_point, ORDER_PENDING, $use_point, '利用ポイントのみ加算される'] + [$use_point, $add_point, ORDER_PENDING, $use_point, '利用ポイントのみ加算される'], ]; } diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfMoveRankTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfMoveRankTest.php index cae2a16117..5c9253e31f 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfMoveRankTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfMoveRankTest.php @@ -171,7 +171,7 @@ public function getNewRankProvider() [3, 2, 1], [2, 2, 1], [1, 2, 2], - [0, 2, 2] + [0, 2, 2], ]; } diff --git a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php index 642e3f7a1b..9ce9047996 100755 --- a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php +++ b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_TestBase.php @@ -31,7 +31,7 @@ protected function setUpKiyaku() 'creator_id' => '0', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'kiyaku_id' => '1001', @@ -41,7 +41,7 @@ protected function setUpKiyaku() 'creator_id' => '0', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'kiyaku_id' => '1002', @@ -51,8 +51,8 @@ protected function setUpKiyaku() 'creator_id' => '0', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '1' - ] + 'del_flg' => '1', + ], ]; $this->objQuery->delete('dtb_kiyaku'); diff --git a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php index 32eaec66f9..64cd977eb9 100644 --- a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php +++ b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getKiyakuTest.php @@ -33,7 +33,7 @@ public function testgetKiyakuTest規約情報を取得できた場合規約のar 'creator_id' => '0', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' + 'del_flg' => '0', ]; $this->actual = $this->objKiyaku->getKiyaku($kiyaku_id, $has_deleted); @@ -68,7 +68,7 @@ public function testgetKiyakuTest削除された情報を含む規約情報を 'creator_id' => '0', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '1' + 'del_flg' => '1', ]; $this->actual = $this->objKiyaku->getKiyaku($kiyaku_id, $has_deleted); diff --git a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getListTest.php b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getListTest.php index 02b8b25cc8..9cd9f471f4 100644 --- a/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getListTest.php +++ b/tests/class/helper/SC_Helper_Kiyaku/SC_Helper_Kiyaku_getListTest.php @@ -28,18 +28,18 @@ public function testgetListTest削除した商品も含んだ一覧を取得で [ 'kiyaku_id' => '1000', 'kiyaku_title' => 'test1', - 'kiyaku_text' => 'test_text' + 'kiyaku_text' => 'test_text', ], [ 'kiyaku_id' => '1001', 'kiyaku_title' => 'test2', - 'kiyaku_text' => 'test_text2' + 'kiyaku_text' => 'test_text2', ], [ 'kiyaku_id' => '1002', 'kiyaku_title' => 'test3', - 'kiyaku_text' => 'test_text' - ] + 'kiyaku_text' => 'test_text', + ], ]; $this->actual = $this->objKiyaku->getList($has_deleted); @@ -56,12 +56,12 @@ public function testgetListTest一覧を取得できた場合削除した商品 [ 'kiyaku_id' => '1000', 'kiyaku_title' => 'test1', - 'kiyaku_text' => 'test_text' + 'kiyaku_text' => 'test_text', ], [ 'kiyaku_id' => '1001', 'kiyaku_title' => 'test2', - 'kiyaku_text' => 'test_text2' + 'kiyaku_text' => 'test_text2', ], ]; diff --git a/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_TestBase.php b/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_TestBase.php index 7733c2b71a..73e32ffdd1 100644 --- a/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_TestBase.php +++ b/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_TestBase.php @@ -55,7 +55,7 @@ protected function setUpMaker() 'creator_id' => '1', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'maker_id' => '1002', @@ -64,7 +64,7 @@ protected function setUpMaker() 'creator_id' => '2', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '1' + 'del_flg' => '1', ], [ 'maker_id' => '1003', @@ -73,7 +73,7 @@ protected function setUpMaker() 'creator_id' => '1', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'maker_id' => '1004', @@ -82,8 +82,8 @@ protected function setUpMaker() 'creator_id' => '1', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ]; $this->objQuery->delete('dtb_maker'); diff --git a/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getByNameTest.php b/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getByNameTest.php index 5db16e3a5e..b3d4e80bbf 100644 --- a/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getByNameTest.php +++ b/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getByNameTest.php @@ -64,7 +64,7 @@ public function testGetByNameメーカー名が存在する場合対応した結 'creator_id' => '1', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' + 'del_flg' => '0', ]; $result = $this->objHelperMaker->getByName('ソニン'); @@ -76,7 +76,7 @@ public function testGetByNameメーカー名が存在する場合対応した結 'creator_id', 'create_date', 'update_date', - 'del_flg' + 'del_flg', ]); $this->verify(); @@ -103,7 +103,7 @@ public function testGetByName削除済みでかつhasDeletedがtrueの場合対 'creator_id' => '2', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '1' + 'del_flg' => '1', ]; $result = $this->objHelperMaker->getMaker('1002', true); @@ -115,7 +115,7 @@ public function testGetByName削除済みでかつhasDeletedがtrueの場合対 'creator_id', 'create_date', 'update_date', - 'del_flg' + 'del_flg', ]); $this->verify(); diff --git a/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getListTest.php b/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getListTest.php index 6177f632b3..fcb9a177d7 100755 --- a/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getListTest.php +++ b/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getListTest.php @@ -62,16 +62,16 @@ public function testGetListデータがある場合想定した結果が返る() $this->expected = [ [ 'maker_id' => '1004', - 'name' => 'MEC' + 'name' => 'MEC', ], [ 'maker_id' => '1003', - 'name' => 'シャンプー' + 'name' => 'シャンプー', ], [ 'maker_id' => '1001', - 'name' => 'ソニン' - ] + 'name' => 'ソニン', + ], ]; $this->actual = $this->objHelperMaker->getList(); @@ -83,20 +83,20 @@ public function testGetList一覧取得hasDeleteをtrueにした場合削除済 $this->expected = [ [ 'maker_id' => '1004', - 'name' => 'MEC' + 'name' => 'MEC', ], [ 'maker_id' => '1003', - 'name' => 'シャンプー' + 'name' => 'シャンプー', ], [ 'maker_id' => '1002', - 'name' => 'パソナニック' + 'name' => 'パソナニック', ], [ 'maker_id' => '1001', - 'name' => 'ソニン' - ] + 'name' => 'ソニン', + ], ]; $this->actual = $this->objHelperMaker->getList(true); diff --git a/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getMakerTest.php b/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getMakerTest.php index a1d755bf47..d3f9441414 100644 --- a/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getMakerTest.php +++ b/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_getMakerTest.php @@ -66,7 +66,7 @@ public function testGetMakerメーカーIDが存在する場合対応した結 'creator_id' => '1', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '0' + 'del_flg' => '0', ]; $result = $this->objHelperMaker->getMaker('1001'); @@ -78,7 +78,7 @@ public function testGetMakerメーカーIDが存在する場合対応した結 'creator_id', 'create_date', 'update_date', - 'del_flg' + 'del_flg', ]); $this->verify(); @@ -105,7 +105,7 @@ public function testGetMaker削除済みでかつhasDeletedがtrueの場合対 'creator_id' => '2', 'create_date' => '2000-01-01 00:00:00', 'update_date' => '2000-01-01 00:00:00', - 'del_flg' => '1' + 'del_flg' => '1', ]; $result = $this->objHelperMaker->getMaker('1002', true); @@ -117,7 +117,7 @@ public function testGetMaker削除済みでかつhasDeletedがtrueの場合対 'creator_id', 'create_date', 'update_date', - 'del_flg' + 'del_flg', ]); $this->verify(); diff --git a/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_saveMakerTest.php b/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_saveMakerTest.php index 465d9d8fd2..077976532f 100755 --- a/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_saveMakerTest.php +++ b/tests/class/helper/SC_Helper_Maker/SC_Helper_Maker_saveMakerTest.php @@ -74,7 +74,7 @@ public function testSaveMakerメーカーIDがない場合インサートされ $sqlVal = [ 'name' => 'フジスリー', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ]; $maker_id = $this->objHelperMaker->saveMaker($sqlVal); @@ -83,7 +83,7 @@ public function testSaveMakerメーカーIDがない場合インサートされ 'name' => 'フジスリー', 'rank' => '5', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ]; $arrRet = $this->objHelperMaker->getMaker($maker_id); @@ -93,7 +93,7 @@ public function testSaveMakerメーカーIDがない場合インサートされ 'name', 'rank', 'creator_id', - 'del_flg' + 'del_flg', ] ); diff --git a/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php b/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php index 4ff89dc6c5..008284aaa7 100644 --- a/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php +++ b/tests/class/helper/SC_Helper_News/SC_Helper_News_TestBase.php @@ -54,7 +54,7 @@ protected function setUpNews() 'news_title' => 'ニュース情報01', 'rank' => '1', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => '2000-01-01 00:00:00', @@ -62,7 +62,7 @@ protected function setUpNews() 'news_title' => 'ニュース情報02', 'rank' => '2', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => '2000-01-01 00:00:00', @@ -70,7 +70,7 @@ protected function setUpNews() 'news_title' => 'ニュース情報03', 'rank' => '3', 'creator_id' => '1', - 'del_flg' => '1' + 'del_flg' => '1', ], [ 'update_date' => '2000-01-01 00:00:00', @@ -78,8 +78,8 @@ protected function setUpNews() 'news_title' => 'ニュース情報04', 'rank' => '4', 'creator_id' => '1', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ]; $this->objQuery->delete('dtb_news'); diff --git a/tests/class/helper/SC_Helper_News/SC_Helper_News_getListTest.php b/tests/class/helper/SC_Helper_News/SC_Helper_News_getListTest.php index 0e0eea3377..83b3961fda 100644 --- a/tests/class/helper/SC_Helper_News/SC_Helper_News_getListTest.php +++ b/tests/class/helper/SC_Helper_News/SC_Helper_News_getListTest.php @@ -32,29 +32,29 @@ public function testGetList削除されたニュースも含む場合全ての 'news_id' => '1004', 'news_title' => 'ニュース情報04', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => '2000-01-01 00:00:00', 'news_id' => '1003', 'news_title' => 'ニュース情報03', 'creator_id' => '1', - 'del_flg' => '1' + 'del_flg' => '1', ], [ 'update_date' => '2000-01-01 00:00:00', 'news_id' => '1002', 'news_title' => 'ニュース情報02', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => '2000-01-01 00:00:00', 'news_id' => '1001', 'news_title' => 'ニュース情報01', 'creator_id' => '1', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ]; $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted); foreach ($result as $value) { @@ -78,22 +78,22 @@ public function testGetList削除されたニュースは含まない場合削 'news_id' => '1004', 'news_title' => 'ニュース情報04', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => '2000-01-01 00:00:00', 'news_id' => '1002', 'news_title' => 'ニュース情報02', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'update_date' => '2000-01-01 00:00:00', 'news_id' => '1001', 'news_title' => 'ニュース情報01', 'creator_id' => '1', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ]; $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted); @@ -117,7 +117,7 @@ public function testGetList表示件数1かつページ番号3の場合対象の 'news_id' => '1001', 'news_title' => 'ニュース情報01', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ]; $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted); @@ -139,7 +139,7 @@ public function testGetList表示件数1かつページ番号0の場合対象の 'news_id' => '1004', 'news_title' => 'ニュース情報04', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ]; $result = $this->objNews->getList($dispNumber, $pageNumber, $has_deleted); diff --git a/tests/class/helper/SC_Helper_News/SC_Helper_News_getNewsTest.php b/tests/class/helper/SC_Helper_News/SC_Helper_News_getNewsTest.php index d17ff7367c..792c7a2c43 100644 --- a/tests/class/helper/SC_Helper_News/SC_Helper_News_getNewsTest.php +++ b/tests/class/helper/SC_Helper_News/SC_Helper_News_getNewsTest.php @@ -40,7 +40,7 @@ public function testGet存在するニュースIDを指定した場合対応す 'news_id' => '1001', 'news_title' => 'ニュース情報01', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ]; $result = $this->objNews->getNews($news_id); diff --git a/tests/class/helper/SC_Helper_News/SC_Helper_News_saveNewsTest.php b/tests/class/helper/SC_Helper_News/SC_Helper_News_saveNewsTest.php index 0f1f5ac545..42d8521649 100644 --- a/tests/class/helper/SC_Helper_News/SC_Helper_News_saveNewsTest.php +++ b/tests/class/helper/SC_Helper_News/SC_Helper_News_saveNewsTest.php @@ -27,14 +27,14 @@ public function testSaveNewsTestNewsIdが空の場合新規登録される() $sqlval = [ 'news_title' => 'ニュース情報05', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ]; $this->expected['count'] = '5'; $this->expected['content'] = [ 'news_title' => 'ニュース情報05', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ]; // $sqlval['news_id'] = $objQuery->setVal('dtb_news_news_id', 5); @@ -61,7 +61,7 @@ public function testSaveNewsTestNewsIdが存在する場合対象のニュース 'news_id' => '1002', 'news_title' => 'ニュース情報05更新', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ]; $this->expected['count'] = '4'; @@ -69,7 +69,7 @@ public function testSaveNewsTestNewsIdが存在する場合対象のニュース 'news_id' => '1002', 'news_title' => 'ニュース情報05更新', 'creator_id' => '1', - 'del_flg' => '0' + 'del_flg' => '0', ]; $ret_id = $this->objNews->saveNews($sqlval); diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php index abf4a6c5e8..5642698e6f 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_TestBase.php @@ -63,7 +63,7 @@ protected function getSingleShipping() '00001' => [ 'shipment_id' => '00001', 'shipment_item' => '商品1', - 'shipping_pref' => '東京都'] + 'shipping_pref' => '東京都', ], ]; } @@ -73,15 +73,15 @@ protected function getMultipleShipping() '00001' => [ 'shipment_id' => '00001', 'shipment_item' => ['商品1'], - 'shipping_pref' => '東京都'], + 'shipping_pref' => '東京都', ], '00002' => [ 'shipment_id' => '00002', 'shipment_item' => ['商品2'], - 'shipping_pref' => '沖縄県'], + 'shipping_pref' => '沖縄県', ], '00003' => [ 'shipment_id' => '00003', 'shipment_item' => [], - 'shipping_pref' => '埼玉県'] + 'shipping_pref' => '埼玉県', ], ]; } @@ -96,22 +96,22 @@ protected function setUpShippingOnDb() 'shipping_id' => '1', 'order_id' => '1001', 'shipping_name01' => '配送情報01', - 'shipping_date' => '2012-01-12' + 'shipping_date' => '2012-01-12', ], [ 'update_date' => '2000-01-01 00:00:00', 'shipping_id' => '2', 'order_id' => '2', 'shipping_name01' => '配送情報02', - 'shipping_date' => '2011-10-01' + 'shipping_date' => '2011-10-01', ], [ 'update_date' => '2000-01-01 00:00:00', 'shipping_id' => '1002', 'order_id' => '1002', 'shipping_time' => '午後', - 'time_id' => '1' - ] + 'time_id' => '1', + ], ]; $this->objQuery->delete('dtb_shipping'); @@ -133,7 +133,7 @@ protected function setUpOrder($customer_ids = [], $product_class_ids = []) 'status' => '3', 'payment_date' => '2032-12-31 01:20:30', // 日付が変わっても良いように、遠い未来に設定 'use_point' => '10', - 'add_point' => '20' + 'add_point' => '20', ], [ 'update_date' => '2000-01-01 00:00:00', @@ -141,8 +141,8 @@ protected function setUpOrder($customer_ids = [], $product_class_ids = []) 'order_name01' => '受注情報02', 'status' => '5', 'use_point' => '10', - 'add_point' => '20' - ] + 'add_point' => '20', + ], ]; $this->objQuery->delete('dtb_order'); @@ -174,7 +174,7 @@ protected function setUpCustomer() return [ $this->objGenerator->createCustomer(null, ['point' => 100]), - $this->objGenerator->createCustomer(null, ['point' => 200]) + $this->objGenerator->createCustomer(null, ['point' => 200]), ]; } } diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php index 4dff287623..49fe825cef 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cancelOrderTest.php @@ -71,17 +71,17 @@ public function testCancelOrderデフォルトの引数で呼び出した場合 'registerOrder' => [ 'order_id' => '1001', 'params' => [ - 'status' => ORDER_CANCEL - ] + 'status' => ORDER_CANCEL, + ], ], 'getOrderDetail' => [ - 'order_id' => '1001' - ] + 'order_id' => '1001', + ], ], 'productClass' => array_map(function ($productsClass) { return ['stock' => $productsClass['stock']]; }, $this->arrProductsClasses - ) + ), ]; $this->verify(); } @@ -106,17 +106,17 @@ public function testCancelOrderトランザクションが開始していない 'registerOrder' => [ 'order_id' => '1001', 'params' => [ - 'status' => ORDER_NEW - ] + 'status' => ORDER_NEW, + ], ], 'getOrderDetail' => [ - 'order_id' => '1001' - ] + 'order_id' => '1001', + ], ], 'productClass' => array_map(function ($productsClass) { return ['stock' => $productsClass['stock']]; }, $this->arrProductsClasses - ) + ), ]; $this->verify(); @@ -142,17 +142,17 @@ public function testCancelOrder削除フラグが立っている場合DB更新 'order_id' => '1001', 'params' => [ 'status' => ORDER_DELIV, - 'del_flg' => '1' - ] + 'del_flg' => '1', + ], ], 'getOrderDetail' => [ - 'order_id' => '1001' - ] + 'order_id' => '1001', + ], ], 'productClass' => array_map(function ($productsClass) { return ['stock' => $productsClass['stock']]; }, $this->arrProductsClasses - ) + ), ]; $this->verify(); @@ -167,25 +167,25 @@ public static function registerOrder($order_id, $params) { $_SESSION['testResult']['registerOrder'] = [ 'order_id' => $order_id, - 'params' => $params + 'params' => $params, ]; } public static function getOrderDetail($order_id, $has_order_status = true) { $_SESSION['testResult']['getOrderDetail'] = [ - 'order_id' => $order_id + 'order_id' => $order_id, ]; return [ [ 'product_class_id' => '1001', - 'quantity' => '5' + 'quantity' => '5', ], [ 'product_class_id' => '1002', - 'quantity' => '1' - ] + 'quantity' => '1', + ], ]; } } diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php index 9c12eed788..6509f4d910 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_cleanupSessionTest.php @@ -72,7 +72,7 @@ public function testCleanupSessionカートとセッションの配送情報が 'cart_max_notdeleted' => 1, 'uniqid' => '', 'shipping' => null, - 'multiple_temp' => null + 'multiple_temp' => null, ]; $this->actual['cart_max_deleted'] = $cartSession->getMax(PRODUCT_TYPE_NORMAL); diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php index bbf92a1d6b..7521dabc44 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_completeOrderTest.php @@ -54,7 +54,7 @@ protected function setUp() 'pre_page' => 'pre', 'now_page' => 'now', 'regist_success' => true, - 'uniqid' => $this->order_temp_ids[0] + 'uniqid' => $this->order_temp_ids[0], ]; $this->helper = new SC_Helper_Purchase_completeOrderMock(); @@ -74,30 +74,30 @@ public function testCompleteOrder顧客IDが指定されている場合購入日 $this->expected = [ 'verifyChangeCart' => [ - 'uniqId' => $this->order_temp_ids[0] + 'uniqId' => $this->order_temp_ids[0], ], 'getOrderTemp' => [ - 'uniqId' => $this->order_temp_ids[0] + 'uniqId' => $this->order_temp_ids[0], ], 'registerOrderComplete' => [ 'order_temp_id' => $this->order_temp_ids[0], 'status' => ORDER_DELIV, - 'cartKey' => '1' + 'cartKey' => '1', ], 'registerShipmentItem' => [ [ 'order_id' => $this->order_ids[0], 'shipping_id' => '00001', - 'shipment_item' => '商品1' - ] + 'shipment_item' => '商品1', + ], ], 'registerShipping' => [ 'order_id' => $this->order_ids[0], ], 'cleanupSession' => [ 'order_id' => $this->order_ids[0], - 'cartKey' => '1' - ] + 'cartKey' => '1', + ], ]; $this->actual = $_SESSION['testResult']; $this->verify('適切なfunctionが呼ばれている'); @@ -111,30 +111,30 @@ public function testCompleteOrder顧客IDが指定されていない場合特に $this->expected = [ 'verifyChangeCart' => [ - 'uniqId' => $this->order_temp_ids[0] + 'uniqId' => $this->order_temp_ids[0], ], 'getOrderTemp' => [ - 'uniqId' => $this->order_temp_ids[0] + 'uniqId' => $this->order_temp_ids[0], ], 'registerOrderComplete' => [ 'order_temp_id' => $this->order_temp_ids[0], 'status' => ORDER_NEW, - 'cartKey' => '1' + 'cartKey' => '1', ], 'registerShipmentItem' => [ [ 'order_id' => (string) $this->order_ids[0], 'shipping_id' => '00001', - 'shipment_item' => '商品1' - ] + 'shipment_item' => '商品1', + ], ], 'registerShipping' => [ - 'order_id' => (string) $this->order_ids[0] + 'order_id' => (string) $this->order_ids[0], ], 'cleanupSession' => [ 'order_id' => (string) $this->order_ids[0], - 'cartKey' => '1' - ] + 'cartKey' => '1', + ], ]; $this->actual = $_SESSION['testResult']; $this->verify('適切なfunctionが呼ばれている'); @@ -162,7 +162,7 @@ public function registerOrderComplete($orderTemp, &$objCartSession, $cartKey) $_SESSION['testResult']['registerOrderComplete'] = [ 'order_temp_id' => $orderTemp['order_temp_id'], 'status' => $orderTemp['status'], - 'cartKey' => $cartKey + 'cartKey' => $cartKey, ]; return parent::registerOrderComplete($orderTemp, $objCartSession, $cartKey); @@ -173,14 +173,14 @@ public static function registerShipmentItem($order_id, $shipping_id, $shipment_i $_SESSION['testResult']['registerShipmentItem'][] = [ 'order_id' => $order_id, 'shipping_id' => $shipping_id, - 'shipment_item' => $shipment_item + 'shipment_item' => $shipment_item, ]; } public static function registerShipping($order_id, $shipping_temp, $convert_shipping_date = true) { $_SESSION['testResult']['registerShipping'] = [ - 'order_id' => $order_id + 'order_id' => $order_id, ]; } @@ -188,7 +188,7 @@ public static function cleanupSession($order_id, &$objCartSesion, &$objCustomer, { $_SESSION['testResult']['cleanupSession'] = [ 'order_id' => $order_id, - 'cartKey' => $cartKey + 'cartKey' => $cartKey, ]; } } diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php index 5e37cb7310..1ca18b21c9 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromCustomerTest.php @@ -115,7 +115,7 @@ public function testCopyFromCustomerモバイルの場合モバイルのメー 'update_date' => 'CURRENT_TIMESTAMP', 'order_country_id' => '', 'order_company_name' => '', - 'order_zipcode' => '' + 'order_zipcode' => '', ]; $helper = new SC_Helper_Purchase_Ex(); $helper->copyFromCustomer($dest, $this->customer); @@ -137,7 +137,7 @@ public function testCopyFromCustomerモバイルかつモバイルのメール 'order_name01' => '姓01', 'order_email' => 'test@example.com', 'customer_id' => '1001', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ]; $helper = new SC_Helper_Purchase_Ex(); $helper->copyFromCustomer($dest, $this->customer, $prefix, $keys); @@ -160,7 +160,7 @@ public function testCopyFromCustomerモバイルでない場合通常のメー 'prefix_name01' => '姓01', 'prefix_email' => 'test@example.com', 'customer_id' => '1001', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ]; $helper = new SC_Helper_Purchase_Ex(); $helper->copyFromCustomer($dest, $this->customer, $prefix, $keys); diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php index 80ab78fafe..967c8a90e9 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_copyFromOrderTest.php @@ -63,7 +63,7 @@ public function testCopyFromOrder全てデフォルト設定にした場合デ 'order_tel03' => '5678', 'order_fax01' => '02', 'order_fax02' => '2345', - 'order_fax03' => '6789' + 'order_fax03' => '6789', ]; $this->expected = [ @@ -82,7 +82,7 @@ public function testCopyFromOrder全てデフォルト設定にした場合デ 'shipping_tel03' => '5678', 'shipping_fax01' => '02', 'shipping_fax02' => '2345', - 'shipping_fax03' => '6789' + 'shipping_fax03' => '6789', ]; $helper = new SC_Helper_Purchase_Ex(); $helper->copyFromOrder($dest, $src); @@ -97,12 +97,12 @@ public function testCopyFromOrder接頭辞・キーを設定した場合指定 $src = [ 'input_name01' => '姓', 'input_name02' => '名', - 'input_zip01' => '012' // キーに含まれないもの + 'input_zip01' => '012', // キーに含まれないもの ]; $this->expected = [ 'output_name01' => '姓', - 'output_name02' => '名' + 'output_name02' => '名', ]; $helper = new SC_Helper_Purchase_Ex(); $helper->copyFromOrder($dest, $src, 'output', 'input', ['name01', 'name02']); diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php index 878c436890..81f03bf7f6 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_extractShippingTest.php @@ -52,13 +52,13 @@ public function testExtractShipping予め指定されたキーだけが抽出さ 'shipping_id' => '1001', 'shipping_code' => 'cd1001', 'shipping_detail' => 'dt1001', // 無視される - 'shipping_name' => '名称1001' + 'shipping_name' => '名称1001', ]; $this->expected = [ 'shipping_id' => '1001', 'shipping_name' => '名称1001', - 'shipping_code' => 'cd1001' + 'shipping_code' => 'cd1001', ]; $this->actual = $helper->extractShipping($arrSrc); diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php index f95f079e8b..414a614f35 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderDetailTest.php @@ -67,7 +67,7 @@ public function testGetOrderDetail存在する受注IDを指定した場合対 'product_id', 'product_class_id', 'product_type_id', 'product_code', 'product_name', 'classcategory_name1', 'classcategory_name2', 'price', 'quantity', 'point_rate', 'status', 'payment_date', 'enable', 'effective', - 'tax_rate', 'tax_rule']; + 'tax_rate', 'tax_rule', ]; $this->objQuery->setOrder('order_detail_id'); $arrOrderDetails = $this->objQuery->select('*', 'dtb_order_detail T1 JOIN dtb_order T2 ON T1.order_id = T2.order_id', 'T1.order_id = ?', [$this->order_ids[0]]); @@ -104,7 +104,7 @@ public function testGetOrderDetailステータス取得フラグがOFFのの場 'product_id', 'product_class_id', 'product_type_id', 'product_code', 'product_name', 'classcategory_name1', 'classcategory_name2', 'price', 'quantity', 'point_rate', 'enable', 'effective', - 'tax_rate', 'tax_rule']; + 'tax_rate', 'tax_rule', ]; $this->objQuery->setOrder('order_detail_id'); $arrOrderDetails = $this->objQuery->select('*', 'dtb_order_detail T1 JOIN dtb_order T2 ON T1.order_id = T2.order_id', 'T1.order_id = ?', [$this->order_ids[0]]); diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php index a303bd3ad7..eea8835648 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTempTest.php @@ -72,7 +72,7 @@ public function testGetOrderTemp存在する受注IDを指定した場合対応 $this->expected = [ 'order_temp_id' => $order_temp_id, 'customer_id' => $this->customer_ids[0], - 'order_name01' => $arrCustomer['name01'] + 'order_name01' => $arrCustomer['name01'], ]; $result = SC_Helper_Purchase::getOrderTemp($order_temp_id); diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php index 74446f0e3b..a3428878ff 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getOrderTest.php @@ -79,7 +79,7 @@ public function testGetOrder顧客IDを指定しなかった場合受注IDに対 $this->expected = [ 'order_id' => $order_id, 'customer_id' => $this->customer_ids[1], - 'order_name01' => '受注情報02' + 'order_name01' => '受注情報02', ]; $result = SC_Helper_Purchase::getOrder($order_id); $this->actual = Test_Utils::mapArray($result, ['order_id', 'customer_id', 'order_name01']); @@ -95,7 +95,7 @@ public function testGetOrder存在する顧客IDを指定した場合対応す $this->expected = [ 'order_id' => $order_id, 'customer_id' => $customer_id, - 'order_name01' => '受注情報02' + 'order_name01' => '受注情報02', ]; $result = SC_Helper_Purchase::getOrder($order_id, $customer_id); $this->actual = Test_Utils::mapArray($result, ['order_id', 'customer_id', 'order_name01']); diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php index 46e1b2d2cf..6df5ee50ec 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShipmentItemsTest.php @@ -86,7 +86,7 @@ public function testGetShipmentItems存在する受注IDと配送先IDを指定 'product_class_id' => '2', 'product_name' => 'アイスクリーム', 'price' => '1008', - 'productsClass' => ['product_class_id' => '2', 'product_id' => '1'] + 'productsClass' => ['product_class_id' => '2', 'product_id' => '1'], ]; $this->expected['first'] = [ 'order_id' => (string) $order_id, @@ -94,17 +94,17 @@ public function testGetShipmentItems存在する受注IDと配送先IDを指定 'product_class_id' => '1', 'product_name' => 'アイスクリーム', 'price' => '1008', - 'productsClass' => ['product_class_id' => '1', 'product_id' => '1'] + 'productsClass' => ['product_class_id' => '1', 'product_id' => '1'], ]; $result = SC_Helper_Purchase::getShipmentItems($order_id, $shipping_id); $this->actual['count'] = count($result); $this->actual['first'] = Test_Utils::mapArray($result[0], [ - 'order_id', 'shipping_id', 'product_class_id', 'product_name', 'price', 'productsClass']); + 'order_id', 'shipping_id', 'product_class_id', 'product_name', 'price', 'productsClass', ]); $this->actual['first']['productsClass'] = Test_Utils::mapArray($this->actual['first']['productsClass'], ['product_class_id', 'product_id']); $this->actual['second'] = Test_Utils::mapArray($result[1], [ - 'order_id', 'shipping_id', 'product_class_id', 'product_name', 'price', 'productsClass']); + 'order_id', 'shipping_id', 'product_class_id', 'product_name', 'price', 'productsClass', ]); $this->actual['second']['productsClass'] = Test_Utils::mapArray($this->actual['second']['productsClass'], ['product_class_id', 'product_id']); $this->verify('配送情報'); } @@ -121,7 +121,7 @@ public function testGetShipmentItems詳細フラグをOFFにした場合結果 'product_class_id' => '2', 'product_name' => 'アイスクリーム', 'price' => '1008', - 'productsClass' => null + 'productsClass' => null, ]; $this->expected['first'] = [ 'order_id' => (string) $order_id, @@ -129,15 +129,15 @@ public function testGetShipmentItems詳細フラグをOFFにした場合結果 'product_class_id' => '1', 'product_name' => 'アイスクリーム', 'price' => '1008', - 'productsClass' => null + 'productsClass' => null, ]; $result = SC_Helper_Purchase::getShipmentItems($order_id, $shipping_id, false); $this->actual['count'] = count($result); $this->actual['first'] = Test_Utils::mapArray($result[0], [ - 'order_id', 'shipping_id', 'product_class_id', 'product_name', 'price', 'productsClass']); + 'order_id', 'shipping_id', 'product_class_id', 'product_name', 'price', 'productsClass', ]); $this->actual['second'] = Test_Utils::mapArray($result[1], [ - 'order_id', 'shipping_id', 'product_class_id', 'product_name', 'price', 'productsClass']); + 'order_id', 'shipping_id', 'product_class_id', 'product_name', 'price', 'productsClass', ]); $this->verify('配送情報'); } diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php index e0df26e294..8073f963de 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingTempTest.php @@ -62,11 +62,11 @@ public function testGetShippingTemp保有フラグがONの場合商品のある '00001' => [ 'shipment_id' => '00001', 'shipment_item' => ['商品1'], - 'shipping_pref' => '東京都'], + 'shipping_pref' => '東京都', ], '00002' => [ 'shipment_id' => '00002', 'shipment_item' => ['商品2'], - 'shipping_pref' => '沖縄県'] + 'shipping_pref' => '沖縄県', ], ]; $this->actual = SC_Helper_Purchase::getShippingTemp(true); diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php index bfa739f263..0b0a159a65 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_getShippingsTest.php @@ -71,7 +71,7 @@ public function testGetShippings存在する受注IDを指定した場合結果 'order_id' => (string) $order_id, 'shipping_id' => '0', 'shipping_name01' => $arrCustomer['name01'], - 'shipping_date' => null + 'shipping_date' => null, ]; $this->expected['shipment_item_count'] = 3; @@ -81,7 +81,7 @@ public function testGetShippings存在する受注IDを指定した場合結果 $this->actual['count'] = count($result); // shipping_idごとの配列になっているのでshipping_idで抽出 $this->actual['first'] = Test_Utils::mapArray($result[0], [ - 'order_id', 'shipping_id', 'shipping_name01', 'shipping_date']); + 'order_id', 'shipping_id', 'shipping_name01', 'shipping_date', ]); $this->actual['shipment_item_count'] = count($result[0]['shipment_item']); $this->verify('配送情報'); } @@ -96,7 +96,7 @@ public function testGetShippings商品取得フラグをOFFにした場合結果 'order_id' => (string) $order_id, 'shipping_id' => '0', 'shipping_name01' => $arrCustomer['name01'], - 'shipping_date' => null + 'shipping_date' => null, ]; $this->expected['shipment_item_count'] = 0; @@ -105,7 +105,7 @@ public function testGetShippings商品取得フラグをOFFにした場合結果 $this->actual['count'] = count($result); // shipping_idごとの配列になっているのでshipping_idで抽出 $this->actual['first'] = Test_Utils::mapArray($result[0], [ - 'order_id', 'shipping_id', 'shipping_name01', 'shipping_date']); + 'order_id', 'shipping_id', 'shipping_name01', 'shipping_date', ]); $this->actual['shipment_item_count'] = is_array($result['1']['shipment_item']) ? count($result['1']['shipment_item']) : 0; $this->verify('配送情報'); } diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php index 5bb32b0b6a..472a64aa33 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderCompleteTest.php @@ -65,7 +65,7 @@ public function testRegisterOrderComplete不要な変数が含まれている場 'status' => ORDER_PAY_WAIT, 'mail_maga_flg' => '1', 'order_tax_rate' => '5', - 'order_tax_rule' => '1' + 'order_tax_rule' => '1', ]; $cartSession = new SC_CartSession_registerOrderCompleteMock(); $_SESSION['site']['uniqid'] = $this->order_temp_ids[0]; @@ -76,7 +76,7 @@ public function testRegisterOrderComplete不要な変数が含まれている場 'registerOrder' => [ 'order_id' => $this->order_ids[0], 'status' => ORDER_PAY_WAIT, - 'mailmaga_flg' => null + 'mailmaga_flg' => null, ], 'registerOrderDetail' => [ 'order_id' => $this->order_ids[0], @@ -94,11 +94,11 @@ public function testRegisterOrderComplete不要な変数が含まれている場 'quantity' => '10', 'tax_rate' => null, 'tax_rule' => null, - 'tax_adjust' => null - ] - ] + 'tax_adjust' => null, + ], + ], ], - 'del_flg' => '1' + 'del_flg' => '1', ]; $this->actual = $_SESSION['testResult']; @@ -113,7 +113,7 @@ public function testRegisterOrderCompleteステータスの指定がない場合 'order_id' => '1001', // 'status' => ORDER_PAY_WAIT, 'order_tax_rate' => '5', - 'order_tax_rule' => '1' + 'order_tax_rule' => '1', ]; $cartSession = new SC_CartSession_registerOrderCompleteMock(); $_SESSION['site']['uniqid'] = '1001'; @@ -125,8 +125,8 @@ public function testRegisterOrderCompleteステータスの指定がない場合 'registerOrder' => [ 'order_id' => '1001', 'status' => ORDER_NEW, - 'mailmaga_flg' => null - ] + 'mailmaga_flg' => null, + ], ]; $this->actual['registerOrder'] = $_SESSION['testResult']['registerOrder']; @@ -143,7 +143,7 @@ public static function registerOrder($order_id, $params) $_SESSION['testResult']['registerOrder'] = [ 'order_id' => $order_id, 'status' => $params['status'], - 'mailmaga_flg' => $params['mailmaga_flg'] + 'mailmaga_flg' => $params['mailmaga_flg'], ]; } @@ -151,7 +151,7 @@ public static function registerOrderDetail($order_id, $params) { $_SESSION['testResult']['registerOrderDetail'] = [ 'order_id' => $order_id, - 'params' => $params + 'params' => $params, ]; } @@ -173,12 +173,12 @@ public function getCartList($cartKey, $pref_id = 0, $country_id = 0) 'name' => '製品02', 'product_code' => 'cd1002', 'classcategory_name1' => 'cat01', - 'classcategory_name2' => 'cat02' + 'classcategory_name2' => 'cat02', ], 'point_rate' => '5', 'price' => '1000', - 'quantity' => '10' - ] + 'quantity' => '10', + ], ]; } } diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php index 91993d4e88..9f049aca08 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderDetailTest.php @@ -59,8 +59,8 @@ public function testRegisterOrderDetail該当の受注が存在する場合削 'hoge' => '999', // DBに存在しないカラム 'product_id' => '9001', 'product_class_id' => '9001', - 'product_name' => '製品名9001' - ] + 'product_name' => '製品名9001', + ], ]; SC_Helper_Purchase::registerOrderDetail($this->order_ids[0], $params); @@ -70,7 +70,7 @@ public function testRegisterOrderDetail該当の受注が存在する場合削 'product_id' => '9001', 'product_class_id' => '9001', 'product_name' => '製品名9001', - 'product_code' => null // 古いデータにはあるが、deleteされたので消えている + 'product_code' => null, // 古いデータにはあるが、deleteされたので消えている ]; $this->actual['count'] = $this->objQuery->count('dtb_order_detail', 'order_id = ?', [$this->order_ids[0]]); @@ -92,8 +92,8 @@ public function testRegisterOrderDetail該当の受注が存在しない場合 'hoge' => '999', // DBに存在しないカラム 'product_id' => '9003', 'product_class_id' => '9003', - 'product_name' => '製品名9003' - ] + 'product_name' => '製品名9003', + ], ]; SC_Helper_Purchase::registerOrderDetail('1003', $params); @@ -103,7 +103,7 @@ public function testRegisterOrderDetail該当の受注が存在しない場合 'product_id' => '9003', 'product_class_id' => '9003', 'product_name' => '製品名9003', - 'product_code' => null + 'product_code' => null, ]; $this->actual['count'] = $this->objQuery->count('dtb_order_detail', 'order_id = ?', [1003]); diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php index e8b17e619e..26adf0c9dc 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerOrderTest.php @@ -60,7 +60,7 @@ public function testRegisterOrder既に受注IDが存在する場合情報が更 'status' => '1', 'add_point' => 10, 'use_point' => 20, - 'order_name01' => '受注情報01_更新' + 'order_name01' => '受注情報01_更新', ]; $this->helper->registerOrder($order_id, $arrParams); @@ -70,7 +70,7 @@ public function testRegisterOrder既に受注IDが存在する場合情報が更 'order_id' => $order_id, 'status' => '1', 'add_point' => 10, - 'use_point' => 20 + 'use_point' => 20, ], 'sfUpdateOrderNameCol' => $order_id, 'count' => '2', @@ -80,8 +80,8 @@ public function testRegisterOrder既に受注IDが存在する場合情報が更 'status' => '1', 'add_point' => '10', 'use_point' => '20', - 'order_name01' => '受注情報01_更新' - ] + 'order_name01' => '受注情報01_更新', + ], ]; $this->actual = $_SESSION['testResult']; $this->actual['count'] = $this->objQuery->count('dtb_order'); @@ -104,7 +104,7 @@ public function testRegisterOrder存在しない受注IDを指定した場合新 'status' => '2', 'add_point' => 100, 'use_point' => 200, - 'order_name01' => '受注情報03' + 'order_name01' => '受注情報03', ]; $this->helper->registerOrder($order_id, $arrParams); @@ -114,7 +114,7 @@ public function testRegisterOrder存在しない受注IDを指定した場合新 'order_id' => '1003', 'status' => '2', 'add_point' => 100, - 'use_point' => 200 + 'use_point' => 200, ], 'sfUpdateOrderNameCol' => '1003', 'count' => '3', @@ -124,8 +124,8 @@ public function testRegisterOrder存在しない受注IDを指定した場合新 'status' => null, // ここではsfUpdateOrderStatusをモックにしているので更新されない 'add_point' => '100', 'use_point' => '200', - 'order_name01' => '受注情報03' - ] + 'order_name01' => '受注情報03', + ], ]; $this->actual = $_SESSION['testResult']; $this->actual['count'] = $this->objQuery->count('dtb_order'); @@ -148,7 +148,7 @@ public function testRegisterOrder受注IDが未指定の場合新たにIDが発 'status' => '2', 'add_point' => 100, 'use_point' => 200, - 'order_name01' => '受注情報03' + 'order_name01' => '受注情報03', ]; // SEQの値を取得 @@ -161,7 +161,7 @@ public function testRegisterOrder受注IDが未指定の場合新たにIDが発 'order_id' => $new_order_id, 'status' => '2', 'add_point' => 100, - 'use_point' => 200 + 'use_point' => 200, ], 'sfUpdateOrderNameCol' => $new_order_id, 'count' => '3', @@ -171,8 +171,8 @@ public function testRegisterOrder受注IDが未指定の場合新たにIDが発 'status' => null, // ここではsfUpdateOrderStatusをモックにしているので更新されない 'add_point' => '100', 'use_point' => '200', - 'order_name01' => '受注情報03' - ] + 'order_name01' => '受注情報03', + ], ]; $this->actual = $_SESSION['testResult']; $this->actual['count'] = $this->objQuery->count('dtb_order'); diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php index 5e877345eb..55991bed6e 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShipmentItemTest.php @@ -63,8 +63,8 @@ public function testRegisterShipmentItem製品クラスIDが入っていない 'product_code' => 'newcode01', 'classcategory_name1' => 'newcat01', 'classcategory_name2' => 'newcat02', - 'price' => '2500' - ] + 'price' => '2500', + ], ]; // 期待値の設定 @@ -95,8 +95,8 @@ public function testRegisterShipmentItem製品名等が指定されている場 'product_code' => 'newcode01', 'classcategory_name1' => 'newcat01', 'classcategory_name2' => 'newcat02', - 'price' => '2500' - ] + 'price' => '2500', + ], ]; // 期待値の設定 @@ -107,7 +107,7 @@ public function testRegisterShipmentItem製品名等が指定されている場 'product_code' => 'newcode01', 'classcategory_name1' => 'newcat01', 'classcategory_name2' => 'newcat02', - 'price' => '2500' + 'price' => '2500', ]; // 対象functionの呼び出し @@ -132,13 +132,13 @@ public function testRegisterShipmentItem製品名等が指定されていない $shipping_id = '1'; $arrParams = [ [ - 'product_class_id' => '1' + 'product_class_id' => '1', // 'product_name' => '追加製品名01', // 'product_code' => 'newcode01', // 'classcategory_name1' => 'newcat01', // 'classcategory_name2' => 'newcat02', // 'price' => '2500' - ] + ], ]; // 期待値の設定 @@ -151,7 +151,7 @@ public function testRegisterShipmentItem製品名等が指定されていない 'classcategory_name2' => 'S', // TODO 要確認price01, price02を設定しても価格が取れない。実際にはDBから取るケースが無い? // 'price' => '1500' - 'price' => null + 'price' => null, ]; // 対象functionの呼び出し @@ -181,8 +181,8 @@ public function testRegisterShipmentItemDBに存在しないカラムを指定 'classcategory_name1' => 'newcat01', 'classcategory_name2' => 'newcat02', 'price' => '2500', - 'xxxx' => 'yyyyyy' // 存在しないカラム - ] + 'xxxx' => 'yyyyyy', // 存在しないカラム + ], ]; // 期待値の設定 @@ -193,7 +193,7 @@ public function testRegisterShipmentItemDBに存在しないカラムを指定 'product_code' => 'newcode01', 'classcategory_name1' => 'newcat01', 'classcategory_name2' => 'newcat02', - 'price' => '2500' + 'price' => '2500', ]; // 対象functionの呼び出し diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php index eefeda1141..1007e1244d 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_registerShippingTest.php @@ -53,8 +53,8 @@ public function testRegisterShipping元々存在しない受注IDの場合新規 'order_id' => '10', 'shipping_id' => '20', 'shipping_name01' => '配送情報10', - 'shipping_date' => '2012/01/12' - ] + 'shipping_date' => '2012/01/12', + ], ]; $this->expected['count'] = '4'; // 1件増える @@ -62,7 +62,7 @@ public function testRegisterShipping元々存在しない受注IDの場合新規 'order_id' => '10', 'shipping_id' => '20', 'shipping_name01' => '配送情報10', - 'shipping_date' => '2012-01-12 00:00:00' + 'shipping_date' => '2012-01-12 00:00:00', ]; SC_Helper_Purchase::registerShipping($order_id, $arrParams); @@ -90,8 +90,8 @@ public function testRegisterShipping元々存在する受注IDの場合既存の 'order_id' => '2', 'shipping_id' => '30', 'shipping_name01' => '配送情報02-update', - 'shipping_date' => '2013/12/03' - ] + 'shipping_date' => '2013/12/03', + ], ]; $this->expected['count'] = '3'; // 件数が変わらない @@ -99,7 +99,7 @@ public function testRegisterShipping元々存在する受注IDの場合既存の 'order_id' => '2', 'shipping_id' => '30', 'shipping_name01' => '配送情報02-update', - 'shipping_date' => '2013-12-03 00:00:00' + 'shipping_date' => '2013-12-03 00:00:00', ]; SC_Helper_Purchase::registerShipping($order_id, $arrParams); @@ -126,9 +126,9 @@ public function testRegisterShipping配送日付が空の場合エラーが起 '30' => [ 'order_id' => '2', 'shipping_id' => '30', - 'shipping_name01' => '配送情報02-update' + 'shipping_name01' => '配送情報02-update', // 'shipping_date' => '2013/12/03 00:00:00' - ] + ], ]; $this->expected['count'] = '3'; @@ -136,7 +136,7 @@ public function testRegisterShipping配送日付が空の場合エラーが起 'order_id' => '2', 'shipping_id' => '30', 'shipping_name01' => '配送情報02-update', - 'shipping_date' => null + 'shipping_date' => null, ]; SC_Helper_Purchase::registerShipping($order_id, $arrParams); @@ -164,8 +164,8 @@ public function testRegisterShipping非会員購入の場合配送IDが設定さ 'order_id' => '2', // 'shipping_id' => '30', 'shipping_name01' => '配送情報02-update', - 'shipping_date' => '2013/12/03 00:00:00' - ] + 'shipping_date' => '2013/12/03 00:00:00', + ], ]; $this->expected['count'] = '3'; // 件数が変わらない @@ -173,7 +173,7 @@ public function testRegisterShipping非会員購入の場合配送IDが設定さ 'order_id' => '2', 'shipping_id' => '30', 'shipping_name01' => '配送情報02-update', - 'shipping_date' => '2013-12-03 00:00:00' + 'shipping_date' => '2013-12-03 00:00:00', ]; SC_Helper_Purchase::registerShipping($order_id, $arrParams); diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_rollbackOrderTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_rollbackOrderTest.php index b7d6bf5f29..a37a554caa 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_rollbackOrderTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_rollbackOrderTest.php @@ -62,23 +62,23 @@ public function testRollbackOrderデフォルトの引数で呼び出した場 'cancelOrder' => [ 'order_id' => '1001', 'orderStatus' => ORDER_CANCEL, - 'is_delete' => false + 'is_delete' => false, ], 'getOrderTempByOrderId' => [ - 'order_id' => '1001' + 'order_id' => '1001', ], 'saveOrderTemp' => [ 'uniqid' => $uniqid, 'arrOrderTemp' => [ 'customer_id' => '2001', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ], 'verifyChangeCart' => [ - 'uniqid' => $uniqid - ] + 'uniqid' => $uniqid, + ], ], - 'siteRegist' => true + 'siteRegist' => true, ]; $this->verify(); } @@ -100,23 +100,23 @@ public function testRollbackOrderトランザクションが開始していな 'cancelOrder' => [ 'order_id' => '1001', 'orderStatus' => ORDER_DELIV, - 'is_delete' => true + 'is_delete' => true, ], 'getOrderTempByOrderId' => [ - 'order_id' => '1001' + 'order_id' => '1001', ], 'saveOrderTemp' => [ 'uniqid' => $uniqid, 'arrOrderTemp' => [ 'customer_id' => '2001', - 'del_flg' => '0' - ] + 'del_flg' => '0', + ], ], 'verifyChangeCart' => [ - 'uniqid' => $uniqid - ] + 'uniqid' => $uniqid, + ], ], - 'siteRegist' => true + 'siteRegist' => true, ]; $this->verify(); } @@ -132,18 +132,18 @@ public static function cancelOrder($order_id, $orderStatus = ORDER_CANCEL, $is_d $_SESSION['testResult']['cancelOrder'] = [ 'order_id' => $order_id, 'orderStatus' => $orderStatus, - 'is_delete' => $is_delete + 'is_delete' => $is_delete, ]; } public static function getOrderTempByOrderId($order_id) { $_SESSION['testResult']['getOrderTempByOrderId'] = [ - 'order_id' => $order_id + 'order_id' => $order_id, ]; return [ - 'customer_id' => '2001' + 'customer_id' => '2001', ]; } @@ -151,14 +151,14 @@ public static function saveOrderTemp($uniqid, $arrOrderTemp, &$objCustomer = nul { $_SESSION['testResult']['saveOrderTemp'] = [ 'uniqid' => $uniqid, - 'arrOrderTemp' => $arrOrderTemp + 'arrOrderTemp' => $arrOrderTemp, ]; } public static function verifyChangeCart($uniqid, &$objCartSession) { $_SESSION['testResult']['verifyChangeCart'] = [ - 'uniqid' => $uniqid + 'uniqid' => $uniqid, ]; } } diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php index 9bb53dc482..23f043d2c4 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveOrderTempTest.php @@ -63,7 +63,7 @@ public function testSaveOrderTemp受注一時情報IDが空の場合何もしな [ 'customer_id' => '1003', 'order_name01' => '受注情報03', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ] ); @@ -79,7 +79,7 @@ public function testSaveOrderTemp既存の情報がない場合情報が新規 [ 'customer_id' => '1003', 'order_name01' => '受注情報03', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ] ); @@ -88,8 +88,8 @@ public function testSaveOrderTemp既存の情報がない場合情報が新規 [ 'order_temp_id' => '1003', 'customer_id' => '1003', - 'order_name01' => '受注情報03' - ] + 'order_name01' => '受注情報03', + ], ]; $this->actual['count'] = $this->objQuery->count('dtb_order_temp'); $this->actual['content'] = $this->objQuery->select( @@ -105,7 +105,7 @@ public function testSaveOrderTemp既存の情報がある場合情報が更新 [ 'customer_id' => '2002', 'order_name01' => '受注情報92', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ] ); @@ -114,8 +114,8 @@ public function testSaveOrderTemp既存の情報がある場合情報が更新 [ 'order_temp_id' => $this->order_temp_ids[0], 'customer_id' => '2002', - 'order_name01' => '受注情報92' - ] + 'order_name01' => '受注情報92', + ], ]; $this->actual['count'] = $this->objQuery->count('dtb_order_temp'); $this->actual['content'] = $this->objQuery->select( @@ -132,7 +132,7 @@ public function testSaveOrderTemp注文者情報がある場合情報がコピ 'order_temp_id' => '1003', 'customer_id' => '1003', 'order_name01' => '受注情報03', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ], new SC_Customer_Ex() ); diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php index a79c6e95eb..081781b7af 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_saveShippingTempTest.php @@ -56,7 +56,7 @@ public function testSaveShippingTemp元々存在しない配送先IDの場合新 'count' => 4, // 配送情報全体の件数 'shipping_id' => 0, 'shipment_item' => null, - 'shipping_pref' => '大阪府' + 'shipping_pref' => '大阪府', ]; $this->actual['count'] = count($_SESSION['shipping']); $this->actual['shipping_id'] = $_SESSION['shipping']['0']['shipping_id']; @@ -79,7 +79,7 @@ public function testSaveShippingTemp元々存在する配送先IDの場合情報 'count' => 3, // 配送情報全体の件数 'shipping_id' => '00001', 'shipment_item' => ['商品1'], - 'shipping_pref' => '大阪府' + 'shipping_pref' => '大阪府', ]; $this->actual['count'] = count($_SESSION['shipping']); $this->actual['shipping_id'] = $_SESSION['shipping']['00001']['shipping_id']; diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php index 14d522f03a..bbff508e4c 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setDownloadableFlgToTest.php @@ -47,7 +47,7 @@ protected function tearDown() public function testSetDownloadableFlgTo販売価格が0円の場合フラグがONになる() { $input = [ - '1001' => ['price' => 0] + '1001' => ['price' => 0], ]; $this->expected = true; @@ -60,7 +60,7 @@ public function testSetDownloadableFlgTo販売価格が0円の場合フラグが public function testSetDownloadableFlgToダウンロード期限内かつ入金日ありの場合フラグがONになる() { $input = [ - '1001' => ['price' => 1000, 'effective' => '1', 'payment_date' => '2012-12-12'] + '1001' => ['price' => 1000, 'effective' => '1', 'payment_date' => '2012-12-12'], ]; $this->expected = true; @@ -73,7 +73,7 @@ public function testSetDownloadableFlgToダウンロード期限内かつ入金 public function testSetDownloadableFlgToダウンロード期限内かつ入金日なしの場合フラグがOFFになる() { $input = [ - '1001' => ['price' => 1000, 'effective' => '1', 'payment_date' => null] + '1001' => ['price' => 1000, 'effective' => '1', 'payment_date' => null], ]; $this->expected = false; @@ -86,7 +86,7 @@ public function testSetDownloadableFlgToダウンロード期限内かつ入金 public function testSetDownloadableFlgToダウンロード期限外かつ入金日ありの場合フラグがOFFになる() { $input = [ - '1001' => ['price' => 1000, 'effective' => '0', 'payment_date' => '2012-12-12'] + '1001' => ['price' => 1000, 'effective' => '0', 'payment_date' => '2012-12-12'], ]; $this->expected = false; @@ -99,7 +99,7 @@ public function testSetDownloadableFlgToダウンロード期限外かつ入金 public function testSetDownloadableFlgToダウンロード期限外かつ入金日なしの場合フラグがOFFになる() { $input = [ - '1001' => ['price' => 1000, 'effective' => '0', 'payment_date' => null] + '1001' => ['price' => 1000, 'effective' => '0', 'payment_date' => null], ]; $this->expected = false; diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php index 1075a92b22..fbdbd0ce08 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempForSoleTest.php @@ -57,8 +57,8 @@ public function testSetShipmentItemTempForSoleいったん配送情報がクリ 'clearShipmentItemTemp' => true, 'shipmentItemTemp' => [ ['shipping_id' => '1001', 'id' => '1', 'quantity' => '10'], - ['shipping_id' => '1001', 'id' => '2', 'quantity' => '5'] - ] + ['shipping_id' => '1001', 'id' => '2', 'quantity' => '5'], + ], ]; $this->actual = $_SESSION['testResult']; @@ -89,7 +89,7 @@ public function getCartList($key, $pref_id = 0, $country_id = 0) return [ ['id' => '1', 'quantity' => '10'], ['id' => '2', 'quantity' => '5'], - ['id' => '3', 'quantity' => '0'] + ['id' => '3', 'quantity' => '0'], ]; } } diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php index 265c199237..889df70458 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_setShipmentItemTempTest.php @@ -49,7 +49,7 @@ protected function setUp() $this->productsClass = $this->objQuery->getRow('*', 'dtb_products_class', 'product_id = ?', [$this->product_id]); $_SESSION['shipping']['1001']['shipment_item'] = [ - '1001' => ['productsClass' => ['price02' => 9000]] + '1001' => ['productsClass' => ['price02' => 9000]], ]; $this->helper = new SC_Helper_Purchase_Ex(); } @@ -70,7 +70,7 @@ public function testSetShipmentItemTemp製品情報が既に存在する場合 'quantity' => 10, 'price' => 9000, 'total_inctax' => SC_Helper_TaxRule_Ex::sfCalcIncTax(90000), - 'productsClass' => ['price02' => 9000] + 'productsClass' => ['price02' => 9000], ]; $this->actual = $_SESSION['shipping']['1001']['shipment_item']['1001']; diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php index 58a35601c2..66bff7654b 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_sfUpdateOrderStatusTest.php @@ -68,11 +68,11 @@ public function testSfUpdateOrderStatusオプションの引数が未指定の 'order' => [ 'status' => '3', 'add_point' => '20', - 'use_point' => '10' + 'use_point' => '10', ], 'customer' => [ - 'point' => $customer_point - ] + 'point' => $customer_point, + ], ]; $this->actual['order'] = array_shift($this->objQuery->select( 'status, use_point, add_point', @@ -111,11 +111,11 @@ public function testSfUpdateOrderStatus対応状況が発送済みに変更さ 'order' => [ 'status' => ORDER_DELIV, 'add_point' => '50', // 引数の設定どおりになる - 'use_point' => '45' // 引数の設定どおりになる + 'use_point' => '45', // 引数の設定どおりになる ], 'customer' => [ - 'point' => $customer_point // ポイントを使わない - ] + 'point' => $customer_point, // ポイントを使わない + ], ]; $this->actual['order'] = array_shift($this->objQuery->select( 'status, use_point, add_point', @@ -148,8 +148,8 @@ public function testSfUpdateOrderStatus対応状況が入金済みに変更さ 'order' => [ 'status' => ORDER_PRE_END, 'add_point' => '50', // 引数の設定どおりになる - 'use_point' => '45' // 引数の設定どおりになる - ] + 'use_point' => '45', // 引数の設定どおりになる + ], ]; $this->actual['order'] = array_shift($this->objQuery->select( 'status, use_point, add_point', @@ -181,11 +181,11 @@ public function testSfUpdateOrderStatus変更前の対応状況が利用対象 'order' => [ 'status' => ORDER_CANCEL, 'add_point' => '0', // 引数の設定どおりになる - 'use_point' => '45' // 引数の設定どおりになる + 'use_point' => '45', // 引数の設定どおりになる ], 'customer' => [ - 'point' => '210' // 元々200pt+10pt戻す - ] + 'point' => '210', // 元々200pt+10pt戻す + ], ]; $this->actual['order'] = array_shift($this->objQuery->select( 'status, use_point, add_point', @@ -211,11 +211,11 @@ public function testSfUpdateOrderStatus変更後の対応状況が利用対象 'order' => [ 'status' => ORDER_NEW, 'add_point' => '50', // 引数の設定どおりになる - 'use_point' => '45' // 引数の設定どおりになる + 'use_point' => '45', // 引数の設定どおりになる ], 'customer' => [ - 'point' => '55' // 元々100pt→45pt引く - ] + 'point' => '55', // 元々100pt→45pt引く + ], ]; $this->actual['order'] = array_shift($this->objQuery->select( 'status, use_point, add_point', @@ -241,11 +241,11 @@ public function testSfUpdateOrderStatus変更前の対応状況が加算対象 'order' => [ 'status' => ORDER_CANCEL, 'add_point' => '50', // 引数の設定どおりになる - 'use_point' => '45' // 引数の設定どおりになる + 'use_point' => '45', // 引数の設定どおりになる ], 'customer' => [ - 'point' => '180' // 元々200pt→20pt引く - ] + 'point' => '180', // 元々200pt→20pt引く + ], ]; $this->actual['order'] = array_shift($this->objQuery->select( 'status, use_point, add_point', @@ -271,11 +271,11 @@ public function testSfUpdateOrderStatus変更後の対応状況が加算対象 'order' => [ 'status' => ORDER_DELIV, 'add_point' => '50', // 引数の設定どおりになる - 'use_point' => '0' // 引数の設定どおりになる + 'use_point' => '0', // 引数の設定どおりになる ], 'customer' => [ - 'point' => '150' // 元々100pt→50pt足す - ] + 'point' => '150', // 元々100pt→50pt足す + ], ]; $this->actual['order'] = array_shift($this->objQuery->select( 'status, use_point, add_point', @@ -301,11 +301,11 @@ public function testSfUpdateOrderStatus加算ポイントがプラスの場合 'order' => [ 'status' => ORDER_PRE_END, 'add_point' => '40', // 引数の設定どおりになる - 'use_point' => '25' // 引数の設定どおりになる + 'use_point' => '25', // 引数の設定どおりになる ], 'customer' => [ - 'point' => '105' // 変更前の状態で-10pt,変更後の状態で+15pt - ] + 'point' => '105', // 変更前の状態で-10pt,変更後の状態で+15pt + ], ]; $this->actual['order'] = array_shift($this->objQuery->select( 'status, use_point, add_point', @@ -331,11 +331,11 @@ public function testSfUpdateOrderStatus加算ポイントが負でポイント 'order' => [ 'status' => ORDER_PRE_END, 'add_point' => '0', // 引数の設定どおりになる - 'use_point' => '50' // 引数の設定どおりになる + 'use_point' => '50', // 引数の設定どおりになる ], 'customer' => [ - 'point' => '40' // 変更前の状態で-10pt,変更後の状態で-50pt - ] + 'point' => '40', // 変更前の状態で-10pt,変更後の状態で-50pt + ], ]; $this->actual['order'] = array_shift($this->objQuery->select( 'status, use_point, add_point', diff --git a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php index 495c3e72ab..de3304e376 100644 --- a/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php +++ b/tests/class/helper/SC_Helper_Purchase/SC_Helper_Purchase_unsetOneShippingTest.php @@ -54,11 +54,11 @@ public function testUnsetOneShippingTemp指定したIDの配送情報のみが '00001' => [ 'shipment_id' => '00001', 'shipment_item' => ['商品1'], - 'shipping_pref' => '東京都'], + 'shipping_pref' => '東京都', ], '00003' => [ 'shipment_id' => '00003', 'shipment_item' => [], - 'shipping_pref' => '埼玉県'] + 'shipping_pref' => '埼玉県', ], ]; $this->actual = $_SESSION['shipping']; diff --git a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php index fc7ba210dc..aada1da28f 100644 --- a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php +++ b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php @@ -45,13 +45,13 @@ public function testGetTaxPerTaxRateWithRound() 8 => [ 'discount' => 596, 'total' => 65160, - 'tax' => 4827 + 'tax' => 4827, ], 10 => [ 'discount' => 6563, 'total' => 717868, - 'tax' => 65261 - ] + 'tax' => 65261, + ], ], $actual ); @@ -92,13 +92,13 @@ public function testGetTaxPerTaxRateWithZero() 8 => [ 'discount' => 0, 'total' => 0, - 'tax' => 0 + 'tax' => 0, ], 10 => [ 'discount' => 0, 'total' => 0, - 'tax' => 0 - ] + 'tax' => 0, + ], ], $actual ); @@ -145,13 +145,13 @@ public function testGetTaxPerTaxRateWithFloor() 8 => [ 'discount' => 596, 'total' => 65160, - 'tax' => 4826 + 'tax' => 4826, ], 10 => [ 'discount' => 6563, 'total' => 717868, - 'tax' => 65260 - ] + 'tax' => 65260, + ], ], $actual ); @@ -194,13 +194,13 @@ public function testGetTaxPerTaxRateWithCeil() 8 => [ 'discount' => 596, 'total' => 65160, - 'tax' => 4827 + 'tax' => 4827, ], 10 => [ 'discount' => 6563, 'total' => 717868, - 'tax' => 65261 - ] + 'tax' => 65261, + ], ], $actual ); @@ -240,13 +240,13 @@ public function testGetTaxPerTaxRateWithRound2() 8 => [ 'discount' => 76, 'total' => 7322, - 'tax' => 542 + 'tax' => 542, ], 10 => [ 'discount' => 16, 'total' => 1579, - 'tax' => 144 - ] + 'tax' => 144, + ], ], $actual ); @@ -296,13 +296,13 @@ public function testGetTaxPerTaxRateWithFloor2() 8 => [ 'discount' => 76, 'total' => 7322, - 'tax' => 542 + 'tax' => 542, ], 10 => [ 'discount' => 16, 'total' => 1579, - 'tax' => 143 - ] + 'tax' => 143, + ], ], $actual ); @@ -346,13 +346,13 @@ public function testGetTaxPerTaxRateWithCeil2() 8 => [ 'discount' => 76, 'total' => 7322, - 'tax' => 543 + 'tax' => 543, ], 10 => [ 'discount' => 16, 'total' => 1579, - 'tax' => 144 - ] + 'tax' => 144, + ], ], $actual ); diff --git a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxRuleTest.php b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxRuleTest.php index 25da9bcf76..3a5b5c10c5 100644 --- a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxRuleTest.php +++ b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxRuleTest.php @@ -43,7 +43,7 @@ public function test引数が空の場合税率設定で設定かつ適用日時 'tax_rate' => '5', 'product_id' => '0', 'product_class_id' => '0', - 'del_flg' => '0' + 'del_flg' => '0', ]; $return = $this->objTaxRule->getTaxRule(); @@ -52,7 +52,7 @@ public function test引数が空の場合税率設定で設定かつ適用日時 'tax_rate' => $return['tax_rate'], 'product_id' => $return['product_id'], 'product_class_id' => $return['product_class_id'], - 'del_flg' => $return['del_flg'] + 'del_flg' => $return['del_flg'], ]; $this->verify(); @@ -69,7 +69,7 @@ public function test商品idを指定した場合税率設定で設定かつ適 'tax_rate' => '5', 'product_id' => '0', 'product_class_id' => '0', - 'del_flg' => '0' + 'del_flg' => '0', ]; $return = $this->objTaxRule->getTaxRule(1000); @@ -78,7 +78,7 @@ public function test商品idを指定した場合税率設定で設定かつ適 'tax_rate' => $return['tax_rate'], 'product_id' => $return['product_id'], 'product_class_id' => $return['product_class_id'], - 'del_flg' => $return['del_flg'] + 'del_flg' => $return['del_flg'], ]; $this->verify(); @@ -95,7 +95,7 @@ public function test商品規格idを指定した場合税率設定で設定か 'tax_rate' => '5', 'product_id' => '0', 'product_class_id' => '0', - 'del_flg' => '0' + 'del_flg' => '0', ]; $return = $this->objTaxRule->getTaxRule(1000, 2000); @@ -104,7 +104,7 @@ public function test商品規格idを指定した場合税率設定で設定か 'tax_rate' => $return['tax_rate'], 'product_id' => $return['product_id'], 'product_class_id' => $return['product_class_id'], - 'del_flg' => $return['del_flg'] + 'del_flg' => $return['del_flg'], ]; $this->verify(); diff --git a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxRule_OptionProductTaxRuleTest.php b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxRule_OptionProductTaxRuleTest.php index b852aa0b73..5d21a51d2b 100644 --- a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxRule_OptionProductTaxRuleTest.php +++ b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxRule_OptionProductTaxRuleTest.php @@ -34,7 +34,7 @@ public function test引数が空の場合税率設定で設定かつ適用日時 'tax_rate' => '5', 'product_id' => '0', 'product_class_id' => '0', - 'del_flg' => '0' + 'del_flg' => '0', ]; $return = $this->objTaxRule->getTaxRule(0, 0, 0, 0, self::OPTION_PRODUCT_TAX_RULE_ENABLE); @@ -43,7 +43,7 @@ public function test引数が空の場合税率設定で設定かつ適用日時 'tax_rate' => $return['tax_rate'], 'product_id' => $return['product_id'], 'product_class_id' => $return['product_class_id'], - 'del_flg' => $return['del_flg'] + 'del_flg' => $return['del_flg'], ]; $this->verify(); @@ -60,7 +60,7 @@ public function test商品idを指定した場合商品に設定かつ適用日 'tax_rate' => '8', 'product_id' => '1000', 'product_class_id' => '0', - 'del_flg' => '0' + 'del_flg' => '0', ]; $return = $this->objTaxRule->getTaxRule(1000, 0, 0, 0, self::OPTION_PRODUCT_TAX_RULE_ENABLE); @@ -69,7 +69,7 @@ public function test商品idを指定した場合商品に設定かつ適用日 'tax_rate' => $return['tax_rate'], 'product_id' => $return['product_id'], 'product_class_id' => $return['product_class_id'], - 'del_flg' => $return['del_flg'] + 'del_flg' => $return['del_flg'], ]; $this->verify(); @@ -86,7 +86,7 @@ public function test商品規格idを指定した場合商品に登録かつ適 'tax_rate' => '9', 'product_id' => '1000', 'product_class_id' => '2000', - 'del_flg' => '0' + 'del_flg' => '0', ]; $return = $this->objTaxRule->getTaxRule(1000, 2000, 0, 0, self::OPTION_PRODUCT_TAX_RULE_ENABLE); @@ -95,7 +95,7 @@ public function test商品規格idを指定した場合商品に登録かつ適 'tax_rate' => $return['tax_rate'], 'product_id' => $return['product_id'], 'product_class_id' => $return['product_class_id'], - 'del_flg' => $return['del_flg'] + 'del_flg' => $return['del_flg'], ]; $this->verify(); @@ -112,7 +112,7 @@ public function test商品規格idのみを指定した場合税率設定に登 'tax_rate' => '5', 'product_id' => '0', 'product_class_id' => '0', - 'del_flg' => '0' + 'del_flg' => '0', ]; $return = $this->objTaxRule->getTaxRule(0, 2000, 0, 0, self::OPTION_PRODUCT_TAX_RULE_ENABLE); @@ -121,7 +121,7 @@ public function test商品規格idのみを指定した場合税率設定に登 'tax_rate' => $return['tax_rate'], 'product_id' => $return['product_id'], 'product_class_id' => $return['product_class_id'], - 'del_flg' => $return['del_flg'] + 'del_flg' => $return['del_flg'], ]; $this->verify(); @@ -147,7 +147,7 @@ public function testDeletedProductTaxRate() 'tax_rate' => $return['tax_rate'], 'product_id' => $return['product_id'], 'product_class_id' => $return['product_class_id'], - 'del_flg' => $return['del_flg'] + 'del_flg' => $return['del_flg'], ]; $this->expected = [ @@ -155,7 +155,7 @@ public function testDeletedProductTaxRate() 'tax_rate' => $arrDefaultTaxRule['tax_rate'], 'product_id' => '0', 'product_class_id' => '0', - 'del_flg' => '0' + 'del_flg' => '0', ]; $this->verify('基本税率が取得できるはず'); diff --git a/tests/class/module/Calendar/CalendarTest.php b/tests/class/module/Calendar/CalendarTest.php index 867129c75d..66bfde0be2 100644 --- a/tests/class/module/Calendar/CalendarTest.php +++ b/tests/class/module/Calendar/CalendarTest.php @@ -42,7 +42,7 @@ public function testPrevDayArray() 'day' => 30, 'hour' => 0, 'minute' => 0, - 'second' => 0], + 'second' => 0, ], $this->cal->prevDay('array')); } diff --git a/tests/class/plugin/LoadClassFileChangeCustomDirTest.php b/tests/class/plugin/LoadClassFileChangeCustomDirTest.php index c8ac1a0d6a..56d4417e82 100644 --- a/tests/class/plugin/LoadClassFileChangeCustomDirTest.php +++ b/tests/class/plugin/LoadClassFileChangeCustomDirTest.php @@ -20,7 +20,7 @@ protected function setUp() 'compliant_version' => '2.17', 'enable' => 1, 'create_date' => 'CURRENT_TIMESTAMP', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ]; $this->objQuery->insert('dtb_plugin', $pluginValues); @@ -30,7 +30,7 @@ protected function setUp() 'plugin_id' => $plugin_id, 'hook_point' => 'loadClassFileChange', 'callback' => 'loadClassFileChange', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ]; $this->objQuery->insert('dtb_plugin_hookpoint', $hookpointValues); } diff --git a/tests/class/plugin/LoadClassFileChangeTest.php b/tests/class/plugin/LoadClassFileChangeTest.php index 99862983fe..42ca34bc2d 100644 --- a/tests/class/plugin/LoadClassFileChangeTest.php +++ b/tests/class/plugin/LoadClassFileChangeTest.php @@ -102,7 +102,7 @@ public function isExtended() { $files = [ 'plugin_info' => $plugin_info, 'AutoloadingPlugin' => $autoloadingPlugin, - 'Autoloading_SC_Product' => $Autoloading_SC_Product + 'Autoloading_SC_Product' => $Autoloading_SC_Product, ]; $dir = PLUGIN_UPLOAD_REALDIR.'AutoloadingPlugin'; @@ -123,7 +123,7 @@ public function isExtended() { 'compliant_version' => '2.17', 'enable' => 1, 'create_date' => 'CURRENT_TIMESTAMP', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ]; $this->objQuery->insert('dtb_plugin', $pluginValues); @@ -133,7 +133,7 @@ public function isExtended() { 'plugin_id' => $plugin_id, 'hook_point' => 'loadClassFileChange', 'callback' => 'loadClassFileChange', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ]; $this->objQuery->insert('dtb_plugin_hookpoint', $hookpointValues); } diff --git a/tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php b/tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php index 5a5202e2a1..e07395f59e 100644 --- a/tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php +++ b/tests/class/util/SC_Utils/SC_Utils_arrayDefineIndexesTest.php @@ -65,7 +65,7 @@ public function testArrayDefineIndexesチェック対象のキーが一部存在 'banana' => 'バナナ', 'orange' => 'オレンジ', 'tomato' => '', - 'kiwi' => '' + 'kiwi' => '', ]; $this->actual = SC_Utils::arrayDefineIndexes($input_array, $defineIndexes); diff --git a/tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php b/tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php index 2282fc014b..3172891c86 100644 --- a/tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php +++ b/tests/class/util/SC_Utils/SC_Utils_sfArrCombineTest.php @@ -64,7 +64,7 @@ public function testSfArrCombine入力のキー配列の方が短い場合余っ $this->expected = [ 'apple' => 'りんご', 'banana' => 'バナナ', - null => '梨' + null => '梨', ]; $this->actual = SC_Utils::sfArrCombine($keys, $values); @@ -80,7 +80,7 @@ public function testSfArrCombine入力のキー配列の方が長い場合余っ 'apple' => 'りんご', 'banana' => 'バナナ', 'orange' => null, - 'pear' => null + 'pear' => null, ]; $this->actual = SC_Utils::sfArrCombine($keys, $values); diff --git a/tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php b/tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php index dbbf7c72df..e07ac179b7 100644 --- a/tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php +++ b/tests/class/util/SC_Utils/SC_Utils_sfArrKeyValueTest.php @@ -45,7 +45,7 @@ protected function setUp() ['testkey' => '1011', 'testvalue' => '2001', 'key' => '3001'], ['testkey' => '2022', 'testvalue' => '2002', 'key' => '3002'], ['testkey' => '3033', 'testvalue' => '2003', 'key' => '3003'], - ['testkey' => '4044', 'testvalue' => '2004', 'key' => '3004'] + ['testkey' => '4044', 'testvalue' => '2004', 'key' => '3004'], ]; $this->keyname = 'testkey'; $this->valuename = 'testvalue'; @@ -64,7 +64,7 @@ public function testSfArrKeyValue最大長が配列より短い場合最大長 $this->expected = [ '1011' => '2001', '2022' => '2002', - '3033' => '2003' + '3033' => '2003', ]; $this->actual = SC_Utils::sfArrKeyValue($this->arrList, $this->keyname, $this->valuename, $len_max); @@ -77,7 +77,7 @@ public function testSfArrKeyValue最大長が指定されていない場合全 '1011' => '2001', '2022' => '2002', '3033' => '2003', - '4044' => '2004' + '4044' => '2004', ]; $this->actual = SC_Utils::sfArrKeyValue($this->arrList, $this->keyname, $this->valuename, $len_max); @@ -93,7 +93,7 @@ public function testSfArrKeyValueキーサイズが短い場合キーサイズ '1...' => '2001', '2...' => '2002', '3...' => '2003', - '4...' => '2004' + '4...' => '2004', ]; $this->actual = SC_Utils::sfArrKeyValue($this->arrList, $this->keyname, $this->valuename, $len_max, $keysize); diff --git a/tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php b/tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php index 2967953b48..352b55df29 100644 --- a/tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php +++ b/tests/class/util/SC_Utils/SC_Utils_sfCopyDirtest.php @@ -61,7 +61,7 @@ public function testSfCopyDirディレクトリでない場合Falseを返し何 $this->expected = [ 'result' => false, - 'file_exists' => false + 'file_exists' => false, ]; $this->actual['result'] = SC_Utils::sfCopyDir($src, $dst); $this->actual['file_exists'] = file_exists($dst); @@ -81,7 +81,7 @@ public function testSfCopyDirコピー先のディレクトリが存在しない $this->expected = [ 'dir_exists' => true, - 'files' => ['test.txt'] + 'files' => ['test.txt'], ]; SC_Utils::sfCopyDir($src, $dst); $this->actual['dir_exists'] = is_dir($dst); @@ -121,7 +121,7 @@ public function testSfCopyDirコピー先のディレクトリが存在する場 'files' => ['CVS', 'dir1', 'test.txt'], 'files_2' => ['dir12'], 'files_3' => ['dir123'], - 'file_content' => 'good morning' + 'file_content' => 'good morning', ]; SC_Utils::sfCopyDir($src, $dst); $this->actual['dir_exists'] = is_dir($dst); @@ -153,7 +153,7 @@ public function testSfCopyDir上書きフラグがONの場合同名ファイル $this->expected = [ 'dir_exists' => true, 'files' => ['test.txt'], - 'file_content' => 'hello' + 'file_content' => 'hello', ]; SC_Utils::sfCopyDir($src, $dst, '', true); $this->actual['dir_exists'] = is_dir($dst); @@ -185,7 +185,7 @@ public function testSfCopyDir上書きフラグがONかつ書き込み権限が $this->expected = [ 'dir_exists' => true, 'files' => ['test.txt'], - 'file_content' => 'good morning' + 'file_content' => 'good morning', ]; SC_Utils::sfCopyDir($src, $dst, '', true); $this->actual['dir_exists'] = is_dir($dst); diff --git a/tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php b/tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php index c077858400..6a3cdc1050 100644 --- a/tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php +++ b/tests/class/util/SC_Utils/SC_Utils_sfEncodeFileTest.php @@ -61,7 +61,7 @@ public function testSfEncodeFileファイルが正常に開けた場合ファイ $this->expected = [ 'filename' => $outdir.'enc_test.txt', - 'content' => 'こんにちは' + 'content' => 'こんにちは', ]; $this->actual['filename'] = SC_Utils::sfEncodeFile($filepath, 'euc-jp', $outdir); diff --git a/tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php b/tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php index 10f6317b55..a5ee656be7 100644 --- a/tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php +++ b/tests/class/util/SC_Utils/SC_Utils_sfGetAddressTest.php @@ -61,8 +61,8 @@ public function test住所が一件だけヒットする場合住所データが [ 'state' => '1', // 北海道 'city' => '札幌市中央区', - 'town' => '大通東' - ] + 'town' => '大通東', + ], ]; $this->actual = SC_Utils::sfGetAddress('0600041'); @@ -98,8 +98,8 @@ public function test住所に但し書きが含まれる場合但し書きが消 [ 'state' => '1', // 北海道 'city' => '札幌市中央区', - 'town' => '大通西' - ] + 'town' => '大通西', + ], ]; $this->actual = SC_Utils::sfGetAddress('0600042'); @@ -112,8 +112,8 @@ public function test住所に注意文言がある場合町名が消去される [ 'state' => '1', // 北海道 'city' => '札幌市中央区', - 'town' => '' - ] + 'town' => '', + ], ]; $this->actual = SC_Utils::sfGetAddress('0600000'); @@ -126,8 +126,8 @@ public function test住所に番地の説明が含まれる場合町名が消去 [ 'state' => '8', // 茨城県 'city' => '猿島郡堺町', - 'town' => '' - ] + 'town' => '', + ], ]; $this->actual = SC_Utils::sfGetAddress('3060433'); @@ -144,43 +144,43 @@ protected function setUpAddress() 'zipcode' => '0600041', 'state' => '北海道', 'city' => '札幌市中央区', - 'town' => '大通東' + 'town' => '大通東', ], [ 'zip_id' => '3', 'zipcode' => '0600042', 'state' => '北海道', 'city' => '札幌市中央区', - 'town' => '大通西(1〜19丁目)' + 'town' => '大通西(1〜19丁目)', ], [ 'zip_id' => '0', 'zipcode' => '0600000', 'state' => '北海道', 'city' => '札幌市中央区', - 'town' => '以下に掲載がない場合' + 'town' => '以下に掲載がない場合', ], [ 'zip_id' => '26867', 'zipcode' => '3060433', 'state' => '茨城県', 'city' => '猿島郡堺町', - 'town' => '堺町の次に番地がくる場合' + 'town' => '堺町の次に番地がくる場合', ], [ 'zip_id' => '16223', 'zipcode' => '0110951', 'state' => '秋田県', 'city' => '秋田市', - 'town' => '土崎港相染町' + 'town' => '土崎港相染町', ], [ 'zip_id' => '16226', 'zipcode' => '0110951', 'state' => '秋田県', 'city' => '秋田市', - 'town' => '土崎港古川町' - ] + 'town' => '土崎港古川町', + ], ]; $this->objQuery->delete('mtb_zip'); diff --git a/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php b/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php index 89f20461dd..260798191f 100644 --- a/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php +++ b/tests/class/util/SC_Utils/SC_Utils_sfGetClassCatCountTest.php @@ -51,7 +51,7 @@ public function testSfGetClassCatCount規格分類の件数がIDごとに取得 { $this->expected = [ '1001' => '2', - '1002' => '1' + '1002' => '1', ]; $this->actual = SC_Utils::sfGetClassCatCount(); @@ -68,14 +68,14 @@ protected function setUpClassCat() 'name' => '味', 'creator_id' => '1', 'update_date' => 'CURRENT_TIMESTAMP', - 'del_flg' => '0' + 'del_flg' => '0', ], [ 'class_id' => '1002', 'name' => '大きさ', 'creator_id' => '1', 'update_date' => 'CURRENT_TIMESTAMP', - 'del_flg' => '0' + 'del_flg' => '0', ], // 削除フラグが立っているので検索されない [ @@ -83,8 +83,8 @@ protected function setUpClassCat() 'name' => '匂い', 'creator_id' => '1', 'update_date' => 'CURRENT_TIMESTAMP', - 'del_flg' => '1' - ] + 'del_flg' => '1', + ], ]; $this->objQuery->delete('dtb_class'); foreach ($classes as $item) { @@ -96,7 +96,7 @@ protected function setUpClassCat() 'classcategory_id' => '1011', 'class_id' => '1001', 'creator_id' => '1', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ], // 削除フラグが立っているので検索されない [ @@ -104,27 +104,27 @@ protected function setUpClassCat() 'class_id' => '1001', 'creator_id' => '1', 'update_date' => 'CURRENT_TIMESTAMP', - 'del_flg' => '1' + 'del_flg' => '1', ], [ 'classcategory_id' => '1013', 'class_id' => '1001', 'creator_id' => '1', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ], [ 'classcategory_id' => '1021', 'class_id' => '1002', 'creator_id' => '1', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ], // dtb_classでdel_flgが立っているので検索されない [ 'classcategory_id' => '1031', 'class_id' => '1003', 'creator_id' => '1', - 'update_date' => 'CURRENT_TIMESTAMP' - ] + 'update_date' => 'CURRENT_TIMESTAMP', + ], ]; // classcategory_id=0のものは削除しない $this->objQuery->delete('dtb_classcategory', 'classcategory_id <> 0'); diff --git a/tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php b/tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php index f2c6c54ef6..3c01fd1079 100644 --- a/tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php +++ b/tests/class/util/SC_Utils/SC_Utils_sfGetProductClassIdTest.php @@ -99,7 +99,7 @@ protected function setUpProductsClass() 'product_code' => 'code2001', 'price02' => '1000', 'creator_id' => '1', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ], [ 'product_class_id' => '1001', @@ -108,7 +108,7 @@ protected function setUpProductsClass() 'price02' => '1000', 'classcategory_id1' => '1', 'creator_id' => '1', - 'update_date' => 'CURRENT_TIMESTAMP' + 'update_date' => 'CURRENT_TIMESTAMP', ], [ 'product_class_id' => '1002', @@ -117,8 +117,8 @@ protected function setUpProductsClass() 'price02' => '1000', 'classcategory_id1' => '2', 'creator_id' => '1', - 'update_date' => 'CURRENT_TIMESTAMP' - ] + 'update_date' => 'CURRENT_TIMESTAMP', + ], ]; $this->objQuery->delete('dtb_products_class'); diff --git a/tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php b/tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php index 616da73742..676ec9701c 100644 --- a/tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php +++ b/tests/class/util/SC_Utils/SC_Utils_sfGetUnderChildrenArrayTest.php @@ -51,7 +51,7 @@ public function testSfGetUnderChildrenArray与えられた親IDを持つ要素 ['parent_id' => '1002', 'child_id' => '1002001'], ['parent_id' => '1002', 'child_id' => '1002002'], ['parent_id' => '1003', 'child_id' => '1003001'], - ['parent_id' => '1004', 'child_id' => '1004001'] + ['parent_id' => '1004', 'child_id' => '1004001'], ]; $this->expected = ['1002001', '1002002']; $this->actual = SC_Utils::sfGetUnderChildrenArray( diff --git a/tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php b/tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php index 0abc18173c..611308facd 100644 --- a/tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php +++ b/tests/class/util/SC_Utils/SC_Utils_sfMakeHiddenArrayTest.php @@ -51,15 +51,15 @@ public function testSfMakeHiddenArray多段配列が1次元配列に変換され 'vegetable' => '野菜', 'fruit' => [ 'apple' => 'りんご', - 'banana' => 'バナナ' + 'banana' => 'バナナ', ], 'drink' => [ 'alcohol' => [ - 'beer' => 'ビール' + 'beer' => 'ビール', ], - 'water' => '水' + 'water' => '水', ], - 'rice' => '米' + 'rice' => '米', ]; $this->expected = [ 'vegetable' => '野菜', @@ -67,7 +67,7 @@ public function testSfMakeHiddenArray多段配列が1次元配列に変換され 'fruit[banana]' => 'バナナ', 'drink[alcohol][beer]' => 'ビール', 'drink[water]' => '水', - 'rice' => '米' + 'rice' => '米', ]; $this->actual = SC_Utils::sfMakeHiddenArray($input_array); $this->verify(); diff --git a/tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php b/tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php index 2442188657..9ab6f5db6f 100644 --- a/tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php +++ b/tests/class/util/SC_Utils/SC_Utils_sfPrePointTest.php @@ -91,7 +91,7 @@ public function testSfPrePoint丸め方法の指定がない場合定数で指 $this->expected = [9, 9]; $this->actual = [ SC_Utils::sfPrePoint(100, 9.4), - SC_Utils::sfPrePoint(100, 9.5) + SC_Utils::sfPrePoint(100, 9.5), ]; $this->verify(); diff --git a/tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php b/tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php index f30cf9060c..116e62171b 100644 --- a/tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php +++ b/tests/class/util/SC_Utils/SC_Utils_sfSwapArrayTest.php @@ -48,12 +48,12 @@ public function testSfSwapArrayカラム名ありの指定の場合キーに名 { $input_array = [ ['id' => '1001', 'name' => 'name1001'], - ['id' => '1002', 'name' => 'name1002'] + ['id' => '1002', 'name' => 'name1002'], ]; $this->expected = [ 'id' => ['1001', '1002'], - 'name' => ['name1001', 'name1002'] + 'name' => ['name1001', 'name1002'], ]; $this->actual = SC_Utils::sfSwapArray($input_array); @@ -64,12 +64,12 @@ public function testSfSwapArrayカラム名なしの指定の場合キーに名 { $input_array = [ ['id' => '1001', 'name' => 'name1001'], - ['id' => '1002', 'name' => 'name1002'] + ['id' => '1002', 'name' => 'name1002'], ]; $this->expected = [ ['1001', '1002'], - ['name1001', 'name1002'] + ['name1001', 'name1002'], ]; $this->actual = SC_Utils::sfSwapArray($input_array, false);