Completed
Pull Request — 4.0 (#4465)
by kazunori
05:25
created
src/Eccube/Controller/Admin/Content/FileController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@
 block discarded – undo
284 284
             $filename = $this->convertStrToServer($file->getClientOriginalName());
285 285
             try {
286 286
                 $file->move($nowDir, $filename);
287
-                $successCount ++;
287
+                $successCount++;
288 288
             } catch (FileException $e) {
289 289
                 $this->errors[] = ['message' => trans('admin.content.file.upload_error', [
290 290
                     '%file_name%' => $filename,
Please login to merge, or discard this patch.
codeception/acceptance/EA07BasicinfoCest.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,6 +11,7 @@  discard block
 block discarded – undo
11 11
  * file that was distributed with this source code.
12 12
  */
13 13
 
14
+use Codeception\Util\Fixtures;
14 15
 use Page\Admin\CsvSettingsPage;
15 16
 use Page\Admin\DeliveryEditPage;
16 17
 use Page\Admin\DeliveryManagePage;
@@ -19,7 +20,6 @@  discard block
 block discarded – undo
19 20
 use Page\Admin\PaymentManagePage;
20 21
 use Page\Admin\ShopSettingPage;
21 22
 use Page\Admin\TaxManagePage;
22
-use Codeception\Util\Fixtures;
23 23
 
24 24
 /**
25 25
  * @group admin
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/CsvImportController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -762,7 +762,7 @@
 block discarded – undo
762 762
     protected function createProductImage($row, Product $Product, $data, $headerByKey)
763 763
     {
764 764
         if (!isset($row[$headerByKey['product_image']])) {
765
-             return;
765
+                return;
766 766
         }
767 767
         if (StringUtil::isNotBlank($row[$headerByKey['product_image']])) {
768 768
             // 画像の削除
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -291,7 +291,7 @@
 block discarded – undo
291 291
                                     $message = trans('admin.common.csv_invalid_description_detail_upper_limit', [
292 292
                                         '%line%' => $line,
293 293
                                         '%name%' => $headerByKey['description_detail'],
294
-                                        '%max%' => $this->eccubeConfig['eccube_ltext_len'],]);
294
+                                        '%max%' => $this->eccubeConfig['eccube_ltext_len'], ]);
295 295
                                     $this->addErrors($message);
296 296
 
297 297
                                     return $this->renderWithError($form, $headers);
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Order/EditController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,6 @@
 block discarded – undo
14 14
 namespace Eccube\Controller\Admin\Order;
15 15
 
16 16
 use Doctrine\Common\Collections\ArrayCollection;
17
-use Doctrine\Common\Collections\Criteria;
18 17
 use Eccube\Controller\AbstractController;
19 18
 use Eccube\Entity\Master\CustomerStatus;
20 19
 use Eccube\Entity\Master\OrderItemType;
Please login to merge, or discard this patch.
src/Eccube/Service/OrderPdfService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -557,7 +557,7 @@
 block discarded – undo
557 557
             $arrOrder[$i][2] = '';
558 558
             $arrOrder[$i][3] = '';
559 559
 
560
-            foreach($Order->getTaxFreeDiscountItems() as $Item) {
560
+            foreach ($Order->getTaxFreeDiscountItems() as $Item) {
561 561
                 ++$i;
562 562
                 $arrOrder[$i][0] = '';
563 563
                 $arrOrder[$i][1] = '';
Please login to merge, or discard this patch.
src/Eccube/Util/CacheUtil.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,6 @@
 block discarded – undo
111 111
     /**
112 112
      * Doctrineのキャッシュを削除します.
113 113
      *
114
-     * @param null $env
115 114
      *
116 115
      * @return string
117 116
      *
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/AdminController.php 1 patch
Doc Comments   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -412,7 +412,6 @@  discard block
 block discarded – undo
412 412
     }
413 413
 
414 414
     /**
415
-     * @param \Doctrine\ORM\EntityManagerInterface $em
416 415
      * @param array $excludes
417 416
      *
418 417
      * @return null|Request
@@ -447,7 +446,7 @@  discard block
 block discarded – undo
447 446
     /**
448 447
      * @param \DateTime $dateTime
449 448
      *
450
-     * @return array|mixed
449
+     * @return null|Request
451 450
      *
452 451
      * @throws \Doctrine\ORM\NonUniqueResultException
453 452
      */
@@ -484,7 +483,7 @@  discard block
 block discarded – undo
484 483
     /**
485 484
      * @param \DateTime $dateTime
486 485
      *
487
-     * @return array|mixed
486
+     * @return null|Request
488 487
      *
489 488
      * @throws \Doctrine\ORM\NonUniqueResultException
490 489
      */
@@ -523,7 +522,7 @@  discard block
 block discarded – undo
523 522
     /**
524 523
      * 在庫切れ商品数を取得
525 524
      *
526
-     * @return mixed
525
+     * @return null|Request
527 526
      *
528 527
      * @throws \Doctrine\ORM\NonUniqueResultException
529 528
      */
@@ -541,7 +540,7 @@  discard block
 block discarded – undo
541 540
     /**
542 541
      * 商品数を取得
543 542
      *
544
-     * @return mixed
543
+     * @return null|Request
545 544
      *
546 545
      * @throws \Doctrine\ORM\NonUniqueResultException
547 546
      */
@@ -558,7 +557,7 @@  discard block
 block discarded – undo
558 557
     /**
559 558
      * 本会員数を取得
560 559
      *
561
-     * @return mixed
560
+     * @return null|Request
562 561
      *
563 562
      * @throws \Doctrine\ORM\NonUniqueResultException
564 563
      */
@@ -577,7 +576,7 @@  discard block
 block discarded – undo
577 576
      *
578 577
      * @param Carbon $fromDate
579 578
      * @param Carbon $toDate
580
-     * @param $format
579
+     * @param string $format
581 580
      *
582 581
      * @return array
583 582
      */
Please login to merge, or discard this patch.