Completed
Pull Request — experimental/3.1 (#1985)
by Kentaro
132:51 queued 123:28
created
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.
src/Eccube/Service/MailService.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -229,7 +229,7 @@
 block discarded – undo
229 229
      * Send order mail.
230 230
      *
231 231
      * @param \Eccube\Entity\Order $Order 受注情報
232
-     * @return string
232
+     * @return \Swift_Mime_MimePart
233 233
      */
234 234
     public function sendOrderMail(\Eccube\Entity\Order $Order)
235 235
     {
Please login to merge, or discard this patch.
src/Eccube/Application.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -964,7 +964,7 @@
 block discarded – undo
964 964
      * 失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie()
965 965
      * 備考 : app['debug']がtrueの際は処理を行わない
966 966
      *
967
-     * @return boolean true
967
+     * @return null|boolean true
968 968
      *
969 969
      */
970 970
     protected function checkDatabaseConnection()
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
@@ -329,6 +329,9 @@
 block discarded – undo
329 329
         flush();
330 330
     }
331 331
 
332
+    /**
333
+     * @param InstallApplication $app
334
+     */
332 335
     private function checkModules($app)
333 336
     {
334 337
         foreach ($this->required_modules as $module) {
Please login to merge, or discard this patch.
src/Eccube/Application/ApplicationTrait.php 1 patch
Doc Comments   +11 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,6 +16,7 @@  discard block
 block discarded – undo
16 16
 {
17 17
     /**
18 18
      * Application Shortcut Methods
19
+     * @param string $message
19 20
      */
20 21
     public function addSuccess($message, $namespace = 'front')
21 22
     {
@@ -32,6 +33,9 @@  discard block
 block discarded – undo
32 33
         $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message);
33 34
     }
34 35
 
36
+    /**
37
+     * @param string $message
38
+     */
35 39
     public function addWarning($message, $namespace = 'front')
36 40
     {
37 41
         $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message);
@@ -42,6 +46,9 @@  discard block
 block discarded – undo
42 46
         $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message);
43 47
     }
44 48
 
49
+    /**
50
+     * @param string $message
51
+     */
45 52
     public function addRequestError($message, $namespace = 'front')
46 53
     {
47 54
         $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message);
@@ -58,6 +65,9 @@  discard block
 block discarded – undo
58 65
         $this->addWarning('admin.delete.warning', 'admin');
59 66
     }
60 67
 
68
+    /**
69
+     * @param string $targetPath
70
+     */
61 71
     public function setLoginTargetPath($targetPath, $namespace = null)
62 72
     {
63 73
         if (is_null($namespace)) {
@@ -110,7 +120,7 @@  discard block
 block discarded – undo
110 120
      * @param Request $request
111 121
      * @param array $requestParameters
112 122
      * @param Response $response
113
-     * @return Application
123
+     * @return ApplicationTrait
114 124
      */
115 125
     public function forwardChain($path, Request $request, array $requestParameters = [], Response &$response = null)
116 126
     {
Please login to merge, or discard this patch.
src/Eccube/Controller/AbstractController.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -52,11 +52,17 @@
 block discarded – undo
52 52
         return $form;
53 53
     }
54 54
 
55
+    /**
56
+     * @param Application $app
57
+     */
55 58
     protected function getSecurity($app)
56 59
     {
57 60
         return $app['security.token_storage'];
58 61
     }
59 62
 
63
+    /**
64
+     * @param Application $app
65
+     */
60 66
     protected function isTokenValid($app)
61 67
     {
62 68
         $csrf = $app['csrf.token_manager'];
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
@@ -37,6 +37,9 @@
 block discarded – undo
37 37
 {
38 38
     private $app;
39 39
 
40
+    /**
41
+     * @param \Pimple\Container $app
42
+     */
40 43
     public function __construct($app)
41 44
     {
42 45
         $this->app = $app;
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
@@ -38,6 +38,9 @@  discard block
 block discarded – undo
38 38
     const EVENT_YML = 'event.yml';
39 39
     private $app;
40 40
 
41
+    /**
42
+     * @param \Pimple\Container $app
43
+     */
41 44
     public function __construct($app)
42 45
     {
43 46
         $this->app = $app;
@@ -103,6 +106,9 @@  discard block
 block discarded – undo
103 106
         }
104 107
     }
105 108
 
109
+    /**
110
+     * @param string $dir
111
+     */
106 112
     public function unpackPluginArchive($archive, $dir)
107 113
     {
108 114
         $extension = pathinfo($archive, PATHINFO_EXTENSION);
@@ -121,6 +127,9 @@  discard block
 block discarded – undo
121 127
         }
122 128
     }
123 129
 
130
+    /**
131
+     * @param string $dir
132
+     */
124 133
     public function checkPluginArchiveContent($dir, array $config_cache = array())
125 134
     {
126 135
         try {
@@ -162,6 +171,9 @@  discard block
 block discarded – undo
162 171
         }
163 172
     }
164 173
 
174
+    /**
175
+     * @param string $yml
176
+     */
165 177
     public function readYml($yml)
166 178
     {
167 179
         if (file_exists($yml)) {
@@ -179,6 +191,9 @@  discard block
 block discarded – undo
179 191
         // ディレクトリ名などに使われれるので厳しめ
180 192
     }
181 193
 
194
+    /**
195
+     * @param string $path
196
+     */
182 197
     public function deleteFile($path)
183 198
     {
184 199
         $f = new Filesystem();
@@ -198,6 +213,9 @@  discard block
 block discarded – undo
198 213
         return $this->app['config']['plugin_realdir'].'/'.$name;
199 214
     }
200 215
 
216
+    /**
217
+     * @param string $d
218
+     */
201 219
     public function createPluginDir($d)
202 220
     {
203 221
         $b = @mkdir($d);
@@ -257,6 +275,9 @@  discard block
 block discarded – undo
257 275
         return $p;
258 276
     }
259 277
 
278
+    /**
279
+     * @param string $method
280
+     */
260 281
     public function callPluginManagerMethod($meta, $method)
261 282
     {
262 283
         $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager';
Please login to merge, or discard this patch.