Completed
Pull Request — experimental/3.1 (#2168)
by Kentaro
93:49 queued 72:21
created
src/Eccube/Application/ApplicationTrait.php 3 patches
Unused Use Statements   -6 removed lines patch added patch discarded remove patch
@@ -2,15 +2,9 @@
 block discarded – undo
2 2
 
3 3
 namespace Eccube\Application;
4 4
 
5
-use Eccube\Event\TemplateEvent;
6
-use Monolog\Logger;
7
-use Symfony\Component\Form\FormBuilder;
8 5
 use Symfony\Component\HttpFoundation\Request;
9 6
 use Symfony\Component\HttpFoundation\Response;
10
-use Symfony\Component\HttpFoundation\StreamedResponse;
11 7
 use Symfony\Component\HttpKernel\HttpKernelInterface;
12
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
13
-use Symfony\Component\Security\Core\User\UserInterface;
14 8
 
15 9
 trait ApplicationTrait
16 10
 {
Please login to merge, or discard this patch.
Doc Comments   +11 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,6 +16,7 @@  discard block
 block discarded – undo
16 16
 {
17 17
     /**
18 18
      * Application Shortcut Methods
19
+     * @param string $message
19 20
      */
20 21
     public function addSuccess($message, $namespace = 'front')
21 22
     {
@@ -32,6 +33,9 @@  discard block
 block discarded – undo
32 33
         $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message);
33 34
     }
34 35
 
36
+    /**
37
+     * @param string $message
38
+     */
35 39
     public function addWarning($message, $namespace = 'front')
36 40
     {
37 41
         $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message);
@@ -42,6 +46,9 @@  discard block
 block discarded – undo
42 46
         $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message);
43 47
     }
44 48
 
49
+    /**
50
+     * @param string $message
51
+     */
45 52
     public function addRequestError($message, $namespace = 'front')
46 53
     {
47 54
         $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message);
@@ -58,6 +65,9 @@  discard block
 block discarded – undo
58 65
         $this->addWarning('admin.delete.warning', 'admin');
59 66
     }
60 67
 
68
+    /**
69
+     * @param string $targetPath
70
+     */
61 71
     public function setLoginTargetPath($targetPath, $namespace = null)
62 72
     {
63 73
         if (is_null($namespace)) {
@@ -109,7 +119,7 @@  discard block
 block discarded – undo
109 119
      * @param string $path フォワード先のパス
110 120
      * @param array $requestParameters
111 121
      * @param Response $response
112
-     * @return Application
122
+     * @return ApplicationTrait
113 123
      */
114 124
     public function forwardChain($path, array $requestParameters = [], Response &$response = null)
115 125
     {
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -19,32 +19,32 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
src/Eccube/Controller/AbstractController.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -52,11 +52,17 @@
 block discarded – undo
52 52
         return $form;
53 53
     }
54 54
 
55
+    /**
56
+     * @param Application $app
57
+     */
55 58
     protected function getSecurity($app)
56 59
     {
57 60
         return $app['security.token_storage'];
58 61
     }
59 62
 
63
+    /**
64
+     * @param Application $app
65
+     */
60 66
     protected function isTokenValid($app)
61 67
     {
62 68
         $csrf = $app['csrf.token_manager'];
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
         @trigger_error('The '.__METHOD__.' method is deprecated.', E_USER_DEPRECATED);
46 46
 
47 47
         $form = $app['form.factory']
48
-            ->createBuilder($app['eccube.form.type.' . $type], $app['eccube.entity.' . $type])
48
+            ->createBuilder($app['eccube.form.type.'.$type], $app['eccube.entity.'.$type])
49 49
             ->getForm();
50 50
         $form->handleRequest($app['request_stack']->getCurrentRequest());
51 51
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ChangePasswordType.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -37,6 +37,9 @@
 block discarded – undo
37 37
 {
38 38
     private $app;
39 39
 
40
+    /**
41
+     * @param \Pimple\Container $app
42
+     */
40 43
     public function __construct($app)
41 44
     {
42 45
         $this->app = $app;
Please login to merge, or discard this patch.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,6 @@
 block discarded – undo
27 27
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
28 28
 use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
29 29
 use Symfony\Component\Form\FormBuilderInterface;
30
-use Symfony\Component\Form\FormError;
31
-use Symfony\Component\Form\FormEvents;
32 30
 use Symfony\Component\OptionsResolver\OptionsResolver;
33 31
 use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
34 32
 use Symfony\Component\Validator\Constraints as Assert;
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/SearchProductType.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,6 @@
 block discarded – undo
32 32
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
33 33
 use Symfony\Component\Form\Extension\Core\Type\TextType;
34 34
 use Symfony\Component\Form\FormBuilderInterface;
35
-use Symfony\Component\Validator\Constraints as Assert;
36 35
 
37 36
 class SearchProductType extends AbstractType
38 37
 {
Please login to merge, or discard this patch.
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   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -45,31 +45,31 @@  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.order'] = function () use ($app) {
57
+        $app['eccube.service.order'] = function() use ($app) {
58 58
             return new \Eccube\Service\OrderService($app);
59 59
         };
60
-        $app['eccube.service.tax_rule'] = function () use ($app) {
60
+        $app['eccube.service.tax_rule'] = function() use ($app) {
61 61
             return new \Eccube\Service\TaxRuleService($app['eccube.repository.tax_rule']);
62 62
         };
63
-        $app['eccube.service.plugin'] = function () use ($app) {
63
+        $app['eccube.service.plugin'] = function() use ($app) {
64 64
             return new \Eccube\Service\PluginService($app);
65 65
         };
66
-        $app['eccube.service.mail'] = function () use ($app) {
66
+        $app['eccube.service.mail'] = function() use ($app) {
67 67
             return new \Eccube\Service\MailService($app);
68 68
         };
69
-        $app['eccube.calculate.context'] = function () use ($app) {
69
+        $app['eccube.calculate.context'] = function() use ($app) {
70 70
                 return new \Eccube\Service\Calculator\CalculateContext();
71 71
         };
72
-        $app['eccube.service.calculate'] = $app->protect(function ($Order, $Customer) use ($app) {
72
+        $app['eccube.service.calculate'] = $app->protect(function($Order, $Customer) use ($app) {
73 73
                 $Service = new \Eccube\Service\CalculateService($Order, $Customer);
74 74
                 $Context = $app['eccube.calculate.context'];
75 75
                 $Context->setCalculateStrategies($app['eccube.calculate.strategies']($Order));
@@ -78,40 +78,40 @@  discard block
 block discarded – undo
78 78
                 return $Service;
79 79
         });
80 80
 
81
-        $app['eccube.service.payment'] = $app->protect(function ($clazz) use ($app) {
81
+        $app['eccube.service.payment'] = $app->protect(function($clazz) use ($app) {
82 82
                 $Service = new $clazz;
83 83
                 $Service->setApplication($app);
84 84
                 return $Service;
85 85
         });
86 86
 
87
-        $app['eccube.calculate.strategies'] = $app->protect(function ($Order) use ($app) {
87
+        $app['eccube.calculate.strategies'] = $app->protect(function($Order) use ($app) {
88 88
             $Strategies = new \Doctrine\Common\Collections\ArrayCollection(); // TODO 暫定的に ArrayCollection とする. 専用クラスにしたい
89 89
             // デフォルトのストラテジーをセットしておく
90 90
             $Strategies->add($app['eccube.calculate.strategy.shipping']($Order));
91 91
             $Strategies->add($app['eccube.calculate.strategy.tax']($Order));
92 92
             return $Strategies;
93 93
         });
94
-        $app['eccube.calculate.strategy.shipping'] = $app->protect(function ($Order) use ($app) {
94
+        $app['eccube.calculate.strategy.shipping'] = $app->protect(function($Order) use ($app) {
95 95
                 $Strategy = new \Eccube\Service\Calculator\Strategy\ShippingStrategy();
96 96
                 $Strategy->setApplication($app);
97 97
                 $Strategy->setOrder($Order);
98 98
                 return $Strategy;
99 99
         });
100
-        $app['eccube.calculate.strategy.tax'] = $app->protect(function ($Order) use ($app) {
100
+        $app['eccube.calculate.strategy.tax'] = $app->protect(function($Order) use ($app) {
101 101
                 $Strategy = new \Eccube\Service\Calculator\Strategy\TaxStrategy();
102 102
                 $Strategy->setApplication($app);
103 103
                 $Strategy->setOrder($Order);
104 104
                 return $Strategy;
105 105
         });
106 106
 
107
-        $app['payment.method'] = $app->protect(function ($clazz, $form) use ($app) {
107
+        $app['payment.method'] = $app->protect(function($clazz, $form) use ($app) {
108 108
                 $PaymentMethod = new $clazz;
109 109
                 $PaymentMethod->setApplication($app);
110 110
                 $PaymentMethod->setFormType($form);
111 111
                 return $PaymentMethod;
112 112
         });
113 113
 
114
-        $app['payment.method.request'] = $app->protect(function ($clazz, $form, $request) use ($app) {
114
+        $app['payment.method.request'] = $app->protect(function($clazz, $form, $request) use ($app) {
115 115
                 $PaymentMethod = new $clazz;
116 116
                 $PaymentMethod->setApplication($app);
117 117
                 $PaymentMethod->setFormType($form);
@@ -119,11 +119,11 @@  discard block
 block discarded – undo
119 119
                 return $PaymentMethod;
120 120
         });
121 121
 
122
-        $app['eccube.helper.order'] = function ($app) {
122
+        $app['eccube.helper.order'] = function($app) {
123 123
             return new OrderHelper($app);
124 124
         };
125 125
 
126
-        $app['eccube.service.csv.export'] = function () use ($app) {
126
+        $app['eccube.service.csv.export'] = function() use ($app) {
127 127
             $csvService = new \Eccube\Service\CsvExportService();
128 128
             $csvService->setEntityManager($app['orm.em']);
129 129
             $csvService->setConfig($app['config']);
@@ -135,201 +135,201 @@  discard block
 block discarded – undo
135 135
 
136 136
             return $csvService;
137 137
         };
138
-        $app['eccube.service.shopping'] = function () use ($app) {
138
+        $app['eccube.service.shopping'] = function() use ($app) {
139 139
             return new \Eccube\Service\ShoppingService($app, $app['eccube.service.cart'], $app['eccube.service.order']);
140 140
         };
141 141
 
142 142
         // Repository
143
-        $app['eccube.repository.master.authority'] = function () use ($app) {
143
+        $app['eccube.repository.master.authority'] = function() use ($app) {
144 144
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Authority');
145 145
         };
146
-        $app['eccube.repository.master.tag'] = function () use ($app) {
146
+        $app['eccube.repository.master.tag'] = function() use ($app) {
147 147
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Tag');
148 148
         };
149
-        $app['eccube.repository.master.pref'] = function () use ($app) {
149
+        $app['eccube.repository.master.pref'] = function() use ($app) {
150 150
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Pref');
151 151
         };
152
-        $app['eccube.repository.master.sex'] = function () use ($app) {
152
+        $app['eccube.repository.master.sex'] = function() use ($app) {
153 153
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Sex');
154 154
         };
155
-        $app['eccube.repository.master.disp'] = function () use ($app) {
155
+        $app['eccube.repository.master.disp'] = function() use ($app) {
156 156
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Disp');
157 157
         };
158
-        $app['eccube.repository.master.product_type'] = function () use ($app) {
158
+        $app['eccube.repository.master.product_type'] = function() use ($app) {
159 159
             return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductType');
160 160
         };
161
-        $app['eccube.repository.master.page_max'] = function () use ($app) {
161
+        $app['eccube.repository.master.page_max'] = function() use ($app) {
162 162
             return $app['orm.em']->getRepository('Eccube\Entity\Master\PageMax');
163 163
         };
164
-        $app['eccube.repository.master.order_status'] = function () use ($app) {
164
+        $app['eccube.repository.master.order_status'] = function() use ($app) {
165 165
         };
166
-        $app['eccube.repository.master.product_list_max'] = function () use ($app) {
166
+        $app['eccube.repository.master.product_list_max'] = function() use ($app) {
167 167
             return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductListMax');
168 168
         };
169
-        $app['eccube.repository.master.product_list_order_by'] = function () use ($app) {
169
+        $app['eccube.repository.master.product_list_order_by'] = function() use ($app) {
170 170
             return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductListOrderBy');
171 171
         };
172
-        $app['eccube.repository.master.order_status'] = function () use ($app) {
172
+        $app['eccube.repository.master.order_status'] = function() use ($app) {
173 173
             return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus');
174 174
         };
175
-        $app['eccube.repository.master.device_type'] = function () use ($app) {
175
+        $app['eccube.repository.master.device_type'] = function() use ($app) {
176 176
             return $app['orm.em']->getRepository('Eccube\Entity\Master\DeviceType');
177 177
         };
178
-        $app['eccube.repository.master.csv_type'] = function () use ($app) {
178
+        $app['eccube.repository.master.csv_type'] = function() use ($app) {
179 179
             return $app['orm.em']->getRepository('Eccube\Entity\Master\CsvType');
180 180
         };
181 181
 
182
-        $app['eccube.repository.delivery'] = function () use ($app) {
182
+        $app['eccube.repository.delivery'] = function() use ($app) {
183 183
             return $app['orm.em']->getRepository('Eccube\Entity\Delivery');
184 184
         };
185
-        $app['eccube.repository.delivery_date'] = function () use ($app) {
185
+        $app['eccube.repository.delivery_date'] = function() use ($app) {
186 186
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryDate');
187 187
         };
188
-        $app['eccube.repository.delivery_fee'] = function () use ($app) {
188
+        $app['eccube.repository.delivery_fee'] = function() use ($app) {
189 189
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryFee');
190 190
         };
191
-        $app['eccube.repository.delivery_time'] = function () use ($app) {
191
+        $app['eccube.repository.delivery_time'] = function() use ($app) {
192 192
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryTime');
193 193
         };
194
-        $app['eccube.repository.payment'] = function () use ($app) {
194
+        $app['eccube.repository.payment'] = function() use ($app) {
195 195
             return $app['orm.em']->getRepository('Eccube\Entity\Payment');
196 196
         };
197
-        $app['eccube.repository.payment_option'] = function () use ($app) {
197
+        $app['eccube.repository.payment_option'] = function() use ($app) {
198 198
             return $app['orm.em']->getRepository('Eccube\Entity\PaymentOption');
199 199
         };
200
-        $app['eccube.repository.category'] = function () use ($app) {
200
+        $app['eccube.repository.category'] = function() use ($app) {
201 201
             $CategoryRepository = $app['orm.em']->getRepository('Eccube\Entity\Category');
202 202
             $CategoryRepository->setApplication($app);
203 203
 
204 204
             return $CategoryRepository;
205 205
         };
206
-        $app['eccube.repository.customer'] = function () use ($app) {
206
+        $app['eccube.repository.customer'] = function() use ($app) {
207 207
             return $app['orm.em']->getRepository('Eccube\Entity\Customer');
208 208
         };
209
-        $app['eccube.repository.news'] = function () use ($app) {
209
+        $app['eccube.repository.news'] = function() use ($app) {
210 210
             return $app['orm.em']->getRepository('Eccube\Entity\News');
211 211
         };
212
-        $app['eccube.repository.mail_history'] = function () use ($app) {
212
+        $app['eccube.repository.mail_history'] = function() use ($app) {
213 213
             return $app['orm.em']->getRepository('Eccube\Entity\MailHistory');
214 214
         };
215
-        $app['eccube.repository.member'] = function () use ($app) {
215
+        $app['eccube.repository.member'] = function() use ($app) {
216 216
             $memberRepository = $app['orm.em']->getRepository('Eccube\Entity\Member');
217 217
             $memberRepository->setEncoderFactorty($app['security.encoder_factory']);
218 218
             return $memberRepository;
219 219
         };
220
-        $app['eccube.repository.order'] = function () use ($app) {
220
+        $app['eccube.repository.order'] = function() use ($app) {
221 221
             return $app['orm.em']->getRepository('Eccube\Entity\Order');
222 222
         };
223
-        $app['eccube.repository.product'] = function () use ($app) {
223
+        $app['eccube.repository.product'] = function() use ($app) {
224 224
             $productRepository = $app['orm.em']->getRepository('Eccube\Entity\Product');
225 225
             $productRepository->setApplication($app);
226 226
 
227 227
             return $productRepository;
228 228
         };
229
-        $app['eccube.repository.product_image'] = function () use ($app) {
229
+        $app['eccube.repository.product_image'] = function() use ($app) {
230 230
             return $app['orm.em']->getRepository('Eccube\Entity\ProductImage');
231 231
         };
232
-        $app['eccube.repository.product_class'] = function () use ($app) {
232
+        $app['eccube.repository.product_class'] = function() use ($app) {
233 233
             return $app['orm.em']->getRepository('Eccube\Entity\ProductClass');
234 234
         };
235
-        $app['eccube.repository.product_stock'] = function () use ($app) {
235
+        $app['eccube.repository.product_stock'] = function() use ($app) {
236 236
             return $app['orm.em']->getRepository('Eccube\Entity\ProductStock');
237 237
         };
238
-        $app['eccube.repository.product_tag'] = function () use ($app) {
238
+        $app['eccube.repository.product_tag'] = function() use ($app) {
239 239
             return $app['orm.em']->getRepository('Eccube\Entity\ProductTag');
240 240
         };
241
-        $app['eccube.repository.class_name'] = function () use ($app) {
241
+        $app['eccube.repository.class_name'] = function() use ($app) {
242 242
             return $app['orm.em']->getRepository('Eccube\Entity\ClassName');
243 243
         };
244
-        $app['eccube.repository.class_category'] = function () use ($app) {
244
+        $app['eccube.repository.class_category'] = function() use ($app) {
245 245
             return $app['orm.em']->getRepository('Eccube\Entity\ClassCategory');
246 246
         };
247
-        $app['eccube.repository.customer_favorite_product'] = function () use ($app) {
247
+        $app['eccube.repository.customer_favorite_product'] = function() use ($app) {
248 248
             return $app['orm.em']->getRepository('Eccube\Entity\CustomerFavoriteProduct');
249 249
         };
250
-        $app['eccube.repository.base_info'] = function () use ($app) {
250
+        $app['eccube.repository.base_info'] = function() use ($app) {
251 251
             $BaseInfoRepository = $app['orm.em']->getRepository('Eccube\Entity\BaseInfo');
252 252
             $BaseInfoRepository->setApplication($app);
253 253
 
254 254
             return $BaseInfoRepository;
255 255
         };
256
-        $app['eccube.repository.tax_rule'] = function () use ($app) {
256
+        $app['eccube.repository.tax_rule'] = function() use ($app) {
257 257
             $taxRuleRepository = $app['orm.em']->getRepository('Eccube\Entity\TaxRule');
258 258
             $taxRuleRepository->setApplication($app);
259 259
 
260 260
             return $taxRuleRepository;
261 261
         };
262
-        $app['eccube.repository.page_layout'] = function () use ($app) {
262
+        $app['eccube.repository.page_layout'] = function() use ($app) {
263 263
             $pageLayoutRepository = $app['orm.em']->getRepository('Eccube\Entity\PageLayout');
264 264
             $pageLayoutRepository->setApplication($app);
265 265
 
266 266
             return $pageLayoutRepository;
267 267
         };
268
-        $app['eccube.repository.block'] = function () use ($app) {
268
+        $app['eccube.repository.block'] = function() use ($app) {
269 269
             $blockRepository = $app['orm.em']->getRepository('Eccube\Entity\Block');
270 270
             $blockRepository->setApplication($app);
271 271
 
272 272
             return $blockRepository;
273 273
         };
274
-        $app['eccube.repository.order'] = function () use ($app) {
274
+        $app['eccube.repository.order'] = function() use ($app) {
275 275
             $orderRepository = $app['orm.em']->getRepository('Eccube\Entity\Order');
276 276
             $orderRepository->setApplication($app);
277 277
 
278 278
             return $orderRepository;
279 279
         };
280
-        $app['eccube.repository.customer_address'] = function () use ($app) {
280
+        $app['eccube.repository.customer_address'] = function() use ($app) {
281 281
             return $app['orm.em']->getRepository('Eccube\Entity\CustomerAddress');
282 282
         };
283
-        $app['eccube.repository.shipping'] = function () use ($app) {
283
+        $app['eccube.repository.shipping'] = function() use ($app) {
284 284
             return $app['orm.em']->getRepository('Eccube\Entity\Shipping');
285 285
         };
286
-        $app['eccube.repository.customer_status'] = function () use ($app) {
286
+        $app['eccube.repository.customer_status'] = function() use ($app) {
287 287
             return $app['orm.em']->getRepository('Eccube\Entity\Master\CustomerStatus');
288 288
         };
289
-        $app['eccube.repository.order_status'] = function () use ($app) {
289
+        $app['eccube.repository.order_status'] = function() use ($app) {
290 290
             return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus');
291 291
         };
292
-        $app['eccube.repository.mail_template'] = function () use ($app) {
292
+        $app['eccube.repository.mail_template'] = function() use ($app) {
293 293
             return $app['orm.em']->getRepository('Eccube\Entity\MailTemplate');
294 294
         };
295
-        $app['eccube.repository.csv'] = function () use ($app) {
295
+        $app['eccube.repository.csv'] = function() use ($app) {
296 296
             return $app['orm.em']->getRepository('Eccube\Entity\Csv');
297 297
         };
298
-        $app['eccube.repository.template'] = function () use ($app) {
298
+        $app['eccube.repository.template'] = function() use ($app) {
299 299
             return $app['orm.em']->getRepository('Eccube\Entity\Template');
300 300
         };
301
-        $app['eccube.repository.authority_role'] = function () use ($app) {
301
+        $app['eccube.repository.authority_role'] = function() use ($app) {
302 302
             return $app['orm.em']->getRepository('Eccube\Entity\AuthorityRole');
303 303
         };
304 304
 
305
-        $app['paginator'] = $app->protect(function () {
305
+        $app['paginator'] = $app->protect(function() {
306 306
             $paginator = new \Knp\Component\Pager\Paginator();
307 307
             $paginator->subscribe(new \Eccube\EventListener\PaginatorListener());
308 308
 
309 309
             return $paginator;
310 310
         });
311 311
 
312
-        $app['eccube.repository.help'] = function () use ($app) {
312
+        $app['eccube.repository.help'] = function() use ($app) {
313 313
             return $app['orm.em']->getRepository('Eccube\Entity\Help');
314 314
         };
315
-        $app['eccube.repository.plugin'] = function () use ($app) {
315
+        $app['eccube.repository.plugin'] = function() use ($app) {
316 316
             return $app['orm.em']->getRepository('Eccube\Entity\Plugin');
317 317
         };
318
-        $app['eccube.repository.plugin_event_handler'] = function () use ($app) {
318
+        $app['eccube.repository.plugin_event_handler'] = function() use ($app) {
319 319
             return $app['orm.em']->getRepository('Eccube\Entity\PluginEventHandler');
320 320
         };
321 321
 
322
-        $app['request_scope'] = function () {
322
+        $app['request_scope'] = function() {
323 323
             return new ParameterBag();
324 324
         };
325 325
 
326 326
         // Form\Type
327
-        $app->extend('form.type.extensions', function ($extensions) use ($app) {
327
+        $app->extend('form.type.extensions', function($extensions) use ($app) {
328 328
             $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension();
329 329
             $extensions[] = new \Eccube\Form\Extension\FreezeTypeExtension();
330 330
             return $extensions;
331 331
         });
332
-        $app->extend('form.types', function ($types) use ($app) {
332
+        $app->extend('form.types', function($types) use ($app) {
333 333
             $types[] = new \Eccube\Form\Type\NameType($app['config']);
334 334
             $types[] = new \Eccube\Form\Type\KanaType($app['config']);
335 335
             $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.