EC-CUBE / ec-cube

src/Eccube/Controller/Admin/Product/ClassCategoryController.php

Spacing +2 added lines, -2 removed lines

@@ -182,7 +182,7 @@ 
         $num = $this->productClassRepository->createQueryBuilder('pc')
             ->select('count(pc.id)')
             ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id')
-            ->setParameter('id',$id)
+            ->setParameter('id', $id)
             ->getQuery()
             ->getSingleScalarResult();
         if ($num > 0) {
@@ -208,7 +208,7 @@ 
                 log_error('規格分類削除エラー', array($id, $e));
 
                 $message = $app->trans('admin.delete.failed.foreign_key', ['%name%' => '規格分類']);
-                $app->addError($message, 'admin');            }
+                $app->addError($message, 'admin'); }
         }
 
         return $app->redirect($app->url('admin_product_class_category', array('class_name_id' => $ClassName->getId())));

src/Eccube/Controller/Admin/Product/ClassNameController.php

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
         try {
             $this->classNameRepository->delete($ClassName);
 
-            $event = new EventArgs(['ClassName' => $ClassName,], $request);
+            $event = new EventArgs(['ClassName' => $ClassName, ], $request);
             $this->eventDispatcher->dispatch(EccubeEvents::ADMIN_PRODUCT_CLASS_NAME_DELETE_COMPLETE, $event);
 
             $app->addSuccess('admin.class_name.delete.complete', 'admin');

src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php

Spacing +1 added lines, -1 removed lines

@@ -242,7 +242,7 @@
             $this->eventDispatcher->dispatch(EccubeEvents::ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE, $event);
 
             $app->addSuccess('admin.delete.complete', 'admin');
-        } catch(ForeignKeyConstraintViolationException $e) {
+        } catch (ForeignKeyConstraintViolationException $e) {
             $this->entityManager->rollback();
 
             $message = $app->trans('admin.delete.failed.foreign_key', ['%name%' => '支払方法']);

src/Eccube/Repository/PageRepository.php

Spacing +1 added lines, -1 removed lines

@@ -257,7 +257,7 @@
         }
 
         foreach ($readPaths as $readPath) {
-            $filePath = $readPath . '/' . $fileName . '.twig';
+            $filePath = $readPath.'/'.$fileName.'.twig';
             $fs = new Filesystem();
             if ($fs->exists($filePath)) {
                 return array(

src/Eccube/Service/Calculator/OrderItemCollection.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     public function hasProductByName($productName)
     {
         $OrderItems = $this->filter(
-            function (ItemInterface $OrderItem) use ($productName) {
+            function(ItemInterface $OrderItem) use ($productName) {
                 /* @var OrderItem $OrderItem */
                 return $OrderItem->getProductName() == $productName;
             });

src/Eccube/Service/PurchaseFlow/ItemCollection.php

Spacing +7 added lines, -7 removed lines

@@ -31,7 +31,7 @@ 
     public function getProductClasses()
     {
         return $this->filter(
-            function (ItemInterface $OrderItem) {
+            function(ItemInterface $OrderItem) {
                 return $OrderItem->isProduct();
             });
     }
@@ -39,7 +39,7 @@ 
     public function getDeliveryFees()
     {
         return $this->filter(
-            function (ItemInterface $OrderItem) {
+            function(ItemInterface $OrderItem) {
                 return $OrderItem->isDeliveryFee();
             });
     }
@@ -47,7 +47,7 @@ 
     public function getCharges()
     {
         return $this->filter(
-            function (ItemInterface $OrderItem) {
+            function(ItemInterface $OrderItem) {
                 return $OrderItem->isCharge();
             });
     }
@@ -55,7 +55,7 @@ 
     public function getDiscounts()
     {
         return $this->filter(
-            function (ItemInterface $OrderItem) {
+            function(ItemInterface $OrderItem) {
                 return $OrderItem->isDiscount();
             });
     }
@@ -68,7 +68,7 @@ 
     public function hasProductByName($productName)
     {
         $OrderItems = $this->filter(
-            function (ItemInterface $OrderItem) use ($productName) {
+            function(ItemInterface $OrderItem) use ($productName) {
                 /* @var OrderItem $OrderItem */
                 return $OrderItem->getProductName() == $productName;
             });
@@ -85,7 +85,7 @@ 
      */
     public function hasItemByOrderItemType($OrderItemType)
     {
-        $filteredItems = $this->filter(function (ItemInterface $OrderItem) use ($OrderItemType) {
+        $filteredItems = $this->filter(function(ItemInterface $OrderItem) use ($OrderItemType) {
             /* @var OrderItem $OrderItem */
             return $OrderItem->getOrderItemType() && $OrderItem->getOrderItemType()->getId() == $OrderItemType->getId();
         });
@@ -101,7 +101,7 @@ 
     public function sort()
     {
         $Items = $this->toArray();
-        usort($Items, function (ItemInterface $a, ItemInterface $b) {
+        usort($Items, function(ItemInterface $a, ItemInterface $b) {
             if ($a->getOrderItemType() === $b->getOrderItemType()) {
                 return ($a->getId() < $b->getId()) ? -1 : 1;
             } elseif ($a->isProduct()) {

src/Eccube/ServiceProvider/CompatRepositoryProvider.php

Spacing +52 added lines, -52 removed lines

@@ -11,163 +11,163 @@
     public function register(Container $app)
     {
         // Repository
-        $app['eccube.repository.master.authority'] = function () use ($app) {
+        $app['eccube.repository.master.authority'] = function() use ($app) {
             return $app['Eccube\Repository\Master\AuthorityRepository'];
         };
-        $app['eccube.repository.master.tag'] = function () use ($app) {
+        $app['eccube.repository.master.tag'] = function() use ($app) {
             return $app['Eccube\Repository\Master\TagRepository'];
         };
-        $app['eccube.repository.master.pref'] = function () use ($app) {
+        $app['eccube.repository.master.pref'] = function() use ($app) {
             return $app['Eccube\Repository\Master\PrefRepository'];
         };
-        $app['eccube.repository.master.sex'] = function () use ($app) {
+        $app['eccube.repository.master.sex'] = function() use ($app) {
             return $app['Eccube\Repository\Master\SexRepository'];
         };
-        $app['eccube.repository.master.product_status'] = function () use ($app) {
+        $app['eccube.repository.master.product_status'] = function() use ($app) {
             return $app['Eccube\Repository\Master\ProductStatusRepository'];
         };
-        $app['eccube.repository.master.product_type'] = function () use ($app) {
+        $app['eccube.repository.master.product_type'] = function() use ($app) {
             return $app['Eccube\Repository\Master\ProductTypeRepository'];
         };
-        $app['eccube.repository.master.page_max'] = function () use ($app) {
+        $app['eccube.repository.master.page_max'] = function() use ($app) {
             return $app['Eccube\Repository\Master\PageMaxRepository'];
         };
-        $app['eccube.repository.master.order_status'] = function () use ($app) {
+        $app['eccube.repository.master.order_status'] = function() use ($app) {
             return $app['Eccube\Repository\Master\OrderStatusRepository'];
         };
-        $app['eccube.repository.master.product_list_max'] = function () use ($app) {
+        $app['eccube.repository.master.product_list_max'] = function() use ($app) {
             return $app['Eccube\Repository\Master\ProductListMaxRepository'];
         };
-        $app['eccube.repository.master.product_list_order_by'] = function () use ($app) {
+        $app['eccube.repository.master.product_list_order_by'] = function() use ($app) {
             return $app['Eccube\Repository\Master\ProductListOrderByRepository'];
         };
-        $app['eccube.repository.master.device_type'] = function () use ($app) {
+        $app['eccube.repository.master.device_type'] = function() use ($app) {
             return $app['Eccube\Repository\Master\DeviceTypeRepository'];
         };
-        $app['eccube.repository.master.csv_type'] = function () use ($app) {
+        $app['eccube.repository.master.csv_type'] = function() use ($app) {
             return $app['Eccube\Repository\Master\CsvTypeRepository'];
         };
-        $app['eccube.repository.master.order_item_type'] = function () use ($app) {
+        $app['eccube.repository.master.order_item_type'] = function() use ($app) {
             return $app['Eccube\Repository\Master\OrderItemTypeRepository'];
         };
-        $app['eccube.repository.base_info'] = function () use ($app) {
+        $app['eccube.repository.base_info'] = function() use ($app) {
             return $app['Eccube\Repository\BaseInfoRepository'];
         };
-        $app['eccube.repository.delivery'] = function () use ($app) {
+        $app['eccube.repository.delivery'] = function() use ($app) {
             return $app['Eccube\Repository\DeliveryRepository'];
         };
-        $app['eccube.repository.delivery_date'] = function () use ($app) {
+        $app['eccube.repository.delivery_date'] = function() use ($app) {
             return $app['Eccube\Repository\DeliveryDateRepository'];
         };
-        $app['eccube.repository.delivery_fee'] = function () use ($app) {
+        $app['eccube.repository.delivery_fee'] = function() use ($app) {
             return $app['Eccube\Repository\DeliveryFeeRepository'];
         };
-        $app['eccube.repository.delivery_time'] = function () use ($app) {
+        $app['eccube.repository.delivery_time'] = function() use ($app) {
             return $app['Eccube\Repository\DeliveryTimeRepository'];
         };
-        $app['eccube.repository.payment'] = function () use ($app) {
+        $app['eccube.repository.payment'] = function() use ($app) {
             return $app['Eccube\Repository\PaymentRepository'];
         };
-        $app['eccube.repository.payment_option'] = function () use ($app) {
+        $app['eccube.repository.payment_option'] = function() use ($app) {
             return $app['Eccube\Repository\PaymentOptionRepository'];
         };
-        $app['eccube.repository.customer'] = function () use ($app) {
+        $app['eccube.repository.customer'] = function() use ($app) {
             return $app['Eccube\Repository\CustomerRepository'];
         };
-        $app['eccube.repository.news'] = function () use ($app) {
+        $app['eccube.repository.news'] = function() use ($app) {
             return $app['Eccube\Repository\NewsRepository'];
         };
-        $app['eccube.repository.mail_history'] = function () use ($app) {
+        $app['eccube.repository.mail_history'] = function() use ($app) {
             return $app['Eccube\Repository\MailHistoryRepository'];
         };
-        $app['eccube.repository.member'] = function () use ($app) {
+        $app['eccube.repository.member'] = function() use ($app) {
             return $app['Eccube\Repository\MemberRepository'];
         };
-        $app['eccube.repository.order'] = function () use ($app) {
+        $app['eccube.repository.order'] = function() use ($app) {
             return $app['Eccube\Repository\OrderRepository'];
         };
-        $app['eccube.repository.product'] = function () use ($app) {
+        $app['eccube.repository.product'] = function() use ($app) {
             return $app['Eccube\Repository\ProductRepository'];
         };
-        $app['eccube.repository.product_image'] = function () use ($app) {
+        $app['eccube.repository.product_image'] = function() use ($app) {
             return $app['Eccube\Repository\ProductImageRepository'];
         };
-        $app['eccube.repository.product_class'] = function () use ($app) {
+        $app['eccube.repository.product_class'] = function() use ($app) {
             return $app['Eccube\Repository\ProductClassRepository'];
         };
-        $app['eccube.repository.product_stock'] = function () use ($app) {
+        $app['eccube.repository.product_stock'] = function() use ($app) {
             return $app['Eccube\Repository\ProductStockRepository'];
         };
-        $app['eccube.repository.product_tag'] = function () use ($app) {
+        $app['eccube.repository.product_tag'] = function() use ($app) {
             return $app['Eccube\Repository\ProductTagRepository'];
         };
-        $app['eccube.repository.class_name'] = function () use ($app) {
+        $app['eccube.repository.class_name'] = function() use ($app) {
             return $app['Eccube\Repository\ClassNameRepository'];
         };
-        $app['eccube.repository.class_category'] = function () use ($app) {
+        $app['eccube.repository.class_category'] = function() use ($app) {
             return $app['Eccube\Repository\ClassCategoryRepository'];
         };
-        $app['eccube.repository.customer_favorite_product'] = function () use ($app) {
+        $app['eccube.repository.customer_favorite_product'] = function() use ($app) {
             return $app['Eccube\Repository\CustomerFavoriteProductRepository'];
         };
-        $app['eccube.repository.tax_rule'] = function () use ($app) {
+        $app['eccube.repository.tax_rule'] = function() use ($app) {
             return $app['Eccube\Repository\TaxRuleRepository'];
         };
-        $app['eccube.repository.page'] = function () use ($app) {
+        $app['eccube.repository.page'] = function() use ($app) {
             return $app['Eccube\Repository\PageRepository'];
         };
-        $app['eccube.repository.block'] = function () use ($app) {
+        $app['eccube.repository.block'] = function() use ($app) {
             return $app['Eccube\Repository\BlockRepository'];
         };
-        $app['eccube.repository.order'] = function () use ($app) {
+        $app['eccube.repository.order'] = function() use ($app) {
             return $app['Eccube\Repository\OrderRepository'];
         };
-        $app['eccube.repository.customer_address'] = function () use ($app) {
+        $app['eccube.repository.customer_address'] = function() use ($app) {
             return $app['Eccube\Repository\CustomerAddressRepository'];
         };
-        $app['eccube.repository.shipping'] = function () use ($app) {
+        $app['eccube.repository.shipping'] = function() use ($app) {
             return $app['Eccube\Repository\ShippingRepository'];
         };
-        $app['eccube.repository.order_item'] = function () use ($app) {
+        $app['eccube.repository.order_item'] = function() use ($app) {
             return $app['Eccube\Repository\OrderItemRepository'];
         };
-        $app['eccube.repository.master.customer_status'] = function () use ($app) {
+        $app['eccube.repository.master.customer_status'] = function() use ($app) {
             return $app['Eccube\Repository\Master\CustomerStatusRepository'];
         };
 
-        $app['eccube.repository.mail_template'] = function () use ($app) {
+        $app['eccube.repository.mail_template'] = function() use ($app) {
             return $app['Eccube\Repository\MailTemplateRepository'];
         };
-        $app['eccube.repository.csv'] = function () use ($app) {
+        $app['eccube.repository.csv'] = function() use ($app) {
             return $app['Eccube\Repository\CsvRepository'];
         };
-        $app['eccube.repository.template'] = function () use ($app) {
+        $app['eccube.repository.template'] = function() use ($app) {
             return $app['Eccube\Repository\TemplateRepository'];
         };
-        $app['eccube.repository.authority_role'] = function () use ($app) {
+        $app['eccube.repository.authority_role'] = function() use ($app) {
             return $app['Eccube\Repository\AuthorityRoleRepository'];
         };
-        $app['eccube.repository.category'] = function () use ($app) {
+        $app['eccube.repository.category'] = function() use ($app) {
             return $app['Eccube\Repository\CategoryRepository'];
         };
-        $app['eccube.repository.help'] = function () use ($app) {
+        $app['eccube.repository.help'] = function() use ($app) {
             return $app['Eccube\Repository\HelpRepository'];
         };
-        $app['eccube.repository.plugin'] = function () use ($app) {
+        $app['eccube.repository.plugin'] = function() use ($app) {
             return $app['Eccube\Repository\PluginRepository'];
         };
-        $app['eccube.repository.plugin_event_handler'] = function () use ($app) {
+        $app['eccube.repository.plugin_event_handler'] = function() use ($app) {
             return $app['Eccube\Repository\PluginEventHandlerRepository'];
         };
-        $app['eccube.repository.layout'] = function () use ($app) {
+        $app['eccube.repository.layout'] = function() use ($app) {
             return $app['Eccube\Repository\LayoutRepository'];
         };
 
         // alias
-        $app['eccube.repository.order_status'] = function () use ($app) {
+        $app['eccube.repository.order_status'] = function() use ($app) {
             return $app['Eccube\Repository\Master\OrderStatusRepository'];
         };
-        $app['eccube.repository.customer_status'] = function () use ($app) {
+        $app['eccube.repository.customer_status'] = function() use ($app) {
             return $app['Eccube\Repository\Master\CustomerStatusRepository'];
         };
     }

src/Eccube/Form/Type/ShippingMultipleType.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         $app = $this->app;
 
         $builder
-            ->addEventListener(FormEvents::POST_SET_DATA, function ($event) use ($app) {
+            ->addEventListener(FormEvents::POST_SET_DATA, function($event) use ($app) {
                 /** @var \Eccube\Entity\OrderItem $data */
                 $data = $event->getData();
                 /** @var \Symfony\Component\Form\Form $form */

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

Spacing +6 added lines, -10 removed lines

@@ -178,7 +178,7 @@ 
         $app = $this->app;
         // XXX price を priceIncTax にセットし直す
         // OrderItem::getTotalPrice でもやっているので、どこか一箇所にまとめたい
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($app) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($app) {
                 /** @var \Eccube\Entity\OrderItem $OrderItem */
                 $OrderItem = $event->getData();
                 $TaxDisplayType = $OrderItem->getTaxDisplayType();
@@ -196,7 +196,7 @@ 
 
                 $event->setData($OrderItem);
         });
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
             // モーダルからのPOST時に、金額等をセットする.
             if ('modal' === $this->requestStack->getCurrentRequest()->get('modal')) {
                 $data = $event->getData();
@@ -266,17 +266,13 @@ 
                                 $data['product_name'] = $Product->getName();
                                 $data['product_code'] = $ProductClass->getCode();
                                 $data['class_name1'] = $ProductClass->hasClassCategory1() ?
-                                    $ProductClass->getClassCategory1()->getClassName() :
-                                    null;
+                                    $ProductClass->getClassCategory1()->getClassName() : null;
                                 $data['class_name2'] = $ProductClass->hasClassCategory2() ?
-                                    $ProductClass->getClassCategory2()->getClassName() :
-                                    null;
+                                    $ProductClass->getClassCategory2()->getClassName() : null;
                                 $data['class_category_name1'] = $ProductClass->hasClassCategory1() ?
-                                    $ProductClass->getClassCategory1()->getName() :
-                                    null;
+                                    $ProductClass->getClassCategory1()->getName() : null;
                                 $data['class_category_name2'] = $ProductClass->hasClassCategory2() ?
-                                    $ProductClass->getClassCategory2()->getName() :
-                                    null;
+                                    $ProductClass->getClassCategory2()->getName() : null;
                                 $data['price'] = $ProductClass->getPrice02();
                                 $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];
                                 $data['tax_type'] = TaxType::TAXATION;