@@ -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 | }) |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $app = $this->app; |
| 179 | 179 | // XXX price を priceIncTax にセットし直す |
| 180 | 180 | // ShipmentItem::getTotalPrice でもやっているので、どこか一箇所にまとめたい |
| 181 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($app) { |
|
| 181 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($app) { |
|
| 182 | 182 | /** @var \Eccube\Entity\ShipmentItem $ShipmentItem */ |
| 183 | 183 | $ShipmentItem = $event->getData(); |
| 184 | 184 | $TaxDisplayType = $ShipmentItem->getTaxDisplayType(); |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | |
| 197 | 197 | $event->setData($ShipmentItem); |
| 198 | 198 | }); |
| 199 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) { |
|
| 199 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) { |
|
| 200 | 200 | // モーダルからのPOST時に、金額等をセットする. |
| 201 | 201 | if ('modal' === $this->requestStack->getCurrentRequest()->get('modal')) { |
| 202 | 202 | $data = $event->getData(); |
@@ -266,17 +266,13 @@ discard block |
||
| 266 | 266 | $data['product_name'] = $Product->getName(); |
| 267 | 267 | $data['product_code'] = $ProductClass->getCode(); |
| 268 | 268 | $data['class_name1'] = $ProductClass->hasClassCategory1() ? |
| 269 | - $ProductClass->getClassCategory1()->getClassName() : |
|
| 270 | - null; |
|
| 269 | + $ProductClass->getClassCategory1()->getClassName() : null; |
|
| 271 | 270 | $data['class_name2'] = $ProductClass->hasClassCategory2() ? |
| 272 | - $ProductClass->getClassCategory2()->getClassName() : |
|
| 273 | - null; |
|
| 271 | + $ProductClass->getClassCategory2()->getClassName() : null; |
|
| 274 | 272 | $data['class_category_name1'] = $ProductClass->hasClassCategory1() ? |
| 275 | - $ProductClass->getClassCategory1()->getName() : |
|
| 276 | - null; |
|
| 273 | + $ProductClass->getClassCategory1()->getName() : null; |
|
| 277 | 274 | $data['class_category_name2'] = $ProductClass->hasClassCategory2() ? |
| 278 | - $ProductClass->getClassCategory2()->getName() : |
|
| 279 | - null; |
|
| 275 | + $ProductClass->getClassCategory2()->getName() : null; |
|
| 280 | 276 | $data['price'] = $ProductClass->getPrice02(); |
| 281 | 277 | $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity']; |
| 282 | 278 | $data['tax_type'] = TaxType::TAXATION; |
@@ -67,8 +67,8 @@ |
||
| 67 | 67 | 'constraints' => array( |
| 68 | 68 | new Assert\NotBlank(array('message' => 'ファイルを選択してください。')), |
| 69 | 69 | new Assert\File(array( |
| 70 | - 'maxSize' => $this->appConfig['csv_size'] . 'M', |
|
| 71 | - 'maxSizeMessage' => 'CSVファイルは' . $this->appConfig['csv_size'] . 'M以下でアップロードしてください。', |
|
| 70 | + 'maxSize' => $this->appConfig['csv_size'].'M', |
|
| 71 | + 'maxSizeMessage' => 'CSVファイルは'.$this->appConfig['csv_size'].'M以下でアップロードしてください。', |
|
| 72 | 72 | )), |
| 73 | 73 | ), |
| 74 | 74 | )); |
@@ -166,19 +166,19 @@ |
||
| 166 | 166 | 'help' => 'メーラーバックエンドがSMTPかつSMTP-AUTH使用時のみ指定', |
| 167 | 167 | 'required' => false, |
| 168 | 168 | )) |
| 169 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) { |
|
| 169 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) { |
|
| 170 | 170 | $form = $event->getForm(); |
| 171 | 171 | $data = $form->getData(); |
| 172 | 172 | |
| 173 | 173 | $ips = preg_split("/\R/", $data['admin_allow_hosts'], null, PREG_SPLIT_NO_EMPTY); |
| 174 | 174 | |
| 175 | - foreach($ips as $ip) { |
|
| 175 | + foreach ($ips as $ip) { |
|
| 176 | 176 | $errors = $this->validator->validate($ip, array( |
| 177 | 177 | new Assert\Ip(), |
| 178 | 178 | ) |
| 179 | 179 | ); |
| 180 | 180 | if ($errors->count() != 0) { |
| 181 | - $form['admin_allow_hosts']->addError(new FormError($ip . 'はIPv4アドレスではありません。')); |
|
| 181 | + $form['admin_allow_hosts']->addError(new FormError($ip.'はIPv4アドレスではありません。')); |
|
| 182 | 182 | } |
| 183 | 183 | } |
| 184 | 184 | }) |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | 'label' => 'パスワード', |
| 107 | 107 | 'required' => false, |
| 108 | 108 | )) |
| 109 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) { |
|
| 109 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) { |
|
| 110 | 110 | $form = $event->getForm(); |
| 111 | 111 | $data = $form->getData(); |
| 112 | 112 | try { |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config); |
| 132 | 132 | $conn->connect(); |
| 133 | 133 | } catch (\Exception $e) { |
| 134 | - $form['database']->addError(new FormError('データベースに接続できませんでした。' . $e->getMessage())); |
|
| 134 | + $form['database']->addError(new FormError('データベースに接続できませんでした。'.$e->getMessage())); |
|
| 135 | 135 | } |
| 136 | 136 | }); |
| 137 | 137 | } |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | public function validate($data, ExecutionContext $context, $param = null) |
| 148 | 148 | { |
| 149 | 149 | $parameters = $this->requestStack->getCurrentRequest()->get('install_step4'); |
| 150 | - if ($parameters['database'] != 'pdo_sqlite'){ |
|
| 150 | + if ($parameters['database'] != 'pdo_sqlite') { |
|
| 151 | 151 | $context->getValidator()->validate($data, array( |
| 152 | 152 | new Assert\NotBlank() |
| 153 | 153 | )); |