Completed
Pull Request — experimental/3.1 (#1985)
by Kentaro
26:46
created
src/Eccube/Controller/ForgotController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
                 // リセットキーの発行・有効期限の設定
65 65
                 $Customer
66 66
                     ->setResetKey($app['eccube.repository.customer']->getUniqueResetKey($app))
67
-                    ->setResetExpire(new \DateTime('+' . $app['config']['customer_reset_expire'] .' min'));
67
+                    ->setResetExpire(new \DateTime('+'.$app['config']['customer_reset_expire'].' min'));
68 68
 
69 69
                 // リセットキーを更新
70 70
                 $app['orm.em']->persist($Customer);
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 
88 88
                 // ログ出力
89 89
                 $app['monolog']->addInfo(
90
-                    'send reset password mail to:'  . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
90
+                    'send reset password mail to:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
91 91
                 );
92 92
             } else {
93 93
                 log_warning('Un active customer try send reset password email: ', array('Enter email' => $form->get('login_email')->getData()));
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 
170 170
             // ログ出力
171 171
             $app['monolog']->addInfo(
172
-                'reset password complete:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
172
+                'reset password complete:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
173 173
             );
174 174
         } else {
175 175
             throw new HttpException\AccessDeniedHttpException('不正なアクセスです。');
Please login to merge, or discard this patch.
src/Eccube/Repository/ProductRepository.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
                 $key = sprintf('keyword%s', $index);
114 114
                 $qb
115 115
                     ->andWhere(sprintf('NORMALIZE(p.name) LIKE NORMALIZE(:%s) OR NORMALIZE(p.search_word) LIKE NORMALIZE(:%s)', $key, $key))
116
-                    ->setParameter($key, '%' . $keyword . '%');
116
+                    ->setParameter($key, '%'.$keyword.'%');
117 117
             }
118 118
         }
119 119
 
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
             $qb
177 177
                 ->andWhere('p.id = :id OR p.name LIKE :likeid OR pc.code LIKE :likeid')
178 178
                 ->setParameter('id', $id)
179
-                ->setParameter('likeid', '%' . $searchData['id'] . '%');
179
+                ->setParameter('likeid', '%'.$searchData['id'].'%');
180 180
         }
181 181
 
182 182
         // code
Please login to merge, or discard this patch.
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 3 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.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,6 @@
 block discarded – undo
24 24
 
25 25
 namespace Eccube\ServiceProvider;
26 26
 
27
-use Eccube\EventListener\TransactionListener;
28 27
 use Eccube\Service\OrderHelper;
29 28
 use Pimple\Container;
30 29
 use Pimple\ServiceProviderInterface;
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.