@@ -25,7 +25,7 @@ |
||
| 25 | 25 | require __DIR__.'/../autoload.php'; |
| 26 | 26 | |
| 27 | 27 | ini_set('display_errors', 'Off'); |
| 28 | -error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT); |
|
| 28 | +error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT); |
|
| 29 | 29 | |
| 30 | 30 | $app = new Eccube\Application(); |
| 31 | 31 | |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | |
| 59 | 59 | // load config dev |
| 60 | 60 | $conf = $app['config']; |
| 61 | -$app['config'] = $app->share(function () use ($conf) { |
|
| 61 | +$app['config'] = $app->share(function() use ($conf) { |
|
| 62 | 62 | $confarray = array(); |
| 63 | 63 | $config_dev_file = __DIR__.'/../app/config/eccube/config_dev.yml'; |
| 64 | 64 | if (file_exists($config_dev_file)) { |
@@ -26,11 +26,11 @@ |
||
| 26 | 26 | apc_clear_cache(); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | -require __DIR__ . '/../autoload.php'; |
|
| 29 | +require __DIR__.'/../autoload.php'; |
|
| 30 | 30 | |
| 31 | 31 | $app = new Eccube\InstallApplication(); |
| 32 | 32 | $app['debug'] = true; |
| 33 | -$app->before(function (\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) { |
|
| 33 | +$app->before(function(\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) { |
|
| 34 | 34 | if (!$request->getSession()->isStarted()) { |
| 35 | 35 | $request->getSession()->start(); |
| 36 | 36 | } |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | |
| 56 | 56 | protected function execute(InputInterface $input, OutputInterface $output) { |
| 57 | 57 | |
| 58 | - \Eccube\Util\Cache::clear($this->app,$input->getOption('all')); |
|
| 58 | + \Eccube\Util\Cache::clear($this->app, $input->getOption('all')); |
|
| 59 | 59 | $output->writeln(sprintf("%s <info>success</info>", 'cache:clear')); |
| 60 | 60 | |
| 61 | 61 | } |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | protected function getBoundForm(Application $app, $type) |
| 39 | 39 | { |
| 40 | 40 | $form = $app['form.factory'] |
| 41 | - ->createBuilder($app['eccube.form.type.' . $type], $app['eccube.entity.' . $type]) |
|
| 41 | + ->createBuilder($app['eccube.form.type.'.$type], $app['eccube.entity.'.$type]) |
|
| 42 | 42 | ->getForm(); |
| 43 | 43 | $form->handleRequest($app['request']); |
| 44 | 44 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | private $error = null; |
| 40 | 40 | private $encode = ''; |
| 41 | 41 | |
| 42 | - public function __construct(){ |
|
| 42 | + public function __construct() { |
|
| 43 | 43 | $this->encode = self::UTF; |
| 44 | 44 | if ('\\' === DIRECTORY_SEPARATOR) { |
| 45 | 45 | $this->encode = self::SJIS; |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | $arrFileList = $this->getFileList($app, $nowDir); |
| 83 | 83 | |
| 84 | 84 | $javascript = $this->getJsArrayList($tree); |
| 85 | - $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '" . $nowDir . "', 'tree_select_file', 'tree_status', 'move');"; |
|
| 85 | + $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '".$nowDir."', 'tree_select_file', 'tree_status', 'move');"; |
|
| 86 | 86 | |
| 87 | 87 | return $app->render('Content/file.twig', array( |
| 88 | 88 | 'form' => $form->createView(), |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | $nowDir = $this->checkDir($request->get('now_dir'), $topDir) |
| 140 | 140 | ? $this->normalizePath($request->get('now_dir')) |
| 141 | 141 | : $topDir; |
| 142 | - $fs->mkdir($nowDir . '/' . $filename); |
|
| 142 | + $fs->mkdir($nowDir.'/'.$filename); |
|
| 143 | 143 | } |
| 144 | 144 | } |
| 145 | 145 | |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | { |
| 220 | 220 | $str = "arrTree = new Array();\n"; |
| 221 | 221 | foreach ($tree as $key => $val) { |
| 222 | - $str .= 'arrTree[' . $key . "] = new Array(" . $key . ", '" . $val['type'] . "', '" . $val['path'] . "', " . $val['rank'] . ','; |
|
| 222 | + $str .= 'arrTree['.$key."] = new Array(".$key.", '".$val['type']."', '".$val['path']."', ".$val['rank'].','; |
|
| 223 | 223 | if ($val['open']) { |
| 224 | 224 | $str .= "true);\n"; |
| 225 | 225 | } else { |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | private function getFileList($app, $nowDir) |
| 271 | 271 | { |
| 272 | 272 | $topDir = $app['config']['user_data_realdir']; |
| 273 | - $filter = function (\SplFileInfo $file) use ($topDir) { |
|
| 273 | + $filter = function(\SplFileInfo $file) use ($topDir) { |
|
| 274 | 274 | $acceptPath = realpath($topDir); |
| 275 | 275 | $targetPath = $file->getRealPath(); |
| 276 | 276 | return (strpos($targetPath, $acceptPath) === 0); |
@@ -89,20 +89,20 @@ discard block |
||
| 89 | 89 | $max = count($Blocks); |
| 90 | 90 | for ($i = 0; $i < $max; $i++) { |
| 91 | 91 | // block_id が取得できない場合は INSERT しない |
| 92 | - if (!isset($data['id_' . $i])) { |
|
| 92 | + if (!isset($data['id_'.$i])) { |
|
| 93 | 93 | continue; |
| 94 | 94 | } |
| 95 | 95 | // 未使用は INSERT しない |
| 96 | - if ($data['target_id_' . $i] == \Eccube\Entity\PageLayout::TARGET_ID_UNUSED) { |
|
| 96 | + if ($data['target_id_'.$i] == \Eccube\Entity\PageLayout::TARGET_ID_UNUSED) { |
|
| 97 | 97 | continue; |
| 98 | 98 | } |
| 99 | 99 | // 他のページに anywhere が存在する場合は INSERT しない |
| 100 | - $anywhere = (isset($data['anywhere_' . $i]) && $data['anywhere_' . $i] == 1) ? 1 : 0; |
|
| 101 | - if (isset($data['anywhere_' . $i]) && $data['anywhere_' . $i] == 1) { |
|
| 100 | + $anywhere = (isset($data['anywhere_'.$i]) && $data['anywhere_'.$i] == 1) ? 1 : 0; |
|
| 101 | + if (isset($data['anywhere_'.$i]) && $data['anywhere_'.$i] == 1) { |
|
| 102 | 102 | $Other = $app['orm.em']->getRepository('Eccube\Entity\BlockPosition') |
| 103 | 103 | ->findBy(array( |
| 104 | 104 | 'anywhere' => 1, |
| 105 | - 'block_id' => $data['id_' . $i], |
|
| 105 | + 'block_id' => $data['id_'.$i], |
|
| 106 | 106 | )); |
| 107 | 107 | if (count($Other) > 0) { |
| 108 | 108 | continue; |
@@ -112,14 +112,14 @@ discard block |
||
| 112 | 112 | $BlockPosition = new \Eccube\Entity\BlockPosition(); |
| 113 | 113 | $Block = $app['orm.em']->getRepository('Eccube\Entity\Block') |
| 114 | 114 | ->findOneBy(array( |
| 115 | - 'id' => $data['id_' . $i], |
|
| 115 | + 'id' => $data['id_'.$i], |
|
| 116 | 116 | 'DeviceType' => $DeviceType, |
| 117 | 117 | )); |
| 118 | 118 | $BlockPosition |
| 119 | 119 | ->setPageId($id) |
| 120 | - ->setBlockId($data['id_' . $i]) |
|
| 121 | - ->setBlockRow($data['top_' . $i]) |
|
| 122 | - ->setTargetId($data['target_id_' . $i]) |
|
| 120 | + ->setBlockId($data['id_'.$i]) |
|
| 121 | + ->setBlockRow($data['top_'.$i]) |
|
| 122 | + ->setTargetId($data['target_id_'.$i]) |
|
| 123 | 123 | ->setBlock($Block) |
| 124 | 124 | ->setPageLayout($TargetPageLayout) |
| 125 | 125 | ->setAnywhere($anywhere); |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $em->getConfiguration()->setSQLLogger(null); |
| 172 | 172 | |
| 173 | 173 | $response = new StreamedResponse(); |
| 174 | - $response->setCallback(function () use ($app, $request) { |
|
| 174 | + $response->setCallback(function() use ($app, $request) { |
|
| 175 | 175 | |
| 176 | 176 | // CSV種別を元に初期化. |
| 177 | 177 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CUSTOMER); |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | |
| 186 | 186 | // データ行の出力. |
| 187 | 187 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
| 188 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
| 188 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
| 189 | 189 | |
| 190 | 190 | $Csvs = $csvService->getCsvs(); |
| 191 | 191 | |
@@ -207,9 +207,9 @@ discard block |
||
| 207 | 207 | }); |
| 208 | 208 | |
| 209 | 209 | $now = new \DateTime(); |
| 210 | - $filename = 'customer_' . $now->format('YmdHis') . '.csv'; |
|
| 210 | + $filename = 'customer_'.$now->format('YmdHis').'.csv'; |
|
| 211 | 211 | $response->headers->set('Content-Type', 'application/octet-stream'); |
| 212 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
| 212 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
| 213 | 213 | $response->send(); |
| 214 | 214 | |
| 215 | 215 | return $response; |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | $em->getConfiguration()->setSQLLogger(null); |
| 185 | 185 | |
| 186 | 186 | $response = new StreamedResponse(); |
| 187 | - $response->setCallback(function () use ($app, $request) { |
|
| 187 | + $response->setCallback(function() use ($app, $request) { |
|
| 188 | 188 | |
| 189 | 189 | // CSV種別を元に初期化. |
| 190 | 190 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_ORDER); |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | |
| 199 | 199 | // データ行の出力. |
| 200 | 200 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
| 201 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
| 201 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
| 202 | 202 | |
| 203 | 203 | $Csvs = $csvService->getCsvs(); |
| 204 | 204 | |
@@ -228,9 +228,9 @@ discard block |
||
| 228 | 228 | }); |
| 229 | 229 | |
| 230 | 230 | $now = new \DateTime(); |
| 231 | - $filename = 'order_' . $now->format('YmdHis') . '.csv'; |
|
| 231 | + $filename = 'order_'.$now->format('YmdHis').'.csv'; |
|
| 232 | 232 | $response->headers->set('Content-Type', 'application/octet-stream'); |
| 233 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
| 233 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
| 234 | 234 | $response->send(); |
| 235 | 235 | |
| 236 | 236 | return $response; |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | $em->getConfiguration()->setSQLLogger(null); |
| 254 | 254 | |
| 255 | 255 | $response = new StreamedResponse(); |
| 256 | - $response->setCallback(function () use ($app, $request) { |
|
| 256 | + $response->setCallback(function() use ($app, $request) { |
|
| 257 | 257 | |
| 258 | 258 | // CSV種別を元に初期化. |
| 259 | 259 | $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_SHIPPING); |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | |
| 268 | 268 | // データ行の出力. |
| 269 | 269 | $app['eccube.service.csv.export']->setExportQueryBuilder($qb); |
| 270 | - $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) { |
|
| 270 | + $app['eccube.service.csv.export']->exportData(function($entity, $csvService) { |
|
| 271 | 271 | |
| 272 | 272 | $Csvs = $csvService->getCsvs(); |
| 273 | 273 | |
@@ -305,9 +305,9 @@ discard block |
||
| 305 | 305 | }); |
| 306 | 306 | |
| 307 | 307 | $now = new \DateTime(); |
| 308 | - $filename = 'shipping_' . $now->format('YmdHis') . '.csv'; |
|
| 308 | + $filename = 'shipping_'.$now->format('YmdHis').'.csv'; |
|
| 309 | 309 | $response->headers->set('Content-Type', 'application/octet-stream'); |
| 310 | - $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename); |
|
| 310 | + $response->headers->set('Content-Disposition', 'attachment; filename='.$filename); |
|
| 311 | 311 | $response->send(); |
| 312 | 312 | |
| 313 | 313 | return $response; |