@@ -21,7 +21,7 @@ |
||
| 21 | 21 | |
| 22 | 22 | // path.ymlの更新 |
| 23 | 23 | $app = Application::getInstance(); |
| 24 | - $file = $app['config']['root_dir'] . '/app/config/eccube/path.yml'; |
|
| 24 | + $file = $app['config']['root_dir'].'/app/config/eccube/path.yml'; |
|
| 25 | 25 | $config = Yaml::parse(file_get_contents($file)); |
| 26 | 26 | |
| 27 | 27 | if (!array_key_exists('public_path', $config)) { |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | $PageLayout = new PageLayout(); |
| 28 | 28 | $PageLayout->setDeviceType($DeviceType); |
| 29 | - $PageLayout->setName( '商品購入/配送方法選択'); |
|
| 29 | + $PageLayout->setName('商品購入/配送方法選択'); |
|
| 30 | 30 | $PageLayout->setUrl('shopping_delivery'); |
| 31 | 31 | $PageLayout->setFileName('Shopping/index'); |
| 32 | 32 | $PageLayout->setEditFlg(2); |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | $PageLayout = new PageLayout(); |
| 37 | 37 | $PageLayout->setDeviceType($DeviceType); |
| 38 | - $PageLayout->setName( '商品購入/支払方法選択'); |
|
| 38 | + $PageLayout->setName('商品購入/支払方法選択'); |
|
| 39 | 39 | $PageLayout->setUrl('shopping_payment'); |
| 40 | 40 | $PageLayout->setFileName('Shopping/index'); |
| 41 | 41 | $PageLayout->setEditFlg(2); |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | $PageLayout = new PageLayout(); |
| 46 | 46 | $PageLayout->setDeviceType($DeviceType); |
| 47 | - $PageLayout->setName( '商品購入/お届け先変更'); |
|
| 47 | + $PageLayout->setName('商品購入/お届け先変更'); |
|
| 48 | 48 | $PageLayout->setUrl('shopping_shipping_change'); |
| 49 | 49 | $PageLayout->setFileName('Shopping/index'); |
| 50 | 50 | $PageLayout->setEditFlg(2); |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | $PageLayout = new PageLayout(); |
| 55 | 55 | $PageLayout->setDeviceType($DeviceType); |
| 56 | - $PageLayout->setName( '商品購入/お届け先変更'); |
|
| 56 | + $PageLayout->setName('商品購入/お届け先変更'); |
|
| 57 | 57 | $PageLayout->setUrl('shopping_shipping_edit_change'); |
| 58 | 58 | $PageLayout->setFileName('Shopping/index'); |
| 59 | 59 | $PageLayout->setEditFlg(2); |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | $PageLayout = new PageLayout(); |
| 64 | 64 | $PageLayout->setDeviceType($DeviceType); |
| 65 | - $PageLayout->setName( '商品購入/お届け先の複数指定'); |
|
| 65 | + $PageLayout->setName('商品購入/お届け先の複数指定'); |
|
| 66 | 66 | $PageLayout->setUrl('shopping_shipping_multiple_change'); |
| 67 | 67 | $PageLayout->setFileName('Shopping/index'); |
| 68 | 68 | $PageLayout->setEditFlg(2); |
@@ -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 | } |
@@ -38,8 +38,8 @@ |
||
| 38 | 38 | public function up(Schema $schema) |
| 39 | 39 | { |
| 40 | 40 | // this up() migration is auto-generated, please modify it to your needs |
| 41 | - $t=$schema->getTable('dtb_product_class'); |
|
| 42 | - if(!$t->hasColumn('stock_unlimited') && $t->hasColumn('stock_unlimited_tmp')){ |
|
| 41 | + $t = $schema->getTable('dtb_product_class'); |
|
| 42 | + if (!$t->hasColumn('stock_unlimited') && $t->hasColumn('stock_unlimited_tmp')) { |
|
| 43 | 43 | $t->addColumn('stock_unlimited', 'smallint', array('NotNull'=>true, 'Default'=>0)); |
| 44 | 44 | } |
| 45 | 45 | } |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | )); |
| 60 | 60 | |
| 61 | 61 | $message = \Swift_Message::newInstance() |
| 62 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認') |
|
| 62 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認') |
|
| 63 | 63 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 64 | 64 | ->setTo(array($Customer->getEmail())) |
| 65 | 65 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | )); |
| 96 | 96 | |
| 97 | 97 | $message = \Swift_Message::newInstance() |
| 98 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録が完了しました。') |
|
| 98 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録が完了しました。') |
|
| 99 | 99 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 100 | 100 | ->setTo(array($Customer->getEmail())) |
| 101 | 101 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | )); |
| 134 | 134 | |
| 135 | 135 | $message = \Swift_Message::newInstance() |
| 136 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 退会手続きのご完了') |
|
| 136 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 退会手続きのご完了') |
|
| 137 | 137 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 138 | 138 | ->setTo(array($email)) |
| 139 | 139 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | |
| 173 | 173 | // 問い合わせ者にメール送信 |
| 174 | 174 | $message = \Swift_Message::newInstance() |
| 175 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] お問い合わせを受け付けました。') |
|
| 175 | + ->setSubject('['.$this->BaseInfo->getShopName().'] お問い合わせを受け付けました。') |
|
| 176 | 176 | ->setFrom(array($this->BaseInfo->getEmail02() => $this->BaseInfo->getShopName())) |
| 177 | 177 | ->setTo(array($formData['email'])) |
| 178 | 178 | ->setBcc($this->BaseInfo->getEmail02()) |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | )); |
| 226 | 226 | |
| 227 | 227 | $message = \Swift_Message::newInstance() |
| 228 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $MailTemplate->getSubject()) |
|
| 228 | + ->setSubject('['.$this->BaseInfo->getShopName().'] '.$MailTemplate->getSubject()) |
|
| 229 | 229 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 230 | 230 | ->setTo(array($Order->getEmail())) |
| 231 | 231 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | )); |
| 267 | 267 | |
| 268 | 268 | $message = \Swift_Message::newInstance() |
| 269 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認') |
|
| 269 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認') |
|
| 270 | 270 | ->setFrom(array($this->BaseInfo->getEmail03() => $this->BaseInfo->getShopName())) |
| 271 | 271 | ->setTo(array($Customer->getEmail())) |
| 272 | 272 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | )); |
| 307 | 307 | |
| 308 | 308 | $message = \Swift_Message::newInstance() |
| 309 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $formData['subject']) |
|
| 309 | + ->setSubject('['.$this->BaseInfo->getShopName().'] '.$formData['subject']) |
|
| 310 | 310 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 311 | 311 | ->setTo(array($Order->getEmail())) |
| 312 | 312 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | )); |
| 343 | 343 | |
| 344 | 344 | $message = \Swift_Message::newInstance() |
| 345 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のご確認') |
|
| 345 | + ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のご確認') |
|
| 346 | 346 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 347 | 347 | ->setTo(array($Customer->getEmail())) |
| 348 | 348 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | )); |
| 379 | 379 | |
| 380 | 380 | $message = \Swift_Message::newInstance() |
| 381 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のお知らせ') |
|
| 381 | + ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のお知らせ') |
|
| 382 | 382 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 383 | 383 | ->setTo(array($Customer->getEmail())) |
| 384 | 384 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | return $value; |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - return rtrim(mb_substr($value, 0, $length, 'UTF-8')) . $end; |
|
| 162 | + return rtrim(mb_substr($value, 0, $length, 'UTF-8')).$end; |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | |
@@ -186,18 +186,18 @@ discard block |
||
| 186 | 186 | } |
| 187 | 187 | if ($diff->m == 1 || $diff->days > 0) { |
| 188 | 188 | if ($diff->days <= 31) { |
| 189 | - return $diff->days . '日前'; |
|
| 189 | + return $diff->days.'日前'; |
|
| 190 | 190 | } |
| 191 | 191 | // return $date->format("Y/m/d H:i"); |
| 192 | 192 | return $date->format("Y/m/d"); |
| 193 | 193 | } |
| 194 | 194 | if ($diff->h > 0) { |
| 195 | - return $diff->h . "時間前"; |
|
| 195 | + return $diff->h."時間前"; |
|
| 196 | 196 | } |
| 197 | 197 | if ($diff->i > 0) { |
| 198 | - return $diff->i . "分前"; |
|
| 198 | + return $diff->i."分前"; |
|
| 199 | 199 | } |
| 200 | - return $diff->s . "秒前"; |
|
| 200 | + return $diff->s."秒前"; |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | /** |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | public function getCsrfTokenForAnchor() |
| 120 | 120 | { |
| 121 | 121 | $token = $this->app['form.csrf_provider']->getToken(Constant::TOKEN_NAME)->getValue(); |
| 122 | - return 'token-for-anchor=\'' . $token . '\''; |
|
| 122 | + return 'token-for-anchor=\''.$token.'\''; |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | /** |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | public function getPriceFilter($number, $decimals = 0, $decPoint = '.', $thousandsSep = ',') |
| 155 | 155 | { |
| 156 | 156 | $price = number_format($number, $decimals, $decPoint, $thousandsSep); |
| 157 | - $price = '¥ ' . $price; |
|
| 157 | + $price = '¥ '.$price; |
|
| 158 | 158 | |
| 159 | 159 | return $price; |
| 160 | 160 | } |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | $builder->add('category_id', 'entity', array( |
| 43 | 43 | 'class' => 'Eccube\Entity\Category', |
| 44 | 44 | 'property' => 'NameWithLevel', |
| 45 | - 'query_builder' => function (EntityRepository $er) { |
|
| 45 | + 'query_builder' => function(EntityRepository $er) { |
|
| 46 | 46 | return $er |
| 47 | 47 | ->createQueryBuilder('c') |
| 48 | 48 | ->orderBy('c.rank', 'DESC'); |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | new Assert\GreaterThanOrEqual(array('value' => 0)), |
| 48 | 48 | ); |
| 49 | 49 | |
| 50 | - $constraints = function (Options $options) use ($defaultValues) { |
|
| 50 | + $constraints = function(Options $options) use ($defaultValues) { |
|
| 51 | 51 | if (false !== $options['required']) { |
| 52 | 52 | return array_merge($defaultValues, array(new Assert\NotBlank())); |
| 53 | 53 | } |