Completed
Pull Request — experimental/3.1 (#1985)
by Kentaro
26:46
created
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/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.
src/Eccube/ServiceProvider/EccubeServiceProvider.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
      * This method should only be used to configure services and parameters.
40 40
      * It should not get services.
41 41
      *
42
-     * @param BaseApplication $app An Application instance
42
+     * @param Container $app An Application instance
43 43
      */
44 44
     public function register(Container $app)
45 45
     {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Order/EditController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -660,7 +660,7 @@
 block discarded – undo
660 660
      * - 受注ステータスが入金済に設定された場合に入金日を更新
661 661
      *
662 662
      *
663
-     * @param $app
663
+     * @param Application $app
664 664
      * @param $TargetOrder
665 665
      * @param $OriginOrder
666 666
      */
Please login to merge, or discard this patch.