Completed
Pull Request — 4.0 (#4064)
by Syunsuke
05:38
created
src/Eccube/Controller/Mypage/MypageController.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@
 block discarded – undo
16 16
 use Eccube\Controller\AbstractController;
17 17
 use Eccube\Entity\BaseInfo;
18 18
 use Eccube\Entity\Customer;
19
-use Eccube\Entity\Product;
20 19
 use Eccube\Entity\Order;
20
+use Eccube\Entity\Product;
21 21
 use Eccube\Event\EccubeEvents;
22 22
 use Eccube\Event\EventArgs;
23 23
 use Eccube\Exception\CartException;
Please login to merge, or discard this patch.
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/Service/PluginApiService.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -250,6 +250,9 @@
 block discarded – undo
250 250
         $this->updatePluginStatus('/status/uninstalled', $Plugin);
251 251
     }
252 252
 
253
+    /**
254
+     * @param string $url
255
+     */
253 256
     private function updatePluginStatus($url, Plugin $Plugin)
254 257
     {
255 258
         if ($Plugin->getSource()) {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Order/MailController.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
      * @param MailService $mailService
57 57
      * @param MailHistoryRepository $mailHistoryRepository
58 58
      * @param OrderRepository $orderRepository
59
-     * @param twig $twig
59
+     * @param Environment $twig
60 60
      */
61 61
     public function __construct(
62 62
         MailService $mailService,
@@ -227,6 +227,9 @@  discard block
 block discarded – undo
227 227
         ];
228 228
     }
229 229
 
230
+    /**
231
+     * @param Order $Order
232
+     */
230 233
     private function createBody($Order, $twig = 'Mail/order.twig')
231 234
     {
232 235
         return $this->renderView($twig, [
Please login to merge, or discard this patch.
src/Eccube/Service/Composer/ComposerProcessService.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
      *
82 82
      * @throws PluginException
83 83
      *
84
-     * @param string $command
84
+     * @param string[] $commands
85 85
      */
86 86
     public function runCommand($commands, $output = null, $init = true)
87 87
     {
Please login to merge, or discard this patch.
src/Eccube/DependencyInjection/EccubeExtension.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -64,12 +64,12 @@  discard block
 block discarded – undo
64 64
 
65 65
         // SSL強制時は, httpsのみにアクセス制限する
66 66
         $accessControl = [
67
-          [ 'path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
68
-          [ 'path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN' ],
69
-          [ 'path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
70
-          [ 'path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
71
-          [ 'path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY' ],
72
-          [ 'path' => '^/mypage/', 'roles' => 'ROLE_USER' ],
67
+            [ 'path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
68
+            [ 'path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN' ],
69
+            [ 'path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
70
+            [ 'path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
71
+            [ 'path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY' ],
72
+            [ 'path' => '^/mypage/', 'roles' => 'ROLE_USER' ],
73 73
         ];
74 74
         if ($forceSSL) {
75 75
             foreach ($accessControl as &$control) {
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 
80 80
         // security.ymlでは制御できないため, ここで定義する.
81 81
         $container->prependExtensionConfig('security', [
82
-          'access_control' => $accessControl,
82
+            'access_control' => $accessControl,
83 83
         ]);
84 84
     }
85 85
 
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -64,12 +64,12 @@
 block discarded – undo
64 64
 
65 65
         // SSL強制時は, httpsのみにアクセス制限する
66 66
         $accessControl = [
67
-          [ 'path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
68
-          [ 'path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN' ],
69
-          [ 'path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
70
-          [ 'path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY' ],
71
-          [ 'path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY' ],
72
-          [ 'path' => '^/mypage/', 'roles' => 'ROLE_USER' ],
67
+          ['path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
68
+          ['path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN'],
69
+          ['path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
70
+          ['path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
71
+          ['path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY'],
72
+          ['path' => '^/mypage/', 'roles' => 'ROLE_USER'],
73 73
         ];
74 74
         if ($forceSSL) {
75 75
             foreach ($accessControl as &$control) {
Please login to merge, or discard this patch.