@@ -28,9 +28,7 @@ |
||
| 28 | 28 | use Eccube\Common\Constant; |
| 29 | 29 | use Eccube\Util\Str; |
| 30 | 30 | use Eccube\Controller\AbstractController; |
| 31 | - |
|
| 32 | 31 | use Symfony\Component\HttpFoundation\Request; |
| 33 | -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
|
| 34 | 32 | use Symfony\Component\Yaml\Yaml; |
| 35 | 33 | |
| 36 | 34 | |
@@ -641,7 +641,7 @@ |
||
| 641 | 641 | * |
| 642 | 642 | * @param Request $request |
| 643 | 643 | * @param $authKey |
| 644 | - * @param $url |
|
| 644 | + * @param string $url |
|
| 645 | 645 | * @return array |
| 646 | 646 | */ |
| 647 | 647 | private function getRequestApi(Request $request, $authKey, $url) |
@@ -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; |
@@ -256,6 +256,9 @@ |
||
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | |
| 259 | + /** |
|
| 260 | + * @param InstallApplication $app |
|
| 261 | + */ |
|
| 259 | 262 | private function checkModules($app) |
| 260 | 263 | { |
| 261 | 264 | foreach ($this->required_modules as $module) { |
@@ -83,7 +83,7 @@ |
||
| 83 | 83 | * Complete |
| 84 | 84 | * |
| 85 | 85 | * @param Application $app |
| 86 | - * @return mixed |
|
| 86 | + * @return \Symfony\Component\HttpFoundation\Response |
|
| 87 | 87 | */ |
| 88 | 88 | public function complete(Application $app, Request $request) |
| 89 | 89 | { |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | * Index |
| 36 | 36 | * |
| 37 | 37 | * @param Application $app |
| 38 | - * @return string |
|
| 38 | + * @return \Symfony\Component\HttpFoundation\Response |
|
| 39 | 39 | */ |
| 40 | 40 | public function index(Application $app, Request $request) |
| 41 | 41 | { |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | * |
| 52 | 52 | * @param Application $app |
| 53 | 53 | * @request Symfony\Component\HttpFoundation\Request $app |
| 54 | - * @return mixed |
|
| 54 | + * @return \Symfony\Component\HttpFoundation\Response |
|
| 55 | 55 | */ |
| 56 | 56 | public function edit(Application $app, Request $request, $id = null) |
| 57 | 57 | { |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * @param Application $app |
| 61 | 61 | * @param Request $request |
| 62 | 62 | * |
| 63 | - * @return string |
|
| 63 | + * @return \Symfony\Component\HttpFoundation\Response |
|
| 64 | 64 | */ |
| 65 | 65 | public function index(Application $app, Request $request) |
| 66 | 66 | { |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | * @param Application $app |
| 88 | 88 | * @param Request $request |
| 89 | 89 | * |
| 90 | - * @return string |
|
| 90 | + * @return \Symfony\Component\HttpFoundation\Response |
|
| 91 | 91 | */ |
| 92 | 92 | public function history(Application $app, Request $request, $id) |
| 93 | 93 | { |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | * @param Application $app |
| 116 | 116 | * @param Request $request |
| 117 | 117 | * |
| 118 | - * @return string |
|
| 118 | + * @return \Symfony\Component\HttpFoundation\RedirectResponse |
|
| 119 | 119 | */ |
| 120 | 120 | public function order(Application $app, Request $request) |
| 121 | 121 | { |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | * @param Application $app |
| 148 | 148 | * @param Request $request |
| 149 | 149 | * |
| 150 | - * @return string |
|
| 150 | + * @return \Symfony\Component\HttpFoundation\Response |
|
| 151 | 151 | */ |
| 152 | 152 | public function favorite(Application $app, Request $request) |
| 153 | 153 | { |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | * Complete |
| 88 | 88 | * |
| 89 | 89 | * @param Application $app |
| 90 | - * @return mixed |
|
| 90 | + * @return \Symfony\Component\HttpFoundation\Response |
|
| 91 | 91 | */ |
| 92 | 92 | public function complete(Application $app, Request $request) |
| 93 | 93 | { |
@@ -1129,6 +1129,7 @@ |
||
| 1129 | 1129 | |
| 1130 | 1130 | /** |
| 1131 | 1131 | * 非会員でのお客様情報変更時の入力チェック |
| 1132 | + * @param Application $app |
|
| 1132 | 1133 | */ |
| 1133 | 1134 | private function customerValidation($app, $data) { |
| 1134 | 1135 | |