Failed Conditions
Pull Request — experimental/3.1 (#2273)
by
unknown
42:18
created
src/Eccube/ServiceProvider/EccubeServiceProvider.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
      * This method should only be used to configure services and parameters.
40 40
      * It should not get services.
41 41
      *
42
-     * @param BaseApplication $app An Application instance
42
+     * @param Container $app An Application instance
43 43
      */
44 44
     public function register(Container $app)
45 45
     {
Please login to merge, or discard this patch.
Spacing   +79 added lines, -79 removed lines patch added patch discarded remove patch
@@ -45,44 +45,44 @@  discard block
 block discarded – undo
45 45
     public function register(Container $app)
46 46
     {
47 47
         // Service
48
-        $app['eccube.service.system'] = function () use ($app) {
48
+        $app['eccube.service.system'] = function() use ($app) {
49 49
             return new \Eccube\Service\SystemService($app);
50 50
         };
51
-        $app['view'] = function () use ($app) {
51
+        $app['view'] = function() use ($app) {
52 52
             return $app['twig'];
53 53
         };
54
-        $app['eccube.service.cart'] = function () use ($app) {
54
+        $app['eccube.service.cart'] = function() use ($app) {
55 55
             return new \Eccube\Service\CartService($app);
56 56
         };
57
-        $app['eccube.service.cart.compare'] = $app->protect(function ($Cart) use ($app) {
57
+        $app['eccube.service.cart.compare'] = $app->protect(function($Cart) use ($app) {
58 58
             $service = new \Eccube\Service\CartCompareService($Cart);
59 59
             $service->setContext($app['eccube.cart.comparator.context']);
60 60
             return $service;
61 61
         });
62
-        $app['eccube.cart.comparator.context'] = function () use ($app) {
62
+        $app['eccube.cart.comparator.context'] = function() use ($app) {
63 63
             $context = new \Eccube\Service\CartComparator\CompareContext();
64 64
             $context->addStrategy($app['eccube.cart.comparator.strategy.product_class']);
65 65
             return $context;
66 66
         };
67
-        $app['eccube.cart.comparator.strategy.product_class'] = function () {
67
+        $app['eccube.cart.comparator.strategy.product_class'] = function() {
68 68
             return new \Eccube\Service\CartComparator\Strategy\ProductClassStrategy();
69 69
         };
70
-        $app['eccube.service.order'] = function () use ($app) {
70
+        $app['eccube.service.order'] = function() use ($app) {
71 71
             return new \Eccube\Service\OrderService($app);
72 72
         };
73
-        $app['eccube.service.tax_rule'] = function () use ($app) {
73
+        $app['eccube.service.tax_rule'] = function() use ($app) {
74 74
             return new \Eccube\Service\TaxRuleService($app['eccube.repository.tax_rule']);
75 75
         };
76
-        $app['eccube.service.plugin'] = function () use ($app) {
76
+        $app['eccube.service.plugin'] = function() use ($app) {
77 77
             return new \Eccube\Service\PluginService($app);
78 78
         };
79
-        $app['eccube.service.mail'] = function () use ($app) {
79
+        $app['eccube.service.mail'] = function() use ($app) {
80 80
             return new \Eccube\Service\MailService($app);
81 81
         };
82
-        $app['eccube.calculate.context'] = function () use ($app) {
82
+        $app['eccube.calculate.context'] = function() use ($app) {
83 83
                 return new \Eccube\Service\Calculator\CalculateContext();
84 84
         };
85
-        $app['eccube.service.calculate'] = $app->protect(function ($Order, $Customer) use ($app) {
85
+        $app['eccube.service.calculate'] = $app->protect(function($Order, $Customer) use ($app) {
86 86
                 $Service = new \Eccube\Service\CalculateService($Order, $Customer);
87 87
                 $Context = $app['eccube.calculate.context'];
88 88
                 $Context->setCalculateStrategies($app['eccube.calculate.strategies']($Order));
@@ -91,40 +91,40 @@  discard block
 block discarded – undo
91 91
                 return $Service;
92 92
         });
93 93
 
94
-        $app['eccube.service.payment'] = $app->protect(function ($clazz) use ($app) {
94
+        $app['eccube.service.payment'] = $app->protect(function($clazz) use ($app) {
95 95
                 $Service = new $clazz;
96 96
                 $Service->setApplication($app);
97 97
                 return $Service;
98 98
         });
99 99
 
100
-        $app['eccube.calculate.strategies'] = $app->protect(function ($Order) use ($app) {
100
+        $app['eccube.calculate.strategies'] = $app->protect(function($Order) use ($app) {
101 101
             $Strategies = new \Doctrine\Common\Collections\ArrayCollection(); // TODO 暫定的に ArrayCollection とする. 専用クラスにしたい
102 102
             // デフォルトのストラテジーをセットしておく
103 103
             $Strategies->add($app['eccube.calculate.strategy.shipping']($Order));
104 104
             $Strategies->add($app['eccube.calculate.strategy.tax']($Order));
105 105
             return $Strategies;
106 106
         });
107
-        $app['eccube.calculate.strategy.shipping'] = $app->protect(function ($Order) use ($app) {
107
+        $app['eccube.calculate.strategy.shipping'] = $app->protect(function($Order) use ($app) {
108 108
                 $Strategy = new \Eccube\Service\Calculator\Strategy\ShippingStrategy();
109 109
                 $Strategy->setApplication($app);
110 110
                 $Strategy->setOrder($Order);
111 111
                 return $Strategy;
112 112
         });
113
-        $app['eccube.calculate.strategy.tax'] = $app->protect(function ($Order) use ($app) {
113
+        $app['eccube.calculate.strategy.tax'] = $app->protect(function($Order) use ($app) {
114 114
                 $Strategy = new \Eccube\Service\Calculator\Strategy\TaxStrategy();
115 115
                 $Strategy->setApplication($app);
116 116
                 $Strategy->setOrder($Order);
117 117
                 return $Strategy;
118 118
         });
119 119
 
120
-        $app['payment.method'] = $app->protect(function ($clazz, $form) use ($app) {
120
+        $app['payment.method'] = $app->protect(function($clazz, $form) use ($app) {
121 121
                 $PaymentMethod = new $clazz;
122 122
                 $PaymentMethod->setApplication($app);
123 123
                 $PaymentMethod->setFormType($form);
124 124
                 return $PaymentMethod;
125 125
         });
126 126
 
127
-        $app['payment.method.request'] = $app->protect(function ($clazz, $form, $request) use ($app) {
127
+        $app['payment.method.request'] = $app->protect(function($clazz, $form, $request) use ($app) {
128 128
                 $PaymentMethod = new $clazz;
129 129
                 $PaymentMethod->setApplication($app);
130 130
                 $PaymentMethod->setFormType($form);
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
                 return $PaymentMethod;
133 133
         });
134 134
 
135
-        $app['eccube.helper.order'] = function ($app) {
135
+        $app['eccube.helper.order'] = function($app) {
136 136
             return new OrderHelper($app);
137 137
         };
138 138
 
139
-        $app['eccube.service.csv.export'] = function () use ($app) {
139
+        $app['eccube.service.csv.export'] = function() use ($app) {
140 140
             $csvService = new \Eccube\Service\CsvExportService();
141 141
             $csvService->setEntityManager($app['orm.em']);
142 142
             $csvService->setConfig($app['config']);
@@ -148,195 +148,195 @@  discard block
 block discarded – undo
148 148
 
149 149
             return $csvService;
150 150
         };
151
-        $app['eccube.service.shopping'] = function () use ($app) {
151
+        $app['eccube.service.shopping'] = function() use ($app) {
152 152
             return new \Eccube\Service\ShoppingService($app, $app['eccube.service.cart'], $app['eccube.service.order']);
153 153
         };
154 154
 
155 155
         // Repository
156
-        $app['eccube.repository.master.authority'] = function () use ($app) {
156
+        $app['eccube.repository.master.authority'] = function() use ($app) {
157 157
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Authority');
158 158
         };
159
-        $app['eccube.repository.master.tag'] = function () use ($app) {
159
+        $app['eccube.repository.master.tag'] = function() use ($app) {
160 160
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Tag');
161 161
         };
162
-        $app['eccube.repository.master.pref'] = function () use ($app) {
162
+        $app['eccube.repository.master.pref'] = function() use ($app) {
163 163
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Pref');
164 164
         };
165
-        $app['eccube.repository.master.sex'] = function () use ($app) {
165
+        $app['eccube.repository.master.sex'] = function() use ($app) {
166 166
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Sex');
167 167
         };
168
-        $app['eccube.repository.master.disp'] = function () use ($app) {
168
+        $app['eccube.repository.master.disp'] = function() use ($app) {
169 169
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Disp');
170 170
         };
171
-        $app['eccube.repository.master.product_type'] = function () use ($app) {
171
+        $app['eccube.repository.master.product_type'] = function() use ($app) {
172 172
             return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductType');
173 173
         };
174
-        $app['eccube.repository.master.page_max'] = function () use ($app) {
174
+        $app['eccube.repository.master.page_max'] = function() use ($app) {
175 175
             return $app['orm.em']->getRepository('Eccube\Entity\Master\PageMax');
176 176
         };
177
-        $app['eccube.repository.master.order_status'] = function () use ($app) {
177
+        $app['eccube.repository.master.order_status'] = function() use ($app) {
178 178
         };
179
-        $app['eccube.repository.master.product_list_max'] = function () use ($app) {
179
+        $app['eccube.repository.master.product_list_max'] = function() use ($app) {
180 180
             return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductListMax');
181 181
         };
182
-        $app['eccube.repository.master.product_list_order_by'] = function () use ($app) {
182
+        $app['eccube.repository.master.product_list_order_by'] = function() use ($app) {
183 183
             return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductListOrderBy');
184 184
         };
185
-        $app['eccube.repository.master.order_status'] = function () use ($app) {
185
+        $app['eccube.repository.master.order_status'] = function() use ($app) {
186 186
             return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus');
187 187
         };
188
-        $app['eccube.repository.master.device_type'] = function () use ($app) {
188
+        $app['eccube.repository.master.device_type'] = function() use ($app) {
189 189
             return $app['orm.em']->getRepository('Eccube\Entity\Master\DeviceType');
190 190
         };
191
-        $app['eccube.repository.master.csv_type'] = function () use ($app) {
191
+        $app['eccube.repository.master.csv_type'] = function() use ($app) {
192 192
             return $app['orm.em']->getRepository('Eccube\Entity\Master\CsvType');
193 193
         };
194 194
 
195
-        $app['eccube.repository.delivery'] = function () use ($app) {
195
+        $app['eccube.repository.delivery'] = function() use ($app) {
196 196
             return $app['orm.em']->getRepository('Eccube\Entity\Delivery');
197 197
         };
198
-        $app['eccube.repository.delivery_date'] = function () use ($app) {
198
+        $app['eccube.repository.delivery_date'] = function() use ($app) {
199 199
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryDate');
200 200
         };
201
-        $app['eccube.repository.delivery_fee'] = function () use ($app) {
201
+        $app['eccube.repository.delivery_fee'] = function() use ($app) {
202 202
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryFee');
203 203
         };
204
-        $app['eccube.repository.delivery_time'] = function () use ($app) {
204
+        $app['eccube.repository.delivery_time'] = function() use ($app) {
205 205
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryTime');
206 206
         };
207
-        $app['eccube.repository.payment'] = function () use ($app) {
207
+        $app['eccube.repository.payment'] = function() use ($app) {
208 208
             return $app['orm.em']->getRepository('Eccube\Entity\Payment');
209 209
         };
210
-        $app['eccube.repository.payment_option'] = function () use ($app) {
210
+        $app['eccube.repository.payment_option'] = function() use ($app) {
211 211
             return $app['orm.em']->getRepository('Eccube\Entity\PaymentOption');
212 212
         };
213
-        $app['eccube.repository.category'] = function () use ($app) {
213
+        $app['eccube.repository.category'] = function() use ($app) {
214 214
             $CategoryRepository = $app['orm.em']->getRepository('Eccube\Entity\Category');
215 215
             $CategoryRepository->setApplication($app);
216 216
 
217 217
             return $CategoryRepository;
218 218
         };
219
-        $app['eccube.repository.customer'] = function () use ($app) {
219
+        $app['eccube.repository.customer'] = function() use ($app) {
220 220
             return $app['orm.em']->getRepository('Eccube\Entity\Customer');
221 221
         };
222
-        $app['eccube.repository.news'] = function () use ($app) {
222
+        $app['eccube.repository.news'] = function() use ($app) {
223 223
             return $app['orm.em']->getRepository('Eccube\Entity\News');
224 224
         };
225
-        $app['eccube.repository.mail_history'] = function () use ($app) {
225
+        $app['eccube.repository.mail_history'] = function() use ($app) {
226 226
             return $app['orm.em']->getRepository('Eccube\Entity\MailHistory');
227 227
         };
228
-        $app['eccube.repository.member'] = function () use ($app) {
228
+        $app['eccube.repository.member'] = function() use ($app) {
229 229
             $memberRepository = $app['orm.em']->getRepository('Eccube\Entity\Member');
230 230
             $memberRepository->setEncoderFactorty($app['security.encoder_factory']);
231 231
             return $memberRepository;
232 232
         };
233
-        $app['eccube.repository.order'] = function () use ($app) {
233
+        $app['eccube.repository.order'] = function() use ($app) {
234 234
             return $app['orm.em']->getRepository('Eccube\Entity\Order');
235 235
         };
236
-        $app['eccube.repository.product'] = function () use ($app) {
236
+        $app['eccube.repository.product'] = function() use ($app) {
237 237
             $productRepository = $app['orm.em']->getRepository('Eccube\Entity\Product');
238 238
             $productRepository->setApplication($app);
239 239
 
240 240
             return $productRepository;
241 241
         };
242
-        $app['eccube.repository.product_image'] = function () use ($app) {
242
+        $app['eccube.repository.product_image'] = function() use ($app) {
243 243
             return $app['orm.em']->getRepository('Eccube\Entity\ProductImage');
244 244
         };
245
-        $app['eccube.repository.product_class'] = function () use ($app) {
245
+        $app['eccube.repository.product_class'] = function() use ($app) {
246 246
             return $app['orm.em']->getRepository('Eccube\Entity\ProductClass');
247 247
         };
248
-        $app['eccube.repository.product_stock'] = function () use ($app) {
248
+        $app['eccube.repository.product_stock'] = function() use ($app) {
249 249
             return $app['orm.em']->getRepository('Eccube\Entity\ProductStock');
250 250
         };
251
-        $app['eccube.repository.product_tag'] = function () use ($app) {
251
+        $app['eccube.repository.product_tag'] = function() use ($app) {
252 252
             return $app['orm.em']->getRepository('Eccube\Entity\ProductTag');
253 253
         };
254
-        $app['eccube.repository.class_name'] = function () use ($app) {
254
+        $app['eccube.repository.class_name'] = function() use ($app) {
255 255
             return $app['orm.em']->getRepository('Eccube\Entity\ClassName');
256 256
         };
257
-        $app['eccube.repository.class_category'] = function () use ($app) {
257
+        $app['eccube.repository.class_category'] = function() use ($app) {
258 258
             return $app['orm.em']->getRepository('Eccube\Entity\ClassCategory');
259 259
         };
260
-        $app['eccube.repository.customer_favorite_product'] = function () use ($app) {
260
+        $app['eccube.repository.customer_favorite_product'] = function() use ($app) {
261 261
             return $app['orm.em']->getRepository('Eccube\Entity\CustomerFavoriteProduct');
262 262
         };
263
-        $app['eccube.repository.base_info'] = function () use ($app) {
263
+        $app['eccube.repository.base_info'] = function() use ($app) {
264 264
             $BaseInfoRepository = $app['orm.em']->getRepository('Eccube\Entity\BaseInfo');
265 265
             $BaseInfoRepository->setApplication($app);
266 266
 
267 267
             return $BaseInfoRepository;
268 268
         };
269
-        $app['eccube.repository.tax_rule'] = function () use ($app) {
269
+        $app['eccube.repository.tax_rule'] = function() use ($app) {
270 270
             $taxRuleRepository = $app['orm.em']->getRepository('Eccube\Entity\TaxRule');
271 271
             $taxRuleRepository->setApplication($app);
272 272
 
273 273
             return $taxRuleRepository;
274 274
         };
275
-        $app['eccube.repository.page_layout'] = function () use ($app) {
275
+        $app['eccube.repository.page_layout'] = function() use ($app) {
276 276
             $pageLayoutRepository = $app['orm.em']->getRepository('Eccube\Entity\PageLayout');
277 277
             $pageLayoutRepository->setApplication($app);
278 278
 
279 279
             return $pageLayoutRepository;
280 280
         };
281
-        $app['eccube.repository.block'] = function () use ($app) {
281
+        $app['eccube.repository.block'] = function() use ($app) {
282 282
             $blockRepository = $app['orm.em']->getRepository('Eccube\Entity\Block');
283 283
             $blockRepository->setApplication($app);
284 284
 
285 285
             return $blockRepository;
286 286
         };
287
-        $app['eccube.repository.order'] = function () use ($app) {
287
+        $app['eccube.repository.order'] = function() use ($app) {
288 288
             $orderRepository = $app['orm.em']->getRepository('Eccube\Entity\Order');
289 289
             $orderRepository->setApplication($app);
290 290
 
291 291
             return $orderRepository;
292 292
         };
293
-        $app['eccube.repository.customer_address'] = function () use ($app) {
293
+        $app['eccube.repository.customer_address'] = function() use ($app) {
294 294
             return $app['orm.em']->getRepository('Eccube\Entity\CustomerAddress');
295 295
         };
296
-        $app['eccube.repository.shipping'] = function () use ($app) {
296
+        $app['eccube.repository.shipping'] = function() use ($app) {
297 297
             return $app['orm.em']->getRepository('Eccube\Entity\Shipping');
298 298
         };
299
-        $app['eccube.repository.customer_status'] = function () use ($app) {
299
+        $app['eccube.repository.customer_status'] = function() use ($app) {
300 300
             return $app['orm.em']->getRepository('Eccube\Entity\Master\CustomerStatus');
301 301
         };
302
-        $app['eccube.repository.order_status'] = function () use ($app) {
302
+        $app['eccube.repository.order_status'] = function() use ($app) {
303 303
             return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus');
304 304
         };
305
-        $app['eccube.repository.mail_template'] = function () use ($app) {
305
+        $app['eccube.repository.mail_template'] = function() use ($app) {
306 306
             return $app['orm.em']->getRepository('Eccube\Entity\MailTemplate');
307 307
         };
308
-        $app['eccube.repository.csv'] = function () use ($app) {
308
+        $app['eccube.repository.csv'] = function() use ($app) {
309 309
             return $app['orm.em']->getRepository('Eccube\Entity\Csv');
310 310
         };
311
-        $app['eccube.repository.template'] = function () use ($app) {
311
+        $app['eccube.repository.template'] = function() use ($app) {
312 312
             return $app['orm.em']->getRepository('Eccube\Entity\Template');
313 313
         };
314
-        $app['eccube.repository.authority_role'] = function () use ($app) {
314
+        $app['eccube.repository.authority_role'] = function() use ($app) {
315 315
             return $app['orm.em']->getRepository('Eccube\Entity\AuthorityRole');
316 316
         };
317 317
 
318
-        $app['paginator'] = $app->protect(function () {
318
+        $app['paginator'] = $app->protect(function() {
319 319
             $paginator = new \Knp\Component\Pager\Paginator();
320 320
             $paginator->subscribe(new \Eccube\EventListener\PaginatorListener());
321 321
 
322 322
             return $paginator;
323 323
         });
324 324
 
325
-        $app['eccube.repository.help'] = function () use ($app) {
325
+        $app['eccube.repository.help'] = function() use ($app) {
326 326
             return $app['orm.em']->getRepository('Eccube\Entity\Help');
327 327
         };
328
-        $app['eccube.repository.plugin'] = function () use ($app) {
328
+        $app['eccube.repository.plugin'] = function() use ($app) {
329 329
             return $app['orm.em']->getRepository('Eccube\Entity\Plugin');
330 330
         };
331
-        $app['eccube.repository.plugin_event_handler'] = function () use ($app) {
331
+        $app['eccube.repository.plugin_event_handler'] = function() use ($app) {
332 332
             return $app['orm.em']->getRepository('Eccube\Entity\PluginEventHandler');
333 333
         };
334 334
 
335
-        $app['request_scope'] = function () {
335
+        $app['request_scope'] = function() {
336 336
             return new ParameterBag();
337 337
         };
338 338
         // TODO 使用するか検討
339
-        $app['eccube.twig.node.hello'] = $app->protect(function ($node, $compiler) {
339
+        $app['eccube.twig.node.hello'] = $app->protect(function($node, $compiler) {
340 340
             $compiler
341 341
             ->addDebugInfo($node)
342 342
             ->write("echo 'Helloooooo ' . ")
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
 
347 347
         });
348 348
         // TODO 使用するか検討
349
-        $app['eccube.twig.node.jiro'] = $app->protect(function ($node, $compiler) {
349
+        $app['eccube.twig.node.jiro'] = $app->protect(function($node, $compiler) {
350 350
             $compiler
351 351
             ->addDebugInfo($node)
352 352
             ->write("echo 'jirooooooo ' . ")
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
         });
358 358
 
359 359
         // TODO 使用するか検討
360
-        $app['eccube.twig.generic_node_names'] = function () use ($app) {
360
+        $app['eccube.twig.generic_node_names'] = function() use ($app) {
361 361
             return [
362 362
                 'hello',
363 363
                 'jiro',
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
         };
367 367
 
368 368
         // TODO 使用するか検討
369
-        $app['twig_parsers'] = function () use ($app) {
369
+        $app['twig_parsers'] = function() use ($app) {
370 370
             $GenericTokenParsers = [];
371 371
             foreach ($app['eccube.twig.generic_node_names'] as $tagName) {
372 372
                 $GenericTokenParsers[] = new \Eccube\Twig\Extension\GenericTokenParser($app, $tagName);
@@ -375,19 +375,19 @@  discard block
 block discarded – undo
375 375
         };
376 376
 
377 377
         // TODO ServiceProvider から追加できるよう Collection にする
378
-        $app['eccube.twig.block.templates'] = function () {
378
+        $app['eccube.twig.block.templates'] = function() {
379 379
             return [
380 380
                 'render_block.twig',
381 381
             ];
382 382
         };
383 383
 
384 384
         // Form\Type
385
-        $app->extend('form.type.extensions', function ($extensions) use ($app) {
385
+        $app->extend('form.type.extensions', function($extensions) use ($app) {
386 386
             $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension();
387 387
             $extensions[] = new \Eccube\Form\Extension\FreezeTypeExtension();
388 388
             return $extensions;
389 389
         });
390
-        $app->extend('form.types', function ($types) use ($app) {
390
+        $app->extend('form.types', function($types) use ($app) {
391 391
             $types[] = new \Eccube\Form\Type\NameType($app['config']);
392 392
             $types[] = new \Eccube\Form\Type\KanaType($app['config']);
393 393
             $types[] = new \Eccube\Form\Type\TelType($app['config']);
Please login to merge, or discard this patch.
src/Eccube/Application/TwigTrait.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -40,14 +40,14 @@
 block discarded – undo
40 40
         $eventName = $view;
41 41
         if ($this->isAdminRequest()) {
42 42
             // 管理画面の場合、event名に「Admin/」を付ける
43
-            $eventName = 'Admin/' . $view;
43
+            $eventName = 'Admin/'.$view;
44 44
         }
45
-        $this['monolog']->debug('Template Event Name : ' . $eventName);
45
+        $this['monolog']->debug('Template Event Name : '.$eventName);
46 46
 
47 47
         // $this['eccube.event.dispatcher']->dispatch($eventName, $event);
48 48
 
49 49
         if ($response instanceof StreamedResponse) {
50
-            $response->setCallback(function () use ($twig, $view, $parameters) {
50
+            $response->setCallback(function() use ($twig, $view, $parameters) {
51 51
                 $twig->display($view, $parameters);
52 52
             });
53 53
         } else {
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/LogServiceProvider.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -22,17 +22,17 @@  discard block
 block discarded – undo
22 22
         $app->register(new \Silex\Provider\MonologServiceProvider());
23 23
 
24 24
         // Log
25
-        $app['eccube.logger'] = function ($app) {
25
+        $app['eccube.logger'] = function($app) {
26 26
             return new Logger($app);
27 27
         };
28 28
 
29 29
         // ヘルパー作成
30
-        $app['eccube.monolog.helper'] = function ($app) {
30
+        $app['eccube.monolog.helper'] = function($app) {
31 31
             return new LogHelper($app);
32 32
         };
33 33
 
34 34
         // ログクラス作成ファクトリー
35
-        $app['eccube.monolog.factory'] = $app->protect(function (array $channelValues) use ($app) {
35
+        $app['eccube.monolog.factory'] = $app->protect(function(array $channelValues) use ($app) {
36 36
 
37 37
             $log = new $app['monolog.logger.class']($channelValues['name']);
38 38
 
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
         // monologの設定は除外
48 48
         unset($channels['monolog']);
49 49
         foreach ($channels as $channel => $channelValues) {
50
-            $app['monolog.logger.'.$channel] = function ($app) use ($channelValues) {
50
+            $app['monolog.logger.'.$channel] = function($app) use ($channelValues) {
51 51
                 return $app['eccube.monolog.factory']($channelValues);
52 52
             };
53 53
         }
@@ -55,15 +55,15 @@  discard block
 block discarded – undo
55 55
         // MonologServiceProviderで定義されているmonolog.handlerの置換
56 56
         $channelValues = $app['config']['log']['channel']['monolog'];
57 57
         $app['monolog.name'] = $channelValues['name'];
58
-        $app['monolog.handler'] = function ($app) use ($channelValues) {
58
+        $app['monolog.handler'] = function($app) use ($channelValues) {
59 59
             return $app['eccube.monolog.helper']->getHandler($channelValues);
60 60
         };
61 61
 
62
-        $app['eccube.monolog.listener'] = function () use ($app) {
62
+        $app['eccube.monolog.listener'] = function() use ($app) {
63 63
             return new LogListener($app['eccube.logger']);
64 64
         };
65 65
 
66
-        $app['listener.requestdump'] = function ($app) {
66
+        $app['listener.requestdump'] = function($app) {
67 67
             return new \Eccube\EventListener\RequestDumpListener($app);
68 68
         };
69 69
     }
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/InstallServiceProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,13 +42,13 @@
 block discarded – undo
42 42
      */
43 43
     public function register(Container $app)
44 44
     {
45
-        $app->extend('form.type.extensions', function ($extensions) use ($app) {
45
+        $app->extend('form.type.extensions', function($extensions) use ($app) {
46 46
             $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension();
47 47
 
48 48
             return $extensions;
49 49
         });
50 50
 
51
-        $app->extend('form.types', function ($types) use ($app) {
51
+        $app->extend('form.types', function($types) use ($app) {
52 52
             $types[] = new \Eccube\Form\Type\Install\Step1Type($app);
53 53
             $types[] = new \Eccube\Form\Type\Install\Step3Type($app);
54 54
             $types[] = new \Eccube\Form\Type\Install\Step4Type($app);
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/ValidatorServiceProvider.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 {
33 33
     public function register(Container $app)
34 34
     {
35
-        $app['validator'] = function ($app) {
35
+        $app['validator'] = function($app) {
36 36
 
37 37
             return new Validator(
38 38
                 $app['validator.mapping.class_metadata_factory'],
@@ -43,17 +43,17 @@  discard block
 block discarded – undo
43 43
             );
44 44
         };
45 45
 
46
-        $app['validator.mapping.class_metadata_factory'] = function ($app) {
46
+        $app['validator.mapping.class_metadata_factory'] = function($app) {
47 47
             return new ClassMetadataFactory(new StaticMethodLoader());
48 48
         };
49 49
 
50
-        $app['validator.validator_factory'] = function () use ($app) {
50
+        $app['validator.validator_factory'] = function() use ($app) {
51 51
             $validators = isset($app['validator.validator_service_ids']) ? $app['validator.validator_service_ids'] : array();
52 52
 
53 53
             return new ConstraintValidatorFactory($app, $validators);
54 54
         };
55 55
 
56
-        $app['validator.object_initializers'] = function ($app) {
56
+        $app['validator.object_initializers'] = function($app) {
57 57
             return array();
58 58
         };
59 59
     }
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/EccubePluginServiceProvider.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     public function register(Container $app)
26 26
     {
27 27
         // EventDispatcher
28
-        $app['eccube.event.dispatcher'] = function () {
28
+        $app['eccube.event.dispatcher'] = function() {
29 29
             return new EventDispatcher();
30 30
         };
31 31
 
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
             $config = $pluginConfig['config'];
37 37
 
38 38
             if (isset($config['const'])) {
39
-                $app->extend('config', function ($eccubeConfig) use ($config) {
39
+                $app->extend('config', function($eccubeConfig) use ($config) {
40 40
                     $eccubeConfig[$config['code']] = array(
41 41
                         'const' => $config['const'],
42 42
                     );
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
     public function initPluginEventDispatcher(Application $app)
73 73
     {
74 74
         // hook point
75
-        $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
75
+        $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
76 76
             if (!$event->isMasterRequest()) {
77 77
                 return;
78 78
             }
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
81 81
         }, Application::EARLY_EVENT);
82 82
 
83
-        $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
83
+        $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
84 84
             if (!$event->isMasterRequest()) {
85 85
                 return;
86 86
             }
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
90 90
         });
91 91
 
92
-        $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
92
+        $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
93 93
             if (!$event->isMasterRequest()) {
94 94
                 return;
95 95
             }
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
99 99
         });
100 100
 
101
-        $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
101
+        $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
102 102
             if (!$event->isMasterRequest()) {
103 103
                 return;
104 104
             }
@@ -106,13 +106,13 @@  discard block
 block discarded – undo
106 106
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
107 107
         }, Application::LATE_EVENT);
108 108
 
109
-        $app->on(KernelEvents::TERMINATE, function (PostResponseEvent $event) use ($app) {
109
+        $app->on(KernelEvents::TERMINATE, function(PostResponseEvent $event) use ($app) {
110 110
             $route = $event->getRequest()->attributes->get('_route');
111 111
             $hookpoint = "eccube.event.controller.$route.finish";
112 112
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
113 113
         });
114 114
 
115
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
115
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
116 116
             if (!$event->isMasterRequest()) {
117 117
                 return;
118 118
             }
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
         });
122 122
 
123 123
         // Request Event
124
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function (\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
124
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function(\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
125 125
 
126 126
             if (!$event->isMasterRequest()) {
127 127
                 return;
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
         }, 30); // Routing(32)が解決し, 認証判定(8)が実行される前のタイミング.
153 153
 
154 154
         // Controller Event
155
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
155
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
156 156
 
157 157
             if (!$event->isMasterRequest()) {
158 158
                 return;
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
         });
182 182
 
183 183
         // Response Event
184
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
184
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
185 185
             if (!$event->isMasterRequest()) {
186 186
                 return;
187 187
             }
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
         });
211 211
 
212 212
         // Exception Event
213
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function (\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
213
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function(\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
214 214
 
215 215
             if (!$event->isMasterRequest()) {
216 216
                 return;
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
         });
241 241
 
242 242
         // Terminate Event
243
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function (\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
243
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function(\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
244 244
 
245 245
             $route = $event->getRequest()->attributes->get('_route');
246 246
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/PageLayoutType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
                 'label' => false,
42 42
                 'class' => 'Eccube\Entity\PageLayout',
43 43
                 'choice_label' => 'name',
44
-                'query_builder' => function (EntityRepository $er) {
44
+                'query_builder' => function(EntityRepository $er) {
45 45
                     return $er
46 46
                         ->createQueryBuilder('l')
47 47
                         ->where('l.id <> 0')
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/SecurityType.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,8 +57,8 @@
 block discarded – undo
57 57
                     new Assert\NotBlank(),
58 58
                     new Assert\Length(array('max' => $this->config['stext_len'])),
59 59
                     new Assert\Regex(array(
60
-                       'pattern' => "/^[0-9a-zA-Z]+$/",
61
-                   )),
60
+                        'pattern' => "/^[0-9a-zA-Z]+$/",
61
+                    )),
62 62
                 ),
63 63
             ))
64 64
             ->add('admin_allow_host', TextareaType::class, array(
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -72,19 +72,19 @@
 block discarded – undo
72 72
                 'label' => 'SSLを強制',
73 73
                 'required' => false,
74 74
             ))
75
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use($app) {
75
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) use($app) {
76 76
                 $form = $event->getForm();
77 77
                 $data = $form->getData();
78 78
 
79 79
                 $ips = preg_split("/\R/", $data['admin_allow_host'], null, PREG_SPLIT_NO_EMPTY);
80 80
 
81
-                foreach($ips as $ip) {
81
+                foreach ($ips as $ip) {
82 82
                     $errors = $app['validator']->validate($ip, array(
83 83
                             new Assert\Ip(),
84 84
                         )
85 85
                     );
86 86
                     if ($errors->count() != 0) {
87
-                        $form['admin_allow_host']->addError(new FormError($ip . 'はIPv4アドレスではありません。'));
87
+                        $form['admin_allow_host']->addError(new FormError($ip.'はIPv4アドレスではありません。'));
88 88
                     }
89 89
                 }
90 90
             })
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/OrderDetailType.php 1 patch
Spacing   +5 added lines, -9 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
                 )));
115 115
 
116 116
         $app = $this->app;
117
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
117
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
118 118
             // モーダルからのPOST時に、金額等をセットする.
119 119
             if ('modal' === $app['request_stack']->getCurrentRequest()->get('modal')) {
120 120
                 $data = $event->getData();
@@ -131,17 +131,13 @@  discard block
 block discarded – undo
131 131
                     $data['product_name'] = $Product->getName();
132 132
                     $data['product_code'] = $ProductClass->getCode();
133 133
                     $data['class_name1'] = $ProductClass->hasClassCategory1() ?
134
-                        $ProductClass->getClassCategory1()->getClassName() :
135
-                        null;
134
+                        $ProductClass->getClassCategory1()->getClassName() : null;
136 135
                     $data['class_name2'] = $ProductClass->hasClassCategory2() ?
137
-                        $ProductClass->getClassCategory2()->getClassName() :
138
-                        null;
136
+                        $ProductClass->getClassCategory2()->getClassName() : null;
139 137
                     $data['class_category_name1'] = $ProductClass->hasClassCategory1() ?
140
-                        $ProductClass->getClassCategory1()->getName() :
141
-                        null;
138
+                        $ProductClass->getClassCategory1()->getName() : null;
142 139
                     $data['class_category_name2'] = $ProductClass->hasClassCategory2() ?
143
-                        $ProductClass->getClassCategory2()->getName() :
144
-                        null;
140
+                        $ProductClass->getClassCategory2()->getName() : null;
145 141
                     $data['tax_rule'] = $TaxRule->getCalcRule()->getId();
146 142
                     $data['price'] = $ProductClass->getPrice02();
147 143
                     $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];
Please login to merge, or discard this patch.