Completed
Pull Request — experimental/sf (#3157)
by Kentaro
151:58 queued 143:16
created
src/Eccube/Form/Type/NameType.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
                 ],
103 103
                 'constraints' => [
104 104
                     new Assert\Length([
105
-                         'max' => $this->eccubeConfig['eccube_name_len'],
105
+                            'max' => $this->eccubeConfig['eccube_name_len'],
106 106
                     ]),
107 107
                     new Assert\Regex([
108 108
                         'pattern' => '/^[^\s ]+$/u',
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
                 ],
117 117
                 'constraints' => [
118 118
                     new Assert\Length([
119
-                         'max' => $this->eccubeConfig['eccube_name_len'],
119
+                            'max' => $this->eccubeConfig['eccube_name_len'],
120 120
                     ]),
121 121
                     new Assert\Regex([
122 122
                         'pattern' => '/^[^\s ]+$/u',
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/SecurityType.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,8 +69,8 @@
 block discarded – undo
69 69
                     new Assert\NotBlank(),
70 70
                     new Assert\Length(['max' => $this->eccubeConfig['eccube_stext_len']]),
71 71
                     new Assert\Regex([
72
-                       'pattern' => '/^[0-9a-zA-Z]+$/',
73
-                   ]),
72
+                        'pattern' => '/^[0-9a-zA-Z]+$/',
73
+                    ]),
74 74
                 ],
75 75
                 'data' => $this->eccubeConfig->get('eccube_admin_route'),
76 76
             ])
Please login to merge, or discard this patch.
src/Eccube/Repository/ShippingRepository.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
             $multi = preg_match('/^\d{0,10}$/', $searchData['multi']) ? $searchData['multi'] : null;
56 56
             $qb
57 57
                 ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR '.
58
-                           's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
58
+                            's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
59 59
                 ->setParameter('multi', $multi)
60 60
                 ->setParameter('likemulti', '%'.$searchData['multi'].'%');
61 61
         }
Please login to merge, or discard this patch.
src/Eccube/Repository/PluginEventHandlerRepository.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -62,11 +62,11 @@  discard block
 block discarded – undo
62 62
 
63 63
         $qb = $this->createQueryBuilder('e');
64 64
         $qb->andWhere("e.priority >= $range_end ")
65
-           ->andWhere("e.priority <= $range_start ")
66
-           ->andWhere('e.event = :event')
67
-           ->setParameter('event', $event)
68
-           ->setMaxResults(1)
69
-           ->orderBy('e.priority', 'ASC');
65
+            ->andWhere("e.priority <= $range_start ")
66
+            ->andWhere('e.event = :event')
67
+            ->setParameter('event', $event)
68
+            ->setMaxResults(1)
69
+            ->orderBy('e.priority', 'ASC');
70 70
 
71 71
         $result = $qb->getQuery()->getResult();
72 72
         if (count($result)) {
@@ -83,13 +83,13 @@  discard block
 block discarded – undo
83 83
         $qb = $this->createQueryBuilder('e');
84 84
 
85 85
         $qb->andWhere("e.priority >= $range_end ")
86
-           ->andWhere("e.priority <= $range_start ")
87
-           ->andWhere('e.priority '.($up ? '>' : '<').' :pri')
88
-           ->andWhere('e.event = :event')
89
-           ->setParameter('event', $pluginEventHandler->getEvent())
90
-           ->setParameter('pri', $pluginEventHandler->getPriority())
91
-           ->setMaxResults(1)
92
-           ->orderBy('e.priority', ($up ? 'ASC' : 'DESC'));
86
+            ->andWhere("e.priority <= $range_start ")
87
+            ->andWhere('e.priority '.($up ? '>' : '<').' :pri')
88
+            ->andWhere('e.event = :event')
89
+            ->setParameter('event', $pluginEventHandler->getEvent())
90
+            ->setParameter('pri', $pluginEventHandler->getPriority())
91
+            ->setMaxResults(1)
92
+            ->orderBy('e.priority', ($up ? 'ASC' : 'DESC'));
93 93
 
94 94
         $result = $qb->getQuery()->getResult();
95 95
 
Please login to merge, or discard this patch.
src/Eccube/Repository/OrderRepository.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -287,8 +287,8 @@
 block discarded – undo
287 287
             $multi = preg_match('/^\d{0,10}$/', $searchData['multi']) ? $searchData['multi'] : null;
288 288
             $qb
289 289
                 ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '.
290
-                           'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR '.
291
-                           'o.order_code LIKE :likemulti')
290
+                            'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR '.
291
+                            'o.order_code LIKE :likemulti')
292 292
                 ->setParameter('multi', $multi)
293 293
                 ->setParameter('likemulti', '%'.$searchData['multi'].'%');
294 294
         }
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Order/OrderController.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -495,8 +495,8 @@  discard block
 block discarded – undo
495 495
                 if ($flowResult->hasWarning()) {
496 496
                     foreach ($flowResult->getWarning() as $warning) {
497 497
                         $msg = $this->translator->trans('admin.order.index.bulk_warning', [
498
-                          '%orderId%' => $Order->getId(),
499
-                          '%message%' => $warning->getMessage(),
498
+                            '%orderId%' => $Order->getId(),
499
+                            '%message%' => $warning->getMessage(),
500 500
                         ]);
501 501
                         $this->addWarning($msg, 'admin');
502 502
                     }
@@ -505,8 +505,8 @@  discard block
 block discarded – undo
505 505
                 if ($flowResult->hasError()) {
506 506
                     foreach ($flowResult->getErrors() as $error) {
507 507
                         $msg = $this->translator->trans('admin.order.index.bulk_error', [
508
-                          '%orderId%' => $Order->getId(),
509
-                          '%message%' => $error->getMessage(),
508
+                            '%orderId%' => $Order->getId(),
509
+                            '%message%' => $error->getMessage(),
510 510
                         ]);
511 511
                         $this->addError($msg, 'admin');
512 512
                     }
@@ -517,8 +517,8 @@  discard block
 block discarded – undo
517 517
                     $this->purchaseFlow->purchase($Order, $purchaseContext);
518 518
                 } catch (PurchaseException $e) {
519 519
                     $msg = $this->translator->trans('admin.order.index.bulk_error', [
520
-                      '%orderId%' => $Order->getId(),
521
-                      '%message%' => $e->getMessage(),
520
+                        '%orderId%' => $Order->getId(),
521
+                        '%message%' => $e->getMessage(),
522 522
                     ]);
523 523
                     $this->addError($msg, 'admin');
524 524
                     continue;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Shipping/EditController.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -189,13 +189,13 @@
 block discarded – undo
189 189
                     if ($form->get('notify_email')->getData()) {
190 190
                         try {
191 191
                             $this->mailService->sendShippingNotifyMail(
192
-                              $TargetShipping
192
+                                $TargetShipping
193 193
                             );
194 194
                         } catch (\Exception $e) {
195 195
                             log_error('メール通知エラー', [$TargetShipping->getId(), $e]);
196 196
                             $this->addError(
197
-                              'admin.shipping.edit.shipped_mail_failed',
198
-                              'admin'
197
+                                'admin.shipping.edit.shipped_mail_failed',
198
+                                'admin'
199 199
                             );
200 200
                         }
201 201
                     }
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/Shop/ShopController.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -84,15 +84,15 @@
 block discarded – undo
84 84
                 $this->entityManager->flush();
85 85
 
86 86
                 $event = new EventArgs(
87
-                  [
87
+                    [
88 88
                     'form' => $form,
89 89
                     'BaseInfo' => $this->BaseInfo,
90
-                  ],
91
-                  $request
90
+                    ],
91
+                    $request
92 92
                 );
93 93
                 $this->eventDispatcher->dispatch(
94
-                  EccubeEvents::ADMIN_SETTING_SHOP_SHOP_INDEX_COMPLETE,
95
-                  $event
94
+                    EccubeEvents::ADMIN_SETTING_SHOP_SHOP_INDEX_COMPLETE,
95
+                    $event
96 96
                 );
97 97
 
98 98
                 $cacheUtil->clearCache();
Please login to merge, or discard this patch.
src/Eccube/Controller/ShoppingController.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -689,12 +689,12 @@
 block discarded – undo
689 689
         $builder = $this->formFactory->createBuilder(OrderType::class, $Order);
690 690
 
691 691
         $event = new EventArgs(
692
-             [
693
-                 'builder' => $builder,
694
-                 'Order' => $Order,
695
-             ],
696
-             $request
697
-         );
692
+                [
693
+                    'builder' => $builder,
694
+                    'Order' => $Order,
695
+                ],
696
+                $request
697
+            );
698 698
         $this->eventDispatcher->dispatch(EccubeEvents::FRONT_SHOPPING_INDEX_INITIALIZE, $event);
699 699
 
700 700
         $form = $builder->getForm();
Please login to merge, or discard this patch.