Completed
Pull Request — 3.0 (#71)
by Toshiaki
85:23 queued 73:15
created
src/Eccube/Service/CsvExportService.php 1 patch
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -327,7 +327,6 @@  discard block
 block discarded – undo
327 327
 
328 328
     /**
329 329
      * @param $row
330
-     * @param null $callback
331 330
      */
332 331
     public function fputcsv($row)
333 332
     {
@@ -431,7 +430,6 @@  discard block
 block discarded – undo
431 430
      * XXX self::setExportQueryBuilder() をコールする前に EntityManager を取得したいので、引数で渡している
432 431
      *
433 432
      * @param array $searchData セッションから取得した検索条件の配列
434
-     * @param EntityManager $em
435 433
      */
436 434
     protected function findDeserializeObjects(array &$searchData)
437 435
     {
Please login to merge, or discard this patch.
src/Eccube/Service/CsvImportService.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,6 @@
 block discarded – undo
23 23
 
24 24
 namespace Eccube\Service;
25 25
 
26
-use Eccube\Application;
27
-
28 26
 
29 27
 /**
30 28
  * Copyright (C) 2012-2014 David de Boer <[email protected]>
Please login to merge, or discard this patch.
src/Eccube/Service/PluginService.php 1 patch
Doc Comments   +21 added lines patch added patch discarded remove patch
@@ -37,6 +37,9 @@  discard block
 block discarded – undo
37 37
     const EVENT_YML = 'event.yml';
38 38
     private $app;
39 39
 
40
+    /**
41
+     * @param \Silex\Application $app
42
+     */
40 43
     public function __construct($app)
41 44
     {
42 45
         $this->app = $app;
@@ -102,6 +105,9 @@  discard block
 block discarded – undo
102 105
         }
103 106
     }
104 107
 
108
+    /**
109
+     * @param string $dir
110
+     */
105 111
     public function unpackPluginArchive($archive, $dir)
106 112
     {
107 113
         $extension = pathinfo($archive, PATHINFO_EXTENSION);
@@ -120,6 +126,9 @@  discard block
 block discarded – undo
120 126
         }
121 127
     }
122 128
 
129
+    /**
130
+     * @param string $dir
131
+     */
123 132
     public function checkPluginArchiveContent($dir, array $config_cache = array())
124 133
     {
125 134
         try {
@@ -161,6 +170,9 @@  discard block
 block discarded – undo
161 170
         }
162 171
     }
163 172
 
173
+    /**
174
+     * @param string $yml
175
+     */
164 176
     public function readYml($yml)
165 177
     {
166 178
         if (file_exists($yml)) {
@@ -178,6 +190,9 @@  discard block
 block discarded – undo
178 190
         // ディレクトリ名などに使われれるので厳しめ
179 191
     }
180 192
 
193
+    /**
194
+     * @param string $path
195
+     */
181 196
     public function deleteFile($path)
182 197
     {
183 198
         $f = new Filesystem();
@@ -197,6 +212,9 @@  discard block
 block discarded – undo
197 212
         return $this->app['config']['plugin_realdir'].'/'.$name;
198 213
     }
199 214
 
215
+    /**
216
+     * @param string $d
217
+     */
200 218
     public function createPluginDir($d)
201 219
     {
202 220
         $b = @mkdir($d);
@@ -256,6 +274,9 @@  discard block
 block discarded – undo
256 274
         return $p;
257 275
     }
258 276
 
277
+    /**
278
+     * @param string $method
279
+     */
259 280
     public function callPluginManagerMethod($meta, $method)
260 281
     {
261 282
         $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager';
Please login to merge, or discard this patch.
src/Eccube/Service/ShoppingService.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -172,7 +172,7 @@
 block discarded – undo
172 172
      * 仮受注情報作成
173 173
      *
174 174
      * @param $Customer
175
-     * @param $preOrderId
175
+     * @param string $preOrderId
176 176
      * @return mixed
177 177
      * @throws \Doctrine\ORM\NoResultException
178 178
      * @throws \Doctrine\ORM\NonUniqueResultException
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/CsvImportController.php 1 patch
Doc Comments   +12 added lines patch added patch discarded remove patch
@@ -614,6 +614,8 @@  discard block
 block discarded – undo
614 614
     /**
615 615
      * 登録、更新時のエラー画面表示
616 616
      *
617
+     * @param Application $app
618
+     * @param string $twig
617 619
      */
618 620
     protected function render($app, $form, $headers, $twig)
619 621
     {
@@ -645,6 +647,7 @@  discard block
 block discarded – undo
645 647
      * アップロードされたCSVファイルの行ごとの処理
646 648
      *
647 649
      * @param $formFile
650
+     * @param Application $app
648 651
      * @return CsvImportService
649 652
      */
650 653
     protected function getImportData($app, $formFile)
@@ -690,6 +693,7 @@  discard block
 block discarded – undo
690 693
 
691 694
     /**
692 695
      * 商品画像の削除、登録
696
+     * @param CsvImportService $data
693 697
      */
694 698
     protected function createProductImage($row, Product $Product, $data)
695 699
     {
@@ -734,6 +738,8 @@  discard block
 block discarded – undo
734 738
 
735 739
     /**
736 740
      * 商品カテゴリの削除、登録
741
+     * @param Application $app
742
+     * @param CsvImportService $data
737 743
      */
738 744
     protected function createProductCategory($row, Product $Product, $app, $data)
739 745
     {
@@ -828,6 +834,8 @@  discard block
 block discarded – undo
828 834
 
829 835
     /**
830 836
      * 商品規格分類1、商品規格分類2がnullとなる商品規格情報を作成
837
+     * @param Application $app
838
+     * @param CsvImportService $data
831 839
      */
832 840
     protected function createProductClass($row, Product $Product, $app, $data, $ClassCategory1 = null, $ClassCategory2 = null)
833 841
     {
@@ -970,6 +978,8 @@  discard block
 block discarded – undo
970 978
 
971 979
     /**
972 980
      * 商品規格情報を更新
981
+     * @param Application $app
982
+     * @param CsvImportService $data
973 983
      */
974 984
     protected function updateProductClass($row, Product $Product, ProductClass $ProductClass, $app, $data)
975 985
     {
@@ -1116,6 +1126,7 @@  discard block
 block discarded – undo
1116 1126
     /**
1117 1127
      * 登録、更新時のエラー画面表示
1118 1128
      *
1129
+     * @param string $message
1119 1130
      */
1120 1131
     protected function addErrors($message)
1121 1132
     {
@@ -1192,6 +1203,7 @@  discard block
 block discarded – undo
1192 1203
      *
1193 1204
      * @param \Eccube\Entity\Product $Product
1194 1205
      * @param \Eccube\Entity\Category $Category
1206
+     * @param integer $rank
1195 1207
      * @return ProductCategory
1196 1208
      */
1197 1209
     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
@@ -856,6 +856,7 @@
 block discarded – undo
856 856
      *
857 857
      * @param \Eccube\Entity\Product $Product
858 858
      * @param \Eccube\Entity\Category $Category
859
+     * @param integer $count
859 860
      *
860 861
      * @return \Eccube\Entity\ProductCategory
861 862
      */
Please login to merge, or discard this patch.