Completed
Pull Request — experimental/sf (#3157)
by Kentaro
151:58 queued 143:16
created
src/Eccube/Doctrine/Query/WhereClause.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -53,6 +53,9 @@
 block discarded – undo
53 53
         $this->params = $params;
54 54
     }
55 55
 
56
+    /**
57
+     * @param Expr\Comparison $expr
58
+     */
56 59
     private static function newWhereClause($expr, $x, $y)
57 60
     {
58 61
         if ($y) {
Please login to merge, or discard this patch.
app/Plugin/QueryCustomize/ServiceProvider/QueryCustomizeServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 {
13 13
     public function register(Container $app)
14 14
     {
15
-        $app['plugin.query_customize.customer_search'] = function (Container $container) {
15
+        $app['plugin.query_customize.customer_search'] = function(Container $container) {
16 16
             return new AdminCustomerCustomizer();
17 17
         };
18 18
     }
Please login to merge, or discard this patch.
app/Plugin/FormExtension/ServiceProvider/FormExtensionServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
     {
13 13
         $app->extend(
14 14
             'form.type.extensions',
15
-            function ($extensions) {
15
+            function($extensions) {
16 16
                 $extensions[] = new EntryTypeExtension();
17 17
 
18 18
                 return $extensions;
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/PurchaseFlow.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
      */
105 105
     protected function calculateTotal(ItemHolderInterface $itemHolder)
106 106
     {
107
-        $total = $itemHolder->getItems()->reduce(function ($sum, ItemInterface $item) {
107
+        $total = $itemHolder->getItems()->reduce(function($sum, ItemInterface $item) {
108 108
             $sum += $item->getPriceIncTax() * $item->getQuantity();
109 109
 
110 110
             return $sum;
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
     {
122 122
         $total = $itemHolder->getItems()
123 123
             ->getProductClasses()
124
-            ->reduce(function ($sum, ItemInterface $item) {
124
+            ->reduce(function($sum, ItemInterface $item) {
125 125
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
126 126
 
127 127
                 return $sum;
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
     {
141 141
         $total = $itemHolder->getItems()
142 142
             ->getDeliveryFees()
143
-            ->reduce(function ($sum, ItemInterface $item) {
143
+            ->reduce(function($sum, ItemInterface $item) {
144 144
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
145 145
 
146 146
                 return $sum;
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
     {
156 156
         $total = $itemHolder->getItems()
157 157
             ->getDiscounts()
158
-            ->reduce(function ($sum, ItemInterface $item) {
158
+            ->reduce(function($sum, ItemInterface $item) {
159 159
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
160 160
 
161 161
                 return $sum;
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
     {
172 172
         $total = $itemHolder->getItems()
173 173
             ->getCharges()
174
-            ->reduce(function ($sum, ItemInterface $item) {
174
+            ->reduce(function($sum, ItemInterface $item) {
175 175
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
176 176
 
177 177
                 return $sum;
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
     protected function calculateTax(ItemHolderInterface $itemHolder)
186 186
     {
187 187
         $total = $itemHolder->getItems()
188
-            ->reduce(function ($sum, ItemInterface $item) {
188
+            ->reduce(function($sum, ItemInterface $item) {
189 189
                 $sum += ($item->getPriceIncTax() - $item->getPrice()) * $item->getQuantity();
190 190
 
191 191
                 return $sum;
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/PurchaseFlowResult.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
      */
54 54
     public function getErrors()
55 55
     {
56
-        return array_filter($this->processResults, function (ProcessResult $processResult) {
56
+        return array_filter($this->processResults, function(ProcessResult $processResult) {
57 57
             return $processResult->isError();
58 58
         });
59 59
     }
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
      */
64 64
     public function getWarning()
65 65
     {
66
-        return array_filter($this->processResults, function (ProcessResult $processResult) {
66
+        return array_filter($this->processResults, function(ProcessResult $processResult) {
67 67
             return $processResult->isWarning();
68 68
         });
69 69
     }
Please login to merge, or discard this patch.
src/Eccube/Controller/ShoppingController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -817,7 +817,7 @@
 block discarded – undo
817 817
                 if ($dispatcher instanceof Response
818 818
                     && ($dispatcher->isRedirection() || $dispatcher->getContent())
819 819
                 ) { // $paymentMethod->apply() が Response を返した場合は画面遷移
820
-                    return $dispatcher;                // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御?
820
+                    return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御?
821 821
                 }
822 822
                 $PaymentResult = $paymentService->doCheckout($paymentMethod); // 決済実行
823 823
                 if (!$PaymentResult->isSuccess()) {
Please login to merge, or discard this 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.
src/Eccube/Form/Type/AddCartType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
                 }
125 125
             }
126 126
 
127
-            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($Product) {
127
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($Product) {
128 128
                 $data = $event->getData();
129 129
                 $form = $event->getForm();
130 130
                 if (isset($data['classcategory_id1']) && !is_null($Product->getClassName2())) {
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
                 }
138 138
             });
139 139
 
140
-            $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
140
+            $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
141 141
                 /** @var CartItem $CartItem */
142 142
                 $CartItem = $event->getData();
143 143
                 $ProductClass = $CartItem->getProductClass();
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/ItemCollection.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     public function getProductClasses()
32 32
     {
33 33
         return $this->filter(
34
-            function (ItemInterface $OrderItem) {
34
+            function(ItemInterface $OrderItem) {
35 35
                 return $OrderItem->isProduct();
36 36
             });
37 37
     }
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
     public function getDeliveryFees()
40 40
     {
41 41
         return $this->filter(
42
-            function (ItemInterface $OrderItem) {
42
+            function(ItemInterface $OrderItem) {
43 43
                 return $OrderItem->isDeliveryFee();
44 44
             });
45 45
     }
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
     public function getCharges()
48 48
     {
49 49
         return $this->filter(
50
-            function (ItemInterface $OrderItem) {
50
+            function(ItemInterface $OrderItem) {
51 51
                 return $OrderItem->isCharge();
52 52
             });
53 53
     }
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     public function getDiscounts()
56 56
     {
57 57
         return $this->filter(
58
-            function (ItemInterface $OrderItem) {
58
+            function(ItemInterface $OrderItem) {
59 59
                 return $OrderItem->isDiscount();
60 60
             });
61 61
     }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     public function hasProductByName($productName)
69 69
     {
70 70
         $OrderItems = $this->filter(
71
-            function (ItemInterface $OrderItem) use ($productName) {
71
+            function(ItemInterface $OrderItem) use ($productName) {
72 72
                 /* @var OrderItem $OrderItem */
73 73
                 return $OrderItem->getProductName() == $productName;
74 74
             });
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
      */
86 86
     public function hasItemByOrderItemType($OrderItemType)
87 87
     {
88
-        $filteredItems = $this->filter(function (ItemInterface $OrderItem) use ($OrderItemType) {
88
+        $filteredItems = $this->filter(function(ItemInterface $OrderItem) use ($OrderItemType) {
89 89
             /* @var OrderItem $OrderItem */
90 90
             return $OrderItem->getOrderItemType() && $OrderItem->getOrderItemType()->getId() == $OrderItemType->getId();
91 91
         });
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
     public function sort()
102 102
     {
103 103
         $Items = $this->toArray();
104
-        usort($Items, function (ItemInterface $a, ItemInterface $b) {
104
+        usort($Items, function(ItemInterface $a, ItemInterface $b) {
105 105
             if ($a->getOrderItemType() === $b->getOrderItemType()) {
106 106
                 return ($a->getId() < $b->getId()) ? -1 : 1;
107 107
             } elseif ($a->isProduct()) {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/PageType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
                 'label' => false,
47 47
                 'class' => 'Eccube\Entity\Page',
48 48
                 'choice_label' => 'name',
49
-                'query_builder' => function (EntityRepository $er) {
49
+                'query_builder' => function(EntityRepository $er) {
50 50
                     return $er
51 51
                         ->createQueryBuilder('l')
52 52
                         ->where('l.id <> 0')
Please login to merge, or discard this patch.