Completed
Pull Request — 4.0 (#4074)
by chihiro
09:16
created
src/Eccube/Service/SystemService.php 1 patch
Unused Use Statements   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,11 +14,11 @@
 block discarded – undo
14 14
 namespace Eccube\Service;
15 15
 
16 16
 use Doctrine\ORM\EntityManagerInterface;
17
+use Symfony\Component\DependencyInjection\ContainerInterface;
17 18
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
18 19
 use Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector;
19
-use Symfony\Component\DependencyInjection\ContainerInterface;
20
-use Symfony\Component\HttpKernel\KernelEvents;
21 20
 use Symfony\Component\HttpKernel\Event\PostResponseEvent;
21
+use Symfony\Component\HttpKernel\KernelEvents;
22 22
 
23 23
 class SystemService implements EventSubscriberInterface
24 24
 {
Please login to merge, or discard this patch.
src/Eccube/Twig/Extension/EccubeExtension.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -347,7 +347,7 @@
 block discarded – undo
347 347
      *
348 348
      * @param null $currency
349 349
      *
350
-     * @return bool|string
350
+     * @return string|null
351 351
      */
352 352
     public function getCurrencySymbol($currency = null)
353 353
     {
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
@@ -102,7 +102,6 @@
 block discarded – undo
102 102
      * Doctrineのキャッシュを削除します.
103 103
      * APP_ENV=prodの場合のみ実行されます.
104 104
      *
105
-     * @param null $env
106 105
      *
107 106
      * @return string
108 107
      *
Please login to merge, or discard this patch.
src/Eccube/DependencyInjection/EccubeExtension.php 1 patch
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.
src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@
 block discarded – undo
83 83
                 } elseif ($item->isProduct()) {
84 84
                     // ポイント = 単価 * ポイント付与率 * 数量
85 85
                     $point = round($item->getPrice() * ($pointRate / 100)) * $item->getQuantity();
86
-                } elseif($item->isDiscount()) {
86
+                } elseif ($item->isDiscount()) {
87 87
                     $point = round($item->getPrice() * ($pointRate / 100)) * $item->getQuantity();
88 88
                 }
89 89
 
Please login to merge, or discard this patch.