@@ -26,7 +26,7 @@ |
||
| 26 | 26 | |
| 27 | 27 | use Eccube\Annotation\FormType; |
| 28 | 28 | use \Symfony\Component\Form\AbstractType; |
| 29 | -use \Symfony\Component\Form\Extension\Core\Type\CheckboxType;; |
|
| 29 | +use \Symfony\Component\Form\Extension\Core\Type\CheckboxType; ; |
|
| 30 | 30 | use \Symfony\Component\Form\FormBuilderInterface; |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -20,34 +20,34 @@ |
||
| 20 | 20 | |
| 21 | 21 | public function register(Container $app) |
| 22 | 22 | { |
| 23 | - $app['eccube.service.cart'] = function () use ($app) { |
|
| 23 | + $app['eccube.service.cart'] = function() use ($app) { |
|
| 24 | 24 | return $app[CartService::class]; |
| 25 | 25 | }; |
| 26 | - $app['eccube.service.order'] = function () use ($app) { |
|
| 26 | + $app['eccube.service.order'] = function() use ($app) { |
|
| 27 | 27 | return $app[OrderService::class]; |
| 28 | 28 | }; |
| 29 | - $app['eccube.service.tax_rule'] = function () use ($app) { |
|
| 29 | + $app['eccube.service.tax_rule'] = function() use ($app) { |
|
| 30 | 30 | return $app[TaxRuleService::class]; |
| 31 | 31 | }; |
| 32 | - $app['eccube.service.plugin'] = function () use ($app) { |
|
| 32 | + $app['eccube.service.plugin'] = function() use ($app) { |
|
| 33 | 33 | return $app[PluginService::class]; |
| 34 | 34 | }; |
| 35 | - $app['eccube.service.mail'] = function () use ($app) { |
|
| 35 | + $app['eccube.service.mail'] = function() use ($app) { |
|
| 36 | 36 | return $app[MailService::class]; |
| 37 | 37 | }; |
| 38 | - $app['eccube.helper.order'] = function ($app) { |
|
| 38 | + $app['eccube.helper.order'] = function($app) { |
|
| 39 | 39 | return $app[OrderHelper::class]; |
| 40 | 40 | }; |
| 41 | - $app['eccube.service.csv.export'] = function () use ($app) { |
|
| 41 | + $app['eccube.service.csv.export'] = function() use ($app) { |
|
| 42 | 42 | return $app[CsvExportService::class]; |
| 43 | 43 | }; |
| 44 | - $app['eccube.service.shopping'] = function () use ($app) { |
|
| 44 | + $app['eccube.service.shopping'] = function() use ($app) { |
|
| 45 | 45 | return $app[ShoppingService::class]; |
| 46 | 46 | }; |
| 47 | - $app['eccube.service.payment'] = function () use ($app) { |
|
| 47 | + $app['eccube.service.payment'] = function() use ($app) { |
|
| 48 | 48 | return $app[PaymentService::class]; |
| 49 | 49 | }; |
| 50 | - $app['eccube.service.system'] = function () use ($app) { |
|
| 50 | + $app['eccube.service.system'] = function() use ($app) { |
|
| 51 | 51 | return $app[SystemService::class]; |
| 52 | 52 | }; |
| 53 | 53 | |
@@ -48,7 +48,6 @@ |
||
| 48 | 48 | /** |
| 49 | 49 | * SearchProductType constructor. |
| 50 | 50 | * |
| 51 | - * @param Application $app |
|
| 52 | 51 | */ |
| 53 | 52 | public function __construct() |
| 54 | 53 | { |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | ); |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - $app[TwigLintValidator::class] = function (Container $app) { |
|
| 26 | + $app[TwigLintValidator::class] = function(Container $app) { |
|
| 27 | 27 | return new TwigLintValidator($app['twig']); |
| 28 | 28 | }; |
| 29 | 29 | |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($Product) { |
|
| 127 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($Product) { |
|
| 128 | 128 | $data = $event->getData(); |
| 129 | 129 | $form = $event->getForm(); |
| 130 | 130 | if (isset($data['classcategory_id1']) && !is_null($Product->getClassName2())) { |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | } |
| 138 | 138 | }); |
| 139 | 139 | |
| 140 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
| 140 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
| 141 | 141 | /** @var CartItem $CartItem */ |
| 142 | 142 | $CartItem = $event->getData(); |
| 143 | 143 | $ProductClass = $CartItem->getProductClass(); |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php return [ |
| 2 | - 'http_cache' => |
|
| 3 | - [ |
|
| 2 | + 'http_cache' => |
|
| 3 | + [ |
|
| 4 | 4 | 'enabled' => false, |
| 5 | 5 | 'age' => 10, |
| 6 | 6 | // フロントでキャッシュを適用させる画面のrouteを設定 |
@@ -17,5 +17,5 @@ discard block |
||
| 17 | 17 | // 'help_tradelaw', |
| 18 | 18 | // 'help_agreement', |
| 19 | 19 | ], |
| 20 | - ], |
|
| 20 | + ], |
|
| 21 | 21 | ]; |
@@ -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)); |
@@ -392,7 +392,7 @@ |
||
| 392 | 392 | /** |
| 393 | 393 | * 会員の初回購入時間、購入時間、購入回数、購入金額を更新する |
| 394 | 394 | * |
| 395 | - * @param $app |
|
| 395 | + * @param \Eccube\Application $app |
|
| 396 | 396 | * @param Customer $Customer |
| 397 | 397 | * @param $orderStatusId |
| 398 | 398 | */ |