@@ -21,7 +21,7 @@ |
||
| 21 | 21 | // this up() migration is auto-generated, please modify it to your needs |
| 22 | 22 | $t = $schema->getTable(self::NAME); |
| 23 | 23 | |
| 24 | - if($t->hasColumn('option_delivery_fee')){ |
|
| 24 | + if ($t->hasColumn('option_delivery_fee')) { |
|
| 25 | 25 | $t->dropColumn('option_delivery_fee'); |
| 26 | 26 | } |
| 27 | 27 | |
@@ -11,9 +11,9 @@ discard block |
||
| 11 | 11 | class Version20151022094610 extends AbstractMigration |
| 12 | 12 | { |
| 13 | 13 | |
| 14 | - const DTB_CATEGORY='dtb_category'; |
|
| 15 | - const DTB_CLASS_CATEGORY='dtb_class_category'; |
|
| 16 | - const DTB_CLASS_NAME='dtb_class_name'; |
|
| 14 | + const DTB_CATEGORY = 'dtb_category'; |
|
| 15 | + const DTB_CLASS_CATEGORY = 'dtb_class_category'; |
|
| 16 | + const DTB_CLASS_NAME = 'dtb_class_name'; |
|
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * @param Schema $schema |
@@ -22,27 +22,27 @@ discard block |
||
| 22 | 22 | { |
| 23 | 23 | // this up() migration is auto-generated, please modify it to your needs |
| 24 | 24 | // dtb_category |
| 25 | - $t_dtb_category=$schema->getTable(self::DTB_CATEGORY); |
|
| 26 | - if($t_dtb_category->hasColumn('category_name')){ |
|
| 25 | + $t_dtb_category = $schema->getTable(self::DTB_CATEGORY); |
|
| 26 | + if ($t_dtb_category->hasColumn('category_name')) { |
|
| 27 | 27 | $t_dtb_category->changeColumn('category_name', array('NotNull'=>true)); |
| 28 | 28 | } |
| 29 | - if($t_dtb_category->hasColumn('rank')){ |
|
| 29 | + if ($t_dtb_category->hasColumn('rank')) { |
|
| 30 | 30 | $t_dtb_category->changeColumn('rank', array('NotNull'=>true)); |
| 31 | 31 | } |
| 32 | 32 | // dtb_class_category |
| 33 | - $t_dtb_class_category=$schema->getTable(self::DTB_CLASS_CATEGORY); |
|
| 34 | - if($t_dtb_class_category->hasColumn('name')){ |
|
| 33 | + $t_dtb_class_category = $schema->getTable(self::DTB_CLASS_CATEGORY); |
|
| 34 | + if ($t_dtb_class_category->hasColumn('name')) { |
|
| 35 | 35 | $t_dtb_class_category->changeColumn('name', array('NotNull'=>true)); |
| 36 | 36 | } |
| 37 | - if($t_dtb_class_category->hasColumn('rank')){ |
|
| 37 | + if ($t_dtb_class_category->hasColumn('rank')) { |
|
| 38 | 38 | $t_dtb_class_category->changeColumn('rank', array('NotNull'=>true)); |
| 39 | 39 | } |
| 40 | 40 | // dtb_class_name |
| 41 | - $t_dtb_class_name=$schema->getTable(self::DTB_CLASS_NAME); |
|
| 42 | - if($t_dtb_class_name->hasColumn('name')){ |
|
| 41 | + $t_dtb_class_name = $schema->getTable(self::DTB_CLASS_NAME); |
|
| 42 | + if ($t_dtb_class_name->hasColumn('name')) { |
|
| 43 | 43 | $t_dtb_class_name->changeColumn('name', array('NotNull'=>true)); |
| 44 | 44 | } |
| 45 | - if($t_dtb_class_name->hasColumn('rank')){ |
|
| 45 | + if ($t_dtb_class_name->hasColumn('rank')) { |
|
| 46 | 46 | $t_dtb_class_name->changeColumn('rank', array('NotNull'=>true)); |
| 47 | 47 | } |
| 48 | 48 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | $PageLayout = new PageLayout(); |
| 31 | 31 | $PageLayout->setDeviceType($DeviceType); |
| 32 | - $PageLayout->setName( '商品購入/お届け先の追加'); |
|
| 32 | + $PageLayout->setName('商品購入/お届け先の追加'); |
|
| 33 | 33 | $PageLayout->setUrl('shopping_shipping_edit'); |
| 34 | 34 | $PageLayout->setFileName('Shopping/shipping_edit'); |
| 35 | 35 | $PageLayout->setEditFlg(2); |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | $PageLayout = new PageLayout(); |
| 40 | 40 | $PageLayout->setDeviceType($DeviceType); |
| 41 | - $PageLayout->setName( '商品購入/お届け先の複数指定(お届け先の追加)'); |
|
| 41 | + $PageLayout->setName('商品購入/お届け先の複数指定(お届け先の追加)'); |
|
| 42 | 42 | $PageLayout->setUrl('shopping_shipping_multiple_edit'); |
| 43 | 43 | $PageLayout->setFileName('Shopping/shipping_multiple_edit'); |
| 44 | 44 | $PageLayout->setEditFlg(2); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | $PageLayout = new PageLayout(); |
| 49 | 49 | $PageLayout->setDeviceType($DeviceType); |
| 50 | - $PageLayout->setName( '商品購入/購入エラー'); |
|
| 50 | + $PageLayout->setName('商品購入/購入エラー'); |
|
| 51 | 51 | $PageLayout->setUrl('shopping_error'); |
| 52 | 52 | $PageLayout->setFileName('Shopping/shopping_error'); |
| 53 | 53 | $PageLayout->setEditFlg(2); |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | $PageLayout = new PageLayout(); |
| 58 | 58 | $PageLayout->setDeviceType($DeviceType); |
| 59 | - $PageLayout->setName( 'ご利用ガイド'); |
|
| 59 | + $PageLayout->setName('ご利用ガイド'); |
|
| 60 | 60 | $PageLayout->setUrl('help_guide'); |
| 61 | 61 | $PageLayout->setFileName('Help/guide'); |
| 62 | 62 | $PageLayout->setEditFlg(2); |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | $PageLayout = new PageLayout(); |
| 66 | 66 | $PageLayout->setDeviceType($DeviceType); |
| 67 | - $PageLayout->setName( 'パスワード再発行(入力ページ)'); |
|
| 67 | + $PageLayout->setName('パスワード再発行(入力ページ)'); |
|
| 68 | 68 | $PageLayout->setUrl('forgot'); |
| 69 | 69 | $PageLayout->setFileName('Forgot/index'); |
| 70 | 70 | $PageLayout->setEditFlg(2); |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | |
| 73 | 73 | $PageLayout = new PageLayout(); |
| 74 | 74 | $PageLayout->setDeviceType($DeviceType); |
| 75 | - $PageLayout->setName( 'パスワード再発行(完了ページ)'); |
|
| 75 | + $PageLayout->setName('パスワード再発行(完了ページ)'); |
|
| 76 | 76 | $PageLayout->setUrl('forgot_complete'); |
| 77 | 77 | $PageLayout->setFileName('Forgot/complete'); |
| 78 | 78 | $PageLayout->setEditFlg(2); |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | $PageLayout = new PageLayout(); |
| 83 | 83 | $PageLayout->setDeviceType($DeviceType); |
| 84 | - $PageLayout->setName( 'パスワード変更((完了ページ)'); |
|
| 84 | + $PageLayout->setName('パスワード変更((完了ページ)'); |
|
| 85 | 85 | $PageLayout->setUrl('forgot_reset'); |
| 86 | 86 | $PageLayout->setFileName('Forgot/reset'); |
| 87 | 87 | $PageLayout->setEditFlg(2); |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | $t_dtb_mail_history = $schema->getTable(self::DTB_MAIL_HISTORY); |
| 25 | 25 | |
| 26 | 26 | $keyName = ''; |
| 27 | - if($t_dtb_mail_history->hasColumn('creator_id')){ |
|
| 27 | + if ($t_dtb_mail_history->hasColumn('creator_id')) { |
|
| 28 | 28 | $keys = $t_dtb_mail_history->getForeignKeys(); |
| 29 | 29 | foreach ($keys as $key) { |
| 30 | 30 | $column = $key->getColumns(); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | $PageLayout = new PageLayout(); |
| 30 | 30 | $PageLayout->setDeviceType($DeviceType); |
| 31 | - $PageLayout->setName( '商品購入/配送方法選択'); |
|
| 31 | + $PageLayout->setName('商品購入/配送方法選択'); |
|
| 32 | 32 | $PageLayout->setUrl('shopping_delivery'); |
| 33 | 33 | $PageLayout->setFileName('Shopping/index'); |
| 34 | 34 | $PageLayout->setEditFlg(2); |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | $PageLayout = new PageLayout(); |
| 39 | 39 | $PageLayout->setDeviceType($DeviceType); |
| 40 | - $PageLayout->setName( '商品購入/支払方法選択'); |
|
| 40 | + $PageLayout->setName('商品購入/支払方法選択'); |
|
| 41 | 41 | $PageLayout->setUrl('shopping_payment'); |
| 42 | 42 | $PageLayout->setFileName('Shopping/index'); |
| 43 | 43 | $PageLayout->setEditFlg(2); |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | $PageLayout = new PageLayout(); |
| 48 | 48 | $PageLayout->setDeviceType($DeviceType); |
| 49 | - $PageLayout->setName( '商品購入/お届け先変更'); |
|
| 49 | + $PageLayout->setName('商品購入/お届け先変更'); |
|
| 50 | 50 | $PageLayout->setUrl('shopping_shipping_change'); |
| 51 | 51 | $PageLayout->setFileName('Shopping/index'); |
| 52 | 52 | $PageLayout->setEditFlg(2); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | $PageLayout = new PageLayout(); |
| 57 | 57 | $PageLayout->setDeviceType($DeviceType); |
| 58 | - $PageLayout->setName( '商品購入/お届け先変更'); |
|
| 58 | + $PageLayout->setName('商品購入/お届け先変更'); |
|
| 59 | 59 | $PageLayout->setUrl('shopping_shipping_edit_change'); |
| 60 | 60 | $PageLayout->setFileName('Shopping/index'); |
| 61 | 61 | $PageLayout->setEditFlg(2); |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | $PageLayout = new PageLayout(); |
| 66 | 66 | $PageLayout->setDeviceType($DeviceType); |
| 67 | - $PageLayout->setName( '商品購入/お届け先の複数指定'); |
|
| 67 | + $PageLayout->setName('商品購入/お届け先の複数指定'); |
|
| 68 | 68 | $PageLayout->setUrl('shopping_shipping_multiple_change'); |
| 69 | 69 | $PageLayout->setFileName('Shopping/index'); |
| 70 | 70 | $PageLayout->setEditFlg(2); |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | if ($this->config['auth_type'] == 'PLAIN') { |
| 54 | 54 | $res = $raw; |
| 55 | 55 | } else { |
| 56 | - $res = hash_hmac($this->config['password_hash_algos'], $raw . ':' . $this->config['auth_magic'], $salt); |
|
| 56 | + $res = hash_hmac($this->config['password_hash_algos'], $raw.':'.$this->config['auth_magic'], $salt); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | return $res; |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | } else { |
| 82 | 82 | // 旧バージョン(2.11未満)からの移行を考慮 |
| 83 | 83 | if (empty($salt)) { |
| 84 | - $hash = sha1($raw . ':' . $this->config['auth_magic']); |
|
| 84 | + $hash = sha1($raw.':'.$this->config['auth_magic']); |
|
| 85 | 85 | } else { |
| 86 | 86 | $hash = $this->encodePassword($raw, $salt); |
| 87 | 87 | } |
@@ -274,7 +274,7 @@ |
||
| 274 | 274 | $this->addError('cart.over.sale_limit', $product_str); |
| 275 | 275 | } else { |
| 276 | 276 | $tmp_quantity = $ProductClass->getStock(); |
| 277 | - $this->addError('cart.over.stock', $product_str); |
|
| 277 | + $this->addError('cart.over.stock', $product_str); |
|
| 278 | 278 | } |
| 279 | 279 | } |
| 280 | 280 | if ($ProductClass->getSaleLimit() && $quantity > $ProductClass->getSaleLimit()) { |
@@ -307,7 +307,7 @@ |
||
| 307 | 307 | { |
| 308 | 308 | $config = $this->config; |
| 309 | 309 | |
| 310 | - return function ($value) use ($config) { |
|
| 310 | + return function($value) use ($config) { |
|
| 311 | 311 | return mb_convert_encoding( |
| 312 | 312 | (string) $value, $config['csv_export_encoding'], 'UTF-8' |
| 313 | 313 | ); |
@@ -117,9 +117,9 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | $this->file = $file; |
| 119 | 119 | $this->file->setFlags( |
| 120 | - \SplFileObject::READ_CSV | |
|
| 121 | - \SplFileObject::SKIP_EMPTY | |
|
| 122 | - \SplFileObject::READ_AHEAD | |
|
| 120 | + \SplFileObject::READ_CSV| |
|
| 121 | + \SplFileObject::SKIP_EMPTY| |
|
| 122 | + \SplFileObject::READ_AHEAD| |
|
| 123 | 123 | \SplFileObject::DROP_NEW_LINE |
| 124 | 124 | ); |
| 125 | 125 | $this->file->setCsvControl( |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | if ($count > 1) { |
| 359 | 359 | $incrementedHeaders[] = $header; |
| 360 | 360 | for ($i = 1; $i < $count; $i++) { |
| 361 | - $incrementedHeaders[] = $header . $i; |
|
| 361 | + $incrementedHeaders[] = $header.$i; |
|
| 362 | 362 | } |
| 363 | 363 | } else { |
| 364 | 364 | $incrementedHeaders[] = $header; |