Completed
Pull Request — experimental/3.1 (#1985)
by Kentaro
126:16 queued 119:19
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   +68 added lines, -68 removed lines patch added patch discarded remove patch
@@ -44,31 +44,31 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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']);
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/Command/PluginCommand/Resource/ServiceProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
         $app->match('/plugin/[lower_code]/hello', 'Plugin\[code]\Controller\[code]Controller::index')->bind('plugin_[code]_hello');
34 34
 
35 35
         // Form
36
-        $app['form.types'] = $app->extend('form.types', function ($types) use ($app) {
36
+        $app['form.types'] = $app->extend('form.types', function($types) use ($app) {
37 37
             $types[] = new [code]ConfigType();
38 38
 
39 39
             return $types;
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
         // }
58 58
 
59 59
         // ログファイル設定
60
-        $app['monolog.logger.[lower_code]'] = function ($app) {
60
+        $app['monolog.logger.[lower_code]'] = function($app) {
61 61
 
62 62
             $logger = new $app['monolog.logger.class']('[lower_code]');
63 63
 
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.