EC-CUBE / ec-cube

src/Eccube/Form/Type/Admin/OrderType.php

Spacing +9 added lines, -11 removed lines

@@ -252,7 +252,7 @@ 
         /**
          * 複数配送オプション有効時の画面制御を行う.
          */
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
 
             if ($this->BaseInfo->getOptionMultipleShipping() != Constant::ENABLED) {
                 return;
@@ -262,17 +262,16 @@ 
             $orderDetails = &$data['OrderDetails'];
 
             // 数量0フィルター
-            $quantityFilter = function ($v) {
+            $quantityFilter = function($v) {
                 return !(isset($v['quantity']) && preg_match('/^0+$/', trim($v['quantity'])));
             };
 
             // $shippings = &$data['Shippings'];
 
             // 数量を抽出
-            $getQuantity = function ($v) {
+            $getQuantity = function($v) {
                 return (isset($v['quantity']) && preg_match('/^\d+$/', trim($v['quantity']))) ?
-                    trim($v['quantity']) :
-                    0;
+                    trim($v['quantity']) : 0;
             };
 
             // foreach ($shippings as &$shipping) {
@@ -289,7 +288,7 @@ 
                     $orderDetail['quantity'] = 0;
 
                     // 受注詳細と同じ商品規格のみ抽出
-                    $productClassFilter = function ($v) use ($orderDetail) {
+                    $productClassFilter = function($v) use ($orderDetail) {
                         return $orderDetail['ProductClass'] === $v['ProductClass'];
                     };
 
@@ -298,10 +297,9 @@ 
                         if (!empty($shipping['ShipmentItems'])) {
 
                             // 同じ商品規格の受注詳細の価格を適用
-                            $applyPrice = function (&$v) use ($orderDetail) {
+                            $applyPrice = function(&$v) use ($orderDetail) {
                                 $v['price'] = ($v['ProductClass'] === $orderDetail['ProductClass']) ?
-                                    $orderDetail['price'] :
-                                    $v['price'];
+                                    $orderDetail['price'] : $v['price'];
                             };
                             array_walk($shipping['ShipmentItems'], $applyPrice);
 
@@ -330,7 +328,7 @@ 
         //     }
         // });
         // 選択された支払い方法の名称をエンティティにコピーする
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
             $Order = $event->getData();
             $Payment = $Order->getPayment();
             if (!is_null($Payment)) {
@@ -338,7 +336,7 @@ 
             }
         });
         // 会員受注の場合、会員の性別/職業/誕生日をエンティティにコピーする
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
             $Order = $event->getData();
             $Customer = $Order->getCustomer();
             if (!is_null($Customer)) {

src/Eccube/Form/Type/Admin/ShippingType.php

Spacing +7 added lines, -7 removed lines

@@ -199,7 +199,7 @@ 
                 'prototype' => true,
             ))
 
-            ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+            ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
                 if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
                     $form = $event->getForm();
                     $form->add('ShipmentItems', CollectionType::class, array(
@@ -210,7 +210,7 @@ 
                     ));
                 }
             })
-            ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {
+            ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) {
                 /** @var \Eccube\Entity\Shipping $data */
                 $data = $event->getData();
                 /** @var \Symfony\Component\Form\Form $form */
@@ -229,7 +229,7 @@ 
                     'choice_label' => 'delivery_time',
                     'placeholder' => '指定なし',
                     'required' => false,
-                    'query_builder' => function (EntityRepository $er) use($Delivery) {
+                    'query_builder' => function(EntityRepository $er) use($Delivery) {
                         return $er->createQueryBuilder('dt')
                             ->where('dt.Delivery = :Delivery')
                             ->setParameter('Delivery', $Delivery);
@@ -237,7 +237,7 @@ 
                 ));
 
             })
-            ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+            ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
                 $data = $event->getData();
                 $form = $event->getForm();
                 if (!$data) {
@@ -257,14 +257,14 @@ 
                     'choice_label' => 'delivery_time',
                     'placeholder' => '指定なし',
                     'required' => false,
-                    'query_builder' => function (EntityRepository $er) use($Delivery) {
+                    'query_builder' => function(EntityRepository $er) use($Delivery) {
                         return $er->createQueryBuilder('dt')
                             ->where('dt.Delivery = :Delivery')
                             ->setParameter('Delivery', $Delivery);
                     },
                 ));
             })
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
                 if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
                     $form = $event->getForm();
                     $shipmentItems = $form['ShipmentItems']->getData();
@@ -275,7 +275,7 @@ 
                     }
                 }
             })
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
                 $Shipping = $event->getData();
                 $Delivery = $Shipping->getDelivery();
                 $Shipping->setShippingDeliveryName($Delivery ? $Delivery : null);

src/Eccube/Controller/CartController.php

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 use Eccube\Annotation\Inject;
 use Eccube\Application;
 use Eccube\Entity\CartItem;
-use Eccube\Entity\ProductClass;
 use Eccube\Event\EccubeEvents;
 use Eccube\Event\EventArgs;
 use Eccube\Repository\ProductClassRepository;

src/Eccube/Form/Type/AddCartType.php

Unused Use Statements -1 removed lines

@@ -27,7 +27,6 @@
 use Doctrine\ORM\EntityManager;
 use Eccube\Annotation\FormType;
 use Eccube\Annotation\Inject;
-use Eccube\Application;
 use Eccube\Entity\CartItem;
 use Eccube\Form\DataTransformer\EntityToIdTransformer;
 use Symfony\Component\Form\AbstractType;

Spacing +2 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
                 }
             }
 
-            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($Product) {
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($Product) {
                 $data = $event->getData();
                 $form = $event->getForm();
                 if (isset($data['classcategory_id1']) && !is_null($Product->getClassName2())) {
@@ -137,7 +137,7 @@ 
                 }
             });
 
-            $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
                 /** @var CartItem $CartItem */
                 $CartItem = $event->getData();
                 $ProductClass = $CartItem->getProductClass();

src/Eccube/Common/Collection/StrictArrayCollection.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
     {
         $collection = $this;
 
-        $newFunc = function ($element) use ($collection, $func) {
+        $newFunc = function($element) use ($collection, $func) {
 
             $new = $func($element);
 

src/Eccube/Service/PurchaseFlow/Comparer/OrderItemTypeComparer.php

Spacing +4 added lines, -4 removed lines

@@ -39,12 +39,12 @@
         $OrderItemType1 = $Item1->getOrderItemType();
         $OrderItemType2 = $Item2->getOrderItemType();
 
-        $order_item_type_id1 = $OrderItemType1 ? (string)$OrderItemType1->getId() : null;
-        $order_item_type_id2 = $OrderItemType2 ? (string)$OrderItemType2->getId() : null;
+        $order_item_type_id1 = $OrderItemType1 ? (string) $OrderItemType1->getId() : null;
+        $order_item_type_id2 = $OrderItemType2 ? (string) $OrderItemType2->getId() : null;
 
         // FIXME 暫定的に、商品以外は全て別商品とする
         return
-            $order_item_type_id1 === (string)OrderItemType::PRODUCT &&
-            $order_item_type_id2 === (string)OrderItemType::PRODUCT;
+            $order_item_type_id1 === (string) OrderItemType::PRODUCT &&
+            $order_item_type_id2 === (string) OrderItemType::PRODUCT;
     }
 }

src/Eccube/Service/PurchaseFlow/Comparer/TaxComparer.php

Spacing +1 added lines, -2 removed lines

@@ -37,7 +37,6 @@
             (
                 intval($Item1->getTaxRule()) === intval($Item2->getTaxRule()) &&
                 intval($Item1->getTaxRate()) === intval($Item2->getTaxRate())
-            ) :
-            true;
+            ) : true;
     }
 }

src/Eccube/Service/PurchaseFlow/Comparer/ProductClassComparer.php

Spacing +2 added lines, -2 removed lines

@@ -34,8 +34,8 @@
     {
         $ProductClass1 = $Item1->getProductClass();
         $ProductClass2 = $Item2->getProductClass();
-        $product_class_id1 = $ProductClass1 ? (string)$ProductClass1->getId() : null;
-        $product_class_id2 = $ProductClass2 ? (string)$ProductClass2->getId() : null;
+        $product_class_id1 = $ProductClass1 ? (string) $ProductClass1->getId() : null;
+        $product_class_id2 = $ProductClass2 ? (string) $ProductClass2->getId() : null;
 
         return $product_class_id1 === $product_class_id2;
     }