@@ -112,7 +112,7 @@ |
||
112 | 112 | } |
113 | 113 | } |
114 | 114 | |
115 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($Product) { |
|
115 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($Product) { |
|
116 | 116 | $data = $event->getData(); |
117 | 117 | $form = $event->getForm(); |
118 | 118 | if (!is_null($Product->getClassName2())) { |
@@ -26,7 +26,6 @@ |
||
26 | 26 | |
27 | 27 | use Eccube\Annotation\FormType; |
28 | 28 | use Eccube\Annotation\Inject; |
29 | -use Eccube\Application; |
|
30 | 29 | use Symfony\Component\Form\AbstractType; |
31 | 30 | use Symfony\Component\Form\Extension\Core\Type\ChoiceType; |
32 | 31 | use Symfony\Component\Form\Extension\Core\Type\HiddenType; |
@@ -52,7 +52,7 @@ |
||
52 | 52 | |
53 | 53 | $this->app = $this->getSilexApplication(); |
54 | 54 | |
55 | - \Eccube\Util\Cache::clear($this->app,$input->getOption('all')); |
|
55 | + \Eccube\Util\Cache::clear($this->app, $input->getOption('all')); |
|
56 | 56 | $output->writeln(sprintf("%s <info>success</info>", 'cache:clear')); |
57 | 57 | |
58 | 58 | } |
@@ -24,7 +24,6 @@ |
||
24 | 24 | |
25 | 25 | namespace Eccube\Command; |
26 | 26 | |
27 | -use Symfony\Component\Console\Input\InputArgument; |
|
28 | 27 | use Symfony\Component\Console\Input\InputInterface; |
29 | 28 | use Symfony\Component\Console\Input\InputOption; |
30 | 29 | use Symfony\Component\Console\Output\OutputInterface; |
@@ -111,7 +111,7 @@ |
||
111 | 111 | $webProcessor = new WebProcessor(); |
112 | 112 | $uidProcessor = new UidProcessor(8); |
113 | 113 | |
114 | - $FingerCrossedHandler->pushProcessor(function ($record) use ($app, $uidProcessor, $webProcessor) { |
|
114 | + $FingerCrossedHandler->pushProcessor(function($record) use ($app, $uidProcessor, $webProcessor) { |
|
115 | 115 | // ログフォーマットに出力する値を独自に設定 |
116 | 116 | |
117 | 117 | $record['level_name'] = sprintf("%-5s", $record['level_name']); |
@@ -83,7 +83,7 @@ |
||
83 | 83 | return $log; |
84 | 84 | } |
85 | 85 | |
86 | - foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) { |
|
86 | + foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) { |
|
87 | 87 | // 上限に達した場合、処理を抜ける |
88 | 88 | if (count($log) >= $formData['line_max']) { |
89 | 89 | break; |
@@ -108,6 +108,9 @@ |
||
108 | 108 | ]; |
109 | 109 | } |
110 | 110 | |
111 | + /** |
|
112 | + * @param string $logFile |
|
113 | + */ |
|
111 | 114 | private function parseLogFile($logFile, $formData) |
112 | 115 | { |
113 | 116 | $log = array(); |
@@ -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 |
@@ -60,7 +60,7 @@ |
||
60 | 60 | */ |
61 | 61 | protected $appConfig; |
62 | 62 | |
63 | - /** |
|
63 | + /** |
|
64 | 64 | * get query builder. |
65 | 65 | * |
66 | 66 | * @param array $searchData |
@@ -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 | { |
@@ -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 | { |
@@ -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; |
@@ -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 | { |
@@ -58,6 +59,9 @@ discard block |
||
58 | 59 | $this->addWarning('admin.delete.warning', 'admin'); |
59 | 60 | } |
60 | 61 | |
62 | + /** |
|
63 | + * @param string $targetPath |
|
64 | + */ |
|
61 | 65 | public function setLoginTargetPath($targetPath, $namespace = null) |
62 | 66 | { |
63 | 67 | if (is_null($namespace)) { |
@@ -109,7 +113,7 @@ discard block |
||
109 | 113 | * @param string $path フォワード先のパス |
110 | 114 | * @param array $requestParameters |
111 | 115 | * @param Response $response |
112 | - * @return Application |
|
116 | + * @return ApplicationTrait |
|
113 | 117 | */ |
114 | 118 | public function forwardChain($path, array $requestParameters = [], Response &$response = null) |
115 | 119 | { |
@@ -122,7 +126,7 @@ discard block |
||
122 | 126 | * Pimple標準では再登録を行うと, `RuntimeException: Cannot override frozen service`が投げられるため,一度unsetしてから再登録を行う. |
123 | 127 | * config系の変更程度に利用はとどめること |
124 | 128 | * |
125 | - * @param $key |
|
129 | + * @param string $key |
|
126 | 130 | * @param $service |
127 | 131 | * @throws \InvalidArgumentException keyが存在しない場合. |
128 | 132 | */ |
@@ -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; |
@@ -40,14 +40,14 @@ |
||
40 | 40 | $eventName = $view; |
41 | 41 | if ($this->isAdminRequest()) { |
42 | 42 | // 管理画面の場合、event名に「Admin/」を付ける |
43 | - $eventName = 'Admin/' . $view; |
|
43 | + $eventName = 'Admin/'.$view; |
|
44 | 44 | } |
45 | - $this['monolog']->debug('Template Event Name : ' . $eventName); |
|
45 | + $this['monolog']->debug('Template Event Name : '.$eventName); |
|
46 | 46 | |
47 | 47 | // $this['eccube.event.dispatcher']->dispatch($eventName, $event); |
48 | 48 | |
49 | 49 | if ($response instanceof StreamedResponse) { |
50 | - $response->setCallback(function () use ($twig, $view, $parameters) { |
|
50 | + $response->setCallback(function() use ($twig, $view, $parameters) { |
|
51 | 51 | $twig->display($view, $parameters); |
52 | 52 | }); |
53 | 53 | } else { |