Completed
Pull Request — 4.0 (#3786)
by k-yamamura
05:54
created
src/Eccube/Controller/ShippingMultipleController.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,9 +26,9 @@
 block discarded – undo
26 26
 use Eccube\Repository\Master\PrefRepository;
27 27
 use Eccube\Repository\OrderRepository;
28 28
 use Eccube\Service\CartService;
29
+use Eccube\Service\OrderHelper;
29 30
 use Eccube\Service\PurchaseFlow\PurchaseContext;
30 31
 use Eccube\Service\PurchaseFlow\PurchaseFlow;
31
-use Eccube\Service\OrderHelper;
32 32
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
33 33
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
34 34
 use Symfony\Component\HttpFoundation\Request;
Please login to merge, or discard this patch.
src/Eccube/EventListener/SecurityListener.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@
 block discarded – undo
17 17
 use Eccube\Entity\Customer;
18 18
 use Eccube\Entity\Member;
19 19
 use Eccube\Service\CartService;
20
+use Eccube\Service\OrderHelper;
20 21
 use Eccube\Service\PurchaseFlow\PurchaseContext;
21 22
 use Eccube\Service\PurchaseFlow\PurchaseFlow;
22
-use Eccube\Service\OrderHelper;
23 23
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
24 24
 use Symfony\Component\HttpFoundation\RequestStack;
25 25
 use Symfony\Component\Security\Core\AuthenticationEvents;
Please login to merge, or discard this patch.
src/Eccube/Entity/Order.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1639,7 +1639,7 @@
 block discarded – undo
1639 1639
         /**
1640 1640
          * Set orderStatus.
1641 1641
          *
1642
-         * @param \Eccube\Entity\Master\OrderStatus|null|object $orderStatus
1642
+         * @param null|Master\OrderStatus $orderStatus
1643 1643
          *
1644 1644
          * @return Order
1645 1645
          */
Please login to merge, or discard this patch.
src/Eccube/Service/PointHelper.php 1 patch
Doc Comments   +7 added lines, -1 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     /**
97 97
      * 金額をポイントに変換する.
98 98
      *
99
-     * @param $price
99
+     * @param double $price
100 100
      *
101 101
      * @return float ポイント
102 102
      *
@@ -153,6 +153,9 @@  discard block
 block discarded – undo
153 153
         }
154 154
     }
155 155
 
156
+    /**
157
+     * @param integer $point
158
+     */
156 159
     public function prepare(ItemHolderInterface $itemHolder, $point)
157 160
     {
158 161
         // ユーザの保有ポイントを減算
@@ -160,6 +163,9 @@  discard block
 block discarded – undo
160 163
         $Customer->setPoint($Customer->getPoint() - $point);
161 164
     }
162 165
 
166
+    /**
167
+     * @param integer $point
168
+     */
163 169
     public function rollback(ItemHolderInterface $itemHolder, $point)
164 170
     {
165 171
         // 利用したポイントをユーザに戻す.
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/CsvImportController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@
 block discarded – undo
211 211
                             }
212 212
 
213 213
                             if (isset($row[$headerByKey['product_del_flg']])) {
214
-                                if (StringUtil::isNotBlank($row[$headerByKey['product_del_flg']]) && $row[$headerByKey['product_del_flg']] == (string)Constant::ENABLED) {
214
+                                if (StringUtil::isNotBlank($row[$headerByKey['product_del_flg']]) && $row[$headerByKey['product_del_flg']] == (string) Constant::ENABLED) {
215 215
                                     // 商品を物理削除
216 216
                                     $deleteImages[] = $Product->getProductImage();
217 217
 
Please login to merge, or discard this patch.