Completed
Push — master ( c53dd7...979eb7 )
by chihiro
31:42
created
src/Eccube/Application.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -959,7 +959,7 @@
 block discarded – undo
959 959
      * 失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie()
960 960
      * 備考 : app['debug']がtrueの際は処理を行わない
961 961
      *
962
-     * @return boolean true
962
+     * @return null|boolean true
963 963
      *
964 964
      */
965 965
     protected function checkDatabaseConnection()
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['form.csrf_provider'];
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
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
     /**
524 524
      * フォームからの入直内容に基づいて、受注情報の再計算を行う
525 525
      *
526
-     * @param $app
526
+     * @param Application $app
527 527
      * @param $Order
528 528
      */
529 529
     protected function calculate($app, \Eccube\Entity\Order $Order)
@@ -613,7 +613,7 @@  discard block
 block discarded – undo
613 613
      * - 受注ステータスが入金済に設定された場合に入金日を更新
614 614
      *
615 615
      *
616
-     * @param $app
616
+     * @param Application $app
617 617
      * @param $TargetOrder
618 618
      * @param $OriginOrder
619 619
      */
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
@@ -354,6 +354,9 @@
 block discarded – undo
354 354
     }
355 355
 
356 356
 
357
+    /**
358
+     * @param Application $app
359
+     */
357 360
     private function createBody($app, $header, $footer, $Order)
358 361
     {
359 362
         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
@@ -582,6 +582,8 @@  discard block
 block discarded – undo
582 582
     /**
583 583
      * 登録、更新時のエラー画面表示
584 584
      *
585
+     * @param Application $app
586
+     * @param string $twig
585 587
      */
586 588
     protected function render($app, $form, $headers, $twig)
587 589
     {
@@ -613,6 +615,7 @@  discard block
 block discarded – undo
613 615
      * アップロードされたCSVファイルの行ごとの処理
614 616
      *
615 617
      * @param $formFile
618
+     * @param Application $app
616 619
      * @return CsvImportService
617 620
      */
618 621
     protected function getImportData($app, $formFile)
@@ -690,6 +693,8 @@  discard block
 block discarded – undo
690 693
 
691 694
     /**
692 695
      * 商品カテゴリの削除、登録
696
+     * @param Application $app
697
+     * @param CsvImportService $data
693 698
      */
694 699
     protected function createProductCategory($row, Product $Product, $app, $data)
695 700
     {
@@ -781,6 +786,8 @@  discard block
 block discarded – undo
781 786
 
782 787
     /**
783 788
      * 商品規格分類1、商品規格分類2がnullとなる商品規格情報を作成
789
+     * @param Application $app
790
+     * @param CsvImportService $data
784 791
      */
785 792
     protected function createProductClass($row, Product $Product, $app, $data, $ClassCategory1 = null, $ClassCategory2 = null)
786 793
     {
@@ -922,6 +929,8 @@  discard block
 block discarded – undo
922 929
 
923 930
     /**
924 931
      * 商品規格情報を更新
932
+     * @param Application $app
933
+     * @param CsvImportService $data
925 934
      */
926 935
     protected function updateProductClass($row, Product $Product, ProductClass $ProductClass, $app, $data)
927 936
     {
@@ -1068,6 +1077,7 @@  discard block
 block discarded – undo
1068 1077
     /**
1069 1078
      * 登録、更新時のエラー画面表示
1070 1079
      *
1080
+     * @param string $message
1071 1081
      */
1072 1082
     protected function addErrors($message)
1073 1083
     {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductClassController.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -517,6 +517,8 @@  discard block
 block discarded – undo
517 517
     /**
518 518
      * 登録、更新時のエラー画面表示
519 519
      *
520
+     * @param Application $app
521
+     * @param boolean $not_product_class
520 522
      */
521 523
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
522 524
     {
@@ -566,6 +568,7 @@  discard block
 block discarded – undo
566 568
 
567 569
     /**
568 570
      * 規格1と規格2を組み合わせた商品規格を作成
571
+     * @param Application $app
569 572
      */
570 573
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
571 574
     {
@@ -653,6 +656,7 @@  discard block
 block discarded – undo
653 656
      *
654 657
      * @param $productClassDest コピー先となる商品規格
655 658
      * @param $productClassOrig コピー元となる商品規格
659
+     * @param Application $app
656 660
      */
657 661
     private function setDefualtProductClass($app, $productClassDest, $productClassOrig) {
658 662
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());
@@ -695,6 +699,7 @@  discard block
 block discarded – undo
695 699
      * 商品規格を登録
696 700
      *
697 701
      * @param $ProductClasses 登録される商品規格
702
+     * @param Application $app
698 703
      */
699 704
     private function insertProductClass($app, $Product, $ProductClasses) {
700 705
 
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
@@ -336,6 +336,9 @@
 block discarded – undo
336 336
     }
337 337
 
338 338
 
339
+    /**
340
+     * @param InstallApplication $app
341
+     */
339 342
     private function checkModules($app)
340 343
     {
341 344
         foreach ($this->required_modules as $module) {
Please login to merge, or discard this patch.
src/Eccube/Form/DataTransformer/EntityToIdTransformer.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 
43 43
     /**
44 44
      * @param ObjectManager $om
45
-     * @param stging $className
45
+     * @param string $className
46 46
      */
47 47
     public function __construct(ObjectManager $om, $className)
48 48
     {
Please login to merge, or discard this patch.