Completed
Push — master ( 9b7f47...c035fa )
by Yangsin
42:09
created
src/Eccube/Controller/Admin/Setting/System/LogController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@
 block discarded – undo
83 83
             return $log;
84 84
         }
85 85
 
86
-        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) {
86
+        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) {
87 87
             // 上限に達した場合、処理を抜ける
88 88
             if (count($log) >= $formData['line_max']) {
89 89
                 break;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -93,10 +93,10 @@  discard block
 block discarded – undo
93 93
                 // ファイルアップロード
94 94
                 $file = $form['payment_image']->getData();
95 95
                 $fs = new Filesystem();
96
-                if ($file && $fs->exists($app['config']['image_temp_realdir'] . '/' . $file)) {
96
+                if ($file && $fs->exists($app['config']['image_temp_realdir'].'/'.$file)) {
97 97
                     $fs->rename(
98
-                        $app['config']['image_temp_realdir'] . '/' . $file,
99
-                        $app['config']['image_save_realdir'] . '/' . $file
98
+                        $app['config']['image_temp_realdir'].'/'.$file,
99
+                        $app['config']['image_save_realdir'].'/'.$file
100 100
                     );
101 101
                 }
102 102
 
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
             }
145 145
 
146 146
             $extension = $image->guessExtension();
147
-            $filename = date('mdHis') . uniqid('_') . '.' . $extension;
147
+            $filename = date('mdHis').uniqid('_').'.'.$extension;
148 148
             $image->move($app['config']['image_temp_realdir'], $filename);
149 149
         }
150 150
         $event = new EventArgs(
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
         foreach ($Payments as $Payment) {
181 181
             if ($Payment->getId() != $id) {
182 182
                 $Payment->setRank($rank);
183
-                $rank ++;
183
+                $rank++;
184 184
             }
185 185
         }
186 186
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
         );
195 195
         $app['eccube.event.dispatcher']->dispatch(EccubeEvents::ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE, $event);
196 196
 
197
-        $app->addSuccess('admin.delete.complete', 'admin') ;
197
+        $app->addSuccess('admin.delete.complete', 'admin');
198 198
 
199 199
         return $app->redirect($app->url('admin_setting_shop_payment'));
200 200
     }
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/CategoryController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
         $em->getConfiguration()->setSQLLogger(null);
206 206
 
207 207
         $response = new StreamedResponse();
208
-        $response->setCallback(function () use ($app, $request) {
208
+        $response->setCallback(function() use ($app, $request) {
209 209
 
210 210
             // CSV種別を元に初期化.
211 211
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CATEGORY);
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 
220 220
             // データ行の出力.
221 221
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
222
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
222
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
223 223
 
224 224
                 $Csvs = $csvService->getCsvs();
225 225
 
@@ -239,9 +239,9 @@  discard block
 block discarded – undo
239 239
         });
240 240
 
241 241
         $now = new \DateTime();
242
-        $filename = 'category_' . $now->format('YmdHis') . '.csv';
242
+        $filename = 'category_'.$now->format('YmdHis').'.csv';
243 243
         $response->headers->set('Content-Type', 'application/octet-stream');
244
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
244
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
245 245
         $response->send();
246 246
 
247 247
         log_info('カテゴリCSV出力ファイル名', array($filename));
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/BlockController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
                 // ファイル生成・更新
115 115
                 $tplDir = $app['config']['block_realdir'];
116 116
 
117
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
117
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
118 118
 
119 119
                 $fs = new Filesystem();
120 120
                 $blockData = $form->get('block_html')->getData();
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
                 $fs->dumpFile($filePath, $blockData);
123 123
                 // 更新でファイル名を変更した場合、以前のファイルを削除
124 124
                 if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) {
125
-                    $oldFilePath = $tplDir . '/' . $previous_filename . '.twig';
125
+                    $oldFilePath = $tplDir.'/'.$previous_filename.'.twig';
126 126
                     if ($fs->exists($oldFilePath)) {
127 127
                         $fs->remove($oldFilePath);
128 128
                     }
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
176 176
         if ($Block->getDeletableFlg() > 0) {
177 177
             $tplDir = $app['config']['block_realdir'];
178
-            $file = $tplDir . '/' . $Block->getFileName() . '.twig';
178
+            $file = $tplDir.'/'.$Block->getFileName().'.twig';
179 179
             $fs = new Filesystem();
180 180
             if ($fs->exists($file)) {
181 181
                 $fs->remove($file);
Please login to merge, or discard this patch.
src/Eccube/Controller/Mypage/DeliveryController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@
 block discarded – undo
83 83
         // 遷移が正しくない場合、デフォルトであるマイページの配送先追加の画面を設定する
84 84
         if (!in_array($parentPage, $allowdParents)) {
85 85
             // @deprecated 使用されていないコード
86
-            $parentPage  = $app->url('mypage_delivery');
86
+            $parentPage = $app->url('mypage_delivery');
87 87
         }
88 88
 
89 89
         $builder = $app['form.factory']
Please login to merge, or discard this patch.
src/Eccube/Controller/UserDataController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
         $paths[] = $app['config']['user_data_realdir'];
56 56
         $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths));
57 57
 
58
-        $file = $PageLayout->getFileName() . '.twig';
58
+        $file = $PageLayout->getFileName().'.twig';
59 59
 
60 60
         $event = new EventArgs(
61 61
             array(
Please login to merge, or discard this patch.
src/Eccube/Controller/ForgotController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
                 // リセットキーの発行・有効期限の設定
65 65
                 $Customer
66 66
                     ->setResetKey($app['eccube.repository.customer']->getUniqueResetKey($app))
67
-                    ->setResetExpire(new \DateTime('+' . $app['config']['customer_reset_expire'] .' min'));
67
+                    ->setResetExpire(new \DateTime('+'.$app['config']['customer_reset_expire'].' min'));
68 68
 
69 69
                 // リセットキーを更新
70 70
                 $app['orm.em']->persist($Customer);
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 
88 88
                 // ログ出力
89 89
                 $app['monolog']->addInfo(
90
-                    'send reset password mail to:'  . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
90
+                    'send reset password mail to:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
91 91
                 );
92 92
             } else {
93 93
                 log_warning('Un active customer try send reset password email: ', array('Enter email' => $form->get('login_email')->getData()));
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 
170 170
             // ログ出力
171 171
             $app['monolog']->addInfo(
172
-                'reset password complete:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
172
+                'reset password complete:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
173 173
             );
174 174
         } else {
175 175
             throw new HttpException\AccessDeniedHttpException('不正なアクセスです。');
Please login to merge, or discard this patch.
src/Eccube/Repository/ProductRepository.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
                 $key = sprintf('keyword%s', $index);
114 114
                 $qb
115 115
                     ->andWhere(sprintf('NORMALIZE(p.name) LIKE NORMALIZE(:%s) OR NORMALIZE(p.search_word) LIKE NORMALIZE(:%s)', $key, $key))
116
-                    ->setParameter($key, '%' . $keyword . '%');
116
+                    ->setParameter($key, '%'.$keyword.'%');
117 117
             }
118 118
         }
119 119
 
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
             $qb
177 177
                 ->andWhere('p.id = :id OR p.name LIKE :likeid OR pc.code LIKE :likeid')
178 178
                 ->setParameter('id', $id)
179
-                ->setParameter('likeid', '%' . $searchData['id'] . '%');
179
+                ->setParameter('likeid', '%'.$searchData['id'].'%');
180 180
         }
181 181
 
182 182
         // code
Please login to merge, or discard this patch.