Completed
Pull Request — master (#1810)
by Lam
371:27 queued 364:11
created
src/Eccube/Controller/Admin/Content/FileController.php 1 patch
Doc Comments   +11 added lines patch added patch discarded remove patch
@@ -230,6 +230,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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) {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Order/EditController.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
     /**
378 378
      * フォームからの入直内容に基づいて、受注情報の再計算を行う
379 379
      *
380
-     * @param $app
380
+     * @param Application $app
381 381
      * @param $Order
382 382
      */
383 383
     protected function calculate($app, \Eccube\Entity\Order $Order)
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
      * - 受注ステータスが入金済に設定された場合に入金日を更新
472 472
      *
473 473
      *
474
-     * @param $app
474
+     * @param Application $app
475 475
      * @param $TargetOrder
476 476
      * @param $OriginOrder
477 477
      */
Please login to merge, or discard this patch.
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/Controller/Admin/Product/CsvImportController.php 1 patch
Doc Comments   +10 added lines patch added patch discarded remove patch
@@ -583,6 +583,8 @@  discard block
 block discarded – undo
583 583
     /**
584 584
      * 登録、更新時のエラー画面表示
585 585
      *
586
+     * @param Application $app
587
+     * @param string $twig
586 588
      */
587 589
     protected function render($app, $form, $headers, $twig)
588 590
     {
@@ -615,6 +617,7 @@  discard block
 block discarded – undo
615 617
      * アップロードされたCSVファイルの行ごとの処理
616 618
      *
617 619
      * @param $formFile
620
+     * @param Application $app
618 621
      * @return CsvImportService
619 622
      */
620 623
     protected function getImportData($app, $formFile)
@@ -682,6 +685,8 @@  discard block
 block discarded – undo
682 685
 
683 686
     /**
684 687
      * 商品カテゴリの削除、登録
688
+     * @param Application $app
689
+     * @param CsvImportService $data
685 690
      */
686 691
     protected function createProductCategory($row, Product $Product, $app, $data)
687 692
     {
@@ -725,6 +730,8 @@  discard block
 block discarded – undo
725 730
 
726 731
     /**
727 732
      * 商品規格分類1、商品規格分類2がnullとなる商品規格情報を作成
733
+     * @param Application $app
734
+     * @param CsvImportService $data
728 735
      */
729 736
     protected function createProductClass($row, Product $Product, $app, $data, $ClassCategory1 = null, $ClassCategory2 = null)
730 737
     {
@@ -866,6 +873,8 @@  discard block
 block discarded – undo
866 873
 
867 874
     /**
868 875
      * 商品規格情報を更新
876
+     * @param Application $app
877
+     * @param CsvImportService $data
869 878
      */
870 879
     protected function updateProductClass($row, Product $Product, ProductClass $ProductClass, $app, $data)
871 880
     {
@@ -1012,6 +1021,7 @@  discard block
 block discarded – undo
1012 1021
     /**
1013 1022
      * 登録、更新時のエラー画面表示
1014 1023
      *
1024
+     * @param string $message
1015 1025
      */
1016 1026
     protected function addErrors($message)
1017 1027
     {
Please login to merge, or discard this patch.
src/Eccube/Controller/Install/InstallController.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -250,6 +250,9 @@
 block discarded – undo
250 250
     }
251 251
 
252 252
 
253
+    /**
254
+     * @param InstallApplication $app
255
+     */
253 256
     private function checkModules($app)
254 257
     {
255 258
         foreach ($this->required_modules as $module) {
Please login to merge, or discard this patch.
src/Eccube/Form/DataTransformer/EntityToIdTransformer.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 
43 43
     /**
44 44
      * @param ObjectManager $om
45
-     * @param stging $className
45
+     * @param string $className
46 46
      */
47 47
     public function __construct(ObjectManager $om, $className)
48 48
     {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ShipmentItemType.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/Repository/MemberRepository.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@
 block discarded – undo
130 130
     /**
131 131
      * @param  \Eccube\Entity\Member $Member
132 132
      *
133
-     * @return void
133
+     * @return boolean
134 134
      */
135 135
     public function up(\Eccube\Entity\Member $Member)
136 136
     {
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.