EC-CUBE / ec-cube

src/Eccube/Repository/QueryKey.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 {
     const PRODUCT_SEARCH = 'Product.getQueryBuilderBySearchData';
     const PRODUCT_SEARCH_ADMIN = 'Product.getQueryBuilderBySearchDataForAdmin';
-    const PRODUCT_GET_FAVORITE  = 'Product.getFavoriteProductQueryBuilderByCustomer';
+    const PRODUCT_GET_FAVORITE = 'Product.getFavoriteProductQueryBuilderByCustomer';
 
     const CUSTOMER_SEARCH = 'Customer.getQueryBuilderBySearchData';
 

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

Doc Comments +3 added lines

@@ -53,6 +53,9 @@
 
     protected $app;
 
+    /**
+     * @param \Pimple\Container $app
+     */
     public function __construct($app)
     {
         $this->app = $app;

Unused Use Statements -1 removed lines

@@ -35,7 +35,6 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
-use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\MoneyType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;

Spacing +10 added lines, -12 removed lines

@@ -257,7 +257,7 @@ 
         /**
          * 複数配送オプション有効時の画面制御を行う.
          */
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($BaseInfo) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($BaseInfo) {
 
             if ($BaseInfo->getOptionMultipleShipping() != Constant::ENABLED) {
                 return;
@@ -267,17 +267,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) {
@@ -294,7 +293,7 @@ 
                     $orderDetail['quantity'] = 0;
 
                     // 受注詳細と同じ商品規格のみ抽出
-                    $productClassFilter = function ($v) use ($orderDetail) {
+                    $productClassFilter = function($v) use ($orderDetail) {
                         return $orderDetail['ProductClass'] === $v['ProductClass'];
                     };
 
@@ -303,10 +302,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);
 
@@ -335,7 +333,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)) {
@@ -343,7 +341,7 @@ 
             }
         });
         // TODO 手数料, 値引きの集計は CalculateService で
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
             $Order = $event->getData();
             $Order->setDiscount($Order->calculateDiscountTotal());
             // $Order->setCharge($Order->calculateChargeTotal());
@@ -351,7 +349,7 @@ 
             $event->setData($Order);
         });
         // 会員受注の場合、会員の性別/職業/誕生日をエンティティにコピーする
-        $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/Shopping/ShippingType.php

Spacing +4 added lines, -4 removed lines

@@ -59,7 +59,7 @@ 
         // 配送業者のプルダウンを生成
         $builder->addEventListener(
             FormEvents::PRE_SET_DATA,
-            function (FormEvent $event) {
+            function(FormEvent $event) {
                 /* @var Shipping $Shipping */
                 $Shipping = $event->getData();
                 if (is_null($Shipping) || !$Shipping->getId()) {
@@ -101,7 +101,7 @@ 
         // お届け日のプルダウンを生成
         $builder->addEventListener(
             FormEvents::PRE_SET_DATA,
-            function (FormEvent $event) {
+            function(FormEvent $event) {
                 $Shipping = $event->getData();
                 if (is_null($Shipping) || !$Shipping->getId()) {
                     return;
@@ -139,7 +139,7 @@ 
 
                 // 配送日数が設定されている
                 if ($deliveryDateFlag) {
-                    $period = new \DatePeriod (
+                    $period = new \DatePeriod(
                         new \DateTime($minDate.' day'),
                         new \DateInterval('P1D'),
                         new \DateTime($minDate + $this->config['deliv_date_end_max'].' day')
@@ -167,7 +167,7 @@ 
         // お届け時間のプルダウンを生成
         $builder->addEventListener(
             FormEvents::PRE_SET_DATA,
-            function (FormEvent $event) {
+            function(FormEvent $event) {
                 $Shipping = $event->getData();
                 if (is_null($Shipping) || !$Shipping->getId()) {
                     return;

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

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
         // 支払い方法のプルダウンを生成
         $builder->addEventListener(
             FormEvents::PRE_SET_DATA,
-            function (FormEvent $event) {
+            function(FormEvent $event) {
                 /** @var Order $Order */
                 $Order = $event->getData();
                 if (is_null($Order) || !$Order->getId()) {
@@ -133,7 +133,7 @@ 
         // TODO Calculatorで行うのが適切.
         $builder->addEventListener(
             FormEvents::POST_SUBMIT,
-            function (FormEvent $event) {
+            function(FormEvent $event) {
                 /** @var Order $Order */
                 $Order = $event->getData();
                 $Payment = $Order->getPayment();

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

Spacing +7 added lines, -7 removed lines

@@ -175,7 +175,7 @@ 
                 'prototype' => true,
             ))
 
-            ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($BaseInfo) {
+            ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($BaseInfo) {
                 if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
                     $form = $event->getForm();
                     $form->add('ShipmentItems', CollectionType::class, array(
@@ -186,7 +186,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 */
@@ -205,7 +205,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);
@@ -213,7 +213,7 @@ 
                 ));
 
             })
-            ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
+            ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
                 $data = $event->getData();
                 $form = $event->getForm();
                 if (!$data) {
@@ -233,14 +233,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) use ($BaseInfo) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) {
                 if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
                     $form = $event->getForm();
                     $shipmentItems = $form['ShipmentItems']->getData();
@@ -251,7 +251,7 @@ 
                     }
                 }
             })
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) {
                 $Shipping = $event->getData();
                 $Delivery = $Shipping->getDelivery();
                 $Shipping->setShippingDeliveryName($Delivery ? $Delivery : null);

src/Eccube/Controller/Admin/Shipping/EditController.php

Spacing +1 added lines, -1 removed lines

@@ -446,7 +446,7 @@
                 $session->set('eccube.admin.order.product.search', $searchData);
                 $session->set('eccube.admin.order.product.search.page_no', $page_no);
             } else {
-                $searchData = (array)$session->get('eccube.admin.order.product.search');
+                $searchData = (array) $session->get('eccube.admin.order.product.search');
                 if (is_null($page_no)) {
                     $page_no = intval($session->get('eccube.admin.order.product.search.page_no'));
                 } else {

Unused Use Statements -8 removed lines

@@ -4,25 +4,17 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Eccube\Application;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\HttpFoundation\Request;
-
-use Eccube\Common\Constant;
-use Eccube\Controller\AbstractController;
 use Eccube\Entity\Shipping;
-use Eccube\Entity\Master\CsvType;
 use Eccube\Event\EccubeEvents;
 use Eccube\Event\EventArgs;
-use Eccube\Form\Type\AddCartType;
-use Eccube\Form\Type\Admin\SearchOrderType;
 use Eccube\Form\Type\Admin\ShippingType;
 use Eccube\Form\Type\Admin\SearchCustomerType;
 use Eccube\Form\Type\Admin\SearchProductType;
 use Eccube\Form\Type\Admin\ShipmentItemType;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 
 /**
  * @Route("/{_admin}/shipping")

src/Eccube/Repository/ShippingRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     /**
      *
      * @param  array        $searchData
-     * @return QueryBuilder
+     * @return \Doctrine\ORM\QueryBuilder
      */
     public function getQueryBuilderBySearchDataForAdmin($searchData)
     {

Indentation +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
             $qb
                 ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR ' .
-                           's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
+                            's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
                 ->setParameter('multi', $multi)
                 ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
         }

Spacing +10 added lines, -10 removed lines

@@ -52,13 +52,13 @@ 
                 ->setParameter('shipping_id_start', $searchData['shipping_id_start']);
         }
         // multi
-        if (isset( $searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
+        if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
             $qb
-                ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR ' .
+                ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR '.
                            's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
                 ->setParameter('multi', $multi)
-                ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
+                ->setParameter('likemulti', '%'.$searchData['multi'].'%');
         }
 
         // shipping_id_end
@@ -91,42 +91,42 @@ 
         if (isset($searchData['name']) && Str::isNotBlank($searchData['name'])) {
             $qb
                 ->andWhere('CONCAT(s.name01, s.name02) LIKE :name')
-                ->setParameter('name', '%' . $searchData['name'] . '%');
+                ->setParameter('name', '%'.$searchData['name'].'%');
         }
 
         // kana
         if (isset($searchData['kana']) && Str::isNotBlank($searchData['kana'])) {
             $qb
                 ->andWhere('CONCAT(s.kana01, s.kana02) LIKE :kana')
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
         }
 
         // order_name
         if (isset($searchData['order_name']) && Str::isNotBlank($searchData['order_name'])) {
             $qb
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :order_name')
-                ->setParameter('order_name', '%' . $searchData['order_name'] . '%');
+                ->setParameter('order_name', '%'.$searchData['order_name'].'%');
         }
 
         // order_kana
         if (isset($searchData['order_kana']) && Str::isNotBlank($searchData['order_kana'])) {
             $qb
                 ->andWhere('CONCAT(o.kana01, s.kana02) LIKE :order_kana')
-                ->setParameter('kana', '%' . $searchData['order_kana'] . '%');
+                ->setParameter('kana', '%'.$searchData['order_kana'].'%');
         }
 
         // order_email
         if (isset($searchData['email']) && Str::isNotBlank($searchData['email'])) {
             $qb
                 ->andWhere('o.email like :email')
-                ->setParameter('email', '%' . $searchData['email'] . '%');
+                ->setParameter('email', '%'.$searchData['email'].'%');
         }
 
         // tel
         if (isset($searchData['tel']) && Str::isNotBlank($searchData['tel'])) {
             $qb
                 ->andWhere('CONCAT(s.tel01, s.tel02, s.tel03) LIKE :tel')
-                ->setParameter('tel', '%' . $searchData['tel'] . '%');
+                ->setParameter('tel', '%'.$searchData['tel'].'%');
         }
 
         // payment
@@ -222,7 +222,7 @@ 
         if (isset($searchData['buy_product_name']) && Str::isNotBlank($searchData['buy_product_name'])) {
             $qb
                 ->andWhere('si.product_name LIKE :buy_product_name')
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
         }
 
         // Order By

app/Plugin/EntityEvent/ServiceProvider/EntityEventServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 {
     public function register(Container $app)
     {
-        $app['plugin.entity_event.base_info_listener'] = function (Container $container) {
+        $app['plugin.entity_event.base_info_listener'] = function(Container $container) {
             return new BaseInfoListener();
         };
     }

app/Plugin/QueryCustomize/ServiceProvider/QueryCustomizeServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 {
     public function register(Container $app)
     {
-        $app['plugin.query_customize.customer_search'] = function (Container $container) {
+        $app['plugin.query_customize.customer_search'] = function(Container $container) {
             return new AdminCustomerCustomizer();
         };
     }