@@ -959,7 +959,7 @@ |
||
959 | 959 | * 失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie() |
960 | 960 | * 備考 : app['debug']がtrueの際は処理を行わない |
961 | 961 | * |
962 | - * @return boolean true |
|
962 | + * @return null|boolean true |
|
963 | 963 | * |
964 | 964 | */ |
965 | 965 | protected function checkDatabaseConnection() |
@@ -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']; |
@@ -230,6 +230,10 @@ discard block |
||
230 | 230 | return $str; |
231 | 231 | } |
232 | 232 | |
233 | + /** |
|
234 | + * @param string $topDir |
|
235 | + * @param Request $request |
|
236 | + */ |
|
233 | 237 | private function getTree($topDir, $request) |
234 | 238 | { |
235 | 239 | $finder = Finder::create()->in($topDir) |
@@ -267,6 +271,10 @@ discard block |
||
267 | 271 | return $tree; |
268 | 272 | } |
269 | 273 | |
274 | + /** |
|
275 | + * @param Application $app |
|
276 | + * @param string $nowDir |
|
277 | + */ |
|
270 | 278 | private function getFileList($app, $nowDir) |
271 | 279 | { |
272 | 280 | $topDir = $app['config']['user_data_realdir']; |
@@ -326,6 +334,9 @@ discard block |
||
326 | 334 | return (strpos($targetDir, $topDir) === 0); |
327 | 335 | } |
328 | 336 | |
337 | + /** |
|
338 | + * @return string |
|
339 | + */ |
|
329 | 340 | private function convertStrFromServer($target) |
330 | 341 | { |
331 | 342 | if ($this->encode == self::SJIS) { |
@@ -523,7 +523,7 @@ discard block |
||
523 | 523 | /** |
524 | 524 | * フォームからの入直内容に基づいて、受注情報の再計算を行う |
525 | 525 | * |
526 | - * @param $app |
|
526 | + * @param Application $app |
|
527 | 527 | * @param $Order |
528 | 528 | */ |
529 | 529 | protected function calculate($app, \Eccube\Entity\Order $Order) |
@@ -613,7 +613,7 @@ discard block |
||
613 | 613 | * - 受注ステータスが入金済に設定された場合に入金日を更新 |
614 | 614 | * |
615 | 615 | * |
616 | - * @param $app |
|
616 | + * @param Application $app |
|
617 | 617 | * @param $TargetOrder |
618 | 618 | * @param $OriginOrder |
619 | 619 | */ |
@@ -354,6 +354,9 @@ |
||
354 | 354 | } |
355 | 355 | |
356 | 356 | |
357 | + /** |
|
358 | + * @param Application $app |
|
359 | + */ |
|
357 | 360 | private function createBody($app, $header, $footer, $Order) |
358 | 361 | { |
359 | 362 | return $app->renderView('Mail/order.twig', array( |
@@ -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; |
@@ -35,6 +35,9 @@ |
||
35 | 35 | { |
36 | 36 | private $app; |
37 | 37 | |
38 | + /** |
|
39 | + * @param \Silex\Application $app |
|
40 | + */ |
|
38 | 41 | public function __construct($app) |
39 | 42 | { |
40 | 43 | $this->app = $app; |
@@ -25,8 +25,6 @@ |
||
25 | 25 | |
26 | 26 | use Symfony\Component\Form\AbstractType; |
27 | 27 | use Symfony\Component\Form\FormBuilderInterface; |
28 | -use Symfony\Component\Form\FormError; |
|
29 | -use Symfony\Component\Form\FormEvents; |
|
30 | 28 | use Symfony\Component\OptionsResolver\OptionsResolverInterface; |
31 | 29 | use Symfony\Component\Security\Core\Validator\Constraints\UserPassword; |
32 | 30 | use Symfony\Component\Validator\Constraints as Assert; |
@@ -27,7 +27,6 @@ |
||
27 | 27 | use Symfony\Component\Form\AbstractType; |
28 | 28 | use Symfony\Component\Form\Extension\Core\Type; |
29 | 29 | use Symfony\Component\Form\FormBuilderInterface; |
30 | -use Symfony\Component\Validator\Constraints as Assert; |
|
31 | 30 | |
32 | 31 | class SearchProductType extends AbstractType |
33 | 32 | { |
@@ -131,7 +131,7 @@ |
||
131 | 131 | /** |
132 | 132 | * @param \Eccube\Entity\Member $Member |
133 | 133 | * |
134 | - * @return void |
|
134 | + * @return boolean |
|
135 | 135 | */ |
136 | 136 | public function up(\Eccube\Entity\Member $Member) |
137 | 137 | { |