@@ -25,7 +25,7 @@ |
||
25 | 25 | namespace Eccube\Form\Type\Install; |
26 | 26 | |
27 | 27 | use \Symfony\Component\Form\AbstractType; |
28 | -use \Symfony\Component\Form\Extension\Core\Type\CheckboxType;; |
|
28 | +use \Symfony\Component\Form\Extension\Core\Type\CheckboxType; ; |
|
29 | 29 | use \Symfony\Component\Form\FormBuilderInterface; |
30 | 30 | use \Symfony\Component\Validator\Constraints as Assert; |
31 | 31 |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | public function getCsrfTokenForAnchor() |
121 | 121 | { |
122 | 122 | $token = $this->app['csrf.token_manager']->getToken(Constant::TOKEN_NAME)->getValue(); |
123 | - return 'token-for-anchor=\'' . $token . '\''; |
|
123 | + return 'token-for-anchor=\''.$token.'\''; |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | public function getPriceFilter($number, $decimals = 0, $decPoint = '.', $thousandsSep = ',') |
156 | 156 | { |
157 | 157 | $price = number_format($number, $decimals, $decPoint, $thousandsSep); |
158 | - $price = '¥ ' . $price; |
|
158 | + $price = '¥ '.$price; |
|
159 | 159 | |
160 | 160 | return $price; |
161 | 161 | } |
@@ -25,7 +25,7 @@ |
||
25 | 25 | $app['db.migrations.table_name'] = null; |
26 | 26 | $app['db.migrations.name'] = null; |
27 | 27 | |
28 | - $app['dispatcher']->addListener(ConsoleEvents::INIT, function (ConsoleEvent $event) use ($app) { |
|
28 | + $app['dispatcher']->addListener(ConsoleEvents::INIT, function(ConsoleEvent $event) use ($app) { |
|
29 | 29 | $application = $event->getApplication(); |
30 | 30 | |
31 | 31 | if (isset($app['orm.em'])) { |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | /** |
254 | 254 | * 複数配送オプション有効時の画面制御を行う. |
255 | 255 | */ |
256 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($BaseInfo) { |
|
256 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($BaseInfo) { |
|
257 | 257 | |
258 | 258 | if ($BaseInfo->getOptionMultipleShipping() != Constant::ENABLED) { |
259 | 259 | return; |
@@ -263,17 +263,16 @@ discard block |
||
263 | 263 | $orderDetails = &$data['OrderDetails']; |
264 | 264 | |
265 | 265 | // 数量0フィルター |
266 | - $quantityFilter = function ($v) { |
|
266 | + $quantityFilter = function($v) { |
|
267 | 267 | return !(isset($v['quantity']) && preg_match('/^0+$/', trim($v['quantity']))); |
268 | 268 | }; |
269 | 269 | |
270 | 270 | $shippings = &$data['Shippings']; |
271 | 271 | |
272 | 272 | // 数量を抽出 |
273 | - $getQuantity = function ($v) { |
|
273 | + $getQuantity = function($v) { |
|
274 | 274 | return (isset($v['quantity']) && preg_match('/^\d+$/', trim($v['quantity']))) ? |
275 | - trim($v['quantity']) : |
|
276 | - 0; |
|
275 | + trim($v['quantity']) : 0; |
|
277 | 276 | }; |
278 | 277 | |
279 | 278 | foreach ($shippings as &$shipping) { |
@@ -289,7 +288,7 @@ discard block |
||
289 | 288 | $orderDetail['quantity'] = 0; |
290 | 289 | |
291 | 290 | // 受注詳細と同じ商品規格のみ抽出 |
292 | - $productClassFilter = function ($v) use ($orderDetail) { |
|
291 | + $productClassFilter = function($v) use ($orderDetail) { |
|
293 | 292 | return $orderDetail['ProductClass'] === $v['ProductClass']; |
294 | 293 | }; |
295 | 294 | |
@@ -298,10 +297,9 @@ discard block |
||
298 | 297 | if (!empty($shipping['ShipmentItems'])) { |
299 | 298 | |
300 | 299 | // 同じ商品規格の受注詳細の価格を適用 |
301 | - $applyPrice = function (&$v) use ($orderDetail) { |
|
300 | + $applyPrice = function(&$v) use ($orderDetail) { |
|
302 | 301 | $v['price'] = ($v['ProductClass'] === $orderDetail['ProductClass']) ? |
303 | - $orderDetail['price'] : |
|
304 | - $v['price']; |
|
302 | + $orderDetail['price'] : $v['price']; |
|
305 | 303 | }; |
306 | 304 | array_walk($shipping['ShipmentItems'], $applyPrice); |
307 | 305 | |
@@ -322,7 +320,7 @@ discard block |
||
322 | 320 | }); |
323 | 321 | |
324 | 322 | // 商品明細が追加されているかどうかを検証する |
325 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
323 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
326 | 324 | $Order = $event->getData(); |
327 | 325 | if ($Order['OrderDetails']->isEmpty()) { |
328 | 326 | $form = $event->getForm(); |
@@ -330,7 +328,7 @@ discard block |
||
330 | 328 | } |
331 | 329 | }); |
332 | 330 | // 選択された支払い方法の名称をエンティティにコピーする |
333 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
331 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
334 | 332 | $Order = $event->getData(); |
335 | 333 | $Payment = $Order->getPayment(); |
336 | 334 | if (!is_null($Payment)) { |
@@ -338,7 +336,7 @@ discard block |
||
338 | 336 | } |
339 | 337 | }); |
340 | 338 | // 会員受注の場合、会員の性別/職業/誕生日をエンティティにコピーする |
341 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
339 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
342 | 340 | $Order = $event->getData(); |
343 | 341 | $Customer = $Order->getCustomer(); |
344 | 342 | if (!is_null($Customer)) { |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | 'format' => 'yyyy-MM-dd', |
150 | 150 | 'required' => false, |
151 | 151 | )) |
152 | - ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($BaseInfo) { |
|
152 | + ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($BaseInfo) { |
|
153 | 153 | if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
154 | 154 | $form = $event->getForm(); |
155 | 155 | $form->add('ShipmentItems', CollectionType::class, array( |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | )); |
161 | 161 | } |
162 | 162 | }) |
163 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
163 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
164 | 164 | /** @var \Eccube\Entity\Shipping $data */ |
165 | 165 | $data = $event->getData(); |
166 | 166 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | 'choice_label' => 'delivery_time', |
180 | 180 | 'placeholder' => '指定なし', |
181 | 181 | 'required' => false, |
182 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
182 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
183 | 183 | return $er->createQueryBuilder('dt') |
184 | 184 | ->where('dt.Delivery = :Delivery') |
185 | 185 | ->setParameter('Delivery', $Delivery); |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | )); |
188 | 188 | |
189 | 189 | }) |
190 | - ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) { |
|
190 | + ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) { |
|
191 | 191 | $data = $event->getData(); |
192 | 192 | $form = $event->getForm(); |
193 | 193 | if (!$data) { |
@@ -207,14 +207,14 @@ discard block |
||
207 | 207 | 'choice_label' => 'delivery_time', |
208 | 208 | 'placeholder' => '指定なし', |
209 | 209 | 'required' => false, |
210 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
210 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
211 | 211 | return $er->createQueryBuilder('dt') |
212 | 212 | ->where('dt.Delivery = :Delivery') |
213 | 213 | ->setParameter('Delivery', $Delivery); |
214 | 214 | }, |
215 | 215 | )); |
216 | 216 | }) |
217 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) { |
|
217 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) { |
|
218 | 218 | if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
219 | 219 | $form = $event->getForm(); |
220 | 220 | $shipmentItems = $form['ShipmentItems']->getData(); |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | } |
226 | 226 | } |
227 | 227 | }) |
228 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) { |
|
228 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) { |
|
229 | 229 | $Shipping = $event->getData(); |
230 | 230 | $Delivery = $Shipping->getDelivery(); |
231 | 231 | $Shipping->setShippingDeliveryName($Delivery ? $Delivery : null); |
@@ -19,32 +19,32 @@ discard block |
||
19 | 19 | */ |
20 | 20 | public function addSuccess($message, $namespace = 'front') |
21 | 21 | { |
22 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message); |
|
22 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | public function addError($message, $namespace = 'front') |
26 | 26 | { |
27 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message); |
|
27 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | public function addDanger($message, $namespace = 'front') |
31 | 31 | { |
32 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message); |
|
32 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | public function addWarning($message, $namespace = 'front') |
36 | 36 | { |
37 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message); |
|
37 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | public function addInfo($message, $namespace = 'front') |
41 | 41 | { |
42 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message); |
|
42 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | public function addRequestError($message, $namespace = 'front') |
46 | 46 | { |
47 | - $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message); |
|
47 | + $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | public function clearMessage() |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | if (is_null($namespace)) { |
64 | 64 | $this['session']->getFlashBag()->set('eccube.login.target.path', $targetPath); |
65 | 65 | } else { |
66 | - $this['session']->getFlashBag()->set('eccube.' . $namespace . '.login.target.path', $targetPath); |
|
66 | + $this['session']->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath); |
|
67 | 67 | } |
68 | 68 | } |
69 | 69 | |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * @param Response $response |
112 | 112 | * @return Application |
113 | 113 | */ |
114 | - public function forwardChain($path, array $requestParameters = [], Response &$response = null) |
|
114 | + public function forwardChain($path, array $requestParameters = [], Response&$response = null) |
|
115 | 115 | { |
116 | 116 | $response = $this->forward($path, $requestParameters); |
117 | 117 | return $this; |
@@ -44,31 +44,31 @@ discard block |
||
44 | 44 | public function register(Container $app) |
45 | 45 | { |
46 | 46 | // Service |
47 | - $app['eccube.service.system'] = function () use ($app) { |
|
47 | + $app['eccube.service.system'] = function() use ($app) { |
|
48 | 48 | return new \Eccube\Service\SystemService($app); |
49 | 49 | }; |
50 | - $app['view'] = function () use ($app) { |
|
50 | + $app['view'] = function() use ($app) { |
|
51 | 51 | return $app['twig']; |
52 | 52 | }; |
53 | - $app['eccube.service.cart'] = function () use ($app) { |
|
53 | + $app['eccube.service.cart'] = function() use ($app) { |
|
54 | 54 | return new \Eccube\Service\CartService($app); |
55 | 55 | }; |
56 | - $app['eccube.service.order'] = function () use ($app) { |
|
56 | + $app['eccube.service.order'] = function() use ($app) { |
|
57 | 57 | return new \Eccube\Service\OrderService($app); |
58 | 58 | }; |
59 | - $app['eccube.service.tax_rule'] = function () use ($app) { |
|
59 | + $app['eccube.service.tax_rule'] = function() use ($app) { |
|
60 | 60 | return new \Eccube\Service\TaxRuleService($app['eccube.repository.tax_rule']); |
61 | 61 | }; |
62 | - $app['eccube.service.plugin'] = function () use ($app) { |
|
62 | + $app['eccube.service.plugin'] = function() use ($app) { |
|
63 | 63 | return new \Eccube\Service\PluginService($app); |
64 | 64 | }; |
65 | - $app['eccube.service.mail'] = function () use ($app) { |
|
65 | + $app['eccube.service.mail'] = function() use ($app) { |
|
66 | 66 | return new \Eccube\Service\MailService($app); |
67 | 67 | }; |
68 | - $app['eccube.calculate.context'] = function () use ($app) { |
|
68 | + $app['eccube.calculate.context'] = function() use ($app) { |
|
69 | 69 | return new \Eccube\Service\Calculator\CalculateContext(); |
70 | 70 | }; |
71 | - $app['eccube.service.calculate'] = $app->protect(function ($Order, $Customer) use ($app) { |
|
71 | + $app['eccube.service.calculate'] = $app->protect(function($Order, $Customer) use ($app) { |
|
72 | 72 | $Service = new \Eccube\Service\CalculateService($Order, $Customer); |
73 | 73 | $Context = $app['eccube.calculate.context']; |
74 | 74 | $Context->setCalculateStrategies($app['eccube.calculate.strategies']($Order)); |
@@ -77,40 +77,40 @@ discard block |
||
77 | 77 | return $Service; |
78 | 78 | }); |
79 | 79 | |
80 | - $app['eccube.service.payment'] = $app->protect(function ($clazz) use ($app) { |
|
80 | + $app['eccube.service.payment'] = $app->protect(function($clazz) use ($app) { |
|
81 | 81 | $Service = new $clazz; |
82 | 82 | $Service->setApplication($app); |
83 | 83 | return $Service; |
84 | 84 | }); |
85 | 85 | |
86 | - $app['eccube.calculate.strategies'] = $app->protect(function ($Order) use ($app) { |
|
86 | + $app['eccube.calculate.strategies'] = $app->protect(function($Order) use ($app) { |
|
87 | 87 | $Strategies = new \Doctrine\Common\Collections\ArrayCollection(); // TODO 暫定的に ArrayCollection とする. 専用クラスにしたい |
88 | 88 | // デフォルトのストラテジーをセットしておく |
89 | 89 | $Strategies->add($app['eccube.calculate.strategy.shipping']($Order)); |
90 | 90 | $Strategies->add($app['eccube.calculate.strategy.tax']($Order)); |
91 | 91 | return $Strategies; |
92 | 92 | }); |
93 | - $app['eccube.calculate.strategy.shipping'] = $app->protect(function ($Order) use ($app) { |
|
93 | + $app['eccube.calculate.strategy.shipping'] = $app->protect(function($Order) use ($app) { |
|
94 | 94 | $Strategy = new \Eccube\Service\Calculator\Strategy\ShippingStrategy(); |
95 | 95 | $Strategy->setApplication($app); |
96 | 96 | $Strategy->setOrder($Order); |
97 | 97 | return $Strategy; |
98 | 98 | }); |
99 | - $app['eccube.calculate.strategy.tax'] = $app->protect(function ($Order) use ($app) { |
|
99 | + $app['eccube.calculate.strategy.tax'] = $app->protect(function($Order) use ($app) { |
|
100 | 100 | $Strategy = new \Eccube\Service\Calculator\Strategy\TaxStrategy(); |
101 | 101 | $Strategy->setApplication($app); |
102 | 102 | $Strategy->setOrder($Order); |
103 | 103 | return $Strategy; |
104 | 104 | }); |
105 | 105 | |
106 | - $app['payment.method'] = $app->protect(function ($clazz, $form) use ($app) { |
|
106 | + $app['payment.method'] = $app->protect(function($clazz, $form) use ($app) { |
|
107 | 107 | $PaymentMethod = new $clazz; |
108 | 108 | $PaymentMethod->setApplication($app); |
109 | 109 | $PaymentMethod->setFormType($form); |
110 | 110 | return $PaymentMethod; |
111 | 111 | }); |
112 | 112 | |
113 | - $app['payment.method.request'] = $app->protect(function ($clazz, $form, $request) use ($app) { |
|
113 | + $app['payment.method.request'] = $app->protect(function($clazz, $form, $request) use ($app) { |
|
114 | 114 | $PaymentMethod = new $clazz; |
115 | 115 | $PaymentMethod->setApplication($app); |
116 | 116 | $PaymentMethod->setFormType($form); |
@@ -118,11 +118,11 @@ discard block |
||
118 | 118 | return $PaymentMethod; |
119 | 119 | }); |
120 | 120 | |
121 | - $app['eccube.helper.order'] = function ($app) { |
|
121 | + $app['eccube.helper.order'] = function($app) { |
|
122 | 122 | return new OrderHelper($app); |
123 | 123 | }; |
124 | 124 | |
125 | - $app['eccube.service.csv.export'] = function () use ($app) { |
|
125 | + $app['eccube.service.csv.export'] = function() use ($app) { |
|
126 | 126 | $csvService = new \Eccube\Service\CsvExportService(); |
127 | 127 | $csvService->setEntityManager($app['orm.em']); |
128 | 128 | $csvService->setConfig($app['config']); |
@@ -134,193 +134,193 @@ discard block |
||
134 | 134 | |
135 | 135 | return $csvService; |
136 | 136 | }; |
137 | - $app['eccube.service.shopping'] = function () use ($app) { |
|
137 | + $app['eccube.service.shopping'] = function() use ($app) { |
|
138 | 138 | return new \Eccube\Service\ShoppingService($app, $app['eccube.service.cart'], $app['eccube.service.order']); |
139 | 139 | }; |
140 | 140 | |
141 | 141 | // Repository |
142 | - $app['eccube.repository.master.authority'] = function () use ($app) { |
|
142 | + $app['eccube.repository.master.authority'] = function() use ($app) { |
|
143 | 143 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Authority'); |
144 | 144 | }; |
145 | - $app['eccube.repository.master.tag'] = function () use ($app) { |
|
145 | + $app['eccube.repository.master.tag'] = function() use ($app) { |
|
146 | 146 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Tag'); |
147 | 147 | }; |
148 | - $app['eccube.repository.master.pref'] = function () use ($app) { |
|
148 | + $app['eccube.repository.master.pref'] = function() use ($app) { |
|
149 | 149 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Pref'); |
150 | 150 | }; |
151 | - $app['eccube.repository.master.sex'] = function () use ($app) { |
|
151 | + $app['eccube.repository.master.sex'] = function() use ($app) { |
|
152 | 152 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Sex'); |
153 | 153 | }; |
154 | - $app['eccube.repository.master.disp'] = function () use ($app) { |
|
154 | + $app['eccube.repository.master.disp'] = function() use ($app) { |
|
155 | 155 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Disp'); |
156 | 156 | }; |
157 | - $app['eccube.repository.master.product_type'] = function () use ($app) { |
|
157 | + $app['eccube.repository.master.product_type'] = function() use ($app) { |
|
158 | 158 | return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductType'); |
159 | 159 | }; |
160 | - $app['eccube.repository.master.page_max'] = function () use ($app) { |
|
160 | + $app['eccube.repository.master.page_max'] = function() use ($app) { |
|
161 | 161 | return $app['orm.em']->getRepository('Eccube\Entity\Master\PageMax'); |
162 | 162 | }; |
163 | - $app['eccube.repository.master.order_status'] = function () use ($app) { |
|
163 | + $app['eccube.repository.master.order_status'] = function() use ($app) { |
|
164 | 164 | return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus'); |
165 | 165 | }; |
166 | - $app['eccube.repository.master.device_type'] = function () use ($app) { |
|
166 | + $app['eccube.repository.master.device_type'] = function() use ($app) { |
|
167 | 167 | return $app['orm.em']->getRepository('Eccube\Entity\Master\DeviceType'); |
168 | 168 | }; |
169 | - $app['eccube.repository.master.csv_type'] = function () use ($app) { |
|
169 | + $app['eccube.repository.master.csv_type'] = function() use ($app) { |
|
170 | 170 | return $app['orm.em']->getRepository('Eccube\Entity\Master\CsvType'); |
171 | 171 | }; |
172 | 172 | |
173 | - $app['eccube.repository.delivery'] = function () use ($app) { |
|
173 | + $app['eccube.repository.delivery'] = function() use ($app) { |
|
174 | 174 | return $app['orm.em']->getRepository('Eccube\Entity\Delivery'); |
175 | 175 | }; |
176 | - $app['eccube.repository.delivery_date'] = function () use ($app) { |
|
176 | + $app['eccube.repository.delivery_date'] = function() use ($app) { |
|
177 | 177 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryDate'); |
178 | 178 | }; |
179 | - $app['eccube.repository.delivery_fee'] = function () use ($app) { |
|
179 | + $app['eccube.repository.delivery_fee'] = function() use ($app) { |
|
180 | 180 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryFee'); |
181 | 181 | }; |
182 | - $app['eccube.repository.delivery_time'] = function () use ($app) { |
|
182 | + $app['eccube.repository.delivery_time'] = function() use ($app) { |
|
183 | 183 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryTime'); |
184 | 184 | }; |
185 | - $app['eccube.repository.payment'] = function () use ($app) { |
|
185 | + $app['eccube.repository.payment'] = function() use ($app) { |
|
186 | 186 | return $app['orm.em']->getRepository('Eccube\Entity\Payment'); |
187 | 187 | }; |
188 | - $app['eccube.repository.payment_option'] = function () use ($app) { |
|
188 | + $app['eccube.repository.payment_option'] = function() use ($app) { |
|
189 | 189 | return $app['orm.em']->getRepository('Eccube\Entity\PaymentOption'); |
190 | 190 | }; |
191 | - $app['eccube.repository.category'] = function () use ($app) { |
|
191 | + $app['eccube.repository.category'] = function() use ($app) { |
|
192 | 192 | $CategoryRepository = $app['orm.em']->getRepository('Eccube\Entity\Category'); |
193 | 193 | $CategoryRepository->setApplication($app); |
194 | 194 | |
195 | 195 | return $CategoryRepository; |
196 | 196 | }; |
197 | - $app['eccube.repository.customer'] = function () use ($app) { |
|
197 | + $app['eccube.repository.customer'] = function() use ($app) { |
|
198 | 198 | return $app['orm.em']->getRepository('Eccube\Entity\Customer'); |
199 | 199 | }; |
200 | - $app['eccube.repository.news'] = function () use ($app) { |
|
200 | + $app['eccube.repository.news'] = function() use ($app) { |
|
201 | 201 | return $app['orm.em']->getRepository('Eccube\Entity\News'); |
202 | 202 | }; |
203 | - $app['eccube.repository.mail_history'] = function () use ($app) { |
|
203 | + $app['eccube.repository.mail_history'] = function() use ($app) { |
|
204 | 204 | return $app['orm.em']->getRepository('Eccube\Entity\MailHistory'); |
205 | 205 | }; |
206 | - $app['eccube.repository.member'] = function () use ($app) { |
|
206 | + $app['eccube.repository.member'] = function() use ($app) { |
|
207 | 207 | $memberRepository = $app['orm.em']->getRepository('Eccube\Entity\Member'); |
208 | 208 | $memberRepository->setEncoderFactorty($app['security.encoder_factory']); |
209 | 209 | return $memberRepository; |
210 | 210 | }; |
211 | - $app['eccube.repository.order'] = function () use ($app) { |
|
211 | + $app['eccube.repository.order'] = function() use ($app) { |
|
212 | 212 | return $app['orm.em']->getRepository('Eccube\Entity\Order'); |
213 | 213 | }; |
214 | - $app['eccube.repository.product'] = function () use ($app) { |
|
214 | + $app['eccube.repository.product'] = function() use ($app) { |
|
215 | 215 | $productRepository = $app['orm.em']->getRepository('Eccube\Entity\Product'); |
216 | 216 | $productRepository->setApplication($app); |
217 | 217 | |
218 | 218 | return $productRepository; |
219 | 219 | }; |
220 | - $app['eccube.repository.product_image'] = function () use ($app) { |
|
220 | + $app['eccube.repository.product_image'] = function() use ($app) { |
|
221 | 221 | return $app['orm.em']->getRepository('Eccube\Entity\ProductImage'); |
222 | 222 | }; |
223 | - $app['eccube.repository.product_class'] = function () use ($app) { |
|
223 | + $app['eccube.repository.product_class'] = function() use ($app) { |
|
224 | 224 | return $app['orm.em']->getRepository('Eccube\Entity\ProductClass'); |
225 | 225 | }; |
226 | - $app['eccube.repository.product_stock'] = function () use ($app) { |
|
226 | + $app['eccube.repository.product_stock'] = function() use ($app) { |
|
227 | 227 | return $app['orm.em']->getRepository('Eccube\Entity\ProductStock'); |
228 | 228 | }; |
229 | - $app['eccube.repository.product_tag'] = function () use ($app) { |
|
229 | + $app['eccube.repository.product_tag'] = function() use ($app) { |
|
230 | 230 | return $app['orm.em']->getRepository('Eccube\Entity\ProductTag'); |
231 | 231 | }; |
232 | - $app['eccube.repository.class_name'] = function () use ($app) { |
|
232 | + $app['eccube.repository.class_name'] = function() use ($app) { |
|
233 | 233 | return $app['orm.em']->getRepository('Eccube\Entity\ClassName'); |
234 | 234 | }; |
235 | - $app['eccube.repository.class_category'] = function () use ($app) { |
|
235 | + $app['eccube.repository.class_category'] = function() use ($app) { |
|
236 | 236 | return $app['orm.em']->getRepository('Eccube\Entity\ClassCategory'); |
237 | 237 | }; |
238 | - $app['eccube.repository.customer_favorite_product'] = function () use ($app) { |
|
238 | + $app['eccube.repository.customer_favorite_product'] = function() use ($app) { |
|
239 | 239 | return $app['orm.em']->getRepository('Eccube\Entity\CustomerFavoriteProduct'); |
240 | 240 | }; |
241 | - $app['eccube.repository.base_info'] = function () use ($app) { |
|
241 | + $app['eccube.repository.base_info'] = function() use ($app) { |
|
242 | 242 | $BaseInfoRepository = $app['orm.em']->getRepository('Eccube\Entity\BaseInfo'); |
243 | 243 | $BaseInfoRepository->setApplication($app); |
244 | 244 | |
245 | 245 | return $BaseInfoRepository; |
246 | 246 | }; |
247 | - $app['eccube.repository.tax_rule'] = function () use ($app) { |
|
247 | + $app['eccube.repository.tax_rule'] = function() use ($app) { |
|
248 | 248 | $taxRuleRepository = $app['orm.em']->getRepository('Eccube\Entity\TaxRule'); |
249 | 249 | $taxRuleRepository->setApplication($app); |
250 | 250 | |
251 | 251 | return $taxRuleRepository; |
252 | 252 | }; |
253 | - $app['eccube.repository.page_layout'] = function () use ($app) { |
|
253 | + $app['eccube.repository.page_layout'] = function() use ($app) { |
|
254 | 254 | $pageLayoutRepository = $app['orm.em']->getRepository('Eccube\Entity\PageLayout'); |
255 | 255 | $pageLayoutRepository->setApplication($app); |
256 | 256 | |
257 | 257 | return $pageLayoutRepository; |
258 | 258 | }; |
259 | - $app['eccube.repository.block'] = function () use ($app) { |
|
259 | + $app['eccube.repository.block'] = function() use ($app) { |
|
260 | 260 | $blockRepository = $app['orm.em']->getRepository('Eccube\Entity\Block'); |
261 | 261 | $blockRepository->setApplication($app); |
262 | 262 | |
263 | 263 | return $blockRepository; |
264 | 264 | }; |
265 | - $app['eccube.repository.order'] = function () use ($app) { |
|
265 | + $app['eccube.repository.order'] = function() use ($app) { |
|
266 | 266 | $orderRepository = $app['orm.em']->getRepository('Eccube\Entity\Order'); |
267 | 267 | $orderRepository->setApplication($app); |
268 | 268 | |
269 | 269 | return $orderRepository; |
270 | 270 | }; |
271 | - $app['eccube.repository.customer_address'] = function () use ($app) { |
|
271 | + $app['eccube.repository.customer_address'] = function() use ($app) { |
|
272 | 272 | return $app['orm.em']->getRepository('Eccube\Entity\CustomerAddress'); |
273 | 273 | }; |
274 | - $app['eccube.repository.shipping'] = function () use ($app) { |
|
274 | + $app['eccube.repository.shipping'] = function() use ($app) { |
|
275 | 275 | return $app['orm.em']->getRepository('Eccube\Entity\Shipping'); |
276 | 276 | }; |
277 | - $app['eccube.repository.customer_status'] = function () use ($app) { |
|
277 | + $app['eccube.repository.customer_status'] = function() use ($app) { |
|
278 | 278 | return $app['orm.em']->getRepository('Eccube\Entity\Master\CustomerStatus'); |
279 | 279 | }; |
280 | - $app['eccube.repository.order_status'] = function () use ($app) { |
|
280 | + $app['eccube.repository.order_status'] = function() use ($app) { |
|
281 | 281 | return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus'); |
282 | 282 | }; |
283 | - $app['eccube.repository.mail_template'] = function () use ($app) { |
|
283 | + $app['eccube.repository.mail_template'] = function() use ($app) { |
|
284 | 284 | return $app['orm.em']->getRepository('Eccube\Entity\MailTemplate'); |
285 | 285 | }; |
286 | - $app['eccube.repository.csv'] = function () use ($app) { |
|
286 | + $app['eccube.repository.csv'] = function() use ($app) { |
|
287 | 287 | return $app['orm.em']->getRepository('Eccube\Entity\Csv'); |
288 | 288 | }; |
289 | - $app['eccube.repository.template'] = function () use ($app) { |
|
289 | + $app['eccube.repository.template'] = function() use ($app) { |
|
290 | 290 | return $app['orm.em']->getRepository('Eccube\Entity\Template'); |
291 | 291 | }; |
292 | - $app['eccube.repository.authority_role'] = function () use ($app) { |
|
292 | + $app['eccube.repository.authority_role'] = function() use ($app) { |
|
293 | 293 | return $app['orm.em']->getRepository('Eccube\Entity\AuthorityRole'); |
294 | 294 | }; |
295 | 295 | |
296 | - $app['paginator'] = $app->protect(function () { |
|
296 | + $app['paginator'] = $app->protect(function() { |
|
297 | 297 | $paginator = new \Knp\Component\Pager\Paginator(); |
298 | 298 | $paginator->subscribe(new \Eccube\EventListener\PaginatorListener()); |
299 | 299 | |
300 | 300 | return $paginator; |
301 | 301 | }); |
302 | 302 | |
303 | - $app['eccube.repository.help'] = function () use ($app) { |
|
303 | + $app['eccube.repository.help'] = function() use ($app) { |
|
304 | 304 | return $app['orm.em']->getRepository('Eccube\Entity\Help'); |
305 | 305 | }; |
306 | - $app['eccube.repository.plugin'] = function () use ($app) { |
|
306 | + $app['eccube.repository.plugin'] = function() use ($app) { |
|
307 | 307 | return $app['orm.em']->getRepository('Eccube\Entity\Plugin'); |
308 | 308 | }; |
309 | - $app['eccube.repository.plugin_event_handler'] = function () use ($app) { |
|
309 | + $app['eccube.repository.plugin_event_handler'] = function() use ($app) { |
|
310 | 310 | return $app['orm.em']->getRepository('Eccube\Entity\PluginEventHandler'); |
311 | 311 | }; |
312 | 312 | |
313 | - $app['request_scope'] = function () { |
|
313 | + $app['request_scope'] = function() { |
|
314 | 314 | return new ParameterBag(); |
315 | 315 | }; |
316 | 316 | |
317 | 317 | // Form\Type |
318 | - $app->extend('form.type.extensions', function ($extensions) use ($app) { |
|
318 | + $app->extend('form.type.extensions', function($extensions) use ($app) { |
|
319 | 319 | $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension(); |
320 | 320 | $extensions[] = new \Eccube\Form\Extension\FreezeTypeExtension(); |
321 | 321 | return $extensions; |
322 | 322 | }); |
323 | - $app->extend('form.types', function ($types) use ($app) { |
|
323 | + $app->extend('form.types', function($types) use ($app) { |
|
324 | 324 | $types[] = new \Eccube\Form\Type\NameType($app['config']); |
325 | 325 | $types[] = new \Eccube\Form\Type\KanaType($app['config']); |
326 | 326 | $types[] = new \Eccube\Form\Type\TelType($app['config']); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | { |
72 | 72 | public function register(Container $app) |
73 | 73 | { |
74 | - $app['var_dumper.cloner'] = function ($app) { |
|
74 | + $app['var_dumper.cloner'] = function($app) { |
|
75 | 75 | $cloner = new VarCloner(); |
76 | 76 | |
77 | 77 | if (isset($app['debug.max_items'])) { |
@@ -85,37 +85,37 @@ discard block |
||
85 | 85 | return $cloner; |
86 | 86 | }; |
87 | 87 | |
88 | - $app->extend('data_collector.templates', function ($templates) { |
|
88 | + $app->extend('data_collector.templates', function($templates) { |
|
89 | 89 | return array_merge($templates, array(array('dump', '@Debug/Profiler/dump.html.twig'))); |
90 | 90 | }); |
91 | 91 | |
92 | - $app['data_collector.dump'] = function ($app) { |
|
92 | + $app['data_collector.dump'] = function($app) { |
|
93 | 93 | return new DumpDataCollector($app['stopwatch'], $app['code.file_link_format']); |
94 | 94 | }; |
95 | 95 | |
96 | - $app->extend('data_collectors', function ($collectors, $app) { |
|
97 | - $collectors['dump'] = function ($app) { |
|
96 | + $app->extend('data_collectors', function($collectors, $app) { |
|
97 | + $collectors['dump'] = function($app) { |
|
98 | 98 | return $app['data_collector.dump']; |
99 | 99 | }; |
100 | 100 | |
101 | - $collectors['eccube'] = function ($app) { |
|
101 | + $collectors['eccube'] = function($app) { |
|
102 | 102 | return new EccubeDataCollector($app); |
103 | 103 | }; |
104 | 104 | return $collectors; |
105 | 105 | }); |
106 | 106 | |
107 | - $app->extend('data_collector.templates', function ($templates, $app) { |
|
107 | + $app->extend('data_collector.templates', function($templates, $app) { |
|
108 | 108 | array_unshift($templates, ['eccube', '@EccubeProfiler/eccube.html.twig']); |
109 | 109 | return $templates; |
110 | 110 | } |
111 | 111 | ); |
112 | 112 | |
113 | - $app->extend('twig.loader.filesystem', function ($filesystem, $app) { |
|
113 | + $app->extend('twig.loader.filesystem', function($filesystem, $app) { |
|
114 | 114 | return $filesystem; |
115 | 115 | } |
116 | 116 | ); |
117 | 117 | |
118 | - $app->extend('twig', function ($twig, $app) { |
|
118 | + $app->extend('twig', function($twig, $app) { |
|
119 | 119 | if (class_exists('\Symfony\Bridge\Twig\Extension\DumpExtension')) { |
120 | 120 | $twig->addExtension(new DumpExtension($app['var_dumper.cloner'])); |
121 | 121 | } |
@@ -123,14 +123,14 @@ discard block |
||
123 | 123 | return $twig; |
124 | 124 | }); |
125 | 125 | |
126 | - $app->extend('twig.loader.filesystem', function ($loader, $app) { |
|
126 | + $app->extend('twig.loader.filesystem', function($loader, $app) { |
|
127 | 127 | $loader->addPath($app['debug.templates_path'], 'Debug'); |
128 | 128 | $loader->addPath(__DIR__.'/../Resource/template/toolbar', 'EccubeProfiler'); |
129 | 129 | |
130 | 130 | return $loader; |
131 | 131 | }); |
132 | 132 | |
133 | - $app['debug.templates_path'] = function () { |
|
133 | + $app['debug.templates_path'] = function() { |
|
134 | 134 | $r = new \ReflectionClass('Symfony\Bundle\DebugBundle\DependencyInjection\Configuration'); |
135 | 135 | |
136 | 136 | return dirname(dirname($r->getFileName())).'/Resources/views'; |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | // This code is here to lazy load the dump stack. This default |
143 | 143 | // configuration for CLI mode is overridden in HTTP mode on |
144 | 144 | // 'kernel.request' event |
145 | - VarDumper::setHandler(function ($var) use ($app) { |
|
145 | + VarDumper::setHandler(function($var) use ($app) { |
|
146 | 146 | $dumper = new CliDumper(); |
147 | 147 | $dumper->dump($app['var_dumper.cloner']->cloneVar($var)); |
148 | 148 | }); |
@@ -58,13 +58,13 @@ |
||
58 | 58 | $system = $app['eccube.service.system']; |
59 | 59 | |
60 | 60 | $arrSystemInfo = array( |
61 | - array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
62 | - array('title' => 'サーバーOS', 'value' => php_uname()), |
|
63 | - array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
64 | - array('title' => 'WEBサーバー', 'value' => $request->server->get("SERVER_SOFTWARE")), |
|
61 | + array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
62 | + array('title' => 'サーバーOS', 'value' => php_uname()), |
|
63 | + array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
64 | + array('title' => 'WEBサーバー', 'value' => $request->server->get("SERVER_SOFTWARE")), |
|
65 | 65 | ); |
66 | 66 | |
67 | - $value = phpversion() . ' (' . implode(', ', get_loaded_extensions()) . ')'; |
|
67 | + $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')'; |
|
68 | 68 | $arrSystemInfo[] = array('title' => 'PHP', 'value' => $value); |
69 | 69 | $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $request->headers->get('User-Agent')); |
70 | 70 |