Completed
Pull Request — 4.0 (#4626)
by Kentaro
08:50
created
src/Eccube/Service/PurchaseFlow/Processor/PaymentChargePreprocessor.php 1 patch
Unused Use Statements   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -13,18 +13,18 @@
 block discarded – undo
13 13
 
14 14
 namespace Eccube\Service\PurchaseFlow\Processor;
15 15
 
16
-use Eccube\Service\PurchaseFlow\ItemHolderPreprocessor;
17 16
 use Eccube\Entity\ItemHolderInterface;
18
-use Eccube\Service\PurchaseFlow\PurchaseContext;
19
-use Eccube\Entity\OrderItem;
20
-use Eccube\Repository\Master\OrderItemTypeRepository;
21
-use Eccube\Repository\Master\TaxDisplayTypeRepository;
22 17
 use Eccube\Entity\Master\OrderItemType;
23 18
 use Eccube\Entity\Master\TaxDisplayType;
19
+use Eccube\Entity\Master\TaxType;
24 20
 use Eccube\Entity\Order;
21
+use Eccube\Entity\OrderItem;
25 22
 use Eccube\Entity\Payment;
23
+use Eccube\Repository\Master\OrderItemTypeRepository;
24
+use Eccube\Repository\Master\TaxDisplayTypeRepository;
26 25
 use Eccube\Repository\Master\TaxTypeRepository;
27
-use Eccube\Entity\Master\TaxType;
26
+use Eccube\Service\PurchaseFlow\ItemHolderPreprocessor;
27
+use Eccube\Service\PurchaseFlow\PurchaseContext;
28 28
 
29 29
 class PaymentChargePreprocessor implements ItemHolderPreprocessor
30 30
 {
Please login to merge, or discard this patch.
src/Eccube/Plugin/AbstractPluginManager.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,8 +14,8 @@
 block discarded – undo
14 14
 namespace Eccube\Plugin;
15 15
 
16 16
 use Doctrine\DBAL\Connection;
17
-use Doctrine\DBAL\Migrations\Migration;
18 17
 use Doctrine\DBAL\Migrations\Configuration\Configuration;
18
+use Doctrine\DBAL\Migrations\Migration;
19 19
 use Symfony\Component\DependencyInjection\ContainerInterface;
20 20
 
21 21
 abstract class AbstractPluginManager
Please login to merge, or discard this patch.
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/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.
src/Eccube/Service/PluginService.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,8 +25,8 @@
 block discarded – undo
25 25
 use Eccube\Util\CacheUtil;
26 26
 use Eccube\Util\StringUtil;
27 27
 use Symfony\Component\DependencyInjection\ContainerInterface;
28
-use Symfony\Component\Finder\Finder;
29 28
 use Symfony\Component\Filesystem\Filesystem;
29
+use Symfony\Component\Finder\Finder;
30 30
 
31 31
 class PluginService
32 32
 {
Please login to merge, or discard this patch.
src/Eccube/Service/SchemaService.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@
 block discarded – undo
18 18
 use Doctrine\ORM\Tools\SchemaTool;
19 19
 use Eccube\Doctrine\ORM\Mapping\Driver\ReloadSafeAnnotationDriver;
20 20
 use Eccube\Util\StringUtil;
21
-use Symfony\Component\Finder\Finder;
22 21
 use Symfony\Component\Filesystem\Filesystem;
22
+use Symfony\Component\Finder\Finder;
23 23
 
24 24
 class SchemaService
25 25
 {
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/PurchaseFlow.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -391,7 +391,7 @@
 block discarded – undo
391 391
             'DiscountProcessor' => $this->discountProcessors->map($callback)->toArray(),
392 392
             'ItemHolderPostValidator' => $this->itemHolderPostValidators->map($callback)->toArray()
393 393
         ];
394
-        $tree  = new \RecursiveTreeIterator(new \RecursiveArrayIterator($flows));
394
+        $tree = new \RecursiveTreeIterator(new \RecursiveArrayIterator($flows));
395 395
         $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_RIGHT, ' ');
396 396
         $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_MID_LAST, ' ');
397 397
         $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_MID_HAS_NEXT, '│');
Please login to merge, or discard this patch.
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.