@@ -48,7 +48,7 @@ |
||
48 | 48 | |
49 | 49 | return $phpinfo; |
50 | 50 | |
51 | - break; |
|
51 | + break; |
|
52 | 52 | default: |
53 | 53 | break; |
54 | 54 | } |
@@ -66,10 +66,10 @@ |
||
66 | 66 | $server = $app['request']; |
67 | 67 | |
68 | 68 | $arrSystemInfo = array( |
69 | - array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
70 | - array('title' => 'サーバーOS', 'value' => php_uname()), |
|
71 | - array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
72 | - array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")), |
|
69 | + array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
70 | + array('title' => 'サーバーOS', 'value' => php_uname()), |
|
71 | + array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
72 | + array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")), |
|
73 | 73 | ); |
74 | 74 | |
75 | 75 | $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')'; |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | 'format' => 'yyyy-MM-dd', |
142 | 142 | 'required' => false, |
143 | 143 | )) |
144 | - ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($BaseInfo) { |
|
144 | + ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($BaseInfo) { |
|
145 | 145 | if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
146 | 146 | $form = $event->getForm(); |
147 | 147 | $form->add('ShipmentItems', 'collection', array( |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | )); |
153 | 153 | } |
154 | 154 | }) |
155 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
155 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
156 | 156 | /** @var \Eccube\Entity\Shipping $data */ |
157 | 157 | $data = $event->getData(); |
158 | 158 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | 'empty_value' => '指定なし', |
173 | 173 | 'empty_data' => null, |
174 | 174 | 'required' => false, |
175 | - 'query_builder' => function (EntityRepository $er) use ($Delivery) { |
|
175 | + 'query_builder' => function(EntityRepository $er) use ($Delivery) { |
|
176 | 176 | return $er->createQueryBuilder('dt') |
177 | 177 | ->where('dt.Delivery = :Delivery') |
178 | 178 | ->setParameter('Delivery', $Delivery); |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | )); |
181 | 181 | |
182 | 182 | }) |
183 | - ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) { |
|
183 | + ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) { |
|
184 | 184 | $data = $event->getData(); |
185 | 185 | $form = $event->getForm(); |
186 | 186 | if (!$data) { |
@@ -201,14 +201,14 @@ discard block |
||
201 | 201 | 'empty_value' => '指定なし', |
202 | 202 | 'empty_data' => null, |
203 | 203 | 'required' => false, |
204 | - 'query_builder' => function (EntityRepository $er) use ($Delivery) { |
|
204 | + 'query_builder' => function(EntityRepository $er) use ($Delivery) { |
|
205 | 205 | return $er->createQueryBuilder('dt') |
206 | 206 | ->where('dt.Delivery = :Delivery') |
207 | 207 | ->setParameter('Delivery', $Delivery); |
208 | 208 | }, |
209 | 209 | )); |
210 | 210 | }) |
211 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) { |
|
211 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) { |
|
212 | 212 | if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
213 | 213 | $form = $event->getForm(); |
214 | 214 | $shipmentItems = $form['ShipmentItems']->getData(); |
@@ -69,11 +69,11 @@ discard block |
||
69 | 69 | |
70 | 70 | $qb = $this->createQueryBuilder('e'); |
71 | 71 | $qb->andWhere("e.priority >= $range_end ") |
72 | - ->andWhere("e.priority <= $range_start ") |
|
73 | - ->andWhere('e.event = :event') |
|
74 | - ->setParameter('event',$event) |
|
75 | - ->setMaxResults(1) |
|
76 | - ->orderBy('e.priority','ASC'); |
|
72 | + ->andWhere("e.priority <= $range_start ") |
|
73 | + ->andWhere('e.event = :event') |
|
74 | + ->setParameter('event',$event) |
|
75 | + ->setMaxResults(1) |
|
76 | + ->orderBy('e.priority','ASC'); |
|
77 | 77 | |
78 | 78 | $result=$qb->getQuery()->getResult(); |
79 | 79 | if (count($result)) { |
@@ -90,14 +90,14 @@ discard block |
||
90 | 90 | $qb = $this->createQueryBuilder('e'); |
91 | 91 | |
92 | 92 | $qb->andWhere("e.priority >= $range_end ") |
93 | - ->andWhere("e.priority <= $range_start ") |
|
94 | - ->andWhere("e.del_flg = 0 ") |
|
95 | - ->andWhere('e.priority '.($up ? '>' : '<' ).' :pri') |
|
96 | - ->andWhere('e.event = :event') |
|
97 | - ->setParameter('event',$pluginEventHandler->getEvent()) |
|
98 | - ->setParameter('pri', $pluginEventHandler->getPriority() ) |
|
99 | - ->setMaxResults(1) |
|
100 | - ->orderBy('e.priority', ($up ? 'ASC':'DESC' ) ); |
|
93 | + ->andWhere("e.priority <= $range_start ") |
|
94 | + ->andWhere("e.del_flg = 0 ") |
|
95 | + ->andWhere('e.priority '.($up ? '>' : '<' ).' :pri') |
|
96 | + ->andWhere('e.event = :event') |
|
97 | + ->setParameter('event',$pluginEventHandler->getEvent()) |
|
98 | + ->setParameter('pri', $pluginEventHandler->getPriority() ) |
|
99 | + ->setMaxResults(1) |
|
100 | + ->orderBy('e.priority', ($up ? 'ASC':'DESC' ) ); |
|
101 | 101 | |
102 | 102 | $result=$qb->getQuery()->getResult(); |
103 | 103 |
@@ -41,8 +41,8 @@ discard block |
||
41 | 41 | $qb = $this->createQueryBuilder('e') |
42 | 42 | ->innerJoin('e.Plugin', 'p') |
43 | 43 | ->andWhere('e.del_flg = 0 ') |
44 | - ->Orderby('e.event','ASC') |
|
45 | - ->addOrderby('e.priority','DESC'); |
|
44 | + ->Orderby('e.event', 'ASC') |
|
45 | + ->addOrderby('e.priority', 'DESC'); |
|
46 | 46 | ; |
47 | 47 | |
48 | 48 | return $qb->getQuery()->getResult(); |
@@ -60,20 +60,20 @@ discard block |
||
60 | 60 | $range_start = PluginEventHandler::EVENT_PRIORITY_NORMAL_START; |
61 | 61 | $range_end = PluginEventHandler::EVENT_PRIORITY_NORMAL_END; |
62 | 62 | } |
63 | - return array($range_start,$range_end); |
|
63 | + return array($range_start, $range_end); |
|
64 | 64 | } |
65 | 65 | |
66 | - public function calcNewPriority($event , $type) |
|
66 | + public function calcNewPriority($event, $type) |
|
67 | 67 | { |
68 | - list($range_start,$range_end) = $this->getPriorityRange($type); |
|
68 | + list($range_start, $range_end) = $this->getPriorityRange($type); |
|
69 | 69 | |
70 | 70 | $qb = $this->createQueryBuilder('e'); |
71 | 71 | $qb->andWhere("e.priority >= $range_end ") |
72 | 72 | ->andWhere("e.priority <= $range_start ") |
73 | 73 | ->andWhere('e.event = :event') |
74 | - ->setParameter('event',$event) |
|
74 | + ->setParameter('event', $event) |
|
75 | 75 | ->setMaxResults(1) |
76 | - ->orderBy('e.priority','ASC'); |
|
76 | + ->orderBy('e.priority', 'ASC'); |
|
77 | 77 | |
78 | 78 | $result = $qb->getQuery()->getResult(); |
79 | 79 | if (count($result)) { |
@@ -83,21 +83,21 @@ discard block |
||
83 | 83 | } |
84 | 84 | } |
85 | 85 | |
86 | - public function upPriority($pluginEventHandler,$up = true) |
|
86 | + public function upPriority($pluginEventHandler, $up = true) |
|
87 | 87 | { |
88 | - list($range_start,$range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType()); |
|
88 | + list($range_start, $range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType()); |
|
89 | 89 | |
90 | 90 | $qb = $this->createQueryBuilder('e'); |
91 | 91 | |
92 | 92 | $qb->andWhere("e.priority >= $range_end ") |
93 | 93 | ->andWhere("e.priority <= $range_start ") |
94 | 94 | ->andWhere("e.del_flg = 0 ") |
95 | - ->andWhere('e.priority '.($up ? '>' : '<' ).' :pri') |
|
95 | + ->andWhere('e.priority '.($up ? '>' : '<').' :pri') |
|
96 | 96 | ->andWhere('e.event = :event') |
97 | - ->setParameter('event',$pluginEventHandler->getEvent()) |
|
98 | - ->setParameter('pri', $pluginEventHandler->getPriority() ) |
|
97 | + ->setParameter('event', $pluginEventHandler->getEvent()) |
|
98 | + ->setParameter('pri', $pluginEventHandler->getPriority()) |
|
99 | 99 | ->setMaxResults(1) |
100 | - ->orderBy('e.priority', ($up ? 'ASC':'DESC' ) ); |
|
100 | + ->orderBy('e.priority', ($up ? 'ASC' : 'DESC')); |
|
101 | 101 | |
102 | 102 | $result = $qb->getQuery()->getResult(); |
103 | 103 |
@@ -241,7 +241,7 @@ |
||
241 | 241 | $this['eccube.event.dispatcher']->dispatch($eventName, $event); |
242 | 242 | |
243 | 243 | if ($response instanceof StreamedResponse) { |
244 | - $response->setCallback(function () use ($twig, $view, $parameters) { |
|
244 | + $response->setCallback(function() use ($twig, $view, $parameters) { |
|
245 | 245 | $twig->display($view, $parameters); |
246 | 246 | }); |
247 | 247 | } else { |
@@ -268,7 +268,7 @@ |
||
268 | 268 | private function getFileList($app, $nowDir) |
269 | 269 | { |
270 | 270 | $topDir = $app['config']['user_data_realdir']; |
271 | - $filter = function (\SplFileInfo $file) use ($topDir) { |
|
271 | + $filter = function(\SplFileInfo $file) use ($topDir) { |
|
272 | 272 | $acceptPath = realpath($topDir); |
273 | 273 | $targetPath = $file->getRealPath(); |
274 | 274 | return (strpos($targetPath, $acceptPath) === 0); |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | $em->getConfiguration()->setSQLLogger(null); |
220 | 220 | |
221 | 221 | $response = new StreamedResponse(); |
222 | - $response->setCallback(function () use ($app, $request) { |
|
222 | + $response->setCallback(function() use ($app, $request) { |
|
223 | 223 | |
224 | 224 | // CSV種別を元に初期化. |
225 | 225 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CUSTOMER); |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | |
234 | 234 | // データ行の出力. |
235 | 235 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
236 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
236 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
237 | 237 | |
238 | 238 | $Csvs = $csvService->getCsvs(); |
239 | 239 |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | $em->getConfiguration()->setSQLLogger(null); |
222 | 222 | |
223 | 223 | $response = new StreamedResponse(); |
224 | - $response->setCallback(function () use ($app, $request) { |
|
224 | + $response->setCallback(function() use ($app, $request) { |
|
225 | 225 | |
226 | 226 | // CSV種別を元に初期化. |
227 | 227 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_ORDER); |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | |
236 | 236 | // データ行の出力. |
237 | 237 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
238 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
238 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
239 | 239 | |
240 | 240 | $Csvs = $csvService->getCsvs(); |
241 | 241 | |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | $em->getConfiguration()->setSQLLogger(null); |
290 | 290 | |
291 | 291 | $response = new StreamedResponse(); |
292 | - $response->setCallback(function () use ($app, $request) { |
|
292 | + $response->setCallback(function() use ($app, $request) { |
|
293 | 293 | |
294 | 294 | // CSV種別を元に初期化. |
295 | 295 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_SHIPPING); |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | |
304 | 304 | // データ行の出力. |
305 | 305 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
306 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
306 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
307 | 307 | |
308 | 308 | $Csvs = $csvService->getCsvs(); |
309 | 309 |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | $em->getConfiguration()->setSQLLogger(null); |
197 | 197 | |
198 | 198 | $response = new StreamedResponse(); |
199 | - $response->setCallback(function () use ($app, $request) { |
|
199 | + $response->setCallback(function() use ($app, $request) { |
|
200 | 200 | |
201 | 201 | // CSV種別を元に初期化. |
202 | 202 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CATEGORY); |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | |
211 | 211 | // データ行の出力. |
212 | 212 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
213 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
213 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
214 | 214 | |
215 | 215 | $Csvs = $csvService->getCsvs(); |
216 | 216 |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | if ($row['商品削除フラグ'] == '') { |
177 | 177 | $Product->setDelFlg(Constant::DISABLED); |
178 | 178 | } else { |
179 | - if ($row['商品削除フラグ'] == (string)Constant::DISABLED || $row['商品削除フラグ'] == (string)Constant::ENABLED) { |
|
179 | + if ($row['商品削除フラグ'] == (string) Constant::DISABLED || $row['商品削除フラグ'] == (string) Constant::ENABLED) { |
|
180 | 180 | $Product->setDelFlg($row['商品削除フラグ']); |
181 | 181 | } else { |
182 | 182 | $this->addErrors(($data->key() + 1).'行目の商品削除フラグが設定されていません。'); |
@@ -530,7 +530,7 @@ discard block |
||
530 | 530 | throw new NotFoundHttpException(); |
531 | 531 | } |
532 | 532 | |
533 | - $response->setCallback(function () use ($app, $request, $headers) { |
|
533 | + $response->setCallback(function() use ($app, $request, $headers) { |
|
534 | 534 | |
535 | 535 | // ヘッダ行の出力 |
536 | 536 | $row = array(); |