Completed
Push — experimental/3.1 ( 9eccde...a17b3e )
by Ryo
25s
created
src/Eccube/Controller/Admin/Order/MailController.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -259,6 +259,9 @@
 block discarded – undo
259 259
     }
260 260
 
261 261
 
262
+    /**
263
+     * @param Application $app
264
+     */
262 265
     private function createBody($app, $header, $footer, $Order)
263 266
     {
264 267
         return $app->renderView('Mail/order.twig', array(
Please login to merge, or discard this patch.
src/Eccube/Repository/TaxRuleRepository.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
      * @param  int|null|\Eccube\Entity\ProductClass   $ProductClass 商品規格
66 66
      * @param  int|null|\Eccube\Entity\Master\Pref    $Pref         都道府県
67 67
      * @param  int|null|\Eccube\Entity\Master\Country $Country      国
68
-     * @return \Eccube\Entity\TaxRule                 税設定情報
68
+     * @return integer                 税設定情報
69 69
      *
70 70
      * @throws NoResultException
71 71
      */
Please login to merge, or discard this patch.
src/Eccube/Repository/OrderRepository.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -274,7 +274,7 @@
 block discarded – undo
274 274
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
275 275
             $qb
276 276
                 ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' .
277
-                           'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti')
277
+                            'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti')
278 278
                 ->setParameter('multi', $multi)
279 279
                 ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
280 280
         }
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 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
                                 'allow_add' => true,
139 139
                                 'allow_delete' => true,
140 140
                                 'data' => $ProductClasses,
141
-                             ));
141
+                                ));
142 142
 
143 143
                         $event = new EventArgs(
144 144
                             array(
Please login to merge, or discard this patch.
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -603,6 +603,9 @@  discard block
 block discarded – undo
603 603
     /**
604 604
      * 登録、更新時のエラー画面表示
605 605
      *
606
+     * @param Application $app
607
+     * @param boolean $not_product_class
608
+     * @param \Symfony\Component\Form\FormInterface $classForm
606 609
      */
607 610
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
608 611
     {
@@ -654,6 +657,7 @@  discard block
 block discarded – undo
654 657
 
655 658
     /**
656 659
      * 規格1と規格2を組み合わせた商品規格を作成
660
+     * @param Application $app
657 661
      */
658 662
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
659 663
     {
@@ -741,6 +745,7 @@  discard block
 block discarded – undo
741 745
      *
742 746
      * @param $productClassDest ProductClass コピー先となる商品規格
743 747
      * @param $productClassOrig ProductClass コピー元となる商品規格
748
+     * @param Application $app
744 749
      */
745 750
     private function setDefaultProductClass($app, $productClassDest, $productClassOrig) {
746 751
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());
Please login to merge, or discard this patch.
src/Eccube/Twig/Extension/EccubeExtension.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     /**
41 41
      * Returns a list of functions to add to the existing list.
42 42
      *
43
-     * @return array An array of functions
43
+     * @return \Twig_SimpleFunction[] An array of functions
44 44
      */
45 45
     public function getFunctions()
46 46
     {
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
     /**
62 62
      * Returns a list of filters.
63 63
      *
64
-     * @return array
64
+     * @return \Twig_SimpleFilter[]
65 65
      */
66 66
     public function getFilters()
67 67
     {
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/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.
src/Eccube/Controller/Admin/Product/CsvImportController.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1155,11 +1155,11 @@
 block discarded – undo
1155 1155
     }
1156 1156
     
1157 1157
         /**
1158
-     * ProductCategory作成
1159
-     * @param \Eccube\Entity\Product $Product
1160
-     * @param \Eccube\Entity\Category $Category
1161
-     * @return ProductCategory
1162
-     */
1158
+         * ProductCategory作成
1159
+         * @param \Eccube\Entity\Product $Product
1160
+         * @param \Eccube\Entity\Category $Category
1161
+         * @return ProductCategory
1162
+         */
1163 1163
     private function makeProductCategory($Product, $Category, $rank)
1164 1164
     {
1165 1165
         $ProductCategory = new ProductCategory();
Please login to merge, or discard this patch.
Doc Comments   +11 added lines patch added patch discarded remove patch
@@ -679,6 +679,8 @@  discard block
 block discarded – undo
679 679
     /**
680 680
      * 登録、更新時のエラー画面表示
681 681
      *
682
+     * @param Application $app
683
+     * @param \Symfony\Component\Form\FormInterface $form
682 684
      */
683 685
     protected function render($app, $form, $headers)
684 686
     {
@@ -710,6 +712,7 @@  discard block
 block discarded – undo
710 712
      * アップロードされたCSVファイルの行ごとの処理
711 713
      *
712 714
      * @param $formFile
715
+     * @param Application $app
713 716
      * @return CsvImportService
714 717
      */
715 718
     protected function getImportData($app, $formFile)
@@ -787,6 +790,8 @@  discard block
 block discarded – undo
787 790
 
788 791
     /**
789 792
      * 商品カテゴリの削除、登録
793
+     * @param Application $app
794
+     * @param CsvImportService $data
790 795
      */
791 796
     protected function createProductCategory($row, Product $Product, $app, $data)
792 797
     {
@@ -886,6 +891,8 @@  discard block
 block discarded – undo
886 891
 
887 892
     /**
888 893
      * 商品規格分類1、商品規格分類2がnullとなる商品規格情報を作成
894
+     * @param Application $app
895
+     * @param CsvImportService $data
889 896
      */
890 897
     protected function createProductClass($row, Product $Product, $app, $data, $ClassCategory1 = null, $ClassCategory2 = null)
891 898
     {
@@ -1027,6 +1034,8 @@  discard block
 block discarded – undo
1027 1034
 
1028 1035
     /**
1029 1036
      * 商品規格情報を更新
1037
+     * @param Application $app
1038
+     * @param CsvImportService $data
1030 1039
      */
1031 1040
     protected function updateProductClass($row, Product $Product, ProductClass $ProductClass, $app, $data)
1032 1041
     {
@@ -1173,6 +1182,7 @@  discard block
 block discarded – undo
1173 1182
     /**
1174 1183
      * 登録、更新時のエラー画面表示
1175 1184
      *
1185
+     * @param string $message
1176 1186
      */
1177 1187
     protected function addErrors($message)
1178 1188
     {
@@ -1247,6 +1257,7 @@  discard block
 block discarded – undo
1247 1257
      * ProductCategory作成
1248 1258
      * @param \Eccube\Entity\Product $Product
1249 1259
      * @param \Eccube\Entity\Category $Category
1260
+     * @param integer $rank
1250 1261
      * @return ProductCategory
1251 1262
      */
1252 1263
     private function makeProductCategory($Product, $Category, $rank)
Please login to merge, or discard this patch.