@@ -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 | { |
@@ -2,15 +2,9 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Eccube\Application; |
| 4 | 4 | |
| 5 | -use Eccube\Event\TemplateEvent; |
|
| 6 | -use Monolog\Logger; |
|
| 7 | -use Symfony\Component\Form\FormBuilder; |
|
| 8 | 5 | use Symfony\Component\HttpFoundation\Request; |
| 9 | 6 | use Symfony\Component\HttpFoundation\Response; |
| 10 | -use Symfony\Component\HttpFoundation\StreamedResponse; |
|
| 11 | 7 | use Symfony\Component\HttpKernel\HttpKernelInterface; |
| 12 | -use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
|
| 13 | -use Symfony\Component\Security\Core\User\UserInterface; |
|
| 14 | 8 | |
| 15 | 9 | trait ApplicationTrait |
| 16 | 10 | { |
@@ -16,6 +16,7 @@ discard block |
||
| 16 | 16 | { |
| 17 | 17 | /** |
| 18 | 18 | * Application Shortcut Methods |
| 19 | + * @param string $message |
|
| 19 | 20 | */ |
| 20 | 21 | public function addSuccess($message, $namespace = 'front') |
| 21 | 22 | { |
@@ -32,6 +33,9 @@ discard block |
||
| 32 | 33 | $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message); |
| 33 | 34 | } |
| 34 | 35 | |
| 36 | + /** |
|
| 37 | + * @param string $message |
|
| 38 | + */ |
|
| 35 | 39 | public function addWarning($message, $namespace = 'front') |
| 36 | 40 | { |
| 37 | 41 | $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message); |
@@ -42,6 +46,9 @@ discard block |
||
| 42 | 46 | $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message); |
| 43 | 47 | } |
| 44 | 48 | |
| 49 | + /** |
|
| 50 | + * @param string $message |
|
| 51 | + */ |
|
| 45 | 52 | public function addRequestError($message, $namespace = 'front') |
| 46 | 53 | { |
| 47 | 54 | $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message); |
@@ -58,6 +65,9 @@ discard block |
||
| 58 | 65 | $this->addWarning('admin.delete.warning', 'admin'); |
| 59 | 66 | } |
| 60 | 67 | |
| 68 | + /** |
|
| 69 | + * @param string $targetPath |
|
| 70 | + */ |
|
| 61 | 71 | public function setLoginTargetPath($targetPath, $namespace = null) |
| 62 | 72 | { |
| 63 | 73 | if (is_null($namespace)) { |
@@ -109,7 +119,7 @@ discard block |
||
| 109 | 119 | * @param string $path フォワード先のパス |
| 110 | 120 | * @param array $requestParameters |
| 111 | 121 | * @param Response $response |
| 112 | - * @return Application |
|
| 122 | + * @return ApplicationTrait |
|
| 113 | 123 | */ |
| 114 | 124 | public function forwardChain($path, array $requestParameters = [], Response &$response = null) |
| 115 | 125 | { |
@@ -19,32 +19,32 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | public function addSuccess($message, $namespace = 'front') |
| 21 | 21 | { |
| 22 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message); |
|
| 22 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | public function addError($message, $namespace = 'front') |
| 26 | 26 | { |
| 27 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message); |
|
| 27 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | public function addDanger($message, $namespace = 'front') |
| 31 | 31 | { |
| 32 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message); |
|
| 32 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public function addWarning($message, $namespace = 'front') |
| 36 | 36 | { |
| 37 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message); |
|
| 37 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public function addInfo($message, $namespace = 'front') |
| 41 | 41 | { |
| 42 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message); |
|
| 42 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | public function addRequestError($message, $namespace = 'front') |
| 46 | 46 | { |
| 47 | - $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message); |
|
| 47 | + $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | public function clearMessage() |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | if (is_null($namespace)) { |
| 64 | 64 | $this['session']->getFlashBag()->set('eccube.login.target.path', $targetPath); |
| 65 | 65 | } else { |
| 66 | - $this['session']->getFlashBag()->set('eccube.' . $namespace . '.login.target.path', $targetPath); |
|
| 66 | + $this['session']->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath); |
|
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * @param Response $response |
| 112 | 112 | * @return Application |
| 113 | 113 | */ |
| 114 | - public function forwardChain($path, array $requestParameters = [], Response &$response = null) |
|
| 114 | + public function forwardChain($path, array $requestParameters = [], Response&$response = null) |
|
| 115 | 115 | { |
| 116 | 116 | $response = $this->forward($path, $requestParameters); |
| 117 | 117 | return $this; |
@@ -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['csrf.token_manager']; |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | @trigger_error('The '.__METHOD__.' method is deprecated.', E_USER_DEPRECATED); |
| 46 | 46 | |
| 47 | 47 | $form = $app['form.factory'] |
| 48 | - ->createBuilder($app['eccube.form.type.' . $type], $app['eccube.entity.' . $type]) |
|
| 48 | + ->createBuilder($app['eccube.form.type.'.$type], $app['eccube.entity.'.$type]) |
|
| 49 | 49 | ->getForm(); |
| 50 | 50 | $form->handleRequest($app['request_stack']->getCurrentRequest()); |
| 51 | 51 | |
@@ -37,6 +37,9 @@ |
||
| 37 | 37 | { |
| 38 | 38 | private $app; |
| 39 | 39 | |
| 40 | + /** |
|
| 41 | + * @param \Pimple\Container $app |
|
| 42 | + */ |
|
| 40 | 43 | public function __construct($app) |
| 41 | 44 | { |
| 42 | 45 | $this->app = $app; |
@@ -27,8 +27,6 @@ |
||
| 27 | 27 | use Symfony\Component\Form\Extension\Core\Type\PasswordType; |
| 28 | 28 | use Symfony\Component\Form\Extension\Core\Type\RepeatedType; |
| 29 | 29 | use Symfony\Component\Form\FormBuilderInterface; |
| 30 | -use Symfony\Component\Form\FormError; |
|
| 31 | -use Symfony\Component\Form\FormEvents; |
|
| 32 | 30 | use Symfony\Component\OptionsResolver\OptionsResolver; |
| 33 | 31 | use Symfony\Component\Security\Core\Validator\Constraints\UserPassword; |
| 34 | 32 | use Symfony\Component\Validator\Constraints as Assert; |
@@ -32,7 +32,6 @@ |
||
| 32 | 32 | use Symfony\Component\Form\Extension\Core\Type\HiddenType; |
| 33 | 33 | use Symfony\Component\Form\Extension\Core\Type\TextType; |
| 34 | 34 | use Symfony\Component\Form\FormBuilderInterface; |
| 35 | -use Symfony\Component\Validator\Constraints as Assert; |
|
| 36 | 35 | |
| 37 | 36 | class SearchProductType extends AbstractType |
| 38 | 37 | { |