Completed
Pull Request — master (#1999)
by chihiro
69:58
created
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/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.
src/Eccube/Doctrine/ORM/Tools/Pagination/Paginator.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
     /**
58 58
      * Constructor.
59 59
      *
60
-     * @param Query|QueryBuilder $query               A Doctrine ORM query or query builder.
60
+     * @param Query $query               A Doctrine ORM query or query builder.
61 61
      * @param boolean            $fetchJoinCollection Whether the query joins a collection (true by default).
62 62
      */
63 63
     public function __construct($query, $fetchJoinCollection = true)
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
@@ -529,6 +529,9 @@  discard block
 block discarded – undo
529 529
     /**
530 530
      * 登録、更新時のエラー画面表示
531 531
      *
532
+     * @param Application $app
533
+     * @param boolean $not_product_class
534
+     * @param \Symfony\Component\Form\FormInterface $classForm
532 535
      */
533 536
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
534 537
     {
@@ -580,6 +583,7 @@  discard block
 block discarded – undo
580 583
 
581 584
     /**
582 585
      * 規格1と規格2を組み合わせた商品規格を作成
586
+     * @param Application $app
583 587
      */
584 588
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
585 589
     {
@@ -667,6 +671,7 @@  discard block
 block discarded – undo
667 671
      *
668 672
      * @param $productClassDest コピー先となる商品規格
669 673
      * @param $productClassOrig コピー元となる商品規格
674
+     * @param Application $app
670 675
      */
671 676
     private function setDefualtProductClass($app, $productClassDest, $productClassOrig) {
672 677
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/CsvImportController.php 1 patch
Doc Comments   +11 added lines patch added patch discarded remove patch
@@ -590,6 +590,8 @@  discard block
 block discarded – undo
590 590
     /**
591 591
      * 登録、更新時のエラー画面表示
592 592
      *
593
+     * @param Application $app
594
+     * @param string $twig
593 595
      */
594 596
     protected function render($app, $form, $headers, $twig)
595 597
     {
@@ -621,6 +623,7 @@  discard block
 block discarded – undo
621 623
      * アップロードされたCSVファイルの行ごとの処理
622 624
      *
623 625
      * @param $formFile
626
+     * @param Application $app
624 627
      * @return CsvImportService
625 628
      */
626 629
     protected function getImportData($app, $formFile)
@@ -698,6 +701,8 @@  discard block
 block discarded – undo
698 701
 
699 702
     /**
700 703
      * 商品カテゴリの削除、登録
704
+     * @param Application $app
705
+     * @param CsvImportService $data
701 706
      */
702 707
     protected function createProductCategory($row, Product $Product, $app, $data)
703 708
     {
@@ -797,6 +802,8 @@  discard block
 block discarded – undo
797 802
 
798 803
     /**
799 804
      * 商品規格分類1、商品規格分類2がnullとなる商品規格情報を作成
805
+     * @param Application $app
806
+     * @param CsvImportService $data
800 807
      */
801 808
     protected function createProductClass($row, Product $Product, $app, $data, $ClassCategory1 = null, $ClassCategory2 = null)
802 809
     {
@@ -938,6 +945,8 @@  discard block
 block discarded – undo
938 945
 
939 946
     /**
940 947
      * 商品規格情報を更新
948
+     * @param Application $app
949
+     * @param CsvImportService $data
941 950
      */
942 951
     protected function updateProductClass($row, Product $Product, ProductClass $ProductClass, $app, $data)
943 952
     {
@@ -1084,6 +1093,7 @@  discard block
 block discarded – undo
1084 1093
     /**
1085 1094
      * 登録、更新時のエラー画面表示
1086 1095
      *
1096
+     * @param string $message
1087 1097
      */
1088 1098
     protected function addErrors($message)
1089 1099
     {
@@ -1158,6 +1168,7 @@  discard block
 block discarded – undo
1158 1168
      * ProductCategory作成
1159 1169
      * @param \Eccube\Entity\Product $Product
1160 1170
      * @param \Eccube\Entity\Category $Category
1171
+     * @param integer $rank
1161 1172
      * @return ProductCategory
1162 1173
      */
1163 1174
     private function makeProductCategory($Product, $Category, $rank)
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductController.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -792,6 +792,7 @@
 block discarded – undo
792 792
      * ProductCategory作成
793 793
      * @param \Eccube\Entity\Product $Product
794 794
      * @param \Eccube\Entity\Category $Category
795
+     * @param integer $count
795 796
      * @return \Eccube\Entity\ProductCategory
796 797
      */
797 798
     private function createProductCategory($Product, $Category, $count)
Please login to merge, or discard this patch.