@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | $em->getConfiguration()->setSQLLogger(null); |
172 | 172 | |
173 | 173 | $response = new StreamedResponse(); |
174 | - $response->setCallback(function () use ($app, $request) { |
|
174 | + $response->setCallback(function() use ($app, $request) { |
|
175 | 175 | |
176 | 176 | // CSV種別を元に初期化. |
177 | 177 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CUSTOMER); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | |
186 | 186 | // データ行の出力. |
187 | 187 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
188 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
188 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
189 | 189 | |
190 | 190 | $Csvs = $csvService->getCsvs(); |
191 | 191 | |
@@ -207,9 +207,9 @@ discard block |
||
207 | 207 | }); |
208 | 208 | |
209 | 209 | $now = new \DateTime(); |
210 | - $filename = 'customer_' . $now->format('YmdHis') . '.csv'; |
|
210 | + $filename = 'customer_'.$now->format('YmdHis').'.csv'; |
|
211 | 211 | $response->headers->set('Content-Type', 'application/octet-stream'); |
212 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
212 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
213 | 213 | $response->send(); |
214 | 214 | |
215 | 215 | return $response; |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | $em->getConfiguration()->setSQLLogger(null); |
185 | 185 | |
186 | 186 | $response = new StreamedResponse(); |
187 | - $response->setCallback(function () use ($app, $request) { |
|
187 | + $response->setCallback(function() use ($app, $request) { |
|
188 | 188 | |
189 | 189 | // CSV種別を元に初期化. |
190 | 190 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_ORDER); |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | |
199 | 199 | // データ行の出力. |
200 | 200 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
201 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
201 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
202 | 202 | |
203 | 203 | $Csvs = $csvService->getCsvs(); |
204 | 204 | |
@@ -228,9 +228,9 @@ discard block |
||
228 | 228 | }); |
229 | 229 | |
230 | 230 | $now = new \DateTime(); |
231 | - $filename = 'order_' . $now->format('YmdHis') . '.csv'; |
|
231 | + $filename = 'order_'.$now->format('YmdHis').'.csv'; |
|
232 | 232 | $response->headers->set('Content-Type', 'application/octet-stream'); |
233 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
233 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
234 | 234 | $response->send(); |
235 | 235 | |
236 | 236 | return $response; |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | $em->getConfiguration()->setSQLLogger(null); |
254 | 254 | |
255 | 255 | $response = new StreamedResponse(); |
256 | - $response->setCallback(function () use ($app, $request) { |
|
256 | + $response->setCallback(function() use ($app, $request) { |
|
257 | 257 | |
258 | 258 | // CSV種別を元に初期化. |
259 | 259 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_SHIPPING); |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | |
268 | 268 | // データ行の出力. |
269 | 269 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
270 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
270 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
271 | 271 | |
272 | 272 | $Csvs = $csvService->getCsvs(); |
273 | 273 | |
@@ -305,9 +305,9 @@ discard block |
||
305 | 305 | }); |
306 | 306 | |
307 | 307 | $now = new \DateTime(); |
308 | - $filename = 'shipping_' . $now->format('YmdHis') . '.csv'; |
|
308 | + $filename = 'shipping_'.$now->format('YmdHis').'.csv'; |
|
309 | 309 | $response->headers->set('Content-Type', 'application/octet-stream'); |
310 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
310 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
311 | 311 | $response->send(); |
312 | 312 | |
313 | 313 | return $response; |
@@ -42,7 +42,7 @@ |
||
42 | 42 | ->getRepository('\Eccube\Entity\Master\OrderStatus') |
43 | 43 | ->findAllArray() |
44 | 44 | ; |
45 | - $CurrentStatus = $app['orm.em'] |
|
45 | + $CurrentStatus = $app['orm.em'] |
|
46 | 46 | ->getRepository('\Eccube\Entity\Master\OrderStatus') |
47 | 47 | ->find($id) |
48 | 48 | ; |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | $em->getConfiguration()->setSQLLogger(null); |
165 | 165 | |
166 | 166 | $response = new StreamedResponse(); |
167 | - $response->setCallback(function () use ($app, $request) { |
|
167 | + $response->setCallback(function() use ($app, $request) { |
|
168 | 168 | |
169 | 169 | // CSV種別を元に初期化. |
170 | 170 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CATEGORY); |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | |
179 | 179 | // データ行の出力. |
180 | 180 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
181 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
181 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
182 | 182 | |
183 | 183 | $Csvs = $csvService->getCsvs(); |
184 | 184 | |
@@ -198,9 +198,9 @@ discard block |
||
198 | 198 | }); |
199 | 199 | |
200 | 200 | $now = new \DateTime(); |
201 | - $filename = 'category_' . $now->format('YmdHis') . '.csv'; |
|
201 | + $filename = 'category_'.$now->format('YmdHis').'.csv'; |
|
202 | 202 | $response->headers->set('Content-Type', 'application/octet-stream'); |
203 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
203 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
204 | 204 | $response->send(); |
205 | 205 | |
206 | 206 | return $response; |
@@ -95,7 +95,7 @@ |
||
95 | 95 | $num = $app['eccube.repository.product_class']->createQueryBuilder('pc') |
96 | 96 | ->select('count(pc.id)') |
97 | 97 | ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id') |
98 | - ->setParameter('id',$id) |
|
98 | + ->setParameter('id', $id) |
|
99 | 99 | ->getQuery() |
100 | 100 | ->getSingleScalarResult(); |
101 | 101 | if ($num > 0) { |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | foreach ($images as $img) { |
152 | 152 | foreach ($img as $image) { |
153 | 153 | $extension = $image->getClientOriginalExtension(); |
154 | - $filename = date('mdHis') . uniqid('_') . '.' . $extension; |
|
154 | + $filename = date('mdHis').uniqid('_').'.'.$extension; |
|
155 | 155 | $image->move($app['config']['image_temp_realdir'], $filename); |
156 | 156 | $files[] = $filename; |
157 | 157 | } |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | $app['orm.em']->persist($ProductImage); |
312 | 312 | |
313 | 313 | // 移動 |
314 | - $file = new File($app['config']['image_temp_realdir'] . '/' . $add_image); |
|
314 | + $file = new File($app['config']['image_temp_realdir'].'/'.$add_image); |
|
315 | 315 | $file->move($app['config']['image_save_realdir']); |
316 | 316 | } |
317 | 317 | |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | |
332 | 332 | // 削除 |
333 | 333 | $fs = new Filesystem(); |
334 | - $fs->remove($app['config']['image_save_realdir'] . '/' . $delete_image); |
|
334 | + $fs->remove($app['config']['image_save_realdir'].'/'.$delete_image); |
|
335 | 335 | } |
336 | 336 | $app['orm.em']->persist($Product); |
337 | 337 | $app['orm.em']->flush(); |
@@ -430,7 +430,7 @@ discard block |
||
430 | 430 | foreach ($deleteImages as $deleteImage) { |
431 | 431 | try { |
432 | 432 | $fs = new Filesystem(); |
433 | - $fs->remove($app['config']['image_save_realdir'] . '/' . $deleteImage); |
|
433 | + $fs->remove($app['config']['image_save_realdir'].'/'.$deleteImage); |
|
434 | 434 | } catch (\Exception $e) { |
435 | 435 | // エラーが発生しても無視する |
436 | 436 | } |
@@ -475,10 +475,10 @@ discard block |
||
475 | 475 | |
476 | 476 | // 画像ファイルを新規作成 |
477 | 477 | $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION); |
478 | - $filename = date('mdHis') . uniqid('_') . '.' . $extension; |
|
478 | + $filename = date('mdHis').uniqid('_').'.'.$extension; |
|
479 | 479 | try { |
480 | 480 | $fs = new Filesystem(); |
481 | - $fs->copy($app['config']['image_save_realdir'] . '/' . $Image->getFileName(), $app['config']['image_save_realdir'] . '/' . $filename); |
|
481 | + $fs->copy($app['config']['image_save_realdir'].'/'.$Image->getFileName(), $app['config']['image_save_realdir'].'/'.$filename); |
|
482 | 482 | } catch (\Exception $e) { |
483 | 483 | // エラーが発生しても無視する |
484 | 484 | } |
@@ -533,7 +533,7 @@ discard block |
||
533 | 533 | $em->getConfiguration()->setSQLLogger(null); |
534 | 534 | |
535 | 535 | $response = new StreamedResponse(); |
536 | - $response->setCallback(function () use ($app, $request) { |
|
536 | + $response->setCallback(function() use ($app, $request) { |
|
537 | 537 | |
538 | 538 | // CSV種別を元に初期化. |
539 | 539 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_PRODUCT); |
@@ -557,7 +557,7 @@ discard block |
||
557 | 557 | |
558 | 558 | // データ行の出力. |
559 | 559 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
560 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
560 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
561 | 561 | |
562 | 562 | $Csvs = $csvService->getCsvs(); |
563 | 563 | |
@@ -589,9 +589,9 @@ discard block |
||
589 | 589 | }); |
590 | 590 | |
591 | 591 | $now = new \DateTime(); |
592 | - $filename = 'product_' . $now->format('YmdHis') . '.csv'; |
|
592 | + $filename = 'product_'.$now->format('YmdHis').'.csv'; |
|
593 | 593 | $response->headers->set('Content-Type', 'application/octet-stream'); |
594 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
594 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
595 | 595 | $response->send(); |
596 | 596 | |
597 | 597 | return $response; |
@@ -70,10 +70,10 @@ discard block |
||
70 | 70 | // ファイルアップロード |
71 | 71 | $file = $form['payment_image']->getData(); |
72 | 72 | $fs = new Filesystem(); |
73 | - if ($file && $fs->exists($app['config']['image_temp_realdir'] . '/' . $file)) { |
|
73 | + if ($file && $fs->exists($app['config']['image_temp_realdir'].'/'.$file)) { |
|
74 | 74 | $fs->rename( |
75 | - $app['config']['image_temp_realdir'] . '/' . $file, |
|
76 | - $app['config']['image_save_realdir'] . '/' . $file |
|
75 | + $app['config']['image_temp_realdir'].'/'.$file, |
|
76 | + $app['config']['image_save_realdir'].'/'.$file |
|
77 | 77 | ); |
78 | 78 | } |
79 | 79 | |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | if (isset($images['payment_image_file'])) { |
101 | 101 | $image = $images['payment_image_file']; |
102 | 102 | $extension = $image->guessExtension(); |
103 | - $filename = date('mdHis') . uniqid('_') . '.' . $extension; |
|
103 | + $filename = date('mdHis').uniqid('_').'.'.$extension; |
|
104 | 104 | $image->move($app['config']['image_temp_realdir'], $filename); |
105 | 105 | } |
106 | 106 | |
@@ -127,12 +127,12 @@ discard block |
||
127 | 127 | foreach ($Payments as $Payment) { |
128 | 128 | if ($Payment->getId() != $id) { |
129 | 129 | $Payment->setRank($rank); |
130 | - $rank ++; |
|
130 | + $rank++; |
|
131 | 131 | } |
132 | 132 | } |
133 | 133 | $app['orm.em']->flush(); |
134 | 134 | |
135 | - $app->addSuccess('admin.delete.complete', 'admin') ; |
|
135 | + $app->addSuccess('admin.delete.complete', 'admin'); |
|
136 | 136 | |
137 | 137 | return $app->redirect($app->url('admin_setting_shop_payment')); |
138 | 138 | } |
@@ -62,7 +62,7 @@ |
||
62 | 62 | $log = array(); |
63 | 63 | $message = array(); |
64 | 64 | |
65 | - foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) { |
|
65 | + foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) { |
|
66 | 66 | // 上限に達した場合、処理を抜ける |
67 | 67 | if (count($log) >= $formData['line_max']) { |
68 | 68 | break; |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | |
50 | 50 | return $phpinfo; |
51 | 51 | |
52 | - break; |
|
52 | + break; |
|
53 | 53 | default: |
54 | 54 | break; |
55 | 55 | } |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | )); |
62 | 62 | } |
63 | 63 | |
64 | - public function getSystemInfo(Application $app) |
|
65 | - { |
|
64 | + public function getSystemInfo(Application $app) |
|
65 | + { |
|
66 | 66 | $system = $app['eccube.service.system']; |
67 | 67 | $server = $app['request']; |
68 | 68 | |
@@ -78,5 +78,5 @@ discard block |
||
78 | 78 | $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent')); |
79 | 79 | |
80 | 80 | return $arrSystemInfo; |
81 | - } |
|
81 | + } |
|
82 | 82 | } |
@@ -67,13 +67,13 @@ |
||
67 | 67 | $server = $app['request']; |
68 | 68 | |
69 | 69 | $arrSystemInfo = array( |
70 | - array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
71 | - array('title' => 'サーバーOS', 'value' => php_uname()), |
|
72 | - array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
73 | - array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")), |
|
70 | + array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
71 | + array('title' => 'サーバーOS', 'value' => php_uname()), |
|
72 | + array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
73 | + array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")), |
|
74 | 74 | ); |
75 | 75 | |
76 | - $value = phpversion() . ' (' . implode(', ', get_loaded_extensions()) . ')'; |
|
76 | + $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')'; |
|
77 | 77 | $arrSystemInfo[] = array('title' => 'PHP', 'value' => $value); |
78 | 78 | $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent')); |
79 | 79 |