Failed Conditions
Pull Request — master (#1886)
by k-yamamura
115:04 queued 107:55
created
src/Eccube/Controller/AbstractController.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -52,11 +52,17 @@
 block discarded – undo
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'];
Please login to merge, or discard this patch.
src/Eccube/Application.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -725,7 +725,7 @@
 block discarded – undo
725 725
      * 成功 : trueを返却
726 726
      * 失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie()
727 727
      * 備考 : app['debug']がtrueの際は処理を行わない
728
-     * @return boolean true
728
+     * @return null|boolean true
729 729
      *
730 730
      */
731 731
     protected function checkDatabaseConnection()
Please login to merge, or discard this patch.
src/Eccube/Service/CsvExportService.php 1 patch
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -325,7 +325,6 @@  discard block
 block discarded – undo
325 325
 
326 326
     /**
327 327
      * @param $row
328
-     * @param null $callback
329 328
      */
330 329
     public function fputcsv($row)
331 330
     {
@@ -424,7 +423,6 @@  discard block
 block discarded – undo
424 423
      * XXX self::setExportQueryBuilder() をコールする前に EntityManager を取得したいので、引数で渡している
425 424
      *
426 425
      * @param array $searchData セッションから取得した検索条件の配列
427
-     * @param EntityManager $em
428 426
      */
429 427
     protected function findDeserializeObjects(array &$searchData)
430 428
     {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductClassController.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -510,6 +510,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
687 691
      * 商品規格を登録
688 692
      *
689 693
      * @param $ProductClasses 登録される商品規格
694
+     * @param Application $app
690 695
      */
691 696
     private function insertProductClass($app, $Product, $ProductClasses) {
692 697
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ChangePasswordType.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/PaymentRegisterType.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.