@@ -32,7 +32,6 @@ |
||
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 | { |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Eccube\Service\Payment\Method; |
4 | 4 | |
5 | -use Eccube\Service\Payment\PaymentMethod; |
|
6 | 5 | use Eccube\Service\Payment\PaymentResult; |
7 | 6 | use Symfony\Component\HttpFoundation\Request; |
8 | 7 | use Symfony\Component\HttpKernel\HttpKernelInterface; |
@@ -27,7 +27,6 @@ |
||
27 | 27 | use Silex\Application; |
28 | 28 | use Silex\Api\BootableProviderInterface; |
29 | 29 | use Symfony\Bridge\Twig\Extension\DumpExtension; |
30 | -use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
|
31 | 30 | use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector; |
32 | 31 | use Symfony\Component\HttpKernel\EventListener\DumpListener; |
33 | 32 | use Symfony\Component\VarDumper\Cloner\VarCloner; |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | { |
70 | 70 | public function register(Container $app) |
71 | 71 | { |
72 | - $app['var_dumper.cloner'] = function ($app) { |
|
72 | + $app['var_dumper.cloner'] = function($app) { |
|
73 | 73 | $cloner = new VarCloner(); |
74 | 74 | |
75 | 75 | if (isset($app['debug.max_items'])) { |
@@ -83,23 +83,23 @@ discard block |
||
83 | 83 | return $cloner; |
84 | 84 | }; |
85 | 85 | |
86 | - $app->extend('data_collector.templates', function ($templates) { |
|
86 | + $app->extend('data_collector.templates', function($templates) { |
|
87 | 87 | return array_merge($templates, array(array('dump', '@Debug/Profiler/dump.html.twig'))); |
88 | 88 | }); |
89 | 89 | |
90 | - $app['data_collector.dump'] = function ($app) { |
|
90 | + $app['data_collector.dump'] = function($app) { |
|
91 | 91 | return new DumpDataCollector($app['stopwatch'], $app['code.file_link_format']); |
92 | 92 | }; |
93 | 93 | |
94 | - $app->extend('data_collectors', function ($collectors, $app) { |
|
95 | - $collectors['dump'] = function ($app) { |
|
94 | + $app->extend('data_collectors', function($collectors, $app) { |
|
95 | + $collectors['dump'] = function($app) { |
|
96 | 96 | return $app['data_collector.dump']; |
97 | 97 | }; |
98 | 98 | |
99 | 99 | return $collectors; |
100 | 100 | }); |
101 | 101 | |
102 | - $app->extend('twig', function ($twig, $app) { |
|
102 | + $app->extend('twig', function($twig, $app) { |
|
103 | 103 | if (class_exists('\Symfony\Bridge\Twig\Extension\DumpExtension')) { |
104 | 104 | $twig->addExtension(new DumpExtension($app['var_dumper.cloner'])); |
105 | 105 | } |
@@ -107,13 +107,13 @@ discard block |
||
107 | 107 | return $twig; |
108 | 108 | }); |
109 | 109 | |
110 | - $app->extend('twig.loader.filesystem', function ($loader, $app) { |
|
110 | + $app->extend('twig.loader.filesystem', function($loader, $app) { |
|
111 | 111 | $loader->addPath($app['debug.templates_path'], 'Debug'); |
112 | 112 | |
113 | 113 | return $loader; |
114 | 114 | }); |
115 | 115 | |
116 | - $app['debug.templates_path'] = function () { |
|
116 | + $app['debug.templates_path'] = function() { |
|
117 | 117 | $r = new \ReflectionClass('Symfony\Bundle\DebugBundle\DependencyInjection\Configuration'); |
118 | 118 | |
119 | 119 | return dirname(dirname($r->getFileName())).'/Resources/views'; |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | // This code is here to lazy load the dump stack. This default |
126 | 126 | // configuration for CLI mode is overridden in HTTP mode on |
127 | 127 | // 'kernel.request' event |
128 | - VarDumper::setHandler(function ($var) use ($app) { |
|
128 | + VarDumper::setHandler(function($var) use ($app) { |
|
129 | 129 | $dumper = new CliDumper(); |
130 | 130 | $dumper->dump($app['var_dumper.cloner']->cloneVar($var)); |
131 | 131 | }); |
@@ -39,7 +39,7 @@ |
||
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 | { |
@@ -44,31 +44,31 @@ discard block |
||
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,39 +77,39 @@ discard block |
||
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 | return new $clazz; |
82 | 82 | }); |
83 | 83 | |
84 | - $app['eccube.calculate.strategies'] = $app->protect(function ($Order) use ($app) { |
|
84 | + $app['eccube.calculate.strategies'] = $app->protect(function($Order) use ($app) { |
|
85 | 85 | // デフォルトのストラテジーをセットしておく |
86 | - $Strategies = [ // ArrayIterator にしたい |
|
86 | + $Strategies = [// ArrayIterator にしたい |
|
87 | 87 | $app['eccube.calculate.strategy.shipping']($Order), |
88 | 88 | $app['eccube.calculate.strategy.tax']($Order) |
89 | 89 | ]; |
90 | 90 | return $Strategies; |
91 | 91 | }); |
92 | - $app['eccube.calculate.strategy.shipping'] = $app->protect(function ($Order) use ($app) { |
|
92 | + $app['eccube.calculate.strategy.shipping'] = $app->protect(function($Order) use ($app) { |
|
93 | 93 | $Strategy = new \Eccube\Service\Calculator\Strategy\ShippingStrategy(); |
94 | 94 | $Strategy->setApplication($app); |
95 | 95 | $Strategy->setOrder($Order); |
96 | 96 | return $Strategy; |
97 | 97 | }); |
98 | - $app['eccube.calculate.strategy.tax'] = $app->protect(function ($Order) use ($app) { |
|
98 | + $app['eccube.calculate.strategy.tax'] = $app->protect(function($Order) use ($app) { |
|
99 | 99 | $Strategy = new \Eccube\Service\Calculator\Strategy\TaxStrategy(); |
100 | 100 | $Strategy->setApplication($app); |
101 | 101 | $Strategy->setOrder($Order); |
102 | 102 | return $Strategy; |
103 | 103 | }); |
104 | 104 | |
105 | - $app['payment.method'] = $app->protect(function ($clazz, $form) use ($app) { |
|
105 | + $app['payment.method'] = $app->protect(function($clazz, $form) use ($app) { |
|
106 | 106 | $PaymentMethod = new $clazz; |
107 | 107 | $PaymentMethod->setApplication($app); |
108 | 108 | $PaymentMethod->setFormType($form); |
109 | 109 | return $PaymentMethod; |
110 | 110 | }); |
111 | 111 | |
112 | - $app['payment.method.request'] = $app->protect(function ($clazz, $form, $request) use ($app) { |
|
112 | + $app['payment.method.request'] = $app->protect(function($clazz, $form, $request) use ($app) { |
|
113 | 113 | $PaymentMethod = new $clazz; |
114 | 114 | $PaymentMethod->setApplication($app); |
115 | 115 | $PaymentMethod->setFormType($form); |
@@ -117,11 +117,11 @@ discard block |
||
117 | 117 | return $PaymentMethod; |
118 | 118 | }); |
119 | 119 | |
120 | - $app['eccube.helper.order'] = function ($app) { |
|
120 | + $app['eccube.helper.order'] = function($app) { |
|
121 | 121 | return new OrderHelper($app); |
122 | 122 | }; |
123 | 123 | |
124 | - $app['eccube.service.csv.export'] = function () use ($app) { |
|
124 | + $app['eccube.service.csv.export'] = function() use ($app) { |
|
125 | 125 | $csvService = new \Eccube\Service\CsvExportService(); |
126 | 126 | $csvService->setEntityManager($app['orm.em']); |
127 | 127 | $csvService->setConfig($app['config']); |
@@ -133,193 +133,193 @@ discard block |
||
133 | 133 | |
134 | 134 | return $csvService; |
135 | 135 | }; |
136 | - $app['eccube.service.shopping'] = function () use ($app) { |
|
136 | + $app['eccube.service.shopping'] = function() use ($app) { |
|
137 | 137 | return new \Eccube\Service\ShoppingService($app, $app['eccube.service.cart'], $app['eccube.service.order']); |
138 | 138 | }; |
139 | 139 | |
140 | 140 | // Repository |
141 | - $app['eccube.repository.master.authority'] = function () use ($app) { |
|
141 | + $app['eccube.repository.master.authority'] = function() use ($app) { |
|
142 | 142 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Authority'); |
143 | 143 | }; |
144 | - $app['eccube.repository.master.tag'] = function () use ($app) { |
|
144 | + $app['eccube.repository.master.tag'] = function() use ($app) { |
|
145 | 145 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Tag'); |
146 | 146 | }; |
147 | - $app['eccube.repository.master.pref'] = function () use ($app) { |
|
147 | + $app['eccube.repository.master.pref'] = function() use ($app) { |
|
148 | 148 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Pref'); |
149 | 149 | }; |
150 | - $app['eccube.repository.master.sex'] = function () use ($app) { |
|
150 | + $app['eccube.repository.master.sex'] = function() use ($app) { |
|
151 | 151 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Sex'); |
152 | 152 | }; |
153 | - $app['eccube.repository.master.disp'] = function () use ($app) { |
|
153 | + $app['eccube.repository.master.disp'] = function() use ($app) { |
|
154 | 154 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Disp'); |
155 | 155 | }; |
156 | - $app['eccube.repository.master.product_type'] = function () use ($app) { |
|
156 | + $app['eccube.repository.master.product_type'] = function() use ($app) { |
|
157 | 157 | return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductType'); |
158 | 158 | }; |
159 | - $app['eccube.repository.master.page_max'] = function () use ($app) { |
|
159 | + $app['eccube.repository.master.page_max'] = function() use ($app) { |
|
160 | 160 | return $app['orm.em']->getRepository('Eccube\Entity\Master\PageMax'); |
161 | 161 | }; |
162 | - $app['eccube.repository.master.order_status'] = function () use ($app) { |
|
162 | + $app['eccube.repository.master.order_status'] = function() use ($app) { |
|
163 | 163 | return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus'); |
164 | 164 | }; |
165 | - $app['eccube.repository.master.device_type'] = function () use ($app) { |
|
165 | + $app['eccube.repository.master.device_type'] = function() use ($app) { |
|
166 | 166 | return $app['orm.em']->getRepository('Eccube\Entity\Master\DeviceType'); |
167 | 167 | }; |
168 | - $app['eccube.repository.master.csv_type'] = function () use ($app) { |
|
168 | + $app['eccube.repository.master.csv_type'] = function() use ($app) { |
|
169 | 169 | return $app['orm.em']->getRepository('Eccube\Entity\Master\CsvType'); |
170 | 170 | }; |
171 | 171 | |
172 | - $app['eccube.repository.delivery'] = function () use ($app) { |
|
172 | + $app['eccube.repository.delivery'] = function() use ($app) { |
|
173 | 173 | return $app['orm.em']->getRepository('Eccube\Entity\Delivery'); |
174 | 174 | }; |
175 | - $app['eccube.repository.delivery_date'] = function () use ($app) { |
|
175 | + $app['eccube.repository.delivery_date'] = function() use ($app) { |
|
176 | 176 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryDate'); |
177 | 177 | }; |
178 | - $app['eccube.repository.delivery_fee'] = function () use ($app) { |
|
178 | + $app['eccube.repository.delivery_fee'] = function() use ($app) { |
|
179 | 179 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryFee'); |
180 | 180 | }; |
181 | - $app['eccube.repository.delivery_time'] = function () use ($app) { |
|
181 | + $app['eccube.repository.delivery_time'] = function() use ($app) { |
|
182 | 182 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryTime'); |
183 | 183 | }; |
184 | - $app['eccube.repository.payment'] = function () use ($app) { |
|
184 | + $app['eccube.repository.payment'] = function() use ($app) { |
|
185 | 185 | return $app['orm.em']->getRepository('Eccube\Entity\Payment'); |
186 | 186 | }; |
187 | - $app['eccube.repository.payment_option'] = function () use ($app) { |
|
187 | + $app['eccube.repository.payment_option'] = function() use ($app) { |
|
188 | 188 | return $app['orm.em']->getRepository('Eccube\Entity\PaymentOption'); |
189 | 189 | }; |
190 | - $app['eccube.repository.category'] = function () use ($app) { |
|
190 | + $app['eccube.repository.category'] = function() use ($app) { |
|
191 | 191 | $CategoryRepository = $app['orm.em']->getRepository('Eccube\Entity\Category'); |
192 | 192 | $CategoryRepository->setApplication($app); |
193 | 193 | |
194 | 194 | return $CategoryRepository; |
195 | 195 | }; |
196 | - $app['eccube.repository.customer'] = function () use ($app) { |
|
196 | + $app['eccube.repository.customer'] = function() use ($app) { |
|
197 | 197 | return $app['orm.em']->getRepository('Eccube\Entity\Customer'); |
198 | 198 | }; |
199 | - $app['eccube.repository.news'] = function () use ($app) { |
|
199 | + $app['eccube.repository.news'] = function() use ($app) { |
|
200 | 200 | return $app['orm.em']->getRepository('Eccube\Entity\News'); |
201 | 201 | }; |
202 | - $app['eccube.repository.mail_history'] = function () use ($app) { |
|
202 | + $app['eccube.repository.mail_history'] = function() use ($app) { |
|
203 | 203 | return $app['orm.em']->getRepository('Eccube\Entity\MailHistory'); |
204 | 204 | }; |
205 | - $app['eccube.repository.member'] = function () use ($app) { |
|
205 | + $app['eccube.repository.member'] = function() use ($app) { |
|
206 | 206 | $memberRepository = $app['orm.em']->getRepository('Eccube\Entity\Member'); |
207 | 207 | $memberRepository->setEncoderFactorty($app['security.encoder_factory']); |
208 | 208 | return $memberRepository; |
209 | 209 | }; |
210 | - $app['eccube.repository.order'] = function () use ($app) { |
|
210 | + $app['eccube.repository.order'] = function() use ($app) { |
|
211 | 211 | return $app['orm.em']->getRepository('Eccube\Entity\Order'); |
212 | 212 | }; |
213 | - $app['eccube.repository.product'] = function () use ($app) { |
|
213 | + $app['eccube.repository.product'] = function() use ($app) { |
|
214 | 214 | $productRepository = $app['orm.em']->getRepository('Eccube\Entity\Product'); |
215 | 215 | $productRepository->setApplication($app); |
216 | 216 | |
217 | 217 | return $productRepository; |
218 | 218 | }; |
219 | - $app['eccube.repository.product_image'] = function () use ($app) { |
|
219 | + $app['eccube.repository.product_image'] = function() use ($app) { |
|
220 | 220 | return $app['orm.em']->getRepository('Eccube\Entity\ProductImage'); |
221 | 221 | }; |
222 | - $app['eccube.repository.product_class'] = function () use ($app) { |
|
222 | + $app['eccube.repository.product_class'] = function() use ($app) { |
|
223 | 223 | return $app['orm.em']->getRepository('Eccube\Entity\ProductClass'); |
224 | 224 | }; |
225 | - $app['eccube.repository.product_stock'] = function () use ($app) { |
|
225 | + $app['eccube.repository.product_stock'] = function() use ($app) { |
|
226 | 226 | return $app['orm.em']->getRepository('Eccube\Entity\ProductStock'); |
227 | 227 | }; |
228 | - $app['eccube.repository.product_tag'] = function () use ($app) { |
|
228 | + $app['eccube.repository.product_tag'] = function() use ($app) { |
|
229 | 229 | return $app['orm.em']->getRepository('Eccube\Entity\ProductTag'); |
230 | 230 | }; |
231 | - $app['eccube.repository.class_name'] = function () use ($app) { |
|
231 | + $app['eccube.repository.class_name'] = function() use ($app) { |
|
232 | 232 | return $app['orm.em']->getRepository('Eccube\Entity\ClassName'); |
233 | 233 | }; |
234 | - $app['eccube.repository.class_category'] = function () use ($app) { |
|
234 | + $app['eccube.repository.class_category'] = function() use ($app) { |
|
235 | 235 | return $app['orm.em']->getRepository('Eccube\Entity\ClassCategory'); |
236 | 236 | }; |
237 | - $app['eccube.repository.customer_favorite_product'] = function () use ($app) { |
|
237 | + $app['eccube.repository.customer_favorite_product'] = function() use ($app) { |
|
238 | 238 | return $app['orm.em']->getRepository('Eccube\Entity\CustomerFavoriteProduct'); |
239 | 239 | }; |
240 | - $app['eccube.repository.base_info'] = function () use ($app) { |
|
240 | + $app['eccube.repository.base_info'] = function() use ($app) { |
|
241 | 241 | $BaseInfoRepository = $app['orm.em']->getRepository('Eccube\Entity\BaseInfo'); |
242 | 242 | $BaseInfoRepository->setApplication($app); |
243 | 243 | |
244 | 244 | return $BaseInfoRepository; |
245 | 245 | }; |
246 | - $app['eccube.repository.tax_rule'] = function () use ($app) { |
|
246 | + $app['eccube.repository.tax_rule'] = function() use ($app) { |
|
247 | 247 | $taxRuleRepository = $app['orm.em']->getRepository('Eccube\Entity\TaxRule'); |
248 | 248 | $taxRuleRepository->setApplication($app); |
249 | 249 | |
250 | 250 | return $taxRuleRepository; |
251 | 251 | }; |
252 | - $app['eccube.repository.page_layout'] = function () use ($app) { |
|
252 | + $app['eccube.repository.page_layout'] = function() use ($app) { |
|
253 | 253 | $pageLayoutRepository = $app['orm.em']->getRepository('Eccube\Entity\PageLayout'); |
254 | 254 | $pageLayoutRepository->setApplication($app); |
255 | 255 | |
256 | 256 | return $pageLayoutRepository; |
257 | 257 | }; |
258 | - $app['eccube.repository.block'] = function () use ($app) { |
|
258 | + $app['eccube.repository.block'] = function() use ($app) { |
|
259 | 259 | $blockRepository = $app['orm.em']->getRepository('Eccube\Entity\Block'); |
260 | 260 | $blockRepository->setApplication($app); |
261 | 261 | |
262 | 262 | return $blockRepository; |
263 | 263 | }; |
264 | - $app['eccube.repository.order'] = function () use ($app) { |
|
264 | + $app['eccube.repository.order'] = function() use ($app) { |
|
265 | 265 | $orderRepository = $app['orm.em']->getRepository('Eccube\Entity\Order'); |
266 | 266 | $orderRepository->setApplication($app); |
267 | 267 | |
268 | 268 | return $orderRepository; |
269 | 269 | }; |
270 | - $app['eccube.repository.customer_address'] = function () use ($app) { |
|
270 | + $app['eccube.repository.customer_address'] = function() use ($app) { |
|
271 | 271 | return $app['orm.em']->getRepository('Eccube\Entity\CustomerAddress'); |
272 | 272 | }; |
273 | - $app['eccube.repository.shipping'] = function () use ($app) { |
|
273 | + $app['eccube.repository.shipping'] = function() use ($app) { |
|
274 | 274 | return $app['orm.em']->getRepository('Eccube\Entity\Shipping'); |
275 | 275 | }; |
276 | - $app['eccube.repository.customer_status'] = function () use ($app) { |
|
276 | + $app['eccube.repository.customer_status'] = function() use ($app) { |
|
277 | 277 | return $app['orm.em']->getRepository('Eccube\Entity\Master\CustomerStatus'); |
278 | 278 | }; |
279 | - $app['eccube.repository.order_status'] = function () use ($app) { |
|
279 | + $app['eccube.repository.order_status'] = function() use ($app) { |
|
280 | 280 | return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus'); |
281 | 281 | }; |
282 | - $app['eccube.repository.mail_template'] = function () use ($app) { |
|
282 | + $app['eccube.repository.mail_template'] = function() use ($app) { |
|
283 | 283 | return $app['orm.em']->getRepository('Eccube\Entity\MailTemplate'); |
284 | 284 | }; |
285 | - $app['eccube.repository.csv'] = function () use ($app) { |
|
285 | + $app['eccube.repository.csv'] = function() use ($app) { |
|
286 | 286 | return $app['orm.em']->getRepository('Eccube\Entity\Csv'); |
287 | 287 | }; |
288 | - $app['eccube.repository.template'] = function () use ($app) { |
|
288 | + $app['eccube.repository.template'] = function() use ($app) { |
|
289 | 289 | return $app['orm.em']->getRepository('Eccube\Entity\Template'); |
290 | 290 | }; |
291 | - $app['eccube.repository.authority_role'] = function () use ($app) { |
|
291 | + $app['eccube.repository.authority_role'] = function() use ($app) { |
|
292 | 292 | return $app['orm.em']->getRepository('Eccube\Entity\AuthorityRole'); |
293 | 293 | }; |
294 | 294 | |
295 | - $app['paginator'] = $app->protect(function () { |
|
295 | + $app['paginator'] = $app->protect(function() { |
|
296 | 296 | $paginator = new \Knp\Component\Pager\Paginator(); |
297 | 297 | $paginator->subscribe(new \Eccube\EventListener\PaginatorListener()); |
298 | 298 | |
299 | 299 | return $paginator; |
300 | 300 | }); |
301 | 301 | |
302 | - $app['eccube.repository.help'] = function () use ($app) { |
|
302 | + $app['eccube.repository.help'] = function() use ($app) { |
|
303 | 303 | return $app['orm.em']->getRepository('Eccube\Entity\Help'); |
304 | 304 | }; |
305 | - $app['eccube.repository.plugin'] = function () use ($app) { |
|
305 | + $app['eccube.repository.plugin'] = function() use ($app) { |
|
306 | 306 | return $app['orm.em']->getRepository('Eccube\Entity\Plugin'); |
307 | 307 | }; |
308 | - $app['eccube.repository.plugin_event_handler'] = function () use ($app) { |
|
308 | + $app['eccube.repository.plugin_event_handler'] = function() use ($app) { |
|
309 | 309 | return $app['orm.em']->getRepository('Eccube\Entity\PluginEventHandler'); |
310 | 310 | }; |
311 | 311 | |
312 | - $app['request_scope'] = function () { |
|
312 | + $app['request_scope'] = function() { |
|
313 | 313 | return new ParameterBag(); |
314 | 314 | }; |
315 | 315 | |
316 | 316 | // Form\Type |
317 | - $app->extend('form.type.extensions', function ($extensions) use ($app) { |
|
317 | + $app->extend('form.type.extensions', function($extensions) use ($app) { |
|
318 | 318 | $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension(); |
319 | 319 | $extensions[] = new \Eccube\Form\Extension\FreezeTypeExtension(); |
320 | 320 | return $extensions; |
321 | 321 | }); |
322 | - $app->extend('form.types', function ($types) use ($app) { |
|
322 | + $app->extend('form.types', function($types) use ($app) { |
|
323 | 323 | $types[] = new \Eccube\Form\Type\NameType($app['config']); |
324 | 324 | $types[] = new \Eccube\Form\Type\KanaType($app['config']); |
325 | 325 | $types[] = new \Eccube\Form\Type\TelType($app['config']); |
@@ -40,14 +40,14 @@ |
||
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 { |
@@ -33,7 +33,7 @@ discard block |
||
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 |
||
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 |
@@ -22,17 +22,17 @@ discard block |
||
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 |
||
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 |
||
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 | } |
@@ -42,13 +42,13 @@ |
||
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); |
@@ -32,7 +32,7 @@ discard block |
||
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 |
||
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 | } |