Completed
Push — fix#1932 ( 142bd3...e67a3b )
by NOBU
40:00
created
src/Eccube/Controller/Admin/Product/ProductClassController.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -510,6 +510,8 @@  discard block
 block discarded – undo
510 510
     /**
511 511
      * 登録、更新時のエラー画面表示
512 512
      *
513
+     * @param Application $app
514
+     * @param boolean $not_product_class
513 515
      */
514 516
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
515 517
     {
@@ -559,6 +561,7 @@  discard block
 block discarded – undo
559 561
 
560 562
     /**
561 563
      * 規格1と規格2を組み合わせた商品規格を作成
564
+     * @param Application $app
562 565
      */
563 566
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
564 567
     {
@@ -646,6 +649,7 @@  discard block
 block discarded – undo
646 649
      *
647 650
      * @param $productClassDest コピー先となる商品規格
648 651
      * @param $productClassOrig コピー元となる商品規格
652
+     * @param Application $app
649 653
      */
650 654
     private function setDefualtProductClass($app, $productClassDest, $productClassOrig) {
651 655
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());
@@ -687,6 +691,7 @@  discard block
 block discarded – undo
687 691
      * 商品規格を登録
688 692
      *
689 693
      * @param $ProductClasses 登録される商品規格
694
+     * @param Application $app
690 695
      */
691 696
     private function insertProductClass($app, $Product, $ProductClasses) {
692 697
 
Please login to merge, or discard this patch.
src/Eccube/Service/CsvExportService.php 1 patch
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -328,7 +328,6 @@  discard block
 block discarded – undo
328 328
 
329 329
     /**
330 330
      * @param $row
331
-     * @param null $callback
332 331
      */
333 332
     public function fputcsv($row)
334 333
     {
@@ -425,7 +424,6 @@  discard block
 block discarded – undo
425 424
      * XXX self::setExportQueryBuilder() をコールする前に EntityManager を取得したいので、引数で渡している
426 425
      *
427 426
      * @param array $searchData セッションから取得した検索条件の配列
428
-     * @param EntityManager $em
429 427
      */
430 428
     protected function findDeserializeObjects(array &$searchData)
431 429
     {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/PaymentRegisterType.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/Application.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -953,7 +953,7 @@
 block discarded – undo
953 953
      * 失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie()
954 954
      * 備考 : app['debug']がtrueの際は処理を行わない
955 955
      *
956
-     * @return boolean true
956
+     * @return null|boolean true
957 957
      *
958 958
      */
959 959
     protected function checkDatabaseConnection()
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
@@ -35,6 +35,9 @@
 block discarded – undo
35 35
 {
36 36
     private $app;
37 37
 
38
+    /**
39
+     * @param \Silex\Application $app
40
+     */
38 41
     public function __construct($app)
39 42
     {
40 43
         $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
@@ -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.