@@ -187,7 +187,7 @@ |
||
| 187 | 187 | $num = $this->productClassRepository->createQueryBuilder('pc') |
| 188 | 188 | ->select('count(pc.id)') |
| 189 | 189 | ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id') |
| 190 | - ->setParameter('id',$id) |
|
| 190 | + ->setParameter('id', $id) |
|
| 191 | 191 | ->getQuery() |
| 192 | 192 | ->getSingleScalarResult(); |
| 193 | 193 | if ($num > 0) { |
@@ -187,7 +187,7 @@ |
||
| 187 | 187 | // ダウンロード完了後にファイルを削除する. |
| 188 | 188 | // http://stackoverflow.com/questions/15238897/removing-file-after-delivering-response-with-silex-symfony |
| 189 | 189 | $app->finish( |
| 190 | - function (Request $request, Response $response, \Silex\Application $app) use ( |
|
| 190 | + function(Request $request, Response $response, \Silex\Application $app) use ( |
|
| 191 | 191 | $tmpDir, |
| 192 | 192 | $tarFile, |
| 193 | 193 | $tarGzFile |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | $em->getConfiguration()->setSQLLogger(null); |
| 350 | 350 | |
| 351 | 351 | $response = new StreamedResponse(); |
| 352 | - $response->setCallback(function () use ($app, $request) { |
|
| 352 | + $response->setCallback(function() use ($app, $request) { |
|
| 353 | 353 | |
| 354 | 354 | // CSV種別を元に初期化. |
| 355 | 355 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_ORDER); |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | |
| 364 | 364 | // データ行の出力. |
| 365 | 365 | $this->csvExportService->setExportQueryBuilder($qb); |
| 366 | - $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) { |
|
| 366 | + $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) { |
|
| 367 | 367 | |
| 368 | 368 | $Csvs = $csvService->getCsvs(); |
| 369 | 369 | |
@@ -404,9 +404,9 @@ discard block |
||
| 404 | 404 | }); |
| 405 | 405 | |
| 406 | 406 | $now = new \DateTime(); |
| 407 | - $filename = 'order_' . $now->format('YmdHis') . '.csv'; |
|
| 407 | + $filename = 'order_'.$now->format('YmdHis').'.csv'; |
|
| 408 | 408 | $response->headers->set('Content-Type', 'application/octet-stream'); |
| 409 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
| 409 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
| 410 | 410 | $response->send(); |
| 411 | 411 | |
| 412 | 412 | log_info('受注CSV出力ファイル名', array($filename)); |
@@ -433,7 +433,7 @@ discard block |
||
| 433 | 433 | $em->getConfiguration()->setSQLLogger(null); |
| 434 | 434 | |
| 435 | 435 | $response = new StreamedResponse(); |
| 436 | - $response->setCallback(function () use ($app, $request) { |
|
| 436 | + $response->setCallback(function() use ($app, $request) { |
|
| 437 | 437 | |
| 438 | 438 | // CSV種別を元に初期化. |
| 439 | 439 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_SHIPPING); |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | |
| 448 | 448 | // データ行の出力. |
| 449 | 449 | $this->csvExportService->setExportQueryBuilder($qb); |
| 450 | - $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) { |
|
| 450 | + $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) { |
|
| 451 | 451 | |
| 452 | 452 | $Csvs = $csvService->getCsvs(); |
| 453 | 453 | |
@@ -497,9 +497,9 @@ discard block |
||
| 497 | 497 | }); |
| 498 | 498 | |
| 499 | 499 | $now = new \DateTime(); |
| 500 | - $filename = 'shipping_' . $now->format('YmdHis') . '.csv'; |
|
| 500 | + $filename = 'shipping_'.$now->format('YmdHis').'.csv'; |
|
| 501 | 501 | $response->headers->set('Content-Type', 'application/octet-stream'); |
| 502 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
| 502 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
| 503 | 503 | $response->send(); |
| 504 | 504 | |
| 505 | 505 | log_info('配送CSV出力ファイル名', array($filename)); |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | } else { |
| 101 | 101 | // httpから変更されたらfalseのまま |
| 102 | 102 | $config['force_ssl'] = Constant::DISABLED; |
| 103 | - $data['force_ssl'] = (bool)Constant::DISABLED; |
|
| 103 | + $data['force_ssl'] = (bool) Constant::DISABLED; |
|
| 104 | 104 | } |
| 105 | 105 | } else { |
| 106 | 106 | $config['force_ssl'] = Constant::DISABLED; |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | if (count($allowHost) > 0) { |
| 162 | 162 | $form->get('admin_allow_host')->setData(Str::convertLineFeed(implode("\n", $allowHost))); |
| 163 | 163 | } |
| 164 | - $form->get('force_ssl')->setData((bool)$this->appConfig['force_ssl']); |
|
| 164 | + $form->get('force_ssl')->setData((bool) $this->appConfig['force_ssl']); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | return [ |
@@ -174,7 +174,7 @@ |
||
| 174 | 174 | $entity = new $entityName(); |
| 175 | 175 | $rank = 0; |
| 176 | 176 | $ids = array_map( |
| 177 | - function ($v) { |
|
| 177 | + function($v) { |
|
| 178 | 178 | return $v['id']; |
| 179 | 179 | }, |
| 180 | 180 | $data['data'] |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | // 配送業者のプルダウンを生成 |
| 76 | 76 | $builder->addEventListener( |
| 77 | 77 | FormEvents::PRE_SET_DATA, |
| 78 | - function (FormEvent $event) { |
|
| 78 | + function(FormEvent $event) { |
|
| 79 | 79 | /* @var Shipping $Shipping */ |
| 80 | 80 | $Shipping = $event->getData(); |
| 81 | 81 | if (is_null($Shipping) || !$Shipping->getId()) { |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | // お届け日のプルダウンを生成 |
| 118 | 118 | $builder->addEventListener( |
| 119 | 119 | FormEvents::PRE_SET_DATA, |
| 120 | - function (FormEvent $event) { |
|
| 120 | + function(FormEvent $event) { |
|
| 121 | 121 | $Shipping = $event->getData(); |
| 122 | 122 | if (is_null($Shipping) || !$Shipping->getId()) { |
| 123 | 123 | return; |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | |
| 156 | 156 | // 配送日数が設定されている |
| 157 | 157 | if ($deliveryDateFlag) { |
| 158 | - $period = new \DatePeriod ( |
|
| 158 | + $period = new \DatePeriod( |
|
| 159 | 159 | new \DateTime($minDate.' day'), |
| 160 | 160 | new \DateInterval('P1D'), |
| 161 | 161 | new \DateTime($minDate + $this->appConfig['deliv_date_end_max'].' day') |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | // お届け時間のプルダウンを生成 |
| 184 | 184 | $builder->addEventListener( |
| 185 | 185 | FormEvents::PRE_SET_DATA, |
| 186 | - function (FormEvent $event) { |
|
| 186 | + function(FormEvent $event) { |
|
| 187 | 187 | $Shipping = $event->getData(); |
| 188 | 188 | if (is_null($Shipping) || !$Shipping->getId()) { |
| 189 | 189 | return; |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | $max = $this->appConfig['price_max']; |
| 57 | 57 | $min = -$max; |
| 58 | 58 | |
| 59 | - $constraints = function (Options $options) use ($max, $min){ |
|
| 59 | + $constraints = function(Options $options) use ($max, $min){ |
|
| 60 | 60 | $constraints = []; |
| 61 | 61 | |
| 62 | 62 | // requiredがtrueに指定されている場合, NotBlankを追加 |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | ))); |
| 148 | 148 | |
| 149 | 149 | $app = $this->app; |
| 150 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) { |
|
| 150 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) { |
|
| 151 | 151 | // モーダルからのPOST時に、金額等をセットする. |
| 152 | 152 | if ('modal' === $this->requestStack->getCurrentRequest()->get('modal')) { |
| 153 | 153 | $data = $event->getData(); |
@@ -164,17 +164,13 @@ discard block |
||
| 164 | 164 | $data['product_name'] = $Product->getName(); |
| 165 | 165 | $data['product_code'] = $ProductClass->getCode(); |
| 166 | 166 | $data['class_name1'] = $ProductClass->hasClassCategory1() ? |
| 167 | - $ProductClass->getClassCategory1()->getClassName() : |
|
| 168 | - null; |
|
| 167 | + $ProductClass->getClassCategory1()->getClassName() : null; |
|
| 169 | 168 | $data['class_name2'] = $ProductClass->hasClassCategory2() ? |
| 170 | - $ProductClass->getClassCategory2()->getClassName() : |
|
| 171 | - null; |
|
| 169 | + $ProductClass->getClassCategory2()->getClassName() : null; |
|
| 172 | 170 | $data['class_category_name1'] = $ProductClass->hasClassCategory1() ? |
| 173 | - $ProductClass->getClassCategory1()->getName() : |
|
| 174 | - null; |
|
| 171 | + $ProductClass->getClassCategory1()->getName() : null; |
|
| 175 | 172 | $data['class_category_name2'] = $ProductClass->hasClassCategory2() ? |
| 176 | - $ProductClass->getClassCategory2()->getName() : |
|
| 177 | - null; |
|
| 173 | + $ProductClass->getClassCategory2()->getName() : null; |
|
| 178 | 174 | $data['tax_rule'] = $TaxRule->getCalcRule()->getId(); |
| 179 | 175 | $data['price'] = $ProductClass->getPrice02(); |
| 180 | 176 | $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity']; |
@@ -77,8 +77,8 @@ |
||
| 77 | 77 | new Assert\NotBlank(), |
| 78 | 78 | new Assert\Length(array('max' => $this->appConfig['stext_len'])), |
| 79 | 79 | new Assert\Regex(array( |
| 80 | - 'pattern' => "/^[0-9a-zA-Z]+$/", |
|
| 81 | - )), |
|
| 80 | + 'pattern' => "/^[0-9a-zA-Z]+$/", |
|
| 81 | + )), |
|
| 82 | 82 | ), |
| 83 | 83 | )) |
| 84 | 84 | ->add('admin_allow_host', TextareaType::class, array( |
@@ -92,19 +92,19 @@ |
||
| 92 | 92 | 'label' => 'SSLを強制', |
| 93 | 93 | 'required' => false, |
| 94 | 94 | )) |
| 95 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use($app) { |
|
| 95 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) use($app) { |
|
| 96 | 96 | $form = $event->getForm(); |
| 97 | 97 | $data = $form->getData(); |
| 98 | 98 | |
| 99 | 99 | $ips = preg_split("/\R/", $data['admin_allow_host'], null, PREG_SPLIT_NO_EMPTY); |
| 100 | 100 | |
| 101 | - foreach($ips as $ip) { |
|
| 101 | + foreach ($ips as $ip) { |
|
| 102 | 102 | $errors = $this->recursiveValidator->validate($ip, array( |
| 103 | 103 | new Assert\Ip(), |
| 104 | 104 | ) |
| 105 | 105 | ); |
| 106 | 106 | if ($errors->count() != 0) { |
| 107 | - $form['admin_allow_host']->addError(new FormError($ip . 'はIPv4アドレスではありません。')); |
|
| 107 | + $form['admin_allow_host']->addError(new FormError($ip.'はIPv4アドレスではありません。')); |
|
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | }) |