@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | // ファイル生成・更新 |
| 115 | 115 | $tplDir = $app['config']['block_realdir']; |
| 116 | 116 | |
| 117 | - $filePath = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
| 117 | + $filePath = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
| 118 | 118 | |
| 119 | 119 | $fs = new Filesystem(); |
| 120 | 120 | $blockData = $form->get('block_html')->getData(); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | $fs->dumpFile($filePath, $blockData); |
| 123 | 123 | // 更新でファイル名を変更した場合、以前のファイルを削除 |
| 124 | 124 | if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) { |
| 125 | - $oldFilePath = $tplDir . '/' . $previous_filename . '.twig'; |
|
| 125 | + $oldFilePath = $tplDir.'/'.$previous_filename.'.twig'; |
|
| 126 | 126 | if ($fs->exists($oldFilePath)) { |
| 127 | 127 | $fs->remove($oldFilePath); |
| 128 | 128 | } |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る |
| 176 | 176 | if ($Block->getDeletableFlg() > 0) { |
| 177 | 177 | $tplDir = $app['config']['block_realdir']; |
| 178 | - $file = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
| 178 | + $file = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
| 179 | 179 | $fs = new Filesystem(); |
| 180 | 180 | if ($fs->exists($file)) { |
| 181 | 181 | $fs->remove($file); |
@@ -83,7 +83,7 @@ |
||
| 83 | 83 | // 遷移が正しくない場合、デフォルトであるマイページの配送先追加の画面を設定する |
| 84 | 84 | if (!in_array($parentPage, $allowdParents)) { |
| 85 | 85 | // @deprecated 使用されていないコード |
| 86 | - $parentPage = $app->url('mypage_delivery'); |
|
| 86 | + $parentPage = $app->url('mypage_delivery'); |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | $builder = $app['form.factory'] |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | $paths[] = $app['config']['user_data_realdir']; |
| 56 | 56 | $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths)); |
| 57 | 57 | |
| 58 | - $file = $PageLayout->getFileName() . '.twig'; |
|
| 58 | + $file = $PageLayout->getFileName().'.twig'; |
|
| 59 | 59 | |
| 60 | 60 | $event = new EventArgs( |
| 61 | 61 | array( |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | // リセットキーの発行・有効期限の設定 |
| 65 | 65 | $Customer |
| 66 | 66 | ->setResetKey($app['eccube.repository.customer']->getUniqueResetKey($app)) |
| 67 | - ->setResetExpire(new \DateTime('+' . $app['config']['customer_reset_expire'] .' min')); |
|
| 67 | + ->setResetExpire(new \DateTime('+'.$app['config']['customer_reset_expire'].' min')); |
|
| 68 | 68 | |
| 69 | 69 | // リセットキーを更新 |
| 70 | 70 | $app['orm.em']->persist($Customer); |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | // ログ出力 |
| 89 | 89 | $app['monolog']->addInfo( |
| 90 | - 'send reset password mail to:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}" |
|
| 90 | + 'send reset password mail to:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}" |
|
| 91 | 91 | ); |
| 92 | 92 | } else { |
| 93 | 93 | log_warning('Un active customer try send reset password email: ', array('Enter email' => $form->get('login_email')->getData())); |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | |
| 170 | 170 | // ログ出力 |
| 171 | 171 | $app['monolog']->addInfo( |
| 172 | - 'reset password complete:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}" |
|
| 172 | + 'reset password complete:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}" |
|
| 173 | 173 | ); |
| 174 | 174 | } else { |
| 175 | 175 | throw new HttpException\AccessDeniedHttpException('不正なアクセスです。'); |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | $key = sprintf('keyword%s', $index); |
| 114 | 114 | $qb |
| 115 | 115 | ->andWhere(sprintf('NORMALIZE(p.name) LIKE NORMALIZE(:%s) OR NORMALIZE(p.search_word) LIKE NORMALIZE(:%s)', $key, $key)) |
| 116 | - ->setParameter($key, '%' . $keyword . '%'); |
|
| 116 | + ->setParameter($key, '%'.$keyword.'%'); |
|
| 117 | 117 | } |
| 118 | 118 | } |
| 119 | 119 | |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | $qb |
| 177 | 177 | ->andWhere('p.id = :id OR p.name LIKE :likeid OR pc.code LIKE :likeid') |
| 178 | 178 | ->setParameter('id', $id) |
| 179 | - ->setParameter('likeid', '%' . $searchData['id'] . '%'); |
|
| 179 | + ->setParameter('likeid', '%'.$searchData['id'].'%'); |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | // code |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | * @param array $metadatas |
| 349 | 349 | * @param array $fsList |
| 350 | 350 | * @param $pluginCode |
| 351 | - * @param $codePath |
|
| 351 | + * @param string $codePath |
|
| 352 | 352 | */ |
| 353 | 353 | protected function generateMigration(array $metadatas, array &$fsList = array(), $pluginCode, $codePath) |
| 354 | 354 | { |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | * |
| 374 | 374 | * @param $pluginCode |
| 375 | 375 | * @param array $metadatas |
| 376 | - * @return mixed|string |
|
| 376 | + * @return string |
|
| 377 | 377 | */ |
| 378 | 378 | protected function makeMigration($pluginCode, array $metadatas) |
| 379 | 379 | { |
@@ -33,7 +33,6 @@ |
||
| 33 | 33 | use Symfony\Component\Console\Input\InputOption; |
| 34 | 34 | use Symfony\Component\Console\Output\OutputInterface; |
| 35 | 35 | use Symfony\Component\Console\Question\Question; |
| 36 | -use Symfony\Component\Validator\Constraints as Assert; |
|
| 37 | 36 | |
| 38 | 37 | class PluginCommand extends \Knp\Command\Command |
| 39 | 38 | { |