@@ -28,14 +28,12 @@ |
||
28 | 28 | use Eccube\Annotation\Component; |
29 | 29 | use Eccube\Annotation\Inject; |
30 | 30 | use Eccube\Application; |
31 | -use Eccube\Common\Constant; |
|
32 | 31 | use Eccube\Controller\AbstractController; |
33 | 32 | use Eccube\Entity\Master\CustomerStatus; |
34 | 33 | use Eccube\Event\EccubeEvents; |
35 | 34 | use Eccube\Event\EventArgs; |
36 | 35 | use Eccube\Repository\Master\CustomerStatusRepository; |
37 | 36 | use Eccube\Service\MailService; |
38 | -use Eccube\Util\Str; |
|
39 | 37 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
40 | 38 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
41 | 39 | use Symfony\Component\EventDispatcher\EventDispatcher; |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use Doctrine\ORM\EntityManager; |
7 | 7 | use Eccube\Annotation\Inject; |
8 | 8 | use Eccube\Annotation\Service; |
9 | -use Eccube\Common\Constant; |
|
10 | 9 | use Eccube\Entity\CartItem; |
11 | 10 | use Eccube\Entity\Customer; |
12 | 11 | use Eccube\Entity\CustomerAddress; |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | log_info('受注削除開始', array($Order->getId())); |
304 | 304 | |
305 | 305 | // 出荷に紐付いている明細がある場合は削除できない. |
306 | - $hasShipping = $Order->getItems()->exists(function ($k, $v) { |
|
306 | + $hasShipping = $Order->getItems()->exists(function($k, $v) { |
|
307 | 307 | return false === is_null($v->getShipping()); |
308 | 308 | }); |
309 | 309 | if ($hasShipping) { |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | $em->getConfiguration()->setSQLLogger(null); |
362 | 362 | |
363 | 363 | $response = new StreamedResponse(); |
364 | - $response->setCallback(function () use ($app, $request) { |
|
364 | + $response->setCallback(function() use ($app, $request) { |
|
365 | 365 | |
366 | 366 | // CSV種別を元に初期化. |
367 | 367 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_ORDER); |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | |
376 | 376 | // データ行の出力. |
377 | 377 | $this->csvExportService->setExportQueryBuilder($qb); |
378 | - $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) { |
|
378 | + $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) { |
|
379 | 379 | |
380 | 380 | $Csvs = $csvService->getCsvs(); |
381 | 381 | |
@@ -416,9 +416,9 @@ discard block |
||
416 | 416 | }); |
417 | 417 | |
418 | 418 | $now = new \DateTime(); |
419 | - $filename = 'order_' . $now->format('YmdHis') . '.csv'; |
|
419 | + $filename = 'order_'.$now->format('YmdHis').'.csv'; |
|
420 | 420 | $response->headers->set('Content-Type', 'application/octet-stream'); |
421 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
421 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
422 | 422 | $response->send(); |
423 | 423 | |
424 | 424 | log_info('受注CSV出力ファイル名', array($filename)); |
@@ -445,7 +445,7 @@ discard block |
||
445 | 445 | $em->getConfiguration()->setSQLLogger(null); |
446 | 446 | |
447 | 447 | $response = new StreamedResponse(); |
448 | - $response->setCallback(function () use ($app, $request) { |
|
448 | + $response->setCallback(function() use ($app, $request) { |
|
449 | 449 | |
450 | 450 | // CSV種別を元に初期化. |
451 | 451 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_SHIPPING); |
@@ -459,7 +459,7 @@ discard block |
||
459 | 459 | |
460 | 460 | // データ行の出力. |
461 | 461 | $this->csvExportService->setExportQueryBuilder($qb); |
462 | - $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) { |
|
462 | + $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) { |
|
463 | 463 | |
464 | 464 | $Csvs = $csvService->getCsvs(); |
465 | 465 | |
@@ -509,9 +509,9 @@ discard block |
||
509 | 509 | }); |
510 | 510 | |
511 | 511 | $now = new \DateTime(); |
512 | - $filename = 'shipping_' . $now->format('YmdHis') . '.csv'; |
|
512 | + $filename = 'shipping_'.$now->format('YmdHis').'.csv'; |
|
513 | 513 | $response->headers->set('Content-Type', 'application/octet-stream'); |
514 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
514 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
515 | 515 | $response->send(); |
516 | 516 | |
517 | 517 | log_info('配送CSV出力ファイル名', array($filename)); |
@@ -31,7 +31,7 @@ |
||
31 | 31 | { |
32 | 32 | /** |
33 | 33 | * FormExtensionAutoWiring constructor. |
34 | - * @param array|string[] $scanDirs |
|
34 | + * @param string[] $scanDirs |
|
35 | 35 | */ |
36 | 36 | public function __construct($scanDirs) |
37 | 37 | { |
@@ -30,8 +30,8 @@ |
||
30 | 30 | { |
31 | 31 | /** |
32 | 32 | * RepositoryDefinition constructor. |
33 | - * @param $id |
|
34 | - * @param $refClass |
|
33 | + * @param string $id |
|
34 | + * @param \ReflectionClass $refClass |
|
35 | 35 | */ |
36 | 36 | public function __construct($id, $refClass) |
37 | 37 | { |
@@ -30,7 +30,7 @@ |
||
30 | 30 | { |
31 | 31 | /** |
32 | 32 | * RepositoryAutoWiring constructor. |
33 | - * @param array|string[] $scanDirs |
|
33 | + * @param string[] $scanDirs |
|
34 | 34 | */ |
35 | 35 | public function __construct($scanDirs) |
36 | 36 | { |
@@ -161,7 +161,9 @@ |
||
161 | 161 | } |
162 | 162 | |
163 | 163 | if (!empty($components)) { |
164 | - if ($snippets) $snippets .= PHP_EOL; |
|
164 | + if ($snippets) { |
|
165 | + $snippets .= PHP_EOL; |
|
166 | + } |
|
165 | 167 | $snippets .= $wiring->generate($twig, $components); |
166 | 168 | $snippets .= $wiring->generateExtend($twig, $components); |
167 | 169 | } |
@@ -13,7 +13,7 @@ |
||
13 | 13 | { |
14 | 14 | public function register(Container $app) |
15 | 15 | { |
16 | - $app['eccube.di'] = function (Container $app) { |
|
16 | + $app['eccube.di'] = function(Container $app) { |
|
17 | 17 | $di = new Di( |
18 | 18 | $app['eccube.di.generator.dir'], |
19 | 19 | $app['eccube.di.generator.class'], |
@@ -6,9 +6,6 @@ |
||
6 | 6 | use Eccube\Annotation\ForwardOnly; |
7 | 7 | use Monolog\Logger; |
8 | 8 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
9 | -use Symfony\Component\HttpFoundation\Request; |
|
10 | -use Symfony\Component\HttpFoundation\Response; |
|
11 | -use Symfony\Component\HttpFoundation\Session\SessionInterface; |
|
12 | 9 | use Symfony\Component\HttpKernel\Event\FilterControllerEvent; |
13 | 10 | use Symfony\Component\HttpKernel\KernelEvents; |
14 | 11 |