@@ -194,7 +194,7 @@ |
||
194 | 194 | ); |
195 | 195 | $addCartForm = $builder->getForm(); |
196 | 196 | |
197 | - if ($request->getMethod() === 'POST' && (string)$Product->getId() === $request->get('product_id')) { |
|
197 | + if ($request->getMethod() === 'POST' && (string) $Product->getId() === $request->get('product_id')) { |
|
198 | 198 | $addCartForm->handleRequest($request); |
199 | 199 | |
200 | 200 | if ($addCartForm->isValid()) { |
@@ -38,7 +38,6 @@ |
||
38 | 38 | use Eccube\Form\Type\Master\ProductListMaxType; |
39 | 39 | use Eccube\Form\Type\Master\ProductListOrderByType; |
40 | 40 | use Eccube\Form\Type\SearchProductType; |
41 | -use Eccube\Repository\BaseInfoRepository; |
|
42 | 41 | use Eccube\Repository\CustomerFavoriteProductRepository; |
43 | 42 | use Eccube\Repository\ProductRepository; |
44 | 43 | use Eccube\Service\CartService; |
@@ -90,7 +90,7 @@ |
||
90 | 90 | } |
91 | 91 | if ($dir == 'doctrine') { |
92 | 92 | // doctrineが指定された場合は, cache driver経由で削除. |
93 | - $config = $this->entityManager->getConfiguration(); |
|
93 | + $config = $this->entityManager->getConfiguration(); |
|
94 | 94 | $this->deleteDoctrineCache($config->getMetadataCacheImpl()); |
95 | 95 | $this->deleteDoctrineCache($config->getQueryCacheImpl()); |
96 | 96 | $this->deleteDoctrineCache($config->getResultCacheImpl()); |
@@ -122,12 +122,12 @@ discard block |
||
122 | 122 | { |
123 | 123 | // install.phpのチェック. |
124 | 124 | if (isset($this->appConfig['eccube_install']) && $this->appConfig['eccube_install'] == 1) { |
125 | - $file = $this->appConfig['root_dir'] . '/html/install.php'; |
|
125 | + $file = $this->appConfig['root_dir'].'/html/install.php'; |
|
126 | 126 | if (file_exists($file)) { |
127 | 127 | $message = $app->trans('admin.install.warning', array('installphpPath' => 'html/install.php')); |
128 | 128 | $app->addWarning($message, 'admin'); |
129 | 129 | } |
130 | - $fileOnRoot = $this->appConfig['root_dir'] . '/install.php'; |
|
130 | + $fileOnRoot = $this->appConfig['root_dir'].'/install.php'; |
|
131 | 131 | if (file_exists($fileOnRoot)) { |
132 | 132 | $message = $app->trans('admin.install.warning', array('installphpPath' => 'install.php')); |
133 | 133 | $app->addWarning($message, 'admin'); |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | t1.status |
376 | 376 | ORDER BY |
377 | 377 | t1.status'; |
378 | - $rsm = new ResultSetMapping();; |
|
378 | + $rsm = new ResultSetMapping(); ; |
|
379 | 379 | $rsm->addScalarResult('status', 'status'); |
380 | 380 | $rsm->addScalarResult('count', 'count'); |
381 | 381 | $query = $em->createNativeQuery($sql, $rsm); |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | $em->getConfiguration()->setSQLLogger(null); |
328 | 328 | |
329 | 329 | $response = new StreamedResponse(); |
330 | - $response->setCallback(function () use ($app, $request) { |
|
330 | + $response->setCallback(function() use ($app, $request) { |
|
331 | 331 | |
332 | 332 | // CSV種別を元に初期化. |
333 | 333 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_CUSTOMER); |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | |
342 | 342 | // データ行の出力. |
343 | 343 | $this->csvExportService->setExportQueryBuilder($qb); |
344 | - $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) { |
|
344 | + $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) { |
|
345 | 345 | |
346 | 346 | $Csvs = $csvService->getCsvs(); |
347 | 347 | |
@@ -376,9 +376,9 @@ discard block |
||
376 | 376 | }); |
377 | 377 | |
378 | 378 | $now = new \DateTime(); |
379 | - $filename = 'customer_' . $now->format('YmdHis') . '.csv'; |
|
379 | + $filename = 'customer_'.$now->format('YmdHis').'.csv'; |
|
380 | 380 | $response->headers->set('Content-Type', 'application/octet-stream'); |
381 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
381 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
382 | 382 | |
383 | 383 | $response->send(); |
384 | 384 |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | $em->getConfiguration()->setSQLLogger(null); |
273 | 273 | |
274 | 274 | $response = new StreamedResponse(); |
275 | - $response->setCallback(function () use ($app, $request) { |
|
275 | + $response->setCallback(function() use ($app, $request) { |
|
276 | 276 | |
277 | 277 | // CSV種別を元に初期化. |
278 | 278 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_CATEGORY); |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | |
287 | 287 | // データ行の出力. |
288 | 288 | $this->csvExportService->setExportQueryBuilder($qb); |
289 | - $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) { |
|
289 | + $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) { |
|
290 | 290 | |
291 | 291 | $Csvs = $csvService->getCsvs(); |
292 | 292 | |
@@ -319,9 +319,9 @@ discard block |
||
319 | 319 | }); |
320 | 320 | |
321 | 321 | $now = new \DateTime(); |
322 | - $filename = 'category_' . $now->format('YmdHis') . '.csv'; |
|
322 | + $filename = 'category_'.$now->format('YmdHis').'.csv'; |
|
323 | 323 | $response->headers->set('Content-Type', 'application/octet-stream'); |
324 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
324 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
325 | 325 | $response->send(); |
326 | 326 | |
327 | 327 | log_info('カテゴリCSV出力ファイル名', array($filename)); |
@@ -187,7 +187,7 @@ |
||
187 | 187 | $num = $this->productClassRepository->createQueryBuilder('pc') |
188 | 188 | ->select('count(pc.id)') |
189 | 189 | ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id') |
190 | - ->setParameter('id',$id) |
|
190 | + ->setParameter('id', $id) |
|
191 | 191 | ->getQuery() |
192 | 192 | ->getSingleScalarResult(); |
193 | 193 | if ($num > 0) { |
@@ -187,7 +187,7 @@ |
||
187 | 187 | // ダウンロード完了後にファイルを削除する. |
188 | 188 | // http://stackoverflow.com/questions/15238897/removing-file-after-delivering-response-with-silex-symfony |
189 | 189 | $app->finish( |
190 | - function (Request $request, Response $response, \Silex\Application $app) use ( |
|
190 | + function(Request $request, Response $response, \Silex\Application $app) use ( |
|
191 | 191 | $tmpDir, |
192 | 192 | $tarFile, |
193 | 193 | $tarGzFile |
@@ -690,7 +690,7 @@ |
||
690 | 690 | [ |
691 | 691 | 'label' => '認証キー', |
692 | 692 | 'constraints' => [ |
693 | - new Assert\Regex(['pattern' => "/^[0-9a-zA-Z]+$/",]), |
|
693 | + new Assert\Regex(['pattern' => "/^[0-9a-zA-Z]+$/", ]), |
|
694 | 694 | ], |
695 | 695 | ] |
696 | 696 | ); |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | } else { |
101 | 101 | // httpから変更されたらfalseのまま |
102 | 102 | $config['force_ssl'] = Constant::DISABLED; |
103 | - $data['force_ssl'] = (bool)Constant::DISABLED; |
|
103 | + $data['force_ssl'] = (bool) Constant::DISABLED; |
|
104 | 104 | } |
105 | 105 | } else { |
106 | 106 | $config['force_ssl'] = Constant::DISABLED; |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | if (count($allowHost) > 0) { |
162 | 162 | $form->get('admin_allow_host')->setData(Str::convertLineFeed(implode("\n", $allowHost))); |
163 | 163 | } |
164 | - $form->get('force_ssl')->setData((bool)$this->appConfig['force_ssl']); |
|
164 | + $form->get('force_ssl')->setData((bool) $this->appConfig['force_ssl']); |
|
165 | 165 | } |
166 | 166 | |
167 | 167 | return [ |