@@ -310,7 +310,7 @@ |
||
310 | 310 | // 一旦、決済処理中になった後は、購入処理中に戻せない。キャンセル or 購入完了の仕様とする |
311 | 311 | // ステータス履歴も保持しておく? 在庫引き当ての仕様もセットで。 |
312 | 312 | if ($dispatcher instanceof Response) { // $paymentMethod->apply() が Response を返した場合は画面遷移 |
313 | - return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御? |
|
313 | + return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御? |
|
314 | 314 | } |
315 | 315 | $PaymentResult = $paymentService->doCheckout($paymentMethod); // 決済実行 |
316 | 316 | if (!$PaymentResult->isSuccess()) { |
@@ -18,7 +18,7 @@ |
||
18 | 18 | { |
19 | 19 | return new self(array_filter( |
20 | 20 | $this->getArrayCopy(), |
21 | - function ($OrderDetail) { |
|
21 | + function($OrderDetail) { |
|
22 | 22 | if ($OrderDetail->getProductClass()) { |
23 | 23 | return true; |
24 | 24 | } |
@@ -21,12 +21,12 @@ |
||
21 | 21 | // 送料をすべて足す |
22 | 22 | $delivery_fee_total = array_reduce( |
23 | 23 | array_map( |
24 | - function ($Shipping) { |
|
24 | + function($Shipping) { |
|
25 | 25 | return $Shipping->getShippingDeliveryFee(); |
26 | 26 | }, |
27 | 27 | $this->Order->getShippings()->toArray() |
28 | 28 | ), |
29 | - function ($carry, $item) { |
|
29 | + function($carry, $item) { |
|
30 | 30 | return $carry += $item; |
31 | 31 | } |
32 | 32 | ); |
@@ -18,7 +18,7 @@ |
||
18 | 18 | $Strategy->execute($this->OrderDetails); |
19 | 19 | } |
20 | 20 | |
21 | - foreach($this->OrderDetails as $OrderDetail) { |
|
21 | + foreach ($this->OrderDetails as $OrderDetail) { |
|
22 | 22 | if (!$this->Order->getOrderDetails()->contains($OrderDetail)) { |
23 | 23 | $OrderDetail->setOrder($this->Order); |
24 | 24 | $this->Order->addOrderDetail($OrderDetail); |
@@ -41,31 +41,31 @@ discard block |
||
41 | 41 | public function register(BaseApplication $app) |
42 | 42 | { |
43 | 43 | // Service |
44 | - $app['eccube.service.system'] = $app->share(function () use ($app) { |
|
44 | + $app['eccube.service.system'] = $app->share(function() use ($app) { |
|
45 | 45 | return new \Eccube\Service\SystemService($app); |
46 | 46 | }); |
47 | - $app['view'] = $app->share(function () use ($app) { |
|
47 | + $app['view'] = $app->share(function() use ($app) { |
|
48 | 48 | return $app['twig']; |
49 | 49 | }); |
50 | - $app['eccube.service.cart'] = $app->share(function () use ($app) { |
|
50 | + $app['eccube.service.cart'] = $app->share(function() use ($app) { |
|
51 | 51 | return new \Eccube\Service\CartService($app); |
52 | 52 | }); |
53 | - $app['eccube.service.order'] = $app->share(function () use ($app) { |
|
53 | + $app['eccube.service.order'] = $app->share(function() use ($app) { |
|
54 | 54 | return new \Eccube\Service\OrderService($app); |
55 | 55 | }); |
56 | - $app['eccube.service.tax_rule'] = $app->share(function () use ($app) { |
|
56 | + $app['eccube.service.tax_rule'] = $app->share(function() use ($app) { |
|
57 | 57 | return new \Eccube\Service\TaxRuleService($app['eccube.repository.tax_rule']); |
58 | 58 | }); |
59 | - $app['eccube.service.plugin'] = $app->share(function () use ($app) { |
|
59 | + $app['eccube.service.plugin'] = $app->share(function() use ($app) { |
|
60 | 60 | return new \Eccube\Service\PluginService($app); |
61 | 61 | }); |
62 | - $app['eccube.service.mail'] = $app->share(function () use ($app) { |
|
62 | + $app['eccube.service.mail'] = $app->share(function() use ($app) { |
|
63 | 63 | return new \Eccube\Service\MailService($app); |
64 | 64 | }); |
65 | - $app['eccube.calculate.context'] = $app->share(function () use ($app) { |
|
65 | + $app['eccube.calculate.context'] = $app->share(function() use ($app) { |
|
66 | 66 | return new \Eccube\Service\Calculator\CalculateContext(); |
67 | 67 | }); |
68 | - $app['eccube.service.calculate'] = $app->protect(function ($Order, $Customer) use ($app) { |
|
68 | + $app['eccube.service.calculate'] = $app->protect(function($Order, $Customer) use ($app) { |
|
69 | 69 | $Service = new \Eccube\Service\CalculateService($Order, $Customer); |
70 | 70 | $Context = $app['eccube.calculate.context']; |
71 | 71 | $Context->setCalculateStrategies($app['eccube.calculate.strategies']($Order)); |
@@ -74,39 +74,39 @@ discard block |
||
74 | 74 | return $Service; |
75 | 75 | }); |
76 | 76 | |
77 | - $app['eccube.service.payment'] = $app->protect(function ($clazz) use ($app) { |
|
77 | + $app['eccube.service.payment'] = $app->protect(function($clazz) use ($app) { |
|
78 | 78 | return new $clazz; |
79 | 79 | }); |
80 | 80 | |
81 | - $app['eccube.calculate.strategies'] = $app->protect(function ($Order) use ($app) { |
|
81 | + $app['eccube.calculate.strategies'] = $app->protect(function($Order) use ($app) { |
|
82 | 82 | // デフォルトのストラテジーをセットしておく |
83 | - $Strategies = [ // ArrayIterator にしたい |
|
83 | + $Strategies = [// ArrayIterator にしたい |
|
84 | 84 | $app['eccube.calculate.strategy.shipping']($Order), |
85 | 85 | $app['eccube.calculate.strategy.tax']($Order) |
86 | 86 | ]; |
87 | 87 | return $Strategies; |
88 | 88 | }); |
89 | - $app['eccube.calculate.strategy.shipping'] = $app->protect(function ($Order) use ($app) { |
|
89 | + $app['eccube.calculate.strategy.shipping'] = $app->protect(function($Order) use ($app) { |
|
90 | 90 | $Strategy = new \Eccube\Service\Calculator\Strategy\ShippingStrategy(); |
91 | 91 | $Strategy->setApplication($app); |
92 | 92 | $Strategy->setOrder($Order); |
93 | 93 | return $Strategy; |
94 | 94 | }); |
95 | - $app['eccube.calculate.strategy.tax'] = $app->protect(function ($Order) use ($app) { |
|
95 | + $app['eccube.calculate.strategy.tax'] = $app->protect(function($Order) use ($app) { |
|
96 | 96 | $Strategy = new \Eccube\Service\Calculator\Strategy\TaxStrategy(); |
97 | 97 | $Strategy->setApplication($app); |
98 | 98 | $Strategy->setOrder($Order); |
99 | 99 | return $Strategy; |
100 | 100 | }); |
101 | 101 | |
102 | - $app['payment.method'] = $app->protect(function ($clazz, $form) use ($app) { |
|
102 | + $app['payment.method'] = $app->protect(function($clazz, $form) use ($app) { |
|
103 | 103 | $PaymentMethod = new $clazz; |
104 | 104 | $PaymentMethod->setApplication($app); |
105 | 105 | $PaymentMethod->setFormType($form); |
106 | 106 | return $PaymentMethod; |
107 | 107 | }); |
108 | 108 | |
109 | - $app['payment.method.request'] = $app->protect(function ($clazz, $form, $request) use ($app) { |
|
109 | + $app['payment.method.request'] = $app->protect(function($clazz, $form, $request) use ($app) { |
|
110 | 110 | $PaymentMethod = new $clazz; |
111 | 111 | $PaymentMethod->setApplication($app); |
112 | 112 | $PaymentMethod->setFormType($form); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | return $PaymentMethod; |
115 | 115 | }); |
116 | 116 | |
117 | - $app['eccube.service.csv.export'] = $app->share(function () use ($app) { |
|
117 | + $app['eccube.service.csv.export'] = $app->share(function() use ($app) { |
|
118 | 118 | $csvService = new \Eccube\Service\CsvExportService(); |
119 | 119 | $csvService->setEntityManager($app['orm.em']); |
120 | 120 | $csvService->setConfig($app['config']); |
@@ -126,184 +126,184 @@ discard block |
||
126 | 126 | |
127 | 127 | return $csvService; |
128 | 128 | }); |
129 | - $app['eccube.service.shopping'] = $app->share(function () use ($app) { |
|
129 | + $app['eccube.service.shopping'] = $app->share(function() use ($app) { |
|
130 | 130 | return new \Eccube\Service\ShoppingService($app, $app['eccube.service.cart'], $app['eccube.service.order']); |
131 | 131 | }); |
132 | 132 | |
133 | 133 | // Repository |
134 | - $app['eccube.repository.master.authority'] = $app->share(function () use ($app) { |
|
134 | + $app['eccube.repository.master.authority'] = $app->share(function() use ($app) { |
|
135 | 135 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Authority'); |
136 | 136 | }); |
137 | - $app['eccube.repository.master.tag'] = $app->share(function () use ($app) { |
|
137 | + $app['eccube.repository.master.tag'] = $app->share(function() use ($app) { |
|
138 | 138 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Tag'); |
139 | 139 | }); |
140 | - $app['eccube.repository.master.pref'] = $app->share(function () use ($app) { |
|
140 | + $app['eccube.repository.master.pref'] = $app->share(function() use ($app) { |
|
141 | 141 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Pref'); |
142 | 142 | }); |
143 | - $app['eccube.repository.master.sex'] = $app->share(function () use ($app) { |
|
143 | + $app['eccube.repository.master.sex'] = $app->share(function() use ($app) { |
|
144 | 144 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Sex'); |
145 | 145 | }); |
146 | - $app['eccube.repository.master.disp'] = $app->share(function () use ($app) { |
|
146 | + $app['eccube.repository.master.disp'] = $app->share(function() use ($app) { |
|
147 | 147 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Disp'); |
148 | 148 | }); |
149 | - $app['eccube.repository.master.product_type'] = $app->share(function () use ($app) { |
|
149 | + $app['eccube.repository.master.product_type'] = $app->share(function() use ($app) { |
|
150 | 150 | return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductType'); |
151 | 151 | }); |
152 | - $app['eccube.repository.master.page_max'] = $app->share(function () use ($app) { |
|
152 | + $app['eccube.repository.master.page_max'] = $app->share(function() use ($app) { |
|
153 | 153 | return $app['orm.em']->getRepository('Eccube\Entity\Master\PageMax'); |
154 | 154 | }); |
155 | - $app['eccube.repository.master.order_status'] = $app->share(function () use ($app) { |
|
155 | + $app['eccube.repository.master.order_status'] = $app->share(function() use ($app) { |
|
156 | 156 | return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus'); |
157 | 157 | }); |
158 | - $app['eccube.repository.master.device_type'] = $app->share(function () use ($app) { |
|
158 | + $app['eccube.repository.master.device_type'] = $app->share(function() use ($app) { |
|
159 | 159 | return $app['orm.em']->getRepository('Eccube\Entity\Master\DeviceType'); |
160 | 160 | }); |
161 | - $app['eccube.repository.master.csv_type'] = $app->share(function () use ($app) { |
|
161 | + $app['eccube.repository.master.csv_type'] = $app->share(function() use ($app) { |
|
162 | 162 | return $app['orm.em']->getRepository('Eccube\Entity\Master\CsvType'); |
163 | 163 | }); |
164 | 164 | |
165 | - $app['eccube.repository.delivery'] = $app->share(function () use ($app) { |
|
165 | + $app['eccube.repository.delivery'] = $app->share(function() use ($app) { |
|
166 | 166 | return $app['orm.em']->getRepository('Eccube\Entity\Delivery'); |
167 | 167 | }); |
168 | - $app['eccube.repository.delivery_date'] = $app->share(function () use ($app) { |
|
168 | + $app['eccube.repository.delivery_date'] = $app->share(function() use ($app) { |
|
169 | 169 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryDate'); |
170 | 170 | }); |
171 | - $app['eccube.repository.delivery_fee'] = $app->share(function () use ($app) { |
|
171 | + $app['eccube.repository.delivery_fee'] = $app->share(function() use ($app) { |
|
172 | 172 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryFee'); |
173 | 173 | }); |
174 | - $app['eccube.repository.delivery_time'] = $app->share(function () use ($app) { |
|
174 | + $app['eccube.repository.delivery_time'] = $app->share(function() use ($app) { |
|
175 | 175 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryTime'); |
176 | 176 | }); |
177 | - $app['eccube.repository.payment'] = $app->share(function () use ($app) { |
|
177 | + $app['eccube.repository.payment'] = $app->share(function() use ($app) { |
|
178 | 178 | return $app['orm.em']->getRepository('Eccube\Entity\Payment'); |
179 | 179 | }); |
180 | - $app['eccube.repository.payment_option'] = $app->share(function () use ($app) { |
|
180 | + $app['eccube.repository.payment_option'] = $app->share(function() use ($app) { |
|
181 | 181 | return $app['orm.em']->getRepository('Eccube\Entity\PaymentOption'); |
182 | 182 | }); |
183 | - $app['eccube.repository.category'] = $app->share(function () use ($app) { |
|
183 | + $app['eccube.repository.category'] = $app->share(function() use ($app) { |
|
184 | 184 | $CategoryRepository = $app['orm.em']->getRepository('Eccube\Entity\Category'); |
185 | 185 | $CategoryRepository->setApplication($app); |
186 | 186 | |
187 | 187 | return $CategoryRepository; |
188 | 188 | }); |
189 | - $app['eccube.repository.customer'] = $app->share(function () use ($app) { |
|
189 | + $app['eccube.repository.customer'] = $app->share(function() use ($app) { |
|
190 | 190 | return $app['orm.em']->getRepository('Eccube\Entity\Customer'); |
191 | 191 | }); |
192 | - $app['eccube.repository.news'] = $app->share(function () use ($app) { |
|
192 | + $app['eccube.repository.news'] = $app->share(function() use ($app) { |
|
193 | 193 | return $app['orm.em']->getRepository('Eccube\Entity\News'); |
194 | 194 | }); |
195 | - $app['eccube.repository.mail_history'] = $app->share(function () use ($app) { |
|
195 | + $app['eccube.repository.mail_history'] = $app->share(function() use ($app) { |
|
196 | 196 | return $app['orm.em']->getRepository('Eccube\Entity\MailHistory'); |
197 | 197 | }); |
198 | - $app['eccube.repository.member'] = $app->share(function () use ($app) { |
|
198 | + $app['eccube.repository.member'] = $app->share(function() use ($app) { |
|
199 | 199 | $memberRepository = $app['orm.em']->getRepository('Eccube\Entity\Member'); |
200 | 200 | $memberRepository->setEncoderFactorty($app['security.encoder_factory']); |
201 | 201 | return $memberRepository; |
202 | 202 | }); |
203 | - $app['eccube.repository.order'] = $app->share(function () use ($app) { |
|
203 | + $app['eccube.repository.order'] = $app->share(function() use ($app) { |
|
204 | 204 | return $app['orm.em']->getRepository('Eccube\Entity\Order'); |
205 | 205 | }); |
206 | - $app['eccube.repository.product'] = $app->share(function () use ($app) { |
|
206 | + $app['eccube.repository.product'] = $app->share(function() use ($app) { |
|
207 | 207 | $productRepository = $app['orm.em']->getRepository('Eccube\Entity\Product'); |
208 | 208 | $productRepository->setApplication($app); |
209 | 209 | |
210 | 210 | return $productRepository; |
211 | 211 | }); |
212 | - $app['eccube.repository.product_image'] = $app->share(function () use ($app) { |
|
212 | + $app['eccube.repository.product_image'] = $app->share(function() use ($app) { |
|
213 | 213 | return $app['orm.em']->getRepository('Eccube\Entity\ProductImage'); |
214 | 214 | }); |
215 | - $app['eccube.repository.product_class'] = $app->share(function () use ($app) { |
|
215 | + $app['eccube.repository.product_class'] = $app->share(function() use ($app) { |
|
216 | 216 | return $app['orm.em']->getRepository('Eccube\Entity\ProductClass'); |
217 | 217 | }); |
218 | - $app['eccube.repository.product_stock'] = $app->share(function () use ($app) { |
|
218 | + $app['eccube.repository.product_stock'] = $app->share(function() use ($app) { |
|
219 | 219 | return $app['orm.em']->getRepository('Eccube\Entity\ProductStock'); |
220 | 220 | }); |
221 | - $app['eccube.repository.product_tag'] = $app->share(function () use ($app) { |
|
221 | + $app['eccube.repository.product_tag'] = $app->share(function() use ($app) { |
|
222 | 222 | return $app['orm.em']->getRepository('Eccube\Entity\ProductTag'); |
223 | 223 | }); |
224 | - $app['eccube.repository.class_name'] = $app->share(function () use ($app) { |
|
224 | + $app['eccube.repository.class_name'] = $app->share(function() use ($app) { |
|
225 | 225 | return $app['orm.em']->getRepository('Eccube\Entity\ClassName'); |
226 | 226 | }); |
227 | - $app['eccube.repository.class_category'] = $app->share(function () use ($app) { |
|
227 | + $app['eccube.repository.class_category'] = $app->share(function() use ($app) { |
|
228 | 228 | return $app['orm.em']->getRepository('Eccube\Entity\ClassCategory'); |
229 | 229 | }); |
230 | - $app['eccube.repository.customer_favorite_product'] = $app->share(function () use ($app) { |
|
230 | + $app['eccube.repository.customer_favorite_product'] = $app->share(function() use ($app) { |
|
231 | 231 | return $app['orm.em']->getRepository('Eccube\Entity\CustomerFavoriteProduct'); |
232 | 232 | }); |
233 | - $app['eccube.repository.base_info'] = $app->share(function () use ($app) { |
|
233 | + $app['eccube.repository.base_info'] = $app->share(function() use ($app) { |
|
234 | 234 | $BaseInfoRepository = $app['orm.em']->getRepository('Eccube\Entity\BaseInfo'); |
235 | 235 | $BaseInfoRepository->setApplication($app); |
236 | 236 | |
237 | 237 | return $BaseInfoRepository; |
238 | 238 | }); |
239 | - $app['eccube.repository.tax_rule'] = $app->share(function () use ($app) { |
|
239 | + $app['eccube.repository.tax_rule'] = $app->share(function() use ($app) { |
|
240 | 240 | $taxRuleRepository = $app['orm.em']->getRepository('Eccube\Entity\TaxRule'); |
241 | 241 | $taxRuleRepository->setApplication($app); |
242 | 242 | |
243 | 243 | return $taxRuleRepository; |
244 | 244 | }); |
245 | - $app['eccube.repository.page_layout'] = $app->share(function () use ($app) { |
|
245 | + $app['eccube.repository.page_layout'] = $app->share(function() use ($app) { |
|
246 | 246 | $pageLayoutRepository = $app['orm.em']->getRepository('Eccube\Entity\PageLayout'); |
247 | 247 | $pageLayoutRepository->setApplication($app); |
248 | 248 | |
249 | 249 | return $pageLayoutRepository; |
250 | 250 | }); |
251 | - $app['eccube.repository.block'] = $app->share(function () use ($app) { |
|
251 | + $app['eccube.repository.block'] = $app->share(function() use ($app) { |
|
252 | 252 | $blockRepository = $app['orm.em']->getRepository('Eccube\Entity\Block'); |
253 | 253 | $blockRepository->setApplication($app); |
254 | 254 | |
255 | 255 | return $blockRepository; |
256 | 256 | }); |
257 | - $app['eccube.repository.order'] = $app->share(function () use ($app) { |
|
257 | + $app['eccube.repository.order'] = $app->share(function() use ($app) { |
|
258 | 258 | $orderRepository = $app['orm.em']->getRepository('Eccube\Entity\Order'); |
259 | 259 | $orderRepository->setApplication($app); |
260 | 260 | |
261 | 261 | return $orderRepository; |
262 | 262 | }); |
263 | - $app['eccube.repository.customer_address'] = $app->share(function () use ($app) { |
|
263 | + $app['eccube.repository.customer_address'] = $app->share(function() use ($app) { |
|
264 | 264 | return $app['orm.em']->getRepository('Eccube\Entity\CustomerAddress'); |
265 | 265 | }); |
266 | - $app['eccube.repository.shipping'] = $app->share(function () use ($app) { |
|
266 | + $app['eccube.repository.shipping'] = $app->share(function() use ($app) { |
|
267 | 267 | return $app['orm.em']->getRepository('Eccube\Entity\Shipping'); |
268 | 268 | }); |
269 | - $app['eccube.repository.customer_status'] = $app->share(function () use ($app) { |
|
269 | + $app['eccube.repository.customer_status'] = $app->share(function() use ($app) { |
|
270 | 270 | return $app['orm.em']->getRepository('Eccube\Entity\Master\CustomerStatus'); |
271 | 271 | }); |
272 | - $app['eccube.repository.order_status'] = $app->share(function () use ($app) { |
|
272 | + $app['eccube.repository.order_status'] = $app->share(function() use ($app) { |
|
273 | 273 | return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus'); |
274 | 274 | }); |
275 | - $app['eccube.repository.mail_template'] = $app->share(function () use ($app) { |
|
275 | + $app['eccube.repository.mail_template'] = $app->share(function() use ($app) { |
|
276 | 276 | return $app['orm.em']->getRepository('Eccube\Entity\MailTemplate'); |
277 | 277 | }); |
278 | - $app['eccube.repository.csv'] = $app->share(function () use ($app) { |
|
278 | + $app['eccube.repository.csv'] = $app->share(function() use ($app) { |
|
279 | 279 | return $app['orm.em']->getRepository('Eccube\Entity\Csv'); |
280 | 280 | }); |
281 | - $app['eccube.repository.template'] = $app->share(function () use ($app) { |
|
281 | + $app['eccube.repository.template'] = $app->share(function() use ($app) { |
|
282 | 282 | return $app['orm.em']->getRepository('Eccube\Entity\Template'); |
283 | 283 | }); |
284 | - $app['eccube.repository.authority_role'] = $app->share(function () use ($app) { |
|
284 | + $app['eccube.repository.authority_role'] = $app->share(function() use ($app) { |
|
285 | 285 | return $app['orm.em']->getRepository('Eccube\Entity\AuthorityRole'); |
286 | 286 | }); |
287 | 287 | |
288 | - $app['paginator'] = $app->protect(function () { |
|
288 | + $app['paginator'] = $app->protect(function() { |
|
289 | 289 | $paginator = new \Knp\Component\Pager\Paginator(); |
290 | 290 | $paginator->subscribe(new \Eccube\EventListener\PaginatorListener()); |
291 | 291 | |
292 | 292 | return $paginator; |
293 | 293 | }); |
294 | 294 | |
295 | - $app['eccube.repository.help'] = $app->share(function () use ($app) { |
|
295 | + $app['eccube.repository.help'] = $app->share(function() use ($app) { |
|
296 | 296 | return $app['orm.em']->getRepository('Eccube\Entity\Help'); |
297 | 297 | }); |
298 | - $app['eccube.repository.plugin'] = $app->share(function () use ($app) { |
|
298 | + $app['eccube.repository.plugin'] = $app->share(function() use ($app) { |
|
299 | 299 | return $app['orm.em']->getRepository('Eccube\Entity\Plugin'); |
300 | 300 | }); |
301 | - $app['eccube.repository.plugin_event_handler'] = $app->share(function () use ($app) { |
|
301 | + $app['eccube.repository.plugin_event_handler'] = $app->share(function() use ($app) { |
|
302 | 302 | return $app['orm.em']->getRepository('Eccube\Entity\PluginEventHandler'); |
303 | 303 | }); |
304 | 304 | // em |
305 | 305 | if (isset($app['orm.em'])) { |
306 | - $app['orm.em'] = $app->share($app->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
306 | + $app['orm.em'] = $app->share($app->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
307 | 307 | // tax_rule |
308 | 308 | $taxRuleRepository = $em->getRepository('Eccube\Entity\TaxRule'); |
309 | 309 | $taxRuleRepository->setApplication($app); |
@@ -330,13 +330,13 @@ discard block |
||
330 | 330 | } |
331 | 331 | |
332 | 332 | // Form\Type |
333 | - $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function ($extensions) use ($app) { |
|
333 | + $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function($extensions) use ($app) { |
|
334 | 334 | $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension(); |
335 | 335 | $extensions[] = new \Eccube\Form\Extension\FreezeTypeExtension(); |
336 | 336 | |
337 | 337 | return $extensions; |
338 | 338 | })); |
339 | - $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) { |
|
339 | + $app['form.types'] = $app->share($app->extend('form.types', function($types) use ($app) { |
|
340 | 340 | $types[] = new \Eccube\Form\Type\NameType($app['config']); |
341 | 341 | $types[] = new \Eccube\Form\Type\KanaType($app['config']); |
342 | 342 | $types[] = new \Eccube\Form\Type\TelType($app['config']); |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | // 支払い方法のプルダウンを生成 |
80 | 80 | $builder->addEventListener( |
81 | 81 | FormEvents::PRE_SET_DATA, |
82 | - function (FormEvent $event) { |
|
82 | + function(FormEvent $event) { |
|
83 | 83 | $Order = $event->getData(); |
84 | 84 | if (is_null($Order) || !$Order->getId()) { |
85 | 85 | return; |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | // TODO Calculatorで行うのが適切. |
125 | 125 | $builder->addEventListener( |
126 | 126 | FormEvents::POST_SUBMIT, |
127 | - function (FormEvent $event) { |
|
127 | + function(FormEvent $event) { |
|
128 | 128 | /** @var Order $Order */ |
129 | 129 | $Order = $event->getData(); |
130 | 130 | $Order->setPaymentMethod($Order->getPayment()->getMethod()); |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | // 配送業者のプルダウンを生成 |
55 | 55 | $builder->addEventListener( |
56 | 56 | FormEvents::PRE_SET_DATA, |
57 | - function (FormEvent $event) { |
|
57 | + function(FormEvent $event) { |
|
58 | 58 | $Shipping = $event->getData(); |
59 | 59 | if (is_null($Shipping) || !$Shipping->getId()) { |
60 | 60 | return; |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | // お届け日のプルダウンを生成 |
96 | 96 | $builder->addEventListener( |
97 | 97 | FormEvents::PRE_SET_DATA, |
98 | - function (FormEvent $event) { |
|
98 | + function(FormEvent $event) { |
|
99 | 99 | $Shipping = $event->getData(); |
100 | 100 | if (is_null($Shipping) || !$Shipping->getId()) { |
101 | 101 | return; |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | |
132 | 132 | // 配送日数が設定されている |
133 | 133 | if ($deliveryDateFlag) { |
134 | - $period = new \DatePeriod ( |
|
134 | + $period = new \DatePeriod( |
|
135 | 135 | new \DateTime($minDate.' day'), |
136 | 136 | new \DateInterval('P1D'), |
137 | 137 | new \DateTime($minDate + $this->config['deliv_date_end_max'].' day') |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | // お届け時間のプルダウンを生成 |
160 | 160 | $builder->addEventListener( |
161 | 161 | FormEvents::PRE_SET_DATA, |
162 | - function (FormEvent $event) { |
|
162 | + function(FormEvent $event) { |
|
163 | 163 | $Shipping = $event->getData(); |
164 | 164 | if (is_null($Shipping) || !$Shipping->getId()) { |
165 | 165 | return; |