@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | )); |
58 | 58 | |
59 | 59 | $message = \Swift_Message::newInstance() |
60 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認') |
|
60 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認') |
|
61 | 61 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
62 | 62 | ->setTo(array($Customer->getEmail())) |
63 | 63 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | )); |
83 | 83 | |
84 | 84 | $message = \Swift_Message::newInstance() |
85 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録が完了しました。') |
|
85 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録が完了しました。') |
|
86 | 86 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
87 | 87 | ->setTo(array($Customer->getEmail())) |
88 | 88 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | )); |
112 | 112 | |
113 | 113 | $message = \Swift_Message::newInstance() |
114 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 退会手続きのご完了') |
|
114 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 退会手続きのご完了') |
|
115 | 115 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
116 | 116 | ->setTo(array($email)) |
117 | 117 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | |
140 | 140 | // 問い合わせ者にメール送信 |
141 | 141 | $message = \Swift_Message::newInstance() |
142 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] お問い合わせを受け付けました。') |
|
142 | + ->setSubject('['.$this->BaseInfo->getShopName().'] お問い合わせを受け付けました。') |
|
143 | 143 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
144 | 144 | ->setTo(array($formData['email'])) |
145 | 145 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | )); |
170 | 170 | |
171 | 171 | $message = \Swift_Message::newInstance() |
172 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $MailTemplate->getSubject()) |
|
172 | + ->setSubject('['.$this->BaseInfo->getShopName().'] '.$MailTemplate->getSubject()) |
|
173 | 173 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
174 | 174 | ->setTo(array($Order->getEmail())) |
175 | 175 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | )); |
198 | 198 | |
199 | 199 | $message = \Swift_Message::newInstance() |
200 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認') |
|
200 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認') |
|
201 | 201 | ->setFrom(array($this->BaseInfo->getEmail03() => $this->BaseInfo->getShopName())) |
202 | 202 | ->setTo(array($Customer->getEmail())) |
203 | 203 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | )); |
227 | 227 | |
228 | 228 | $message = \Swift_Message::newInstance() |
229 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $formData['subject']) |
|
229 | + ->setSubject('['.$this->BaseInfo->getShopName().'] '.$formData['subject']) |
|
230 | 230 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
231 | 231 | ->setTo(array($Order->getEmail())) |
232 | 232 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | )); |
252 | 252 | |
253 | 253 | $message = \Swift_Message::newInstance() |
254 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のご確認') |
|
254 | + ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のご確認') |
|
255 | 255 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
256 | 256 | ->setTo(array($Customer->getEmail())) |
257 | 257 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | )); |
277 | 277 | |
278 | 278 | $message = \Swift_Message::newInstance() |
279 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のお知らせ') |
|
279 | + ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のお知らせ') |
|
280 | 280 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
281 | 281 | ->setTo(array($Customer->getEmail())) |
282 | 282 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -41,28 +41,28 @@ discard block |
||
41 | 41 | public function register(BaseApplication $app) |
42 | 42 | { |
43 | 43 | // Service |
44 | - $app['eccube.service.system'] = $app->share(function () use ($app) { |
|
44 | + $app['eccube.service.system'] = $app->share(function() use ($app) { |
|
45 | 45 | return new \Eccube\Service\SystemService($app); |
46 | 46 | }); |
47 | - $app['view'] = $app->share(function () use ($app) { |
|
47 | + $app['view'] = $app->share(function() use ($app) { |
|
48 | 48 | return $app['twig']; |
49 | 49 | }); |
50 | - $app['eccube.service.cart'] = $app->share(function () use ($app) { |
|
50 | + $app['eccube.service.cart'] = $app->share(function() use ($app) { |
|
51 | 51 | return new \Eccube\Service\CartService($app); |
52 | 52 | }); |
53 | - $app['eccube.service.order'] = $app->share(function () use ($app) { |
|
53 | + $app['eccube.service.order'] = $app->share(function() use ($app) { |
|
54 | 54 | return new \Eccube\Service\OrderService($app); |
55 | 55 | }); |
56 | - $app['eccube.service.tax_rule'] = $app->share(function () use ($app) { |
|
56 | + $app['eccube.service.tax_rule'] = $app->share(function() use ($app) { |
|
57 | 57 | return new \Eccube\Service\TaxRuleService($app['eccube.repository.tax_rule']); |
58 | 58 | }); |
59 | - $app['eccube.service.plugin'] = $app->share(function () use ($app) { |
|
59 | + $app['eccube.service.plugin'] = $app->share(function() use ($app) { |
|
60 | 60 | return new \Eccube\Service\PluginService($app); |
61 | 61 | }); |
62 | - $app['eccube.service.mail'] = $app->share(function () use ($app) { |
|
62 | + $app['eccube.service.mail'] = $app->share(function() use ($app) { |
|
63 | 63 | return new \Eccube\Service\MailService($app); |
64 | 64 | }); |
65 | - $app['eccube.service.csv.export'] = $app->share(function () use ($app) { |
|
65 | + $app['eccube.service.csv.export'] = $app->share(function() use ($app) { |
|
66 | 66 | $csvService = new \Eccube\Service\CsvExportService(); |
67 | 67 | $csvService->setConfig($app['config']); |
68 | 68 | $csvService->setCsvRepository($app['eccube.repository.csv']); |
@@ -73,164 +73,164 @@ discard block |
||
73 | 73 | |
74 | 74 | return $csvService; |
75 | 75 | }); |
76 | - $app['eccube.service.shopping'] = $app->share(function () use ($app) { |
|
76 | + $app['eccube.service.shopping'] = $app->share(function() use ($app) { |
|
77 | 77 | return new \Eccube\Service\ShoppingService($app, $app['eccube.service.cart'], $app['eccube.service.order']); |
78 | 78 | }); |
79 | 79 | |
80 | 80 | // Repository |
81 | - $app['eccube.repository.master.tag'] = $app->share(function () use ($app) { |
|
81 | + $app['eccube.repository.master.tag'] = $app->share(function() use ($app) { |
|
82 | 82 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Tag'); |
83 | 83 | }); |
84 | - $app['eccube.repository.master.pref'] = $app->share(function () use ($app) { |
|
84 | + $app['eccube.repository.master.pref'] = $app->share(function() use ($app) { |
|
85 | 85 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Pref'); |
86 | 86 | }); |
87 | - $app['eccube.repository.master.sex'] = $app->share(function () use ($app) { |
|
87 | + $app['eccube.repository.master.sex'] = $app->share(function() use ($app) { |
|
88 | 88 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Sex'); |
89 | 89 | }); |
90 | - $app['eccube.repository.master.disp'] = $app->share(function () use ($app) { |
|
90 | + $app['eccube.repository.master.disp'] = $app->share(function() use ($app) { |
|
91 | 91 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Disp'); |
92 | 92 | }); |
93 | - $app['eccube.repository.master.product_type'] = $app->share(function () use ($app) { |
|
93 | + $app['eccube.repository.master.product_type'] = $app->share(function() use ($app) { |
|
94 | 94 | return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductType'); |
95 | 95 | }); |
96 | - $app['eccube.repository.master.page_max'] = $app->share(function () use ($app) { |
|
96 | + $app['eccube.repository.master.page_max'] = $app->share(function() use ($app) { |
|
97 | 97 | return $app['orm.em']->getRepository('Eccube\Entity\Master\PageMax'); |
98 | 98 | }); |
99 | - $app['eccube.repository.master.order_status'] = $app->share(function () use ($app) { |
|
99 | + $app['eccube.repository.master.order_status'] = $app->share(function() use ($app) { |
|
100 | 100 | return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus'); |
101 | 101 | }); |
102 | - $app['eccube.repository.master.device_type'] = $app->share(function () use ($app) { |
|
102 | + $app['eccube.repository.master.device_type'] = $app->share(function() use ($app) { |
|
103 | 103 | return $app['orm.em']->getRepository('Eccube\Entity\Master\DeviceType'); |
104 | 104 | }); |
105 | - $app['eccube.repository.master.csv_type'] = $app->share(function () use ($app) { |
|
105 | + $app['eccube.repository.master.csv_type'] = $app->share(function() use ($app) { |
|
106 | 106 | return $app['orm.em']->getRepository('Eccube\Entity\Master\CsvType'); |
107 | 107 | }); |
108 | 108 | |
109 | - $app['eccube.repository.delivery'] = $app->share(function () use ($app) { |
|
109 | + $app['eccube.repository.delivery'] = $app->share(function() use ($app) { |
|
110 | 110 | return $app['orm.em']->getRepository('Eccube\Entity\Delivery'); |
111 | 111 | }); |
112 | - $app['eccube.repository.delivery_date'] = $app->share(function () use ($app) { |
|
112 | + $app['eccube.repository.delivery_date'] = $app->share(function() use ($app) { |
|
113 | 113 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryDate'); |
114 | 114 | }); |
115 | - $app['eccube.repository.delivery_fee'] = $app->share(function () use ($app) { |
|
115 | + $app['eccube.repository.delivery_fee'] = $app->share(function() use ($app) { |
|
116 | 116 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryFee'); |
117 | 117 | }); |
118 | - $app['eccube.repository.delivery_time'] = $app->share(function () use ($app) { |
|
118 | + $app['eccube.repository.delivery_time'] = $app->share(function() use ($app) { |
|
119 | 119 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryTime'); |
120 | 120 | }); |
121 | - $app['eccube.repository.payment'] = $app->share(function () use ($app) { |
|
121 | + $app['eccube.repository.payment'] = $app->share(function() use ($app) { |
|
122 | 122 | return $app['orm.em']->getRepository('Eccube\Entity\Payment'); |
123 | 123 | }); |
124 | - $app['eccube.repository.payment_option'] = $app->share(function () use ($app) { |
|
124 | + $app['eccube.repository.payment_option'] = $app->share(function() use ($app) { |
|
125 | 125 | return $app['orm.em']->getRepository('Eccube\Entity\PaymentOption'); |
126 | 126 | }); |
127 | - $app['eccube.repository.category'] = $app->share(function () use ($app) { |
|
127 | + $app['eccube.repository.category'] = $app->share(function() use ($app) { |
|
128 | 128 | return $app['orm.em']->getRepository('Eccube\Entity\Category'); |
129 | 129 | }); |
130 | - $app['eccube.repository.customer'] = $app->share(function () use ($app) { |
|
130 | + $app['eccube.repository.customer'] = $app->share(function() use ($app) { |
|
131 | 131 | return $app['orm.em']->getRepository('Eccube\Entity\Customer'); |
132 | 132 | }); |
133 | - $app['eccube.repository.news'] = $app->share(function () use ($app) { |
|
133 | + $app['eccube.repository.news'] = $app->share(function() use ($app) { |
|
134 | 134 | return $app['orm.em']->getRepository('Eccube\Entity\News'); |
135 | 135 | }); |
136 | - $app['eccube.repository.mail_history'] = $app->share(function () use ($app) { |
|
136 | + $app['eccube.repository.mail_history'] = $app->share(function() use ($app) { |
|
137 | 137 | return $app['orm.em']->getRepository('Eccube\Entity\MailHistory'); |
138 | 138 | }); |
139 | - $app['eccube.repository.member'] = $app->share(function () use ($app) { |
|
139 | + $app['eccube.repository.member'] = $app->share(function() use ($app) { |
|
140 | 140 | $memberRepository = $app['orm.em']->getRepository('Eccube\Entity\Member'); |
141 | 141 | $memberRepository->setEncoderFactorty($app['security.encoder_factory']); |
142 | 142 | return $memberRepository; |
143 | 143 | }); |
144 | - $app['eccube.repository.order'] = $app->share(function () use ($app) { |
|
144 | + $app['eccube.repository.order'] = $app->share(function() use ($app) { |
|
145 | 145 | return $app['orm.em']->getRepository('Eccube\Entity\Order'); |
146 | 146 | }); |
147 | - $app['eccube.repository.product'] = $app->share(function () use ($app) { |
|
147 | + $app['eccube.repository.product'] = $app->share(function() use ($app) { |
|
148 | 148 | $productRepository = $app['orm.em']->getRepository('Eccube\Entity\Product'); |
149 | 149 | return $productRepository; |
150 | 150 | }); |
151 | - $app['eccube.repository.product_image'] = $app->share(function () use ($app) { |
|
151 | + $app['eccube.repository.product_image'] = $app->share(function() use ($app) { |
|
152 | 152 | return $app['orm.em']->getRepository('Eccube\Entity\ProductImage'); |
153 | 153 | }); |
154 | - $app['eccube.repository.product_class'] = $app->share(function () use ($app) { |
|
154 | + $app['eccube.repository.product_class'] = $app->share(function() use ($app) { |
|
155 | 155 | return $app['orm.em']->getRepository('Eccube\Entity\ProductClass'); |
156 | 156 | }); |
157 | - $app['eccube.repository.product_stock'] = $app->share(function () use ($app) { |
|
157 | + $app['eccube.repository.product_stock'] = $app->share(function() use ($app) { |
|
158 | 158 | return $app['orm.em']->getRepository('Eccube\Entity\ProductStock'); |
159 | 159 | }); |
160 | - $app['eccube.repository.class_name'] = $app->share(function () use ($app) { |
|
160 | + $app['eccube.repository.class_name'] = $app->share(function() use ($app) { |
|
161 | 161 | return $app['orm.em']->getRepository('Eccube\Entity\ClassName'); |
162 | 162 | }); |
163 | - $app['eccube.repository.class_category'] = $app->share(function () use ($app) { |
|
163 | + $app['eccube.repository.class_category'] = $app->share(function() use ($app) { |
|
164 | 164 | return $app['orm.em']->getRepository('Eccube\Entity\ClassCategory'); |
165 | 165 | }); |
166 | - $app['eccube.repository.customer_favorite_product'] = $app->share(function () use ($app) { |
|
166 | + $app['eccube.repository.customer_favorite_product'] = $app->share(function() use ($app) { |
|
167 | 167 | return $app['orm.em']->getRepository('Eccube\Entity\CustomerFavoriteProduct'); |
168 | 168 | }); |
169 | - $app['eccube.repository.base_info'] = $app->share(function () use ($app) { |
|
169 | + $app['eccube.repository.base_info'] = $app->share(function() use ($app) { |
|
170 | 170 | return $app['orm.em']->getRepository('Eccube\Entity\BaseInfo'); |
171 | 171 | }); |
172 | - $app['eccube.repository.tax_rule'] = $app->share(function () use ($app) { |
|
172 | + $app['eccube.repository.tax_rule'] = $app->share(function() use ($app) { |
|
173 | 173 | $taxRuleRepository = $app['orm.em']->getRepository('Eccube\Entity\TaxRule'); |
174 | 174 | $taxRuleRepository->setApplication($app); |
175 | 175 | |
176 | 176 | return $taxRuleRepository; |
177 | 177 | }); |
178 | - $app['eccube.repository.page_layout'] = $app->share(function () use ($app) { |
|
178 | + $app['eccube.repository.page_layout'] = $app->share(function() use ($app) { |
|
179 | 179 | $pageLayoutRepository = $app['orm.em']->getRepository('Eccube\Entity\PageLayout'); |
180 | 180 | $pageLayoutRepository->setApplication($app); |
181 | 181 | |
182 | 182 | return $pageLayoutRepository; |
183 | 183 | }); |
184 | - $app['eccube.repository.block'] = $app->share(function () use ($app) { |
|
184 | + $app['eccube.repository.block'] = $app->share(function() use ($app) { |
|
185 | 185 | $blockRepository = $app['orm.em']->getRepository('Eccube\Entity\Block'); |
186 | 186 | $blockRepository->setApplication($app); |
187 | 187 | |
188 | 188 | return $blockRepository; |
189 | 189 | }); |
190 | - $app['eccube.repository.order'] = $app->share(function () use ($app) { |
|
190 | + $app['eccube.repository.order'] = $app->share(function() use ($app) { |
|
191 | 191 | $orderRepository = $app['orm.em']->getRepository('Eccube\Entity\Order'); |
192 | 192 | $orderRepository->setApplication($app); |
193 | 193 | |
194 | 194 | return $orderRepository; |
195 | 195 | }); |
196 | - $app['eccube.repository.customer_address'] = $app->share(function () use ($app) { |
|
196 | + $app['eccube.repository.customer_address'] = $app->share(function() use ($app) { |
|
197 | 197 | return $app['orm.em']->getRepository('Eccube\Entity\CustomerAddress'); |
198 | 198 | }); |
199 | - $app['eccube.repository.shipping'] = $app->share(function () use ($app) { |
|
199 | + $app['eccube.repository.shipping'] = $app->share(function() use ($app) { |
|
200 | 200 | return $app['orm.em']->getRepository('Eccube\Entity\Shipping'); |
201 | 201 | }); |
202 | - $app['eccube.repository.customer_status'] = $app->share(function () use ($app) { |
|
202 | + $app['eccube.repository.customer_status'] = $app->share(function() use ($app) { |
|
203 | 203 | return $app['orm.em']->getRepository('Eccube\Entity\Master\CustomerStatus'); |
204 | 204 | }); |
205 | - $app['eccube.repository.order_status'] = $app->share(function () use ($app) { |
|
205 | + $app['eccube.repository.order_status'] = $app->share(function() use ($app) { |
|
206 | 206 | return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus'); |
207 | 207 | }); |
208 | - $app['eccube.repository.mail_template'] = $app->share(function () use ($app) { |
|
208 | + $app['eccube.repository.mail_template'] = $app->share(function() use ($app) { |
|
209 | 209 | return $app['orm.em']->getRepository('Eccube\Entity\MailTemplate'); |
210 | 210 | }); |
211 | - $app['eccube.repository.csv'] = $app->share(function () use ($app) { |
|
211 | + $app['eccube.repository.csv'] = $app->share(function() use ($app) { |
|
212 | 212 | return $app['orm.em']->getRepository('Eccube\Entity\Csv'); |
213 | 213 | }); |
214 | - $app['eccube.repository.template'] = $app->share(function () use ($app) { |
|
214 | + $app['eccube.repository.template'] = $app->share(function() use ($app) { |
|
215 | 215 | return $app['orm.em']->getRepository('Eccube\Entity\Template'); |
216 | 216 | }); |
217 | 217 | |
218 | - $app['paginator'] = $app->protect(function () { |
|
218 | + $app['paginator'] = $app->protect(function() { |
|
219 | 219 | return new \Knp\Component\Pager\Paginator(); |
220 | 220 | }); |
221 | 221 | |
222 | - $app['eccube.repository.help'] = $app->share(function () use ($app) { |
|
222 | + $app['eccube.repository.help'] = $app->share(function() use ($app) { |
|
223 | 223 | return $app['orm.em']->getRepository('Eccube\Entity\Help'); |
224 | 224 | }); |
225 | - $app['eccube.repository.plugin'] = $app->share(function () use ($app) { |
|
225 | + $app['eccube.repository.plugin'] = $app->share(function() use ($app) { |
|
226 | 226 | return $app['orm.em']->getRepository('Eccube\Entity\Plugin'); |
227 | 227 | }); |
228 | - $app['eccube.repository.plugin_event_handler'] = $app->share(function () use ($app) { |
|
228 | + $app['eccube.repository.plugin_event_handler'] = $app->share(function() use ($app) { |
|
229 | 229 | return $app['orm.em']->getRepository('Eccube\Entity\PluginEventHandler'); |
230 | 230 | }); |
231 | 231 | // em |
232 | 232 | if (isset($app['orm.em'])) { |
233 | - $app['orm.em'] = $app->share($app->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
233 | + $app['orm.em'] = $app->share($app->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
234 | 234 | // tax_rule |
235 | 235 | $taxRuleRepository = $em->getRepository('Eccube\Entity\TaxRule'); |
236 | 236 | $taxRuleRepository->setApplication($app); |
@@ -253,13 +253,13 @@ discard block |
||
253 | 253 | } |
254 | 254 | |
255 | 255 | // Form\Type |
256 | - $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function ($extensions) use ($app) { |
|
256 | + $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function($extensions) use ($app) { |
|
257 | 257 | $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension(); |
258 | 258 | $extensions[] = new \Eccube\Form\Extension\FreezeTypeExtension(); |
259 | 259 | |
260 | 260 | return $extensions; |
261 | 261 | })); |
262 | - $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) { |
|
262 | + $app['form.types'] = $app->share($app->extend('form.types', function($types) use ($app) { |
|
263 | 263 | $types[] = new \Eccube\Form\Type\NameType($app['config']); |
264 | 264 | $types[] = new \Eccube\Form\Type\KanaType($app['config']); |
265 | 265 | $types[] = new \Eccube\Form\Type\TelType($app['config']); |
@@ -40,13 +40,13 @@ |
||
40 | 40 | */ |
41 | 41 | public function register(BaseApplication $app) |
42 | 42 | { |
43 | - $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function ($extensions) use ($app) { |
|
43 | + $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function($extensions) use ($app) { |
|
44 | 44 | $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension(); |
45 | 45 | |
46 | 46 | return $extensions; |
47 | 47 | })); |
48 | 48 | |
49 | - $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) { |
|
49 | + $app['form.types'] = $app->share($app->extend('form.types', function($types) use ($app) { |
|
50 | 50 | $types[] = new \Eccube\Form\Type\Install\Step1Type($app); |
51 | 51 | $types[] = new \Eccube\Form\Type\Install\Step3Type($app); |
52 | 52 | $types[] = new \Eccube\Form\Type\Install\Step4Type($app); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | { |
29 | 29 | public function register(Application $app) |
30 | 30 | { |
31 | - $app['validator'] = $app->share(function ($app) { |
|
31 | + $app['validator'] = $app->share(function($app) { |
|
32 | 32 | |
33 | 33 | return new Validator( |
34 | 34 | $app['validator.mapping.class_metadata_factory'], |
@@ -39,17 +39,17 @@ discard block |
||
39 | 39 | ); |
40 | 40 | }); |
41 | 41 | |
42 | - $app['validator.mapping.class_metadata_factory'] = $app->share(function ($app) { |
|
42 | + $app['validator.mapping.class_metadata_factory'] = $app->share(function($app) { |
|
43 | 43 | return new ClassMetadataFactory(new StaticMethodLoader()); |
44 | 44 | }); |
45 | 45 | |
46 | - $app['validator.validator_factory'] = $app->share(function () use ($app) { |
|
46 | + $app['validator.validator_factory'] = $app->share(function() use ($app) { |
|
47 | 47 | $validators = isset($app['validator.validator_service_ids']) ? $app['validator.validator_service_ids'] : array(); |
48 | 48 | |
49 | 49 | return new ConstraintValidatorFactory($app, $validators); |
50 | 50 | }); |
51 | 51 | |
52 | - $app['validator.object_initializers'] = $app->share(function ($app) { |
|
52 | + $app['validator.object_initializers'] = $app->share(function($app) { |
|
53 | 53 | return array(); |
54 | 54 | }); |
55 | 55 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | public function getCsrfTokenForAnchor() |
112 | 112 | { |
113 | 113 | $token = $this->app['form.csrf_provider']->getToken(Constant::TOKEN_NAME)->getValue(); |
114 | - return 'token-for-anchor=\'' . $token . '\''; |
|
114 | + return 'token-for-anchor=\''.$token.'\''; |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | public function getPriceFilter($number, $decimals = 0, $decPoint = '.', $thousandsSep = ',') |
147 | 147 | { |
148 | 148 | $price = number_format($number, $decimals, $decPoint, $thousandsSep); |
149 | - $price = '¥ ' . $price; |
|
149 | + $price = '¥ '.$price; |
|
150 | 150 | |
151 | 151 | return $price; |
152 | 152 | } |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | return $value; |
160 | 160 | } |
161 | 161 | |
162 | - return rtrim(mb_substr($value, 0, $length, 'UTF-8')) . $end; |
|
162 | + return rtrim(mb_substr($value, 0, $length, 'UTF-8')).$end; |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | |
@@ -186,18 +186,18 @@ discard block |
||
186 | 186 | } |
187 | 187 | if ($diff->m == 1 || $diff->days > 0) { |
188 | 188 | if ($diff->days <= 31) { |
189 | - return $diff->days . '日前'; |
|
189 | + return $diff->days.'日前'; |
|
190 | 190 | } |
191 | 191 | // return $date->format("Y/m/d H:i"); |
192 | 192 | return $date->format("Y/m/d"); |
193 | 193 | } |
194 | 194 | if ($diff->h > 0) { |
195 | - return $diff->h . "時間前"; |
|
195 | + return $diff->h."時間前"; |
|
196 | 196 | } |
197 | 197 | if ($diff->i > 0) { |
198 | - return $diff->i . "分前"; |
|
198 | + return $diff->i."分前"; |
|
199 | 199 | } |
200 | - return $diff->s . "秒前"; |
|
200 | + return $diff->s."秒前"; |
|
201 | 201 | } |
202 | 202 | |
203 | 203 | /** |
@@ -24,7 +24,7 @@ |
||
24 | 24 | $app['db.migrations.table_name'] = null; |
25 | 25 | $app['db.migrations.name'] = null; |
26 | 26 | |
27 | - $app['dispatcher']->addListener(ConsoleEvents::INIT, function (ConsoleEvent $event) use ($app) { |
|
27 | + $app['dispatcher']->addListener(ConsoleEvents::INIT, function(ConsoleEvent $event) use ($app) { |
|
28 | 28 | $application = $event->getApplication(); |
29 | 29 | |
30 | 30 | $helpers = array('dialog' => new DialogHelper()); |
@@ -26,10 +26,7 @@ |
||
26 | 26 | |
27 | 27 | use Eccube\Application; |
28 | 28 | use Eccube\Controller\AbstractController; |
29 | -use Eccube\Form\Type\Admin\MasterdataDataType; |
|
30 | 29 | use Symfony\Component\HttpFoundation\Request; |
31 | -use Symfony\Component\Form\FormEvent; |
|
32 | -use Symfony\Component\Form\FormEvents; |
|
33 | 30 | |
34 | 31 | class MasterdataController extends AbstractController |
35 | 32 | { |
@@ -53,8 +53,8 @@ |
||
53 | 53 | $data['data'][$value['rank']]['name'] = $value['name']; |
54 | 54 | } |
55 | 55 | |
56 | - $data['data'][$value['rank']+1]['id'] = ''; |
|
57 | - $data['data'][$value['rank']+1]['name'] = ''; |
|
56 | + $data['data'][$value['rank'] + 1]['id'] = ''; |
|
57 | + $data['data'][$value['rank'] + 1]['name'] = ''; |
|
58 | 58 | |
59 | 59 | $data['masterdata_name'] = $data['masterdata']; |
60 | 60 | } |
@@ -87,7 +87,7 @@ |
||
87 | 87 | * Complete |
88 | 88 | * |
89 | 89 | * @param Application $app |
90 | - * @return mixed |
|
90 | + * @return \Symfony\Component\HttpFoundation\Response |
|
91 | 91 | */ |
92 | 92 | public function complete(Application $app, Request $request) |
93 | 93 | { |