EC-CUBE / ec-cube

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/ServiceProvider/EccubeServiceProvider.php

Spacing +36 added lines, -36 removed lines

@@ -69,15 +69,15 @@ 
      */
     public function register(Container $app)
     {
-        $app[BaseInfo::class] = function () use ($app) {
+        $app[BaseInfo::class] = function() use ($app) {
             return $app[BaseInfoRepository::class]->get();
         };
 
-        $app['eccube.calculate.context'] = function () use ($app) {
+        $app['eccube.calculate.context'] = function() use ($app) {
                 return new \Eccube\Service\Calculator\CalculateContext();
         };
 
-        $app['eccube.calculate.strategies'] = function () use ($app) {
+        $app['eccube.calculate.strategies'] = function() use ($app) {
             $Collection = new \Eccube\Service\Calculator\CalculateStrategyCollection();
             $Collection->setApplication($app);
             //$Collection->setOrder($Order);
@@ -90,47 +90,47 @@ 
             $Collection->add($app['eccube.calculate.strategy.calculate_total']);
             return $Collection;
         };
-        $app['eccube.calculate.strategy.shipping'] = function () use ($app) {
+        $app['eccube.calculate.strategy.shipping'] = function() use ($app) {
                 $Strategy = new \Eccube\Service\Calculator\Strategy\ShippingStrategy();
                 $Strategy->setApplication($app);
                 return $Strategy;
         };
-        $app['eccube.calculate.strategy.charge'] = function () use ($app) {
+        $app['eccube.calculate.strategy.charge'] = function() use ($app) {
                 $Strategy = new \Eccube\Service\Calculator\Strategy\ChargeStrategy();
                 $Strategy->setApplication($app);
                 return $Strategy;
         };
 
-        $app['eccube.calculate.strategy.tax'] = function () use ($app) {
+        $app['eccube.calculate.strategy.tax'] = function() use ($app) {
                 $Strategy = new \Eccube\Service\Calculator\Strategy\TaxStrategy();
                 $Strategy->setApplication($app);
                 return $Strategy;
         };
 
-        $app['eccube.calculate.strategy.calculate_delivery_fee'] = function () use ($app) {
+        $app['eccube.calculate.strategy.calculate_delivery_fee'] = function() use ($app) {
             $Strategy = new \Eccube\Service\Calculator\Strategy\CalculateDeliveryFeeStrategy();
             $Strategy->setApplication($app);
             return $Strategy;
         };
-        $app['eccube.calculate.strategy.calculate_charge'] = function () use ($app) {
+        $app['eccube.calculate.strategy.calculate_charge'] = function() use ($app) {
             $Strategy = new \Eccube\Service\Calculator\Strategy\CalculateChargeStrategy();
             $Strategy->setApplication($app);
             return $Strategy;
         };
-        $app['eccube.calculate.strategy.calculate_total'] = function () use ($app) {
+        $app['eccube.calculate.strategy.calculate_total'] = function() use ($app) {
             $Strategy = new \Eccube\Service\Calculator\Strategy\CalculateTotalStrategy();
             $Strategy->setApplication($app);
             return $Strategy;
         };
 
-        $app['payment.method'] = $app->protect(function ($clazz, $form) use ($app) {
+        $app['payment.method'] = $app->protect(function($clazz, $form) use ($app) {
                 $PaymentMethod = new $clazz;
                 $PaymentMethod->setApplication($app);
                 $PaymentMethod->setFormType($form);
                 return $PaymentMethod;
         });
 
-        $app['payment.method.request'] = $app->protect(function ($clazz, $form, $request) use ($app) {
+        $app['payment.method.request'] = $app->protect(function($clazz, $form, $request) use ($app) {
                 $PaymentMethod = new $clazz;
                 $PaymentMethod->setApplication($app);
                 $PaymentMethod->setFormType($form);
@@ -138,7 +138,7 @@ 
                 return $PaymentMethod;
         });
 
-        $app['eccube.service.calculate'] = $app->protect(function ($Order, $Customer) use ($app) {
+        $app['eccube.service.calculate'] = $app->protect(function($Order, $Customer) use ($app) {
             $Service = new \Eccube\Service\CalculateService($Order, $Customer);
             $Context = $app['eccube.calculate.context'];
             $app['eccube.calculate.strategies']->setOrder($Order);
@@ -149,24 +149,24 @@ 
             return $Service;
         });
 
-        $app['eccube.service.payment'] = $app->protect(function ($clazz) use ($app) {
+        $app['eccube.service.payment'] = $app->protect(function($clazz) use ($app) {
             $Service = new $clazz($app['request_stack']);
 
             return $Service;
         });
 
-        $app['paginator'] = $app->protect(function () {
+        $app['paginator'] = $app->protect(function() {
             $paginator = new \Knp\Component\Pager\Paginator();
             $paginator->subscribe(new \Eccube\EventListener\PaginatorListener());
 
             return $paginator;
         });
 
-        $app['request_scope'] = function () {
+        $app['request_scope'] = function() {
             return new ParameterBag();
         };
         // TODO 使用するか検討
-        $app['eccube.twig.node.hello'] = $app->protect(function ($node, $compiler) {
+        $app['eccube.twig.node.hello'] = $app->protect(function($node, $compiler) {
             $compiler
             ->addDebugInfo($node)
             ->write("echo 'Helloooooo ' . ")
@@ -176,7 +176,7 @@ 
 
         });
         // TODO 使用するか検討
-        $app['eccube.twig.node.jiro'] = $app->protect(function ($node, $compiler) {
+        $app['eccube.twig.node.jiro'] = $app->protect(function($node, $compiler) {
             $compiler
             ->addDebugInfo($node)
             ->write("echo 'jirooooooo ' . ")
@@ -187,7 +187,7 @@ 
         });
 
         // TODO 使用するか検討
-        $app['eccube.twig.generic_node_names'] = function () use ($app) {
+        $app['eccube.twig.generic_node_names'] = function() use ($app) {
             return [
                 'hello',
                 'jiro',
@@ -196,7 +196,7 @@ 
         };
 
         // TODO 使用するか検討
-        $app['twig_parsers'] = function () use ($app) {
+        $app['twig_parsers'] = function() use ($app) {
             $GenericTokenParsers = [];
             foreach ($app['eccube.twig.generic_node_names'] as $tagName) {
                 $GenericTokenParsers[] = new \Eccube\Twig\Extension\GenericTokenParser($app, $tagName);
@@ -204,7 +204,7 @@ 
             return $GenericTokenParsers;
         };
 
-        $app['eccube.twig.block.templates'] = function () {
+        $app['eccube.twig.block.templates'] = function() {
             $templates = new ArrayCollection();
             $templates[] = 'render_block.twig';
 
@@ -212,17 +212,17 @@ 
         };
 
         $app['eccube.entity.event.dispatcher']->addEventListener(new \Acme\Entity\SoldOutEventListener());
-        $app['eccube.queries'] = function () {
+        $app['eccube.queries'] = function() {
             return new \Eccube\Doctrine\Query\Queries();
         };
         // TODO QueryCustomizerの追加方法は要検討
         $app['eccube.queries']->addCustomizer(new \Acme\Entity\AdminProductListCustomizer());
 
-        $app['eccube.purchase.context'] = $app->protect(function (ItemHolderInterface $origin = null) {
+        $app['eccube.purchase.context'] = $app->protect(function(ItemHolderInterface $origin = null) {
             return new PurchaseContext($origin);
         });
 
-        $app['eccube.purchase.flow.cart.item_processors'] = function ($app) {
+        $app['eccube.purchase.flow.cart.item_processors'] = function($app) {
             $processors = new ArrayCollection();
             $processors->add(new DeletedProductValidator());
             $processors->add(new DisplayStatusValidator());
@@ -232,7 +232,7 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.cart.holder_processors'] = function ($app) {
+        $app['eccube.purchase.flow.cart.holder_processors'] = function($app) {
             $processors = new ArrayCollection();
             $processors->add(new PaymentProcessor($app[DeliveryRepository::class]));
             $processors->add(new PaymentTotalLimitValidator($app['config']['max_total_fee']));
@@ -242,34 +242,34 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.cart.add_item_processors'] = function ($app) {
+        $app['eccube.purchase.flow.cart.add_item_processors'] = function($app) {
             return new ArrayCollection([
                 new AddItemProcessor($app['eccube.purchase.flow.cart.item_comparer']),
             ]);
         };
 
         // example
-        $app->extend('eccube.purchase.flow.cart.item_processors', function ($processors, $app) {
+        $app->extend('eccube.purchase.flow.cart.item_processors', function($processors, $app) {
 
             $processors->add(new StockValidator());
 
             return $processors;
         });
 
-        $app['eccube.purchase.flow.cart.item_comparer'] = function ($app) {
+        $app['eccube.purchase.flow.cart.item_comparer'] = function($app) {
             return new ItemComparerCollection([
                 $app['eccube.purchase.flow.item_comparer.product_class'],
                 $app['eccube.purchase.flow.item_comparer.price'],
             ]);
         };
 
-        $app['eccube.purchase.flow.order.add_item_processors'] = function ($app) {
+        $app['eccube.purchase.flow.order.add_item_processors'] = function($app) {
             return new ArrayCollection([
                 new AddItemProcessor($app['eccube.purchase.flow.order.item_comparer']),
             ]);
         };
 
-        $app['eccube.purchase.flow.order.item_comparer'] = function ($app) {
+        $app['eccube.purchase.flow.order.item_comparer'] = function($app) {
             return new ItemComparerCollection([
                 $app['eccube.purchase.flow.item_comparer.product_class'],
                 $app['eccube.purchase.flow.item_comparer.price'],
@@ -278,23 +278,23 @@ 
             ]);
         };
 
-        $app['eccube.purchase.flow.item_comparer.product_class'] = function ($app) {
+        $app['eccube.purchase.flow.item_comparer.product_class'] = function($app) {
             return new ProductClassComparer();
         };
 
-        $app['eccube.purchase.flow.item_comparer.price'] = function ($app) {
+        $app['eccube.purchase.flow.item_comparer.price'] = function($app) {
             return new PriceComparer();
         };
 
-        $app['eccube.purchase.flow.item_comparer.tax'] = function ($app) {
+        $app['eccube.purchase.flow.item_comparer.tax'] = function($app) {
             return new TaxComparer();
         };
 
-        $app['eccube.purchase.flow.item_comparer.order_item_type'] = function ($app) {
+        $app['eccube.purchase.flow.item_comparer.order_item_type'] = function($app) {
             return new OrderItemTypeComparer();
         };
 
-        $app['eccube.purchase.flow.cart'] = function ($app) {
+        $app['eccube.purchase.flow.cart'] = function($app) {
             $flow = new PurchaseFlow();
             $flow->setItemProcessors($app['eccube.purchase.flow.cart.item_processors']);
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.cart.holder_processors']);
@@ -303,7 +303,7 @@ 
             return $flow;
         };
 
-        $app['eccube.purchase.flow.shopping'] = function () use ($app) {
+        $app['eccube.purchase.flow.shopping'] = function() use ($app) {
             $flow = new PurchaseFlow();
             $flow->addItemProcessor(new StockValidator());
             $flow->addItemProcessor(new DisplayStatusValidator());
@@ -313,7 +313,7 @@ 
             return $flow;
         };
 
-        $app['eccube.purchase.flow.order'] = function () use ($app) {
+        $app['eccube.purchase.flow.order'] = function() use ($app) {
             $flow = new PurchaseFlow();
             $flow->addItemProcessor(new StockValidator());
             $flow->addItemHolderProcessor(new PaymentTotalLimitValidator($app['config']['max_total_fee']));

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;
     }