@@ -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 | }); |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | '\Eccube\Entity\Customer' |
235 | 235 | ))); |
236 | 236 | |
237 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($BaseInfo) { |
|
237 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($BaseInfo) { |
|
238 | 238 | |
239 | 239 | if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
240 | 240 | |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | } |
275 | 275 | |
276 | 276 | }); |
277 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
277 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
278 | 278 | $form = $event->getForm(); |
279 | 279 | $orderDetails = $form['OrderDetails']->getData(); |
280 | 280 | if (empty($orderDetails) || count($orderDetails) < 1) { |
@@ -36,18 +36,18 @@ discard block |
||
36 | 36 | { |
37 | 37 | $events = array(); |
38 | 38 | // YamlでParseしてがんばる |
39 | - $basePath = __DIR__ . '/../../../app/Plugin'; |
|
39 | + $basePath = __DIR__.'/../../../app/Plugin'; |
|
40 | 40 | $finder = Finder::create() |
41 | 41 | ->in($basePath) |
42 | 42 | ->directories() |
43 | 43 | ->depth(0); |
44 | 44 | |
45 | 45 | foreach ($finder as $dir) { |
46 | - $config = Yaml::parse(file_get_contents($dir->getRealPath() . '/config.yml')); |
|
46 | + $config = Yaml::parse(file_get_contents($dir->getRealPath().'/config.yml')); |
|
47 | 47 | |
48 | 48 | if (isset($config['form'])) { |
49 | 49 | foreach ($config['form'] as $event => $class) { |
50 | - $events[$event][] = '\\Plugin\\' . $config['code'] . '\\' . $class; |
|
50 | + $events[$event][] = '\\Plugin\\'.$config['code'].'\\'.$class; |
|
51 | 51 | } |
52 | 52 | } |
53 | 53 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | $events = self::getEvents(); |
72 | 72 | |
73 | 73 | if (isset($events['onPreSetData'])) { |
74 | - foreach($events['onPreSetData'] as $formEventClass) { |
|
74 | + foreach ($events['onPreSetData'] as $formEventClass) { |
|
75 | 75 | $formEvent = new $formEventClass(); |
76 | 76 | $formEvent->onPreSetData($event); |
77 | 77 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $events = self::getEvents(); |
84 | 84 | |
85 | 85 | if (isset($events['onPostSetData'])) { |
86 | - foreach($events['onPostSetData'] as $formEventClass) { |
|
86 | + foreach ($events['onPostSetData'] as $formEventClass) { |
|
87 | 87 | $formEvent = new $formEventClass(); |
88 | 88 | $formEvent->onPostSetData($event); |
89 | 89 | } |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | $events = self::getEvents(); |
96 | 96 | |
97 | 97 | if (isset($events['onPreSubmit'])) { |
98 | - foreach($events['onPreSubmit'] as $formEventClass) { |
|
98 | + foreach ($events['onPreSubmit'] as $formEventClass) { |
|
99 | 99 | $formEvent = new $formEventClass(); |
100 | 100 | $formEvent->onPreSubmit($event); |
101 | 101 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | $events = self::getEvents(); |
108 | 108 | |
109 | 109 | if (isset($events['onSubmit'])) { |
110 | - foreach($events['onSubmit'] as $formEventClass) { |
|
110 | + foreach ($events['onSubmit'] as $formEventClass) { |
|
111 | 111 | $formEvent = new $formEventClass(); |
112 | 112 | $formEvent->onSubmit($event); |
113 | 113 | } |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $events = self::getEvents(); |
120 | 120 | |
121 | 121 | if (isset($events['onPostSubmit'])) { |
122 | - foreach($events['onPostSubmit'] as $formEventClass) { |
|
122 | + foreach ($events['onPostSubmit'] as $formEventClass) { |
|
123 | 123 | $formEvent = new $formEventClass(); |
124 | 124 | $formEvent->onPostSubmit($event); |
125 | 125 | } |
@@ -60,9 +60,9 @@ discard block |
||
60 | 60 | |
61 | 61 | public function __construct() |
62 | 62 | { |
63 | - $this->config_path = __DIR__ . '/../../../../app/config/eccube'; |
|
64 | - $this->dist_path = __DIR__ . '/../../Resource/config'; |
|
65 | - $this->cache_path = __DIR__ . '/../../../../app/cache'; |
|
63 | + $this->config_path = __DIR__.'/../../../../app/config/eccube'; |
|
64 | + $this->dist_path = __DIR__.'/../../Resource/config'; |
|
65 | + $this->cache_path = __DIR__.'/../../../../app/cache'; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | private function isValid(Request $request, Form $form) |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | |
148 | 148 | if (empty($sessionData['shop_name'])) { |
149 | 149 | |
150 | - $config_file = $this->config_path . '/config.yml'; |
|
150 | + $config_file = $this->config_path.'/config.yml'; |
|
151 | 151 | $fs = new Filesystem(); |
152 | 152 | |
153 | 153 | if ($fs->exists($config_file)) { |
@@ -161,21 +161,21 @@ discard block |
||
161 | 161 | } |
162 | 162 | |
163 | 163 | // セキュリティの設定 |
164 | - $config_file = $this->config_path . '/path.yml'; |
|
164 | + $config_file = $this->config_path.'/path.yml'; |
|
165 | 165 | $config = Yaml::parse(file_get_contents($config_file)); |
166 | 166 | $sessionData['admin_dir'] = $config['admin_route']; |
167 | 167 | |
168 | - $config_file = $this->config_path . '/config.yml'; |
|
168 | + $config_file = $this->config_path.'/config.yml'; |
|
169 | 169 | $config = Yaml::parse(file_get_contents($config_file)); |
170 | 170 | |
171 | 171 | $allowHost = $config['admin_allow_host']; |
172 | 172 | if (count($allowHost) > 0) { |
173 | 173 | $sessionData['admin_allow_hosts'] = Str::convertLineFeed(implode("\n", $allowHost)); |
174 | 174 | } |
175 | - $sessionData['admin_force_ssl'] = (bool)$config['force_ssl']; |
|
175 | + $sessionData['admin_force_ssl'] = (bool) $config['force_ssl']; |
|
176 | 176 | |
177 | 177 | // メール設定 |
178 | - $config_file = $this->config_path . '/mail.yml'; |
|
178 | + $config_file = $this->config_path.'/mail.yml'; |
|
179 | 179 | $config = Yaml::parse(file_get_contents($config_file)); |
180 | 180 | $mail = $config['mail']; |
181 | 181 | $sessionData['mail_backend'] = $mail['transport']; |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | |
213 | 213 | if (empty($sessionData['database'])) { |
214 | 214 | |
215 | - $config_file = $this->config_path . '/database.yml'; |
|
215 | + $config_file = $this->config_path.'/database.yml'; |
|
216 | 216 | $fs = new Filesystem(); |
217 | 217 | |
218 | 218 | if ($fs->exists($config_file)) { |
@@ -285,7 +285,7 @@ discard block |
||
285 | 285 | $host = $request->getSchemeAndHttpHost(); |
286 | 286 | $basePath = $request->getBasePath(); |
287 | 287 | $params = array( |
288 | - 'http_url' => $host . $basePath, |
|
288 | + 'http_url' => $host.$basePath, |
|
289 | 289 | 'shop_name' => $sessionData['shop_name'], |
290 | 290 | ); |
291 | 291 | |
@@ -306,13 +306,13 @@ discard block |
||
306 | 306 | // インストール完了 |
307 | 307 | public function complete(InstallApplication $app, Request $request) |
308 | 308 | { |
309 | - $config_file = $this->config_path . '/path.yml'; |
|
309 | + $config_file = $this->config_path.'/path.yml'; |
|
310 | 310 | $config = Yaml::parse(file_get_contents($config_file)); |
311 | 311 | |
312 | 312 | $host = $request->getSchemeAndHttpHost(); |
313 | 313 | $basePath = $request->getBasePath(); |
314 | 314 | |
315 | - $adminUrl = $host . $basePath . '/' . $config['admin_dir']; |
|
315 | + $adminUrl = $host.$basePath.'/'.$config['admin_dir']; |
|
316 | 316 | |
317 | 317 | return $app['twig']->render('complete.twig', array( |
318 | 318 | 'admin_url' => $adminUrl, |
@@ -332,17 +332,17 @@ discard block |
||
332 | 332 | { |
333 | 333 | foreach ($this->required_modules as $module) { |
334 | 334 | if (!extension_loaded($module)) { |
335 | - $app->addDanger('[必須] ' . $module . ' 拡張モジュールが有効になっていません。', 'install'); |
|
335 | + $app->addDanger('[必須] '.$module.' 拡張モジュールが有効になっていません。', 'install'); |
|
336 | 336 | } |
337 | 337 | } |
338 | 338 | |
339 | 339 | if (!extension_loaded('pdo_mysql') && !extension_loaded('pdo_pgsql')) { |
340 | - $app->addDanger('[必須] ' . 'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install'); |
|
340 | + $app->addDanger('[必須] '.'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install'); |
|
341 | 341 | } |
342 | 342 | |
343 | 343 | foreach ($this->recommended_module as $module) { |
344 | 344 | if (!extension_loaded($module)) { |
345 | - $app->addWarning('[推奨] ' . $module . ' 拡張モジュールが有効になっていません。', 'install'); |
|
345 | + $app->addWarning('[推奨] '.$module.' 拡張モジュールが有効になっていません。', 'install'); |
|
346 | 346 | } |
347 | 347 | } |
348 | 348 | |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | if (!function_exists('apache_get_modules')) { |
361 | 361 | $app->addWarning('mod_rewrite が有効になっているか不明です。', 'install'); |
362 | 362 | } elseif (!in_array('mod_rewrite', apache_get_modules())) { |
363 | - $app->addDanger('[必須] ' . 'mod_rewriteを有効にしてください。', 'install'); |
|
363 | + $app->addDanger('[必須] '.'mod_rewriteを有効にしてください。', 'install'); |
|
364 | 364 | } |
365 | 365 | } elseif (isset($_SERVER['SERVER_SOFTWARE']) && strpos('Microsoft-IIS', $_SERVER['SERVER_SOFTWARE']) !== false) { |
366 | 366 | // iis |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | |
372 | 372 | private function setPDO() |
373 | 373 | { |
374 | - $config_file = $this->config_path . '/database.yml'; |
|
374 | + $config_file = $this->config_path.'/database.yml'; |
|
375 | 375 | $config = Yaml::parse(file_get_contents($config_file)); |
376 | 376 | |
377 | 377 | try { |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | */ |
407 | 407 | private function getEntityManager() |
408 | 408 | { |
409 | - $config_file = $this->config_path . '/database.yml'; |
|
409 | + $config_file = $this->config_path.'/database.yml'; |
|
410 | 410 | $database = Yaml::parse(file_get_contents($config_file)); |
411 | 411 | |
412 | 412 | $this->app->register(new \Silex\Provider\DoctrineServiceProvider(), array( |
@@ -414,15 +414,15 @@ discard block |
||
414 | 414 | )); |
415 | 415 | |
416 | 416 | $this->app->register(new \Dflydev\Silex\Provider\DoctrineOrm\DoctrineOrmServiceProvider(), array( |
417 | - 'orm.proxies_dir' => __DIR__ . '/../../app/cache/doctrine', |
|
417 | + 'orm.proxies_dir' => __DIR__.'/../../app/cache/doctrine', |
|
418 | 418 | 'orm.em.options' => array( |
419 | 419 | 'mappings' => array( |
420 | 420 | array( |
421 | 421 | 'type' => 'yml', |
422 | 422 | 'namespace' => 'Eccube\Entity', |
423 | 423 | 'path' => array( |
424 | - __DIR__ . '/../../Resource/doctrine', |
|
425 | - __DIR__ . '/../../Resource/doctrine/master', |
|
424 | + __DIR__.'/../../Resource/doctrine', |
|
425 | + __DIR__.'/../../Resource/doctrine/master', |
|
426 | 426 | ), |
427 | 427 | ), |
428 | 428 | |
@@ -450,11 +450,11 @@ discard block |
||
450 | 450 | { |
451 | 451 | $this->resetNatTimer(); |
452 | 452 | |
453 | - $config_file = $this->config_path . '/database.yml'; |
|
453 | + $config_file = $this->config_path.'/database.yml'; |
|
454 | 454 | $database = Yaml::parse(file_get_contents($config_file)); |
455 | 455 | $config['database'] = $database['database']; |
456 | 456 | |
457 | - $config_file = $this->config_path . '/config.yml'; |
|
457 | + $config_file = $this->config_path.'/config.yml'; |
|
458 | 458 | $baseConfig = Yaml::parse(file_get_contents($config_file)); |
459 | 459 | $config['config'] = $baseConfig; |
460 | 460 | |
@@ -510,11 +510,11 @@ discard block |
||
510 | 510 | { |
511 | 511 | $this->resetNatTimer(); |
512 | 512 | |
513 | - $config_file = $this->config_path . '/database.yml'; |
|
513 | + $config_file = $this->config_path.'/database.yml'; |
|
514 | 514 | $database = Yaml::parse(file_get_contents($config_file)); |
515 | 515 | $config['database'] = $database['database']; |
516 | 516 | |
517 | - $config_file = $this->config_path . '/config.yml'; |
|
517 | + $config_file = $this->config_path.'/config.yml'; |
|
518 | 518 | $baseConfig = Yaml::parse(file_get_contents($config_file)); |
519 | 519 | $config['config'] = $baseConfig; |
520 | 520 | |
@@ -577,7 +577,7 @@ discard block |
||
577 | 577 | $config = new Configuration($app['db']); |
578 | 578 | $config->setMigrationsNamespace('DoctrineMigrations'); |
579 | 579 | |
580 | - $migrationDir = __DIR__ . '/../../Resource/doctrine/migration'; |
|
580 | + $migrationDir = __DIR__.'/../../Resource/doctrine/migration'; |
|
581 | 581 | $config->setMigrationsDirectory($migrationDir); |
582 | 582 | $config->registerMigrationsFromDirectory($migrationDir); |
583 | 583 | |
@@ -605,7 +605,7 @@ discard block |
||
605 | 605 | private function getProtectedDirs() |
606 | 606 | { |
607 | 607 | $protectedDirs = array(); |
608 | - $base = __DIR__ . '/../../../..'; |
|
608 | + $base = __DIR__.'/../../../..'; |
|
609 | 609 | $dirs = array( |
610 | 610 | '/html', |
611 | 611 | '/app', |
@@ -618,7 +618,7 @@ discard block |
||
618 | 618 | ); |
619 | 619 | |
620 | 620 | foreach ($dirs as $dir) { |
621 | - if (!is_writable($base . $dir)) { |
|
621 | + if (!is_writable($base.$dir)) { |
|
622 | 622 | $protectedDirs[] = $dir; |
623 | 623 | } |
624 | 624 | } |
@@ -629,7 +629,7 @@ discard block |
||
629 | 629 | private function createConfigYamlFile($data, $auth = true) |
630 | 630 | { |
631 | 631 | $fs = new Filesystem(); |
632 | - $config_file = $this->config_path . '/config.yml'; |
|
632 | + $config_file = $this->config_path.'/config.yml'; |
|
633 | 633 | |
634 | 634 | if ($fs->exists($config_file)) { |
635 | 635 | $config = Yaml::parse(file_get_contents($config_file)); |
@@ -660,7 +660,7 @@ discard block |
||
660 | 660 | $content = str_replace( |
661 | 661 | $target, |
662 | 662 | $replace, |
663 | - file_get_contents($this->dist_path . '/config.yml.dist') |
|
663 | + file_get_contents($this->dist_path.'/config.yml.dist') |
|
664 | 664 | ); |
665 | 665 | $fs->dumpFile($config_file, $content); |
666 | 666 | |
@@ -674,7 +674,7 @@ discard block |
||
674 | 674 | |
675 | 675 | private function addInstallStatus() |
676 | 676 | { |
677 | - $config_file = $this->config_path . '/config.yml'; |
|
677 | + $config_file = $this->config_path.'/config.yml'; |
|
678 | 678 | $config = Yaml::parse(file_get_contents($config_file)); |
679 | 679 | $config['eccube_install'] = 1; |
680 | 680 | $yml = Yaml::dump($config); |
@@ -686,7 +686,7 @@ discard block |
||
686 | 686 | private function createDatabaseYamlFile($data) |
687 | 687 | { |
688 | 688 | $fs = new Filesystem(); |
689 | - $config_file = $this->config_path . '/database.yml'; |
|
689 | + $config_file = $this->config_path.'/database.yml'; |
|
690 | 690 | if ($fs->exists($config_file)) { |
691 | 691 | $fs->remove($config_file); |
692 | 692 | } |
@@ -719,7 +719,7 @@ discard block |
||
719 | 719 | $content = str_replace( |
720 | 720 | $target, |
721 | 721 | $replace, |
722 | - file_get_contents($this->dist_path . '/database.yml.dist') |
|
722 | + file_get_contents($this->dist_path.'/database.yml.dist') |
|
723 | 723 | ); |
724 | 724 | |
725 | 725 | $fs->dumpFile($config_file, $content); |
@@ -730,7 +730,7 @@ discard block |
||
730 | 730 | private function createMailYamlFile($data) |
731 | 731 | { |
732 | 732 | $fs = new Filesystem(); |
733 | - $config_file = $this->config_path . '/mail.yml'; |
|
733 | + $config_file = $this->config_path.'/mail.yml'; |
|
734 | 734 | if ($fs->exists($config_file)) { |
735 | 735 | $fs->remove($config_file); |
736 | 736 | } |
@@ -747,7 +747,7 @@ discard block |
||
747 | 747 | $content = str_replace( |
748 | 748 | $target, |
749 | 749 | $replace, |
750 | - file_get_contents($this->dist_path . '/mail.yml.dist') |
|
750 | + file_get_contents($this->dist_path.'/mail.yml.dist') |
|
751 | 751 | ); |
752 | 752 | $fs->dumpFile($config_file, $content); |
753 | 753 | |
@@ -757,7 +757,7 @@ discard block |
||
757 | 757 | private function createPathYamlFile($data, Request $request) |
758 | 758 | { |
759 | 759 | $fs = new Filesystem(); |
760 | - $config_file = $this->config_path . '/path.yml'; |
|
760 | + $config_file = $this->config_path.'/path.yml'; |
|
761 | 761 | if ($fs->exists($config_file)) { |
762 | 762 | $fs->remove($config_file); |
763 | 763 | } |
@@ -765,7 +765,7 @@ discard block |
||
765 | 765 | $ADMIN_ROUTE = $data['admin_dir']; |
766 | 766 | $TEMPLATE_CODE = 'default'; |
767 | 767 | $USER_DATA_ROUTE = 'user_data'; |
768 | - $ROOT_DIR = realpath(__DIR__ . '/../../../../'); |
|
768 | + $ROOT_DIR = realpath(__DIR__.'/../../../../'); |
|
769 | 769 | $ROOT_URLPATH = $request->getBasePath(); |
770 | 770 | |
771 | 771 | $target = array('${ADMIN_ROUTE}', '${TEMPLATE_CODE}', '${USER_DATA_ROUTE}', '${ROOT_DIR}', '${ROOT_URLPATH}'); |
@@ -775,7 +775,7 @@ discard block |
||
775 | 775 | $content = str_replace( |
776 | 776 | $target, |
777 | 777 | $replace, |
778 | - file_get_contents($this->dist_path . '/path.yml.dist') |
|
778 | + file_get_contents($this->dist_path.'/path.yml.dist') |
|
779 | 779 | ); |
780 | 780 | $fs->dumpFile($config_file, $content); |
781 | 781 | |
@@ -784,7 +784,7 @@ discard block |
||
784 | 784 | |
785 | 785 | private function sendAppData($params) |
786 | 786 | { |
787 | - $config_file = $this->config_path . '/database.yml'; |
|
787 | + $config_file = $this->config_path.'/database.yml'; |
|
788 | 788 | $db_config = Yaml::parse(file_get_contents($config_file)); |
789 | 789 | |
790 | 790 | $this->setPDO(); |
@@ -796,7 +796,7 @@ discard block |
||
796 | 796 | } |
797 | 797 | |
798 | 798 | if ($db_config['database']['driver'] === 'pdo_mysql') { |
799 | - $db_ver = 'MySQL:' . $version; |
|
799 | + $db_ver = 'MySQL:'.$version; |
|
800 | 800 | } else { |
801 | 801 | $db_ver = $version; |
802 | 802 | } |
@@ -814,7 +814,7 @@ discard block |
||
814 | 814 | |
815 | 815 | $header = array( |
816 | 816 | 'Content-Type: application/x-www-form-urlencoded', |
817 | - 'Content-Length: ' . strlen($data), |
|
817 | + 'Content-Length: '.strlen($data), |
|
818 | 818 | ); |
819 | 819 | $context = stream_context_create( |
820 | 820 | array( |