Completed
Pull Request — master (#1227)
by NOBU
21:56
created
src/Eccube/Controller/Admin/AdminController.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -198,6 +198,9 @@  discard block
 block discarded – undo
198 198
         return $orderArray;
199 199
     }
200 200
 
201
+    /**
202
+     * @param \DateTime $dateTime
203
+     */
201 204
     protected function getSalesByMonth($em, $dateTime, array $excludes)
202 205
     {
203 206
         // concat... for pgsql
@@ -229,6 +232,9 @@  discard block
 block discarded – undo
229 232
         return $result;
230 233
     }
231 234
 
235
+    /**
236
+     * @param \DateTime $dateTime
237
+     */
232 238
     protected function getSalesByDay($em, $dateTime, array $excludes)
233 239
     {
234 240
         // concat... for pgsql
Please login to merge, or discard this patch.
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/Admin/Product/ProductClassController.php 1 patch
Doc Comments   +6 added lines, -1 removed lines patch added patch discarded remove patch
@@ -430,6 +430,9 @@  discard block
 block discarded – undo
430 430
     /**
431 431
      * 登録、更新時のエラー画面表示
432 432
      *
433
+     * @param Application $app
434
+     * @param boolean $not_product_class
435
+     * @param \Symfony\Component\Form\Form $classForm
433 436
      */
434 437
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
435 438
     {
@@ -479,6 +482,7 @@  discard block
 block discarded – undo
479 482
 
480 483
     /**
481 484
      * 規格1と規格2を組み合わせた商品規格を作成
485
+     * @param Application $app
482 486
      */
483 487
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
484 488
     {
@@ -566,6 +570,7 @@  discard block
 block discarded – undo
566 570
      *
567 571
      * @param $productClassDest コピー先となる商品規格
568 572
      * @param $productClassOrig コピー元となる商品規格
573
+     * @param Application $app
569 574
      */
570 575
     private function setDefualtProductClass($app, $productClassDest, $productClassOrig) {
571 576
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());
@@ -607,6 +612,7 @@  discard block
 block discarded – undo
607 612
      * 商品規格を登録
608 613
      *
609 614
      * @param $ProductClasses 登録される商品規格
615
+     * @param Application $app
610 616
      */
611 617
     private function insertProductClass($app, $Product, $ProductClasses) {
612 618
 
@@ -659,7 +665,6 @@  discard block
 block discarded – undo
659 665
     /**
660 666
      * 規格の分類判定
661 667
      *
662
-     * @param Eccube\Entity\ClassName $ClassesName
663 668
      * @return boolean
664 669
      */
665 670
     private function isValiedCategory($class_name)
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Store/PluginController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -642,7 +642,7 @@
 block discarded – undo
642 642
      *
643 643
      * @param Request $request
644 644
      * @param $authKey
645
-     * @param $url
645
+     * @param string $url
646 646
      * @return array
647 647
      */
648 648
     private function getRequestApi(Request $request, $authKey, $url)
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/Controller/Mypage/DeliveryController.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
      * Index
36 36
      *
37 37
      * @param  Application $app
38
-     * @return string
38
+     * @return \Symfony\Component\HttpFoundation\Response
39 39
      */
40 40
     public function index(Application $app, Request $request)
41 41
     {
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
      *
52 52
      * @param  Application $app
53 53
      * @request  Symfony\Component\HttpFoundation\Request $app
54
-     * @return mixed
54
+     * @return \Symfony\Component\HttpFoundation\Response
55 55
      */
56 56
     public function edit(Application $app, Request $request, $id = null)
57 57
     {
Please login to merge, or discard this patch.