@@ -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 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | )); |
| 58 | 58 | |
| 59 | 59 | $message = \Swift_Message::newInstance() |
| 60 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認') |
|
| 60 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認') |
|
| 61 | 61 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 62 | 62 | ->setTo(array($Customer->getEmail())) |
| 63 | 63 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | )); |
| 83 | 83 | |
| 84 | 84 | $message = \Swift_Message::newInstance() |
| 85 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録が完了しました。') |
|
| 85 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録が完了しました。') |
|
| 86 | 86 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 87 | 87 | ->setTo(array($Customer->getEmail())) |
| 88 | 88 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | )); |
| 112 | 112 | |
| 113 | 113 | $message = \Swift_Message::newInstance() |
| 114 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 退会手続きのご完了') |
|
| 114 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 退会手続きのご完了') |
|
| 115 | 115 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 116 | 116 | ->setTo(array($email)) |
| 117 | 117 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | // 問い合わせ者にメール送信 |
| 141 | 141 | $message = \Swift_Message::newInstance() |
| 142 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] お問い合わせを受け付けました。') |
|
| 142 | + ->setSubject('['.$this->BaseInfo->getShopName().'] お問い合わせを受け付けました。') |
|
| 143 | 143 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 144 | 144 | ->setTo(array($formData['email'])) |
| 145 | 145 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | )); |
| 170 | 170 | |
| 171 | 171 | $message = \Swift_Message::newInstance() |
| 172 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $MailTemplate->getSubject()) |
|
| 172 | + ->setSubject('['.$this->BaseInfo->getShopName().'] '.$MailTemplate->getSubject()) |
|
| 173 | 173 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 174 | 174 | ->setTo(array($Order->getEmail())) |
| 175 | 175 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | )); |
| 198 | 198 | |
| 199 | 199 | $message = \Swift_Message::newInstance() |
| 200 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認') |
|
| 200 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認') |
|
| 201 | 201 | ->setFrom(array($this->BaseInfo->getEmail03() => $this->BaseInfo->getShopName())) |
| 202 | 202 | ->setTo(array($Customer->getEmail())) |
| 203 | 203 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | )); |
| 227 | 227 | |
| 228 | 228 | $message = \Swift_Message::newInstance() |
| 229 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $formData['subject']) |
|
| 229 | + ->setSubject('['.$this->BaseInfo->getShopName().'] '.$formData['subject']) |
|
| 230 | 230 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 231 | 231 | ->setTo(array($Order->getEmail())) |
| 232 | 232 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | )); |
| 252 | 252 | |
| 253 | 253 | $message = \Swift_Message::newInstance() |
| 254 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のご確認') |
|
| 254 | + ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のご確認') |
|
| 255 | 255 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 256 | 256 | ->setTo(array($Customer->getEmail())) |
| 257 | 257 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | )); |
| 277 | 277 | |
| 278 | 278 | $message = \Swift_Message::newInstance() |
| 279 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のお知らせ') |
|
| 279 | + ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のお知らせ') |
|
| 280 | 280 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
| 281 | 281 | ->setTo(array($Customer->getEmail())) |
| 282 | 282 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -229,7 +229,7 @@ |
||
| 229 | 229 | * Send order mail. |
| 230 | 230 | * |
| 231 | 231 | * @param \Eccube\Entity\Order $Order 受注情報 |
| 232 | - * @return string |
|
| 232 | + * @return \Swift_Mime_MimePart |
|
| 233 | 233 | */ |
| 234 | 234 | public function sendOrderMail(\Eccube\Entity\Order $Order) |
| 235 | 235 | { |
@@ -40,13 +40,13 @@ |
||
| 40 | 40 | */ |
| 41 | 41 | public function register(BaseApplication $app) |
| 42 | 42 | { |
| 43 | - $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function ($extensions) use ($app) { |
|
| 43 | + $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function($extensions) use ($app) { |
|
| 44 | 44 | $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension(); |
| 45 | 45 | |
| 46 | 46 | return $extensions; |
| 47 | 47 | })); |
| 48 | 48 | |
| 49 | - $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) { |
|
| 49 | + $app['form.types'] = $app->share($app->extend('form.types', function($types) use ($app) { |
|
| 50 | 50 | $types[] = new \Eccube\Form\Type\Install\Step1Type($app); |
| 51 | 51 | $types[] = new \Eccube\Form\Type\Install\Step3Type($app); |
| 52 | 52 | $types[] = new \Eccube\Form\Type\Install\Step4Type($app); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | { |
| 29 | 29 | public function register(Application $app) |
| 30 | 30 | { |
| 31 | - $app['validator'] = $app->share(function ($app) { |
|
| 31 | + $app['validator'] = $app->share(function($app) { |
|
| 32 | 32 | |
| 33 | 33 | return new Validator( |
| 34 | 34 | $app['validator.mapping.class_metadata_factory'], |
@@ -39,17 +39,17 @@ discard block |
||
| 39 | 39 | ); |
| 40 | 40 | }); |
| 41 | 41 | |
| 42 | - $app['validator.mapping.class_metadata_factory'] = $app->share(function ($app) { |
|
| 42 | + $app['validator.mapping.class_metadata_factory'] = $app->share(function($app) { |
|
| 43 | 43 | return new ClassMetadataFactory(new StaticMethodLoader()); |
| 44 | 44 | }); |
| 45 | 45 | |
| 46 | - $app['validator.validator_factory'] = $app->share(function () use ($app) { |
|
| 46 | + $app['validator.validator_factory'] = $app->share(function() use ($app) { |
|
| 47 | 47 | $validators = isset($app['validator.validator_service_ids']) ? $app['validator.validator_service_ids'] : array(); |
| 48 | 48 | |
| 49 | 49 | return new ConstraintValidatorFactory($app, $validators); |
| 50 | 50 | }); |
| 51 | 51 | |
| 52 | - $app['validator.object_initializers'] = $app->share(function ($app) { |
|
| 52 | + $app['validator.object_initializers'] = $app->share(function($app) { |
|
| 53 | 53 | return array(); |
| 54 | 54 | }); |
| 55 | 55 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | public function getCsrfTokenForAnchor() |
| 112 | 112 | { |
| 113 | 113 | $token = $this->app['form.csrf_provider']->getToken(Constant::TOKEN_NAME)->getValue(); |
| 114 | - return 'token-for-anchor=\'' . $token . '\''; |
|
| 114 | + return 'token-for-anchor=\''.$token.'\''; |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | public function getPriceFilter($number, $decimals = 0, $decPoint = '.', $thousandsSep = ',') |
| 147 | 147 | { |
| 148 | 148 | $price = number_format($number, $decimals, $decPoint, $thousandsSep); |
| 149 | - $price = '¥ ' . $price; |
|
| 149 | + $price = '¥ '.$price; |
|
| 150 | 150 | |
| 151 | 151 | return $price; |
| 152 | 152 | } |
@@ -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 | /** |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | $app['db.migrations.table_name'] = null; |
| 25 | 25 | $app['db.migrations.name'] = null; |
| 26 | 26 | |
| 27 | - $app['dispatcher']->addListener(ConsoleEvents::INIT, function (ConsoleEvent $event) use ($app) { |
|
| 27 | + $app['dispatcher']->addListener(ConsoleEvents::INIT, function(ConsoleEvent $event) use ($app) { |
|
| 28 | 28 | $application = $event->getApplication(); |
| 29 | 29 | |
| 30 | 30 | $helpers = array('dialog' => new DialogHelper()); |
@@ -38,14 +38,14 @@ |
||
| 38 | 38 | */ |
| 39 | 39 | public function buildForm(FormBuilderInterface $builder, array $options) |
| 40 | 40 | { |
| 41 | - $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
| 41 | + $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) { |
|
| 42 | 42 | $options = $event->getForm()->getConfig()->getOptions(); |
| 43 | 43 | if (!$event->getData()) { |
| 44 | 44 | $data = current(array_keys($options['choice_list']->getValues())); |
| 45 | 45 | $event->setData($data); |
| 46 | 46 | } |
| 47 | 47 | }); |
| 48 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
| 48 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) { |
|
| 49 | 49 | $options = $event->getForm()->getConfig()->getOptions(); |
| 50 | 50 | $values = $options['choice_list']->getValues(); |
| 51 | 51 | if (!in_array($event->getData(), $values)) { |