@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | } |
| 319 | 319 | |
| 320 | 320 | $extension = $image->getClientOriginalExtension(); |
| 321 | - $filename = date('mdHis') . uniqid('_') . '.' . $extension; |
|
| 321 | + $filename = date('mdHis').uniqid('_').'.'.$extension; |
|
| 322 | 322 | $image->move($this->appConfig['image_temp_realdir'], $filename); |
| 323 | 323 | $files[] = $filename; |
| 324 | 324 | } |
@@ -479,8 +479,8 @@ discard block |
||
| 479 | 479 | $Categories = $form->get('Category')->getData(); |
| 480 | 480 | $categoriesIdList = array(); |
| 481 | 481 | foreach ($Categories as $Category) { |
| 482 | - foreach($Category->getPath() as $ParentCategory){ |
|
| 483 | - if (!isset($categoriesIdList[$ParentCategory->getId()])){ |
|
| 482 | + foreach ($Category->getPath() as $ParentCategory) { |
|
| 483 | + if (!isset($categoriesIdList[$ParentCategory->getId()])) { |
|
| 484 | 484 | $ProductCategory = $this->createProductCategory($Product, $ParentCategory, $count); |
| 485 | 485 | $this->entityManager->persist($ProductCategory); |
| 486 | 486 | $count++; |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | $categoriesIdList[$ParentCategory->getId()] = true; |
| 490 | 490 | } |
| 491 | 491 | } |
| 492 | - if (!isset($categoriesIdList[$Category->getId()])){ |
|
| 492 | + if (!isset($categoriesIdList[$Category->getId()])) { |
|
| 493 | 493 | $ProductCategory = $this->createProductCategory($Product, $Category, $count); |
| 494 | 494 | $this->entityManager->persist($ProductCategory); |
| 495 | 495 | $count++; |
@@ -511,7 +511,7 @@ discard block |
||
| 511 | 511 | $this->entityManager->persist($ProductImage); |
| 512 | 512 | |
| 513 | 513 | // 移動 |
| 514 | - $file = new File($this->appConfig['image_temp_realdir'] . '/' . $add_image); |
|
| 514 | + $file = new File($this->appConfig['image_temp_realdir'].'/'.$add_image); |
|
| 515 | 515 | $file->move($this->appConfig['image_save_realdir']); |
| 516 | 516 | } |
| 517 | 517 | |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | |
| 532 | 532 | // 削除 |
| 533 | 533 | $fs = new Filesystem(); |
| 534 | - $fs->remove($this->appConfig['image_save_realdir'] . '/' . $delete_image); |
|
| 534 | + $fs->remove($this->appConfig['image_save_realdir'].'/'.$delete_image); |
|
| 535 | 535 | } |
| 536 | 536 | $this->entityManager->persist($Product); |
| 537 | 537 | $this->entityManager->flush(); |
@@ -666,7 +666,7 @@ discard block |
||
| 666 | 666 | foreach ($deleteImages as $deleteImage) { |
| 667 | 667 | try { |
| 668 | 668 | $fs = new Filesystem(); |
| 669 | - $fs->remove($this->appConfig['image_save_realdir'] . '/' . $deleteImage); |
|
| 669 | + $fs->remove($this->appConfig['image_save_realdir'].'/'.$deleteImage); |
|
| 670 | 670 | } catch (\Exception $e) { |
| 671 | 671 | // エラーが発生しても無視する |
| 672 | 672 | } |
@@ -741,10 +741,10 @@ discard block |
||
| 741 | 741 | |
| 742 | 742 | // 画像ファイルを新規作成 |
| 743 | 743 | $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION); |
| 744 | - $filename = date('mdHis') . uniqid('_') . '.' . $extension; |
|
| 744 | + $filename = date('mdHis').uniqid('_').'.'.$extension; |
|
| 745 | 745 | try { |
| 746 | 746 | $fs = new Filesystem(); |
| 747 | - $fs->copy($this->appConfig['image_save_realdir'] . '/' . $Image->getFileName(), $this->appConfig['image_save_realdir'] . '/' . $filename); |
|
| 747 | + $fs->copy($this->appConfig['image_save_realdir'].'/'.$Image->getFileName(), $this->appConfig['image_save_realdir'].'/'.$filename); |
|
| 748 | 748 | } catch (\Exception $e) { |
| 749 | 749 | // エラーが発生しても無視する |
| 750 | 750 | } |
@@ -824,7 +824,7 @@ discard block |
||
| 824 | 824 | $em->getConfiguration()->setSQLLogger(null); |
| 825 | 825 | |
| 826 | 826 | $response = new StreamedResponse(); |
| 827 | - $response->setCallback(function () use ($app, $request) { |
|
| 827 | + $response->setCallback(function() use ($app, $request) { |
|
| 828 | 828 | |
| 829 | 829 | // CSV種別を元に初期化. |
| 830 | 830 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_PRODUCT); |
@@ -864,7 +864,7 @@ discard block |
||
| 864 | 864 | // データ行の出力. |
| 865 | 865 | $this->csvExportService->setExportQueryBuilder($qb); |
| 866 | 866 | |
| 867 | - $this->csvExportService->exportData(function ($entity, CsvExportService $csvService) use ($app, $request) { |
|
| 867 | + $this->csvExportService->exportData(function($entity, CsvExportService $csvService) use ($app, $request) { |
|
| 868 | 868 | $Csvs = $csvService->getCsvs(); |
| 869 | 869 | |
| 870 | 870 | /** @var $Product \Eccube\Entity\Product */ |
@@ -907,9 +907,9 @@ discard block |
||
| 907 | 907 | }); |
| 908 | 908 | |
| 909 | 909 | $now = new \DateTime(); |
| 910 | - $filename = 'product_' . $now->format('YmdHis') . '.csv'; |
|
| 910 | + $filename = 'product_'.$now->format('YmdHis').'.csv'; |
|
| 911 | 911 | $response->headers->set('Content-Type', 'application/octet-stream'); |
| 912 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
| 912 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
| 913 | 913 | $response->send(); |
| 914 | 914 | |
| 915 | 915 | log_info('商品CSV出力ファイル名', array($filename)); |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | { |
| 12 | 12 | public function register(Container $app) |
| 13 | 13 | { |
| 14 | - $app['paginator'] = $app->protect(function () { |
|
| 14 | + $app['paginator'] = $app->protect(function() { |
|
| 15 | 15 | $paginator = new Paginator(); |
| 16 | 16 | $paginator->subscribe(new PaginatorListener()); |
| 17 | 17 | |
@@ -26,11 +26,11 @@ discard block |
||
| 26 | 26 | { |
| 27 | 27 | public function register(Container $app) |
| 28 | 28 | { |
| 29 | - $app['eccube.purchase.context'] = $app->protect(function (ItemHolderInterface $origin = null) { |
|
| 29 | + $app['eccube.purchase.context'] = $app->protect(function(ItemHolderInterface $origin = null) { |
|
| 30 | 30 | return new PurchaseContext($origin); |
| 31 | 31 | }); |
| 32 | 32 | |
| 33 | - $app['eccube.purchase.flow.cart.item_processors'] = function (Container $app) { |
|
| 33 | + $app['eccube.purchase.flow.cart.item_processors'] = function(Container $app) { |
|
| 34 | 34 | $processors = new ArrayCollection(); |
| 35 | 35 | $processors[] = new DisplayStatusValidator(); |
| 36 | 36 | $processors[] = new SaleLimitValidator(); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | return $processors; |
| 41 | 41 | }; |
| 42 | 42 | |
| 43 | - $app['eccube.purchase.flow.cart.holder_processors'] = function (Container $app) { |
|
| 43 | + $app['eccube.purchase.flow.cart.holder_processors'] = function(Container $app) { |
|
| 44 | 44 | $processors = new ArrayCollection(); |
| 45 | 45 | $processors[] = new PaymentProcessor($app[DeliveryRepository::class]); |
| 46 | 46 | $processors[] = new PaymentTotalLimitValidator($app['config']['max_total_fee']); |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | return $processors; |
| 51 | 51 | }; |
| 52 | 52 | |
| 53 | - $app['eccube.purchase.flow.cart'] = function (Container $app) { |
|
| 53 | + $app['eccube.purchase.flow.cart'] = function(Container $app) { |
|
| 54 | 54 | $flow = new PurchaseFlow(); |
| 55 | 55 | $flow->setItemProcessors($app['eccube.purchase.flow.cart.item_processors']); |
| 56 | 56 | $flow->setItemHolderProcessors($app['eccube.purchase.flow.cart.holder_processors']); |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | return $flow; |
| 59 | 59 | }; |
| 60 | 60 | |
| 61 | - $app['eccube.purchase.flow.shopping.item_processors'] = function (Container $app) { |
|
| 61 | + $app['eccube.purchase.flow.shopping.item_processors'] = function(Container $app) { |
|
| 62 | 62 | $processors = new ArrayCollection(); |
| 63 | 63 | $processors[] = new StockValidator(); |
| 64 | 64 | $processors[] = new DisplayStatusValidator(); |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | return $processors; |
| 67 | 67 | }; |
| 68 | 68 | |
| 69 | - $app['eccube.purchase.flow.shopping.holder_processors'] = function (Container $app) { |
|
| 69 | + $app['eccube.purchase.flow.shopping.holder_processors'] = function(Container $app) { |
|
| 70 | 70 | $processors = new ArrayCollection(); |
| 71 | 71 | $processors[] = new PaymentTotalLimitValidator($app['config']['max_total_fee']); |
| 72 | 72 | $processors[] = new DeliveryFeeProcessor($app['orm.em']); |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | return $processors; |
| 76 | 76 | }; |
| 77 | 77 | |
| 78 | - $app['eccube.purchase.flow.shopping'] = function (Container $app) { |
|
| 78 | + $app['eccube.purchase.flow.shopping'] = function(Container $app) { |
|
| 79 | 79 | $flow = new PurchaseFlow(); |
| 80 | 80 | $flow->setItemProcessors($app['eccube.purchase.flow.shopping.item_processors']); |
| 81 | 81 | $flow->setItemHolderProcessors($app['eccube.purchase.flow.shopping.holder_processors']); |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | return $flow; |
| 84 | 84 | }; |
| 85 | 85 | |
| 86 | - $app['eccube.purchase.flow.order.item_processors'] = function (Container $app) { |
|
| 86 | + $app['eccube.purchase.flow.order.item_processors'] = function(Container $app) { |
|
| 87 | 87 | $processors = new ArrayCollection(); |
| 88 | 88 | $processors[] = new StockValidator(); |
| 89 | 89 | $processors[] = new PaymentTotalLimitValidator($app['config']['max_total_fee']); |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | return $processors; |
| 92 | 92 | }; |
| 93 | 93 | |
| 94 | - $app['eccube.purchase.flow.order.holder_processors'] = function (Container $app) { |
|
| 94 | + $app['eccube.purchase.flow.order.holder_processors'] = function(Container $app) { |
|
| 95 | 95 | $processors = new ArrayCollection(); |
| 96 | 96 | $processors[] = new UpdateDatePurchaseProcessor($app['config']); |
| 97 | 97 | $processors[] = new AdminOrderRegisterPurchaseProcessor($app); |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | return $processors; |
| 100 | 100 | }; |
| 101 | 101 | |
| 102 | - $app['eccube.purchase.flow.order'] = function (Container $app) { |
|
| 102 | + $app['eccube.purchase.flow.order'] = function(Container $app) { |
|
| 103 | 103 | $flow = new PurchaseFlow(); |
| 104 | 104 | $flow->setItemProcessors($app['eccube.purchase.flow.order.item_processors']); |
| 105 | 105 | $flow->setItemHolderProcessors($app['eccube.purchase.flow.order.holder_processors']); |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | public function register(Container $app) |
| 22 | 22 | { |
| 23 | - $app['eccube.queries'] = function () { |
|
| 23 | + $app['eccube.queries'] = function() { |
|
| 24 | 24 | return new \Eccube\Doctrine\Query\Queries(); |
| 25 | 25 | }; |
| 26 | 26 | } |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | { |
| 16 | 16 | $app['eccube.listener.transaction.enabled'] = true; |
| 17 | 17 | |
| 18 | - $app['eccube.listener.transaction'] = function (Container $app) { |
|
| 18 | + $app['eccube.listener.transaction'] = function(Container $app) { |
|
| 19 | 19 | $listener = new TransactionListener( |
| 20 | 20 | $app['orm.em'], |
| 21 | 21 | $app['logger'], |
@@ -46,16 +46,16 @@ |
||
| 46 | 46 | */ |
| 47 | 47 | public function register(Container $app) |
| 48 | 48 | { |
| 49 | - $app[BaseInfo::class] = function () use ($app) { |
|
| 49 | + $app[BaseInfo::class] = function() use ($app) { |
|
| 50 | 50 | return $app[BaseInfoRepository::class]->get(); |
| 51 | 51 | }; |
| 52 | 52 | |
| 53 | - $app['request_scope'] = function () { |
|
| 53 | + $app['request_scope'] = function() { |
|
| 54 | 54 | return new ParameterBag(); |
| 55 | 55 | }; |
| 56 | 56 | |
| 57 | 57 | // Application::initRenderingと一緒に修正 |
| 58 | - $app['eccube.twig.block.templates'] = function () { |
|
| 58 | + $app['eccube.twig.block.templates'] = function() { |
|
| 59 | 59 | $templates = new ArrayCollection(); |
| 60 | 60 | $templates[] = 'render_block.twig'; |
| 61 | 61 | |
@@ -14,14 +14,14 @@ discard block |
||
| 14 | 14 | { |
| 15 | 15 | public function register(Container $app) |
| 16 | 16 | { |
| 17 | - $app['payment.method'] = $app->protect(function ($clazz, $form) use ($app) { |
|
| 17 | + $app['payment.method'] = $app->protect(function($clazz, $form) use ($app) { |
|
| 18 | 18 | $PaymentMethod = new $clazz; |
| 19 | 19 | $PaymentMethod->setApplication($app); |
| 20 | 20 | $PaymentMethod->setFormType($form); |
| 21 | 21 | return $PaymentMethod; |
| 22 | 22 | }); |
| 23 | 23 | |
| 24 | - $app['payment.method.request'] = $app->protect(function ($clazz, $form, $request) use ($app) { |
|
| 24 | + $app['payment.method.request'] = $app->protect(function($clazz, $form, $request) use ($app) { |
|
| 25 | 25 | $PaymentMethod = new $clazz; |
| 26 | 26 | $PaymentMethod->setApplication($app); |
| 27 | 27 | $PaymentMethod->setFormType($form); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | return $PaymentMethod; |
| 30 | 30 | }); |
| 31 | 31 | |
| 32 | - $app['eccube.service.payment'] = $app->protect(function ($clazz) use ($app) { |
|
| 32 | + $app['eccube.service.payment'] = $app->protect(function($clazz) use ($app) { |
|
| 33 | 33 | $Service = new $clazz($app['request_stack']); |
| 34 | 34 | |
| 35 | 35 | return $Service; |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | { |
| 14 | 14 | public function register(Container $app) |
| 15 | 15 | { |
| 16 | - $app['eccube.listener.forward_only'] = function (Container $app) { |
|
| 16 | + $app['eccube.listener.forward_only'] = function(Container $app) { |
|
| 17 | 17 | return new ForwardOnlyListener(); |
| 18 | 18 | }; |
| 19 | 19 | } |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | $class2Valied = $this->isValiedCategory($ClassName2); |
| 193 | 193 | |
| 194 | 194 | // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示 |
| 195 | - if($class1Valied && $class2Valied){ |
|
| 195 | + if ($class1Valied && $class2Valied) { |
|
| 196 | 196 | $hasClassCategoryFlg = true; |
| 197 | 197 | } |
| 198 | 198 | |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | $mergeProductClasses = array(); |
| 270 | 270 | |
| 271 | 271 | // 商品税率が設定されている場合、商品税率を項目に設定 |
| 272 | - if ($this->BaseInfo->isOptionProductTaxRule()) { |
|
| 272 | + if ($this->BaseInfo->isOptionProductTaxRule()) { |
|
| 273 | 273 | foreach ($ProductClasses as $class) { |
| 274 | 274 | if ($class->getTaxRule()) { |
| 275 | 275 | $class->setTaxRate($class->getTaxRule()->getTaxRate()); |