@@ -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) { |
@@ -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']; |
@@ -510,6 +510,8 @@ discard block |
||
510 | 510 | /** |
511 | 511 | * 登録、更新時のエラー画面表示 |
512 | 512 | * |
513 | + * @param Application $app |
|
514 | + * @param boolean $not_product_class |
|
513 | 515 | */ |
514 | 516 | protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null) |
515 | 517 | { |
@@ -559,6 +561,7 @@ discard block |
||
559 | 561 | |
560 | 562 | /** |
561 | 563 | * 規格1と規格2を組み合わせた商品規格を作成 |
564 | + * @param Application $app |
|
562 | 565 | */ |
563 | 566 | private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null) |
564 | 567 | { |
@@ -646,6 +649,7 @@ discard block |
||
646 | 649 | * |
647 | 650 | * @param $productClassDest コピー先となる商品規格 |
648 | 651 | * @param $productClassOrig コピー元となる商品規格 |
652 | + * @param Application $app |
|
649 | 653 | */ |
650 | 654 | private function setDefualtProductClass($app, $productClassDest, $productClassOrig) { |
651 | 655 | $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate()); |
@@ -687,6 +691,7 @@ discard block |
||
687 | 691 | * 商品規格を登録 |
688 | 692 | * |
689 | 693 | * @param $ProductClasses 登録される商品規格 |
694 | + * @param Application $app |
|
690 | 695 | */ |
691 | 696 | private function insertProductClass($app, $Product, $ProductClasses) { |
692 | 697 |
@@ -328,7 +328,6 @@ discard block |
||
328 | 328 | |
329 | 329 | /** |
330 | 330 | * @param $row |
331 | - * @param null $callback |
|
332 | 331 | */ |
333 | 332 | public function fputcsv($row) |
334 | 333 | { |
@@ -425,7 +424,6 @@ discard block |
||
425 | 424 | * XXX self::setExportQueryBuilder() をコールする前に EntityManager を取得したいので、引数で渡している |
426 | 425 | * |
427 | 426 | * @param array $searchData セッションから取得した検索条件の配列 |
428 | - * @param EntityManager $em |
|
429 | 427 | */ |
430 | 428 | protected function findDeserializeObjects(array &$searchData) |
431 | 429 | { |
@@ -26,7 +26,6 @@ |
||
26 | 26 | |
27 | 27 | use Eccube\Common\Constant; |
28 | 28 | use Eccube\Util\EntityUtil; |
29 | -use Symfony\Component\Form\FormFactory; |
|
30 | 29 | use Symfony\Component\HttpFoundation\Request; |
31 | 30 | use Doctrine\Common\Collections\ArrayCollection; |
32 | 31 |
@@ -35,7 +35,6 @@ |
||
35 | 35 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
36 | 36 | use Symfony\Component\Routing\Exception\RouteNotFoundException; |
37 | 37 | use Symfony\Component\Validator\Constraints as Assert; |
38 | -use Symfony\Component\Form\FormError; |
|
39 | 38 | use Monolog\Logger; |
40 | 39 | |
41 | 40 | class PluginController extends AbstractController |
@@ -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; |
@@ -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; |
@@ -36,6 +36,9 @@ |
||
36 | 36 | { |
37 | 37 | protected $app; |
38 | 38 | |
39 | + /** |
|
40 | + * @param \Silex\Application $app |
|
41 | + */ |
|
39 | 42 | public function __construct($app) |
40 | 43 | { |
41 | 44 | $this->app = $app; |
@@ -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 | { |
@@ -953,7 +953,7 @@ |
||
953 | 953 | * 失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie() |
954 | 954 | * 備考 : app['debug']がtrueの際は処理を行わない |
955 | 955 | * |
956 | - * @return boolean true |
|
956 | + * @return null|boolean true |
|
957 | 957 | * |
958 | 958 | */ |
959 | 959 | protected function checkDatabaseConnection() |