Completed
Pull Request — 4.0 (#4681)
by
unknown
07:58
created
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/Entity/Order.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
          */
106 106
         public function getTaxableDiscountItems()
107 107
         {
108
-            return array_filter($this->getTaxableItems(), function(OrderItem $Item) {
108
+            return array_filter($this->getTaxableItems(), function (OrderItem $Item) {
109 109
                 return $Item->isDiscount();
110 110
             });
111 111
         }
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
          */
130 130
         public function getTaxFreeDiscountItems()
131 131
         {
132
-            return array_filter($this->OrderItems->toArray(), function(OrderItem $Item) {
132
+            return array_filter($this->OrderItems->toArray(), function (OrderItem $Item) {
133 133
                 return $Item->isPoint() || ($Item->isDiscount() && $Item->getTaxType()->getId() != TaxType::TAXATION);
134 134
             });
135 135
         }
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/Controller/ShoppingController.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,8 +33,8 @@
 block discarded – undo
33 33
 use Eccube\Service\PurchaseFlow\PurchaseFlow;
34 34
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
35 35
 use Symfony\Component\Form\FormInterface;
36
-use Symfony\Component\HttpFoundation\Response;
37 36
 use Symfony\Component\HttpFoundation\Request;
37
+use Symfony\Component\HttpFoundation\Response;
38 38
 use Symfony\Component\Routing\Annotation\Route;
39 39
 use Symfony\Component\Routing\RouterInterface;
40 40
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
Please login to merge, or discard this patch.
src/Eccube/Controller/EntryController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -251,7 +251,7 @@
 block discarded – undo
251 251
             ]
252 252
         );
253 253
 
254
-        if(!is_null($qtyInCart)) {
254
+        if (!is_null($qtyInCart)) {
255 255
 
256 256
             return [
257 257
                 'qtyInCart' => $qtyInCart,
Please login to merge, or discard this patch.
src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -126,14 +126,14 @@
 block discarded – undo
126 126
                     setcookie($this->sessionName, '', 0, ini_get('session.cookie_path'), ini_get('session.cookie_domain'), filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN), filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN));
127 127
                 } else {
128 128
                     setcookie($this->sessionName, '',
129
-                              [
130
-                                  'expires' => 0,
131
-                                  'path' => $this->getCookiePath(),
132
-                                  'domain' => ini_get('session.cookie_domain'),
133
-                                  'secure' => filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN),
134
-                                  'httponly' => filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN),
135
-                                  'samesite' => $this->getCookieSameSite(),
136
-                              ]
129
+                                [
130
+                                    'expires' => 0,
131
+                                    'path' => $this->getCookiePath(),
132
+                                    'domain' => ini_get('session.cookie_domain'),
133
+                                    'secure' => filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN),
134
+                                    'httponly' => filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN),
135
+                                    'samesite' => $this->getCookieSameSite(),
136
+                                ]
137 137
                     );
138 138
                 }
139 139
             }
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ProductType.php 1 patch
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@
 block discarded – undo
24 24
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
25 25
 use Symfony\Component\Form\Extension\Core\Type\FileType;
26 26
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
27
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
28 27
 use Symfony\Component\Form\Extension\Core\Type\TextType;
28
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
29 29
 use Symfony\Component\Form\FormBuilderInterface;
30 30
 use Symfony\Component\Form\FormError;
31 31
 use Symfony\Component\Form\FormEvent;
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
@@ -19,8 +19,8 @@
 block discarded – undo
19 19
 use Eccube\Doctrine\ORM\Mapping\Driver\NopAnnotationDriver;
20 20
 use Eccube\Doctrine\ORM\Mapping\Driver\ReloadSafeAnnotationDriver;
21 21
 use Eccube\Util\StringUtil;
22
-use Symfony\Component\Finder\Finder;
23 22
 use Symfony\Component\Filesystem\Filesystem;
23
+use Symfony\Component\Finder\Finder;
24 24
 
25 25
 class SchemaService
26 26
 {
Please login to merge, or discard this patch.
src/Eccube/Repository/ProductRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -226,7 +226,7 @@
 block discarded – undo
226 226
 
227 227
         // id
228 228
         if (isset($searchData['id']) && StringUtil::isNotBlank($searchData['id'])) {
229
-            $id = preg_match('/^\d{0,10}$/', $searchData['id'])  ? $searchData['id'] : null;
229
+            $id = preg_match('/^\d{0,10}$/', $searchData['id']) ? $searchData['id'] : null;
230 230
             if ($id && $id > '2147483647' && $this->isPostgreSQL()) {
231 231
                 $id = null;
232 232
             }
Please login to merge, or discard this patch.