Completed
Pull Request — experimental/3.1 (#2480)
by Kentaro
72:50 queued 16:33
created
src/Eccube/Controller/Admin/Product/CsvImportController.php 1 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.
src/Eccube/Controller/Admin/Setting/System/LogController.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -108,6 +108,9 @@
 block discarded – undo
108 108
         ];
109 109
     }
110 110
 
111
+    /**
112
+     * @param string $logFile
113
+     */
111 114
     private function parseLogFile($logFile, $formData)
112 115
     {
113 116
         $log = array();
Please login to merge, or discard this patch.
src/Eccube/Controller/Install/InstallController.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -292,6 +292,10 @@
 block discarded – undo
292 292
         ob_flush();
293 293
         flush();
294 294
     }
295
+
296
+    /**
297
+     * @param InstallApplication $app
298
+     */
295 299
     private function checkModules($app)
296 300
     {
297 301
         foreach ($this->required_modules as $module) {
Please login to merge, or discard this patch.
src/Eccube/Controller/NonMemberShoppingController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -474,7 +474,7 @@
 block discarded – undo
474 474
      *
475 475
      * @param Application $app
476 476
      * @param array $data リクエストパラメータ
477
-     * @return array
477
+     * @return \Symfony\Component\Validator\ConstraintViolationListInterface[]
478 478
      */
479 479
     protected function customerValidation(Application $app, array $data)
480 480
     {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Front/CustomerAddressType.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,6 @@
 block discarded – undo
59 59
     protected $app;
60 60
 
61 61
     /**
62
-     * @param array $config
63 62
      */
64 63
     public function __construct()
65 64
     {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/SearchProductBlockType.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,6 @@
 block discarded – undo
48 48
     /**
49 49
      * SearchProductType constructor.
50 50
      *
51
-     * @param Application $app
52 51
      */
53 52
     public function __construct()
54 53
     {
Please login to merge, or discard this patch.
src/Eccube/Repository/BlockRepository.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
      * @deprecated 呼び出し元で制御する
50 50
      * @param $block_id
51 51
      * @param $DeviceType
52
-     * @return array|\Eccube\Entity\Block
52
+     * @return Block|null
53 53
      */
54 54
     public function findOrCreate($block_id, $DeviceType)
55 55
     {
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
      * ブロック一覧の取得.
112 112
      *
113 113
      * @param  \Eccube\Entity\Master\DeviceType $DeviceType
114
-     * @return array
114
+     * @return null|\Symfony\Component\HttpFoundation\Request
115 115
      */
116 116
     public function getList($DeviceType)
117 117
     {
Please login to merge, or discard this patch.
src/Eccube/Repository/CustomerRepository.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 
323 323
     /**
324 324
      * ユニークなシークレットキーを返す
325
-     * @param $app
325
+     * @param \Eccube\Application $app
326 326
      * @return string
327 327
      */
328 328
     public function getUniqueSecretKey($app)
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 
341 341
     /**
342 342
      * ユニークなパスワードリセットキーを返す
343
-     * @param $app
343
+     * @param \Eccube\Application $app
344 344
      * @return string
345 345
      */
346 346
     public function getUniqueResetKey($app)
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
     /**
360 360
      * saltを生成する
361 361
      *
362
-     * @param $byte
362
+     * @param integer $byte
363 363
      * @return string
364 364
      */
365 365
     public function createSalt($byte)
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
     /**
371 371
      * 入力されたパスワードをSaltと暗号化する
372 372
      *
373
-     * @param $app
373
+     * @param \Eccube\Application $app
374 374
      * @param  Customer $Customer
375 375
      * @return mixed
376 376
      */
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
     /**
431 431
      * 会員の初回購入時間、購入時間、購入回数、購入金額を更新する
432 432
      *
433
-     * @param $app
433
+     * @param \Eccube\Application $app
434 434
      * @param  Customer $Customer
435 435
      * @param  $orderStatusId
436 436
      */
Please login to merge, or discard this patch.
src/Eccube/Repository/DeliveryRepository.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 
41 41
     /**
42 42
      * @deprecated 呼び出し元で制御する
43
-     * @param $id
43
+     * @param integer $id
44 44
      * @return \Eccube\Entity\Delivery|null|object
45 45
      */
46 46
     public function findOrCreate($id)
Please login to merge, or discard this patch.