@@ -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()); |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | // ファイル生成・更新 |
| 175 | 175 | $tplDir = $this->appConfig['block_realdir']; |
| 176 | 176 | |
| 177 | - $filePath = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
| 177 | + $filePath = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
| 178 | 178 | |
| 179 | 179 | $fs = new Filesystem(); |
| 180 | 180 | $blockData = $form->get('block_html')->getData(); |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | $fs->dumpFile($filePath, $blockData); |
| 183 | 183 | // 更新でファイル名を変更した場合、以前のファイルを削除 |
| 184 | 184 | if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) { |
| 185 | - $oldFilePath = $tplDir . '/' . $previous_filename . '.twig'; |
|
| 185 | + $oldFilePath = $tplDir.'/'.$previous_filename.'.twig'; |
|
| 186 | 186 | if ($fs->exists($oldFilePath)) { |
| 187 | 187 | $fs->remove($oldFilePath); |
| 188 | 188 | } |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る |
| 240 | 240 | if ($Block->getDeletableFlg() > 0) { |
| 241 | 241 | $tplDir = $this->appConfig['block_realdir']; |
| 242 | - $file = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
| 242 | + $file = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
| 243 | 243 | $fs = new Filesystem(); |
| 244 | 244 | if ($fs->exists($file)) { |
| 245 | 245 | $fs->remove($file); |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | private $error = null; |
| 65 | 65 | private $encode = ''; |
| 66 | 66 | |
| 67 | - public function __construct(){ |
|
| 67 | + public function __construct() { |
|
| 68 | 68 | $this->encode = self::UTF; |
| 69 | 69 | if ('\\' === DIRECTORY_SEPARATOR) { |
| 70 | 70 | $this->encode = self::SJIS; |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | $arrFileList = $this->getFileList($app, $nowDir); |
| 114 | 114 | |
| 115 | 115 | $javascript = $this->getJsArrayList($tree); |
| 116 | - $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '" . $nowDir . "', 'tree_select_file', 'tree_status', 'move');"; |
|
| 116 | + $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '".$nowDir."', 'tree_select_file', 'tree_status', 'move');"; |
|
| 117 | 117 | |
| 118 | 118 | return [ |
| 119 | 119 | 'form' => $form->createView(), |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | $nowDir = $this->checkDir($request->get('now_dir'), $topDir) |
| 175 | 175 | ? $this->normalizePath($request->get('now_dir')) |
| 176 | 176 | : $topDir; |
| 177 | - $fs->mkdir($nowDir . '/' . $filename); |
|
| 177 | + $fs->mkdir($nowDir.'/'.$filename); |
|
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | } |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | { |
| 260 | 260 | $str = "arrTree = new Array();\n"; |
| 261 | 261 | foreach ($tree as $key => $val) { |
| 262 | - $str .= 'arrTree[' . $key . "] = new Array(" . $key . ", '" . $val['type'] . "', '" . $val['path'] . "', " . $val['rank'] . ','; |
|
| 262 | + $str .= 'arrTree['.$key."] = new Array(".$key.", '".$val['type']."', '".$val['path']."', ".$val['rank'].','; |
|
| 263 | 263 | if ($val['open']) { |
| 264 | 264 | $str .= "true);\n"; |
| 265 | 265 | } else { |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | private function getFileList($app, $nowDir) |
| 311 | 311 | { |
| 312 | 312 | $topDir = $this->appConfig['user_data_realdir']; |
| 313 | - $filter = function (\SplFileInfo $file) use ($topDir) { |
|
| 313 | + $filter = function(\SplFileInfo $file) use ($topDir) { |
|
| 314 | 314 | $acceptPath = realpath($topDir); |
| 315 | 315 | $targetPath = $file->getRealPath(); |
| 316 | 316 | return (strpos($targetPath, $acceptPath) === 0); |
@@ -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 | ); |