@@ -137,7 +137,7 @@ |
||
137 | 137 | * 仮受注情報作成 |
138 | 138 | * |
139 | 139 | * @param $Customer |
140 | - * @param $preOrderId |
|
140 | + * @param string $preOrderId |
|
141 | 141 | * @return mixed |
142 | 142 | * @throws \Doctrine\ORM\NoResultException |
143 | 143 | * @throws \Doctrine\ORM\NonUniqueResultException |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | ->setFax03($Customer->getFax03()) |
271 | 271 | ->setZip01($Customer->getZip01()) |
272 | 272 | ->setZip02($Customer->getZip02()) |
273 | - ->setZipCode($Customer->getZip01() . $Customer->getZip02()) |
|
273 | + ->setZipCode($Customer->getZip01().$Customer->getZip02()) |
|
274 | 274 | ->setPref($Customer->getPref()) |
275 | 275 | ->setAddr01($Customer->getAddr01()) |
276 | 276 | ->setAddr02($Customer->getAddr02()) |
@@ -409,7 +409,7 @@ discard block |
||
409 | 409 | ->setFax03($CustomerAddress->getFax03()) |
410 | 410 | ->setZip01($CustomerAddress->getZip01()) |
411 | 411 | ->setZip02($CustomerAddress->getZip02()) |
412 | - ->setZipCode($CustomerAddress->getZip01() . $CustomerAddress->getZip02()) |
|
412 | + ->setZipCode($CustomerAddress->getZip01().$CustomerAddress->getZip02()) |
|
413 | 413 | ->setPref($CustomerAddress->getPref()) |
414 | 414 | ->setAddr01($CustomerAddress->getAddr01()) |
415 | 415 | ->setAddr02($CustomerAddress->getAddr02()); |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | ->setFax03($Customer->getFax03()) |
429 | 429 | ->setZip01($Customer->getZip01()) |
430 | 430 | ->setZip02($Customer->getZip02()) |
431 | - ->setZipCode($Customer->getZip01() . $Customer->getZip02()) |
|
431 | + ->setZipCode($Customer->getZip01().$Customer->getZip02()) |
|
432 | 432 | ->setPref($Customer->getPref()) |
433 | 433 | ->setAddr01($Customer->getAddr01()) |
434 | 434 | ->setAddr02($Customer->getAddr02()); |
@@ -913,10 +913,10 @@ discard block |
||
913 | 913 | |
914 | 914 | // 配送日数が設定されている |
915 | 915 | if ($deliveryDateFlag) { |
916 | - $period = new \DatePeriod ( |
|
917 | - new \DateTime($minDate . ' day'), |
|
916 | + $period = new \DatePeriod( |
|
917 | + new \DateTime($minDate.' day'), |
|
918 | 918 | new \DateInterval('P1D'), |
919 | - new \DateTime($minDate + $this->app['config']['deliv_date_end_max'] . ' day') |
|
919 | + new \DateTime($minDate + $this->app['config']['deliv_date_end_max'].' day') |
|
920 | 920 | ); |
921 | 921 | |
922 | 922 | foreach ($period as $day) { |
@@ -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 | } |
@@ -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 |
@@ -52,11 +52,17 @@ |
||
52 | 52 | return $form; |
53 | 53 | } |
54 | 54 | |
55 | + /** |
|
56 | + * @param Application $app |
|
57 | + */ |
|
55 | 58 | protected function getSecurity($app) |
56 | 59 | { |
57 | 60 | return $app['security.token_storage']; |
58 | 61 | } |
59 | 62 | |
63 | + /** |
|
64 | + * @param Application $app |
|
65 | + */ |
|
60 | 66 | protected function isTokenValid($app) |
61 | 67 | { |
62 | 68 | $csrf = $app['form.csrf_provider']; |
@@ -88,19 +88,19 @@ discard block |
||
88 | 88 | // ファイル生成・更新 |
89 | 89 | $tplDir = $app['config']['block_realdir']; |
90 | 90 | |
91 | - $filePath = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
91 | + $filePath = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
92 | 92 | |
93 | 93 | $fs = new Filesystem(); |
94 | 94 | $fs->dumpFile($filePath, $form->get('block_html')->getData()); |
95 | 95 | // 更新でファイル名を変更した場合、以前のファイルを削除 |
96 | 96 | if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) { |
97 | - $oldFilePath = $tplDir . $previous_filename; |
|
97 | + $oldFilePath = $tplDir.$previous_filename; |
|
98 | 98 | if ($fs->exists($oldFilePath)) { |
99 | 99 | $fs->remove($oldFilePath); |
100 | 100 | } |
101 | 101 | } |
102 | 102 | |
103 | - \Eccube\Util\Cache::clear($app,false); |
|
103 | + \Eccube\Util\Cache::clear($app, false); |
|
104 | 104 | |
105 | 105 | $app->addSuccess('admin.register.complete', 'admin'); |
106 | 106 | |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る |
138 | 138 | if ($Block->getDeletableFlg() > 0) { |
139 | 139 | $tplDir = $app['config']['block_realdir']; |
140 | - $file = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
140 | + $file = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
141 | 141 | $fs = new Filesystem(); |
142 | 142 | if ($fs->exists($file)) { |
143 | 143 | $fs->remove($file); |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | $app['orm.em']->flush(); |
147 | 147 | |
148 | 148 | $app->addSuccess('admin.delete.complete', 'admin'); |
149 | - \Eccube\Util\Cache::clear($app,false); |
|
149 | + \Eccube\Util\Cache::clear($app, false); |
|
150 | 150 | } |
151 | 151 | |
152 | 152 |
@@ -28,7 +28,6 @@ |
||
28 | 28 | use Eccube\Entity\Master\DeviceType; |
29 | 29 | use Eccube\Util\Str; |
30 | 30 | use Symfony\Component\Filesystem\Filesystem; |
31 | -use Symfony\Component\Finder\Finder; |
|
32 | 31 | use Symfony\Component\Form\FormError; |
33 | 32 | use Symfony\Component\HttpFoundation\Request; |
34 | 33 | use Symfony\Component\HttpFoundation\Response; |
@@ -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); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | |
90 | 90 | // ファイル生成・更新 |
91 | 91 | $templatePath = $app['eccube.repository.page_layout']->getWriteTemplatePath($editable); |
92 | - $filePath = $templatePath . '/' . $PageLayout->getFileName() . '.twig'; |
|
92 | + $filePath = $templatePath.'/'.$PageLayout->getFileName().'.twig'; |
|
93 | 93 | |
94 | 94 | $fs = new Filesystem(); |
95 | 95 | $fs->dumpFile($filePath, $form->get('tpl_data')->getData()); |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $app->addSuccess('admin.register.complete', 'admin'); |
98 | 98 | |
99 | 99 | // twig キャッシュの削除. |
100 | - $finder = Finder::create()->in($app['config']['root_dir'] . '/app/cache/twig'); |
|
100 | + $finder = Finder::create()->in($app['config']['root_dir'].'/app/cache/twig'); |
|
101 | 101 | $fs->remove($finder); |
102 | 102 | |
103 | 103 | return $app->redirect($app->url('admin_content_page_edit', array('id' => $PageLayout->getId()))); |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | if ($PageLayout->getEditFlg() == PageLayout::EDIT_FLG_USER) { |
137 | 137 | $templatePath = $app['eccube.repository.page_layout'] |
138 | 138 | ->getWriteTemplatePath($DeviceType, true); |
139 | - $file = $templatePath . '/' . $PageLayout->getFileName() . '.twig'; |
|
139 | + $file = $templatePath.'/'.$PageLayout->getFileName().'.twig'; |
|
140 | 140 | $fs = new Filesystem(); |
141 | 141 | if ($fs->exists($file)) { |
142 | 142 | $fs->remove($file); |
@@ -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; |