@@ -59,7 +59,7 @@ |
||
59 | 59 | 'label' => '拒否URL', |
60 | 60 | 'required' => false, |
61 | 61 | )) |
62 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
62 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
63 | 63 | $form = $event->getForm(); |
64 | 64 | |
65 | 65 | $Authority = $form['Authority']->getData(); |
@@ -36,7 +36,7 @@ |
||
36 | 36 | |
37 | 37 | public function __construct(Application $app) |
38 | 38 | { |
39 | - $this->app = $app; |
|
39 | + $this->app = $app; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | public function supportsAttribute($attribute) |
@@ -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,170 +73,170 @@ 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.authority'] = $app->share(function () use ($app) { |
|
81 | + $app['eccube.repository.master.authority'] = $app->share(function() use ($app) { |
|
82 | 82 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Authority'); |
83 | 83 | }); |
84 | - $app['eccube.repository.master.tag'] = $app->share(function () use ($app) { |
|
84 | + $app['eccube.repository.master.tag'] = $app->share(function() use ($app) { |
|
85 | 85 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Tag'); |
86 | 86 | }); |
87 | - $app['eccube.repository.master.pref'] = $app->share(function () use ($app) { |
|
87 | + $app['eccube.repository.master.pref'] = $app->share(function() use ($app) { |
|
88 | 88 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Pref'); |
89 | 89 | }); |
90 | - $app['eccube.repository.master.sex'] = $app->share(function () use ($app) { |
|
90 | + $app['eccube.repository.master.sex'] = $app->share(function() use ($app) { |
|
91 | 91 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Sex'); |
92 | 92 | }); |
93 | - $app['eccube.repository.master.disp'] = $app->share(function () use ($app) { |
|
93 | + $app['eccube.repository.master.disp'] = $app->share(function() use ($app) { |
|
94 | 94 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Disp'); |
95 | 95 | }); |
96 | - $app['eccube.repository.master.product_type'] = $app->share(function () use ($app) { |
|
96 | + $app['eccube.repository.master.product_type'] = $app->share(function() use ($app) { |
|
97 | 97 | return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductType'); |
98 | 98 | }); |
99 | - $app['eccube.repository.master.page_max'] = $app->share(function () use ($app) { |
|
99 | + $app['eccube.repository.master.page_max'] = $app->share(function() use ($app) { |
|
100 | 100 | return $app['orm.em']->getRepository('Eccube\Entity\Master\PageMax'); |
101 | 101 | }); |
102 | - $app['eccube.repository.master.order_status'] = $app->share(function () use ($app) { |
|
102 | + $app['eccube.repository.master.order_status'] = $app->share(function() use ($app) { |
|
103 | 103 | return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus'); |
104 | 104 | }); |
105 | - $app['eccube.repository.master.device_type'] = $app->share(function () use ($app) { |
|
105 | + $app['eccube.repository.master.device_type'] = $app->share(function() use ($app) { |
|
106 | 106 | return $app['orm.em']->getRepository('Eccube\Entity\Master\DeviceType'); |
107 | 107 | }); |
108 | - $app['eccube.repository.master.csv_type'] = $app->share(function () use ($app) { |
|
108 | + $app['eccube.repository.master.csv_type'] = $app->share(function() use ($app) { |
|
109 | 109 | return $app['orm.em']->getRepository('Eccube\Entity\Master\CsvType'); |
110 | 110 | }); |
111 | 111 | |
112 | - $app['eccube.repository.delivery'] = $app->share(function () use ($app) { |
|
112 | + $app['eccube.repository.delivery'] = $app->share(function() use ($app) { |
|
113 | 113 | return $app['orm.em']->getRepository('Eccube\Entity\Delivery'); |
114 | 114 | }); |
115 | - $app['eccube.repository.delivery_date'] = $app->share(function () use ($app) { |
|
115 | + $app['eccube.repository.delivery_date'] = $app->share(function() use ($app) { |
|
116 | 116 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryDate'); |
117 | 117 | }); |
118 | - $app['eccube.repository.delivery_fee'] = $app->share(function () use ($app) { |
|
118 | + $app['eccube.repository.delivery_fee'] = $app->share(function() use ($app) { |
|
119 | 119 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryFee'); |
120 | 120 | }); |
121 | - $app['eccube.repository.delivery_time'] = $app->share(function () use ($app) { |
|
121 | + $app['eccube.repository.delivery_time'] = $app->share(function() use ($app) { |
|
122 | 122 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryTime'); |
123 | 123 | }); |
124 | - $app['eccube.repository.payment'] = $app->share(function () use ($app) { |
|
124 | + $app['eccube.repository.payment'] = $app->share(function() use ($app) { |
|
125 | 125 | return $app['orm.em']->getRepository('Eccube\Entity\Payment'); |
126 | 126 | }); |
127 | - $app['eccube.repository.payment_option'] = $app->share(function () use ($app) { |
|
127 | + $app['eccube.repository.payment_option'] = $app->share(function() use ($app) { |
|
128 | 128 | return $app['orm.em']->getRepository('Eccube\Entity\PaymentOption'); |
129 | 129 | }); |
130 | - $app['eccube.repository.category'] = $app->share(function () use ($app) { |
|
130 | + $app['eccube.repository.category'] = $app->share(function() use ($app) { |
|
131 | 131 | return $app['orm.em']->getRepository('Eccube\Entity\Category'); |
132 | 132 | }); |
133 | - $app['eccube.repository.customer'] = $app->share(function () use ($app) { |
|
133 | + $app['eccube.repository.customer'] = $app->share(function() use ($app) { |
|
134 | 134 | return $app['orm.em']->getRepository('Eccube\Entity\Customer'); |
135 | 135 | }); |
136 | - $app['eccube.repository.news'] = $app->share(function () use ($app) { |
|
136 | + $app['eccube.repository.news'] = $app->share(function() use ($app) { |
|
137 | 137 | return $app['orm.em']->getRepository('Eccube\Entity\News'); |
138 | 138 | }); |
139 | - $app['eccube.repository.mail_history'] = $app->share(function () use ($app) { |
|
139 | + $app['eccube.repository.mail_history'] = $app->share(function() use ($app) { |
|
140 | 140 | return $app['orm.em']->getRepository('Eccube\Entity\MailHistory'); |
141 | 141 | }); |
142 | - $app['eccube.repository.member'] = $app->share(function () use ($app) { |
|
142 | + $app['eccube.repository.member'] = $app->share(function() use ($app) { |
|
143 | 143 | $memberRepository = $app['orm.em']->getRepository('Eccube\Entity\Member'); |
144 | 144 | $memberRepository->setEncoderFactorty($app['security.encoder_factory']); |
145 | 145 | return $memberRepository; |
146 | 146 | }); |
147 | - $app['eccube.repository.order'] = $app->share(function () use ($app) { |
|
147 | + $app['eccube.repository.order'] = $app->share(function() use ($app) { |
|
148 | 148 | return $app['orm.em']->getRepository('Eccube\Entity\Order'); |
149 | 149 | }); |
150 | - $app['eccube.repository.product'] = $app->share(function () use ($app) { |
|
150 | + $app['eccube.repository.product'] = $app->share(function() use ($app) { |
|
151 | 151 | $productRepository = $app['orm.em']->getRepository('Eccube\Entity\Product'); |
152 | 152 | return $productRepository; |
153 | 153 | }); |
154 | - $app['eccube.repository.product_image'] = $app->share(function () use ($app) { |
|
154 | + $app['eccube.repository.product_image'] = $app->share(function() use ($app) { |
|
155 | 155 | return $app['orm.em']->getRepository('Eccube\Entity\ProductImage'); |
156 | 156 | }); |
157 | - $app['eccube.repository.product_class'] = $app->share(function () use ($app) { |
|
157 | + $app['eccube.repository.product_class'] = $app->share(function() use ($app) { |
|
158 | 158 | return $app['orm.em']->getRepository('Eccube\Entity\ProductClass'); |
159 | 159 | }); |
160 | - $app['eccube.repository.product_stock'] = $app->share(function () use ($app) { |
|
160 | + $app['eccube.repository.product_stock'] = $app->share(function() use ($app) { |
|
161 | 161 | return $app['orm.em']->getRepository('Eccube\Entity\ProductStock'); |
162 | 162 | }); |
163 | - $app['eccube.repository.class_name'] = $app->share(function () use ($app) { |
|
163 | + $app['eccube.repository.class_name'] = $app->share(function() use ($app) { |
|
164 | 164 | return $app['orm.em']->getRepository('Eccube\Entity\ClassName'); |
165 | 165 | }); |
166 | - $app['eccube.repository.class_category'] = $app->share(function () use ($app) { |
|
166 | + $app['eccube.repository.class_category'] = $app->share(function() use ($app) { |
|
167 | 167 | return $app['orm.em']->getRepository('Eccube\Entity\ClassCategory'); |
168 | 168 | }); |
169 | - $app['eccube.repository.customer_favorite_product'] = $app->share(function () use ($app) { |
|
169 | + $app['eccube.repository.customer_favorite_product'] = $app->share(function() use ($app) { |
|
170 | 170 | return $app['orm.em']->getRepository('Eccube\Entity\CustomerFavoriteProduct'); |
171 | 171 | }); |
172 | - $app['eccube.repository.base_info'] = $app->share(function () use ($app) { |
|
172 | + $app['eccube.repository.base_info'] = $app->share(function() use ($app) { |
|
173 | 173 | return $app['orm.em']->getRepository('Eccube\Entity\BaseInfo'); |
174 | 174 | }); |
175 | - $app['eccube.repository.tax_rule'] = $app->share(function () use ($app) { |
|
175 | + $app['eccube.repository.tax_rule'] = $app->share(function() use ($app) { |
|
176 | 176 | $taxRuleRepository = $app['orm.em']->getRepository('Eccube\Entity\TaxRule'); |
177 | 177 | $taxRuleRepository->setApplication($app); |
178 | 178 | |
179 | 179 | return $taxRuleRepository; |
180 | 180 | }); |
181 | - $app['eccube.repository.page_layout'] = $app->share(function () use ($app) { |
|
181 | + $app['eccube.repository.page_layout'] = $app->share(function() use ($app) { |
|
182 | 182 | $pageLayoutRepository = $app['orm.em']->getRepository('Eccube\Entity\PageLayout'); |
183 | 183 | $pageLayoutRepository->setApplication($app); |
184 | 184 | |
185 | 185 | return $pageLayoutRepository; |
186 | 186 | }); |
187 | - $app['eccube.repository.block'] = $app->share(function () use ($app) { |
|
187 | + $app['eccube.repository.block'] = $app->share(function() use ($app) { |
|
188 | 188 | $blockRepository = $app['orm.em']->getRepository('Eccube\Entity\Block'); |
189 | 189 | $blockRepository->setApplication($app); |
190 | 190 | |
191 | 191 | return $blockRepository; |
192 | 192 | }); |
193 | - $app['eccube.repository.order'] = $app->share(function () use ($app) { |
|
193 | + $app['eccube.repository.order'] = $app->share(function() use ($app) { |
|
194 | 194 | $orderRepository = $app['orm.em']->getRepository('Eccube\Entity\Order'); |
195 | 195 | $orderRepository->setApplication($app); |
196 | 196 | |
197 | 197 | return $orderRepository; |
198 | 198 | }); |
199 | - $app['eccube.repository.customer_address'] = $app->share(function () use ($app) { |
|
199 | + $app['eccube.repository.customer_address'] = $app->share(function() use ($app) { |
|
200 | 200 | return $app['orm.em']->getRepository('Eccube\Entity\CustomerAddress'); |
201 | 201 | }); |
202 | - $app['eccube.repository.shipping'] = $app->share(function () use ($app) { |
|
202 | + $app['eccube.repository.shipping'] = $app->share(function() use ($app) { |
|
203 | 203 | return $app['orm.em']->getRepository('Eccube\Entity\Shipping'); |
204 | 204 | }); |
205 | - $app['eccube.repository.customer_status'] = $app->share(function () use ($app) { |
|
205 | + $app['eccube.repository.customer_status'] = $app->share(function() use ($app) { |
|
206 | 206 | return $app['orm.em']->getRepository('Eccube\Entity\Master\CustomerStatus'); |
207 | 207 | }); |
208 | - $app['eccube.repository.order_status'] = $app->share(function () use ($app) { |
|
208 | + $app['eccube.repository.order_status'] = $app->share(function() use ($app) { |
|
209 | 209 | return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus'); |
210 | 210 | }); |
211 | - $app['eccube.repository.mail_template'] = $app->share(function () use ($app) { |
|
211 | + $app['eccube.repository.mail_template'] = $app->share(function() use ($app) { |
|
212 | 212 | return $app['orm.em']->getRepository('Eccube\Entity\MailTemplate'); |
213 | 213 | }); |
214 | - $app['eccube.repository.csv'] = $app->share(function () use ($app) { |
|
214 | + $app['eccube.repository.csv'] = $app->share(function() use ($app) { |
|
215 | 215 | return $app['orm.em']->getRepository('Eccube\Entity\Csv'); |
216 | 216 | }); |
217 | - $app['eccube.repository.template'] = $app->share(function () use ($app) { |
|
217 | + $app['eccube.repository.template'] = $app->share(function() use ($app) { |
|
218 | 218 | return $app['orm.em']->getRepository('Eccube\Entity\Template'); |
219 | 219 | }); |
220 | - $app['eccube.repository.authority_role'] = $app->share(function () use ($app) { |
|
220 | + $app['eccube.repository.authority_role'] = $app->share(function() use ($app) { |
|
221 | 221 | return $app['orm.em']->getRepository('Eccube\Entity\AuthorityRole'); |
222 | 222 | }); |
223 | 223 | |
224 | - $app['paginator'] = $app->protect(function () { |
|
224 | + $app['paginator'] = $app->protect(function() { |
|
225 | 225 | return new \Knp\Component\Pager\Paginator(); |
226 | 226 | }); |
227 | 227 | |
228 | - $app['eccube.repository.help'] = $app->share(function () use ($app) { |
|
228 | + $app['eccube.repository.help'] = $app->share(function() use ($app) { |
|
229 | 229 | return $app['orm.em']->getRepository('Eccube\Entity\Help'); |
230 | 230 | }); |
231 | - $app['eccube.repository.plugin'] = $app->share(function () use ($app) { |
|
231 | + $app['eccube.repository.plugin'] = $app->share(function() use ($app) { |
|
232 | 232 | return $app['orm.em']->getRepository('Eccube\Entity\Plugin'); |
233 | 233 | }); |
234 | - $app['eccube.repository.plugin_event_handler'] = $app->share(function () use ($app) { |
|
234 | + $app['eccube.repository.plugin_event_handler'] = $app->share(function() use ($app) { |
|
235 | 235 | return $app['orm.em']->getRepository('Eccube\Entity\PluginEventHandler'); |
236 | 236 | }); |
237 | 237 | // em |
238 | 238 | if (isset($app['orm.em'])) { |
239 | - $app['orm.em'] = $app->share($app->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
239 | + $app['orm.em'] = $app->share($app->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
240 | 240 | // tax_rule |
241 | 241 | $taxRuleRepository = $em->getRepository('Eccube\Entity\TaxRule'); |
242 | 242 | $taxRuleRepository->setApplication($app); |
@@ -259,13 +259,13 @@ discard block |
||
259 | 259 | } |
260 | 260 | |
261 | 261 | // Form\Type |
262 | - $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function ($extensions) use ($app) { |
|
262 | + $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function($extensions) use ($app) { |
|
263 | 263 | $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension(); |
264 | 264 | $extensions[] = new \Eccube\Form\Extension\FreezeTypeExtension(); |
265 | 265 | |
266 | 266 | return $extensions; |
267 | 267 | })); |
268 | - $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) { |
|
268 | + $app['form.types'] = $app->share($app->extend('form.types', function($types) use ($app) { |
|
269 | 269 | $types[] = new \Eccube\Form\Type\NameType($app['config']); |
270 | 270 | $types[] = new \Eccube\Form\Type\KanaType($app['config']); |
271 | 271 | $types[] = new \Eccube\Form\Type\TelType($app['config']); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | { |
67 | 67 | public function register(Application $app) |
68 | 68 | { |
69 | - $app['var_dumper.cloner'] = $app->share(function ($app) { |
|
69 | + $app['var_dumper.cloner'] = $app->share(function($app) { |
|
70 | 70 | $cloner = new VarCloner(); |
71 | 71 | |
72 | 72 | if (isset($app['debug.max_items'])) { |
@@ -85,19 +85,19 @@ discard block |
||
85 | 85 | array(array('dump', '@Debug/Profiler/dump.html.twig')) |
86 | 86 | ); |
87 | 87 | |
88 | - $app['data_collector.dump'] = $app->share(function ($app) { |
|
88 | + $app['data_collector.dump'] = $app->share(function($app) { |
|
89 | 89 | return new DumpDataCollector($app['stopwatch'], $app['code.file_link_format']); |
90 | 90 | }); |
91 | 91 | |
92 | - $app['data_collectors'] = $app->share($app->extend('data_collectors', function ($collectors, $app) { |
|
93 | - $collectors['dump'] = $app->share(function ($app) { |
|
92 | + $app['data_collectors'] = $app->share($app->extend('data_collectors', function($collectors, $app) { |
|
93 | + $collectors['dump'] = $app->share(function($app) { |
|
94 | 94 | return $app['data_collector.dump']; |
95 | 95 | }); |
96 | 96 | |
97 | 97 | return $collectors; |
98 | 98 | })); |
99 | 99 | |
100 | - $app['twig'] = $app->share($app->extend('twig', function ($twig, $app) { |
|
100 | + $app['twig'] = $app->share($app->extend('twig', function($twig, $app) { |
|
101 | 101 | if (class_exists('\Symfony\Bridge\Twig\Extension\DumpExtension')) { |
102 | 102 | $twig->addExtension(new DumpExtension($app['var_dumper.cloner'])); |
103 | 103 | } |
@@ -105,13 +105,13 @@ discard block |
||
105 | 105 | return $twig; |
106 | 106 | })); |
107 | 107 | |
108 | - $app['twig.loader.filesystem'] = $app->share($app->extend('twig.loader.filesystem', function ($loader, $app) { |
|
108 | + $app['twig.loader.filesystem'] = $app->share($app->extend('twig.loader.filesystem', function($loader, $app) { |
|
109 | 109 | $loader->addPath($app['debug.templates_path'], 'Debug'); |
110 | 110 | |
111 | 111 | return $loader; |
112 | 112 | })); |
113 | 113 | |
114 | - $app['debug.templates_path'] = function () { |
|
114 | + $app['debug.templates_path'] = function() { |
|
115 | 115 | $r = new \ReflectionClass('Symfony\Bundle\DebugBundle\DependencyInjection\Configuration'); |
116 | 116 | |
117 | 117 | return dirname(dirname($r->getFileName())).'/Resources/views'; |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | // This code is here to lazy load the dump stack. This default |
124 | 124 | // configuration for CLI mode is overridden in HTTP mode on |
125 | 125 | // 'kernel.request' event |
126 | - VarDumper::setHandler(function ($var) use ($app) { |
|
126 | + VarDumper::setHandler(function($var) use ($app) { |
|
127 | 127 | $dumper = new CliDumper(); |
128 | 128 | $dumper->dump($app['var_dumper.cloner']->cloneVar($var)); |
129 | 129 | }); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | // リセットキーの発行・有効期限の設定 |
48 | 48 | $Customer |
49 | 49 | ->setResetKey($app['eccube.repository.customer']->getUniqueResetKey($app)) |
50 | - ->setResetExpire(new \DateTime('+' . $app['config']['customer_reset_expire'] .' min')); |
|
50 | + ->setResetExpire(new \DateTime('+'.$app['config']['customer_reset_expire'].' min')); |
|
51 | 51 | |
52 | 52 | // リセットキーを更新 |
53 | 53 | $app['orm.em']->persist($Customer); |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | // ログ出力 |
63 | 63 | $app['monolog']->addInfo( |
64 | - 'send reset password mail to:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}" |
|
64 | + 'send reset password mail to:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}" |
|
65 | 65 | ); |
66 | 66 | } |
67 | 67 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | |
116 | 116 | // ログ出力 |
117 | 117 | $app['monolog']->addInfo( |
118 | - 'reset password complete:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}" |
|
118 | + 'reset password complete:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}" |
|
119 | 119 | ); |
120 | 120 | } else { |
121 | 121 | throw new HttpException\AccessDeniedHttpException('不正なアクセスです。'); |
@@ -60,7 +60,7 @@ |
||
60 | 60 | // 会員削除 |
61 | 61 | $email = $Customer->getEmail(); |
62 | 62 | // メールアドレスにダミーをセット |
63 | - $Customer->setEmail(Str::random(60) . '@dummy.dummy'); |
|
63 | + $Customer->setEmail(Str::random(60).'@dummy.dummy'); |
|
64 | 64 | $Customer->setDelFlg(Constant::ENABLED); |
65 | 65 | |
66 | 66 | $app['orm.em']->flush(); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | new Assert\Callback(array($this, 'validate')), |
97 | 97 | ), |
98 | 98 | )) |
99 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) { |
|
99 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) { |
|
100 | 100 | $form = $event->getForm(); |
101 | 101 | $data = $form->getData(); |
102 | 102 | try { |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config); |
122 | 122 | $conn->connect(); |
123 | 123 | } catch (\Exception $e) { |
124 | - $form['database']->addError(new FormError('データベースに接続できませんでした。' . $e->getMessage())); |
|
124 | + $form['database']->addError(new FormError('データベースに接続できませんでした。'.$e->getMessage())); |
|
125 | 125 | } |
126 | 126 | }); |
127 | 127 | } |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | public function validate($data, ExecutionContext $context, $param = null) |
138 | 138 | { |
139 | 139 | $parameters = $this->app['request']->get('install_step4'); |
140 | - if ($parameters['database'] != 'pdo_sqlite'){ |
|
140 | + if ($parameters['database'] != 'pdo_sqlite') { |
|
141 | 141 | $context->validateValue($data, array( |
142 | 142 | new Assert\NotBlank() |
143 | 143 | )); |
@@ -454,7 +454,7 @@ |
||
454 | 454 | foreach ($finder as $dir) { |
455 | 455 | if (file_exists($dir->getRealPath().'/config.yml')) { |
456 | 456 | $config = Yaml::parse(file_get_contents($dir->getRealPath().'/config.yml')); |
457 | - }else{ |
|
457 | + } else{ |
|
458 | 458 | $error = 'Application::initDoctrine : config.yamlがみつかりません'.$dir->getRealPath(); |
459 | 459 | $this->log($error, array(), Logger::WARNING); |
460 | 460 | continue; |
@@ -725,7 +725,7 @@ |
||
725 | 725 | * 成功 : trueを返却 |
726 | 726 | * 失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie() |
727 | 727 | * 備考 : app['debug']がtrueの際は処理を行わない |
728 | - * @return boolean true |
|
728 | + * @return null|boolean true |
|
729 | 729 | * |
730 | 730 | */ |
731 | 731 | protected function checkDatabaseConnection() |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | foreach ($finder as $dir) { |
455 | 455 | if (file_exists($dir->getRealPath().'/config.yml')) { |
456 | 456 | $config = Yaml::parse(file_get_contents($dir->getRealPath().'/config.yml')); |
457 | - }else{ |
|
457 | + } else { |
|
458 | 458 | $error = 'Application::initDoctrine : config.yamlがみつかりません'.$dir->getRealPath(); |
459 | 459 | $this->log($error, array(), Logger::WARNING); |
460 | 460 | continue; |
@@ -669,7 +669,7 @@ discard block |
||
669 | 669 | //config.ymlのないディレクトリは無視する |
670 | 670 | try { |
671 | 671 | $this['eccube.service.plugin']->checkPluginArchiveContent($dir->getRealPath()); |
672 | - } catch(\Eccube\Exception\PluginException $e) { |
|
672 | + } catch (\Eccube\Exception\PluginException $e) { |
|
673 | 673 | $this['monolog']->warning($e->getMessage()); |
674 | 674 | continue; |
675 | 675 | } |
@@ -721,7 +721,7 @@ discard block |
||
721 | 721 | foreach ($config['service'] as $service) { |
722 | 722 | $class = '\\Plugin\\'.$config['code'].'\\ServiceProvider\\'.$service; |
723 | 723 | if (!class_exists($class)) { |
724 | - $this['monolog']->warning('該当クラスが見つかりません:' . $class); |
|
724 | + $this['monolog']->warning('該当クラスが見つかりません:'.$class); |
|
725 | 725 | continue; |
726 | 726 | } |
727 | 727 | $this->register(new $class($this)); |
@@ -20,32 +20,32 @@ discard block |
||
20 | 20 | */ |
21 | 21 | public function addSuccess($message, $namespace = 'front') |
22 | 22 | { |
23 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message); |
|
23 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public function addError($message, $namespace = 'front') |
27 | 27 | { |
28 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message); |
|
28 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | public function addDanger($message, $namespace = 'front') |
32 | 32 | { |
33 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message); |
|
33 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | public function addWarning($message, $namespace = 'front') |
37 | 37 | { |
38 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message); |
|
38 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | public function addInfo($message, $namespace = 'front') |
42 | 42 | { |
43 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message); |
|
43 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | public function addRequestError($message, $namespace = 'front') |
47 | 47 | { |
48 | - $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message); |
|
48 | + $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | public function clearMessage() |
@@ -230,14 +230,14 @@ discard block |
||
230 | 230 | $eventName = $view; |
231 | 231 | if ($this->isAdminRequest()) { |
232 | 232 | // 管理画面の場合、event名に「admin.」を付ける |
233 | - $eventName = 'admin.' . $view; |
|
233 | + $eventName = 'admin.'.$view; |
|
234 | 234 | } |
235 | - $this['monolog']->debug('Template Event Name : ' . $eventName); |
|
235 | + $this['monolog']->debug('Template Event Name : '.$eventName); |
|
236 | 236 | |
237 | 237 | $this['eccube.event.dispatcher']->dispatch($eventName, $event); |
238 | 238 | |
239 | 239 | if ($response instanceof StreamedResponse) { |
240 | - $response->setCallback(function () use ($twig, $view, $parameters) { |
|
240 | + $response->setCallback(function() use ($twig, $view, $parameters) { |
|
241 | 241 | $twig->display($view, $parameters); |
242 | 242 | }); |
243 | 243 | } else { |