Completed
Pull Request — experimental/3.1 (#1985)
by Kentaro
35:59
created
src/Eccube/Form/Type/Shopping/OrderType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         // 支払い方法のプルダウンを生成
80 80
         $builder->addEventListener(
81 81
             FormEvents::PRE_SET_DATA,
82
-            function (FormEvent $event) {
82
+            function(FormEvent $event) {
83 83
                 $Order = $event->getData();
84 84
                 if (is_null($Order) || !$Order->getId()) {
85 85
                     return;
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
         // TODO Calculatorで行うのが適切.
125 125
         $builder->addEventListener(
126 126
             FormEvents::POST_SUBMIT,
127
-            function (FormEvent $event) {
127
+            function(FormEvent $event) {
128 128
                 /** @var Order $Order */
129 129
                 $Order = $event->getData();
130 130
                 $Order->setPaymentMethod($Order->getPayment()->getMethod());
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Shopping/ShippingType.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
         // 配送業者のプルダウンを生成
55 55
         $builder->addEventListener(
56 56
             FormEvents::PRE_SET_DATA,
57
-            function (FormEvent $event) {
57
+            function(FormEvent $event) {
58 58
                 $Shipping = $event->getData();
59 59
                 if (is_null($Shipping) || !$Shipping->getId()) {
60 60
                     return;
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
         // お届け日のプルダウンを生成
96 96
         $builder->addEventListener(
97 97
             FormEvents::PRE_SET_DATA,
98
-            function (FormEvent $event) {
98
+            function(FormEvent $event) {
99 99
                 $Shipping = $event->getData();
100 100
                 if (is_null($Shipping) || !$Shipping->getId()) {
101 101
                     return;
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 
132 132
                 // 配送日数が設定されている
133 133
                 if ($deliveryDateFlag) {
134
-                    $period = new \DatePeriod (
134
+                    $period = new \DatePeriod(
135 135
                         new \DateTime($minDate.' day'),
136 136
                         new \DateInterval('P1D'),
137 137
                         new \DateTime($minDate + $this->config['deliv_date_end_max'].' day')
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
         // お届け時間のプルダウンを生成
160 160
         $builder->addEventListener(
161 161
             FormEvents::PRE_SET_DATA,
162
-            function (FormEvent $event) {
162
+            function(FormEvent $event) {
163 163
                 $Shipping = $event->getData();
164 164
                 if (is_null($Shipping) || !$Shipping->getId()) {
165 165
                     return;
Please login to merge, or discard this patch.
src/Eccube/InstallApplication.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 
40 40
         if (is_writable($logDir)) {
41 41
             if (file_exists($installLog) && !is_writable($installLog)) {
42
-                die($installLog . ' の書込権限を変更して下さい。');
42
+                die($installLog.' の書込権限を変更して下さい。');
43 43
             }
44 44
             // install step2 でログディレクトリに書き込み権限が付与されればログ出力を開始する.
45 45
             $app->register(new \Silex\Provider\MonologServiceProvider(), array(
Please login to merge, or discard this patch.
html/install.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@
 block discarded – undo
27 27
 }
28 28
 
29 29
 //[INFO]index.php,install.phpをEC-CUBEルート直下に移動させる場合は、コメントアウトしている行に置き換える
30
-require __DIR__ . '/../autoload.php';
30
+require __DIR__.'/../autoload.php';
31 31
 //require __DIR__ . '/autoload.php';
32 32
 
33 33
 $app = new Eccube\InstallApplication();
34 34
 $app['debug'] = true;
35
-$app->before(function (\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) {
35
+$app->before(function(\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) {
36 36
     if (!$request->getSession()->isStarted()) {
37 37
         $request->getSession()->start();
38 38
     }
Please login to merge, or discard this patch.
html/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 //require __DIR__.'/autoload.php';
28 28
 
29 29
 ini_set('display_errors', 'Off');
30
-error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
30
+error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT);
31 31
 
32 32
 // see http://silex.sensiolabs.org/doc/web_servers.html#php-5-4
33 33
 $filename = __DIR__.preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']);
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/CsvImportType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,8 +53,8 @@
 block discarded – undo
53 53
                 'constraints' => array(
54 54
                     new Assert\NotBlank(array('message' => 'ファイルを選択してください。')),
55 55
                     new Assert\File(array(
56
-                        'maxSize' => $app['config']['csv_size'] . 'M',
57
-                        'maxSizeMessage' => 'CSVファイルは' . $app['config']['csv_size'] . 'M以下でアップロードしてください。',
56
+                        'maxSize' => $app['config']['csv_size'].'M',
57
+                        'maxSizeMessage' => 'CSVファイルは'.$app['config']['csv_size'].'M以下でアップロードしてください。',
58 58
                     )),
59 59
                 ),
60 60
             ));
Please login to merge, or discard this patch.
src/Eccube/Form/Type/AddCartType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
                 }
113 113
             }
114 114
 
115
-            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($Product) {
115
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($Product) {
116 116
                 $data = $event->getData();
117 117
                 $form = $event->getForm();
118 118
                 if (!is_null($Product->getClassName2())) {
Please login to merge, or discard this patch.
src/Eccube/Service/MailService.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
         ));
62 62
 
63 63
         $message = \Swift_Message::newInstance()
64
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認')
64
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認')
65 65
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
66 66
             ->setTo(array($Customer->getEmail()))
67 67
             ->setBcc($this->BaseInfo->getEmail01())
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
         ));
103 103
 
104 104
         $message = \Swift_Message::newInstance()
105
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録が完了しました。')
105
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録が完了しました。')
106 106
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
107 107
             ->setTo(array($Customer->getEmail()))
108 108
             ->setBcc($this->BaseInfo->getEmail01())
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
         ));
145 145
 
146 146
         $message = \Swift_Message::newInstance()
147
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 退会手続きのご完了')
147
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 退会手続きのご完了')
148 148
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
149 149
             ->setTo(array($email))
150 150
             ->setBcc($this->BaseInfo->getEmail01())
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 
188 188
         // 問い合わせ者にメール送信
189 189
         $message = \Swift_Message::newInstance()
190
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] お問い合わせを受け付けました。')
190
+            ->setSubject('['.$this->BaseInfo->getShopName().'] お問い合わせを受け付けました。')
191 191
             ->setFrom(array($this->BaseInfo->getEmail02() => $this->BaseInfo->getShopName()))
192 192
             ->setTo(array($formData['email']))
193 193
             ->setBcc($this->BaseInfo->getEmail02())
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
         ));
245 245
 
246 246
         $message = \Swift_Message::newInstance()
247
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $MailTemplate->getSubject())
247
+            ->setSubject('['.$this->BaseInfo->getShopName().'] '.$MailTemplate->getSubject())
248 248
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
249 249
             ->setTo(array($Order->getEmail()))
250 250
             ->setBcc($this->BaseInfo->getEmail01())
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
         ));
289 289
 
290 290
         $message = \Swift_Message::newInstance()
291
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認')
291
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認')
292 292
             ->setFrom(array($this->BaseInfo->getEmail03() => $this->BaseInfo->getShopName()))
293 293
             ->setTo(array($Customer->getEmail()))
294 294
             ->setBcc($this->BaseInfo->getEmail01())
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
         ));
333 333
 
334 334
         $message = \Swift_Message::newInstance()
335
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $formData['subject'])
335
+            ->setSubject('['.$this->BaseInfo->getShopName().'] '.$formData['subject'])
336 336
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
337 337
             ->setTo(array($Order->getEmail()))
338 338
             ->setBcc($this->BaseInfo->getEmail01())
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
         ));
374 374
 
375 375
         $message = \Swift_Message::newInstance()
376
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のご確認')
376
+            ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のご確認')
377 377
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
378 378
             ->setTo(array($Customer->getEmail()))
379 379
             ->setBcc($this->BaseInfo->getEmail01())
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
         ));
415 415
 
416 416
         $message = \Swift_Message::newInstance()
417
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のお知らせ')
417
+            ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のお知らせ')
418 418
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
419 419
             ->setTo(array($Customer->getEmail()))
420 420
             ->setBcc($this->BaseInfo->getEmail01())
Please login to merge, or discard this patch.
src/Eccube/Command/CacheClearCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
 
53 53
         $this->app = $this->getSilexApplication();
54 54
         
55
-        \Eccube\Util\Cache::clear($this->app,$input->getOption('all'));
55
+        \Eccube\Util\Cache::clear($this->app, $input->getOption('all'));
56 56
         $output->writeln(sprintf("%s <info>success</info>", 'cache:clear'));
57 57
 
58 58
     }
Please login to merge, or discard this patch.