Completed
Push — lammn_eccube_dev ( 8b0a29...c86c88 )
by Lam
05:27
created
src/Eccube/Application.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -912,7 +912,7 @@
 block discarded – undo
912 912
      * 成功 : trueを返却
913 913
      * 失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie()
914 914
      * 備考 : app['debug']がtrueの際は処理を行わない
915
-     * @return boolean true
915
+     * @return null|boolean true
916 916
      *
917 917
      */
918 918
     protected function checkDatabaseConnection()
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,6 @@
 block discarded – undo
25 25
 
26 26
 use Eccube\Application\ApplicationTrait;
27 27
 use Eccube\Common\Constant;
28
-use Monolog\Logger;
29 28
 use Symfony\Component\EventDispatcher\EventDispatcher;
30 29
 use Symfony\Component\Finder\Finder;
31 30
 use Symfony\Component\HttpFoundation\Request;
Please login to merge, or discard this patch.
src/Eccube/Command/CacheClearCommand.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,6 @@
 block discarded – undo
24 24
 
25 25
 namespace Eccube\Command;
26 26
 
27
-use Symfony\Component\Console\Input\InputArgument;
28 27
 use Symfony\Component\Console\Input\InputInterface;
29 28
 use Symfony\Component\Console\Output\OutputInterface;
30 29
 use Symfony\Component\Console\Input\InputOption;
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
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
     /**
480 480
      * フォームからの入直内容に基づいて、受注情報の再計算を行う
481 481
      *
482
-     * @param $app
482
+     * @param Application $app
483 483
      * @param $Order
484 484
      */
485 485
     protected function calculate($app, \Eccube\Entity\Order $Order)
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
      * - 受注ステータスが入金済に設定された場合に入金日を更新
570 570
      *
571 571
      *
572
-     * @param $app
572
+     * @param Application $app
573 573
      * @param $TargetOrder
574 574
      * @param $OriginOrder
575 575
      */
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
@@ -349,6 +349,9 @@
 block discarded – undo
349 349
     }
350 350
 
351 351
 
352
+    /**
353
+     * @param Application $app
354
+     */
352 355
     private function createBody($app, $header, $footer, $Order)
353 356
     {
354 357
         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
@@ -580,6 +580,8 @@  discard block
 block discarded – undo
580 580
     /**
581 581
      * 登録、更新時のエラー画面表示
582 582
      *
583
+     * @param Application $app
584
+     * @param string $twig
583 585
      */
584 586
     protected function render($app, $form, $headers, $twig)
585 587
     {
@@ -611,6 +613,7 @@  discard block
 block discarded – undo
611 613
      * アップロードされたCSVファイルの行ごとの処理
612 614
      *
613 615
      * @param $formFile
616
+     * @param Application $app
614 617
      * @return CsvImportService
615 618
      */
616 619
     protected function getImportData($app, $formFile)
@@ -678,6 +681,8 @@  discard block
 block discarded – undo
678 681
 
679 682
     /**
680 683
      * 商品カテゴリの削除、登録
684
+     * @param Application $app
685
+     * @param CsvImportService $data
681 686
      */
682 687
     protected function createProductCategory($row, Product $Product, $app, $data)
683 688
     {
@@ -721,6 +726,8 @@  discard block
 block discarded – undo
721 726
 
722 727
     /**
723 728
      * 商品規格分類1、商品規格分類2がnullとなる商品規格情報を作成
729
+     * @param Application $app
730
+     * @param CsvImportService $data
724 731
      */
725 732
     protected function createProductClass($row, Product $Product, $app, $data, $ClassCategory1 = null, $ClassCategory2 = null)
726 733
     {
@@ -862,6 +869,8 @@  discard block
 block discarded – undo
862 869
 
863 870
     /**
864 871
      * 商品規格情報を更新
872
+     * @param Application $app
873
+     * @param CsvImportService $data
865 874
      */
866 875
     protected function updateProductClass($row, Product $Product, ProductClass $ProductClass, $app, $data)
867 876
     {
@@ -1008,6 +1017,7 @@  discard block
 block discarded – undo
1008 1017
     /**
1009 1018
      * 登録、更新時のエラー画面表示
1010 1019
      *
1020
+     * @param string $message
1011 1021
      */
1012 1022
     protected function addErrors($message)
1013 1023
     {
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
@@ -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/Controller/Admin/Store/TemplateController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,6 @@
 block discarded – undo
28 28
 use Eccube\Entity\Master\DeviceType;
29 29
 use Eccube\Util\Str;
30 30
 use Symfony\Component\Filesystem\Filesystem;
31
-use Symfony\Component\Finder\Finder;
32 31
 use Symfony\Component\Form\FormError;
33 32
 use Symfony\Component\HttpFoundation\Request;
34 33
 use Symfony\Component\HttpFoundation\Response;
Please login to merge, or discard this patch.