EC-CUBE / ec-cube

src/Eccube/Service/CartService.php

Spacing +5 added lines, -6 removed lines

@@ -221,7 +221,7 @@ 
         $CartItem
             ->setClassName('Eccube\Entity\ProductClass')
             ->setObject($ProductClass)
-            ->setClassId((string)$ProductClass->getId())
+            ->setClassId((string) $ProductClass->getId())
             ->setPrice($ProductClass->getPrice02IncTax())
             ->setQuantity(1);
         return $CartItem;
@@ -252,8 +252,7 @@ 
         $compareService = $this->generateCartCompareService();
         $ExistsCartItem = $compareService->getExistsCartItem($CartItem);
         return $ExistsCartItem ?
-            $ExistsCartItem->getQuantity() :
-            0;
+            $ExistsCartItem->getQuantity() : 0;
     }
 
     /**
@@ -383,7 +382,7 @@ 
      */
     public function getProductQuantity($productClassId)
     {
-        $CartItem = $this->cart->getCartItemByIdentifier('Eccube\Entity\ProductClass', (string)$productClassId);
+        $CartItem = $this->cart->getCartItemByIdentifier('Eccube\Entity\ProductClass', (string) $productClassId);
         if ($CartItem) {
             return $CartItem->getQuantity();
         } else {
@@ -468,7 +467,7 @@ 
             $CartItem = new CartItem();
             $CartItem
                 ->setClassName('Eccube\Entity\ProductClass')
-                ->setClassId((string)$ProductClass->getId())
+                ->setClassId((string) $ProductClass->getId())
                 ->setPrice($ProductClass->getPrice02IncTax())
                 ->setQuantity($quantity);
 
@@ -626,7 +625,7 @@ 
      */
     public function removeProduct($productClassId)
     {
-        $this->cart->removeCartItemByIdentifier('Eccube\Entity\ProductClass', (string)$productClassId);
+        $this->cart->removeCartItemByIdentifier('Eccube\Entity\ProductClass', (string) $productClassId);
 
         // 支払方法の再設定
         if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {

src/Eccube/ServiceProvider/EccubeServiceProvider.php

Spacing +79 added lines, -79 removed lines

@@ -45,44 +45,44 @@ 
     public function register(Container $app)
     {
         // Service
-        $app['eccube.service.system'] = function () use ($app) {
+        $app['eccube.service.system'] = function() use ($app) {
             return new \Eccube\Service\SystemService($app);
         };
-        $app['view'] = function () use ($app) {
+        $app['view'] = function() use ($app) {
             return $app['twig'];
         };
-        $app['eccube.service.cart'] = function () use ($app) {
+        $app['eccube.service.cart'] = function() use ($app) {
             return new \Eccube\Service\CartService($app);
         };
-        $app['eccube.service.cart.compare'] = $app->protect(function ($Cart) use ($app) {
+        $app['eccube.service.cart.compare'] = $app->protect(function($Cart) use ($app) {
             $service = new \Eccube\Service\CartCompareService($Cart);
             $service->setContext($app['eccube.cart.comparator.context']);
             return $service;
         });
-        $app['eccube.cart.comparator.context'] = function () use ($app) {
+        $app['eccube.cart.comparator.context'] = function() use ($app) {
             $context = new \Eccube\Service\CartComparator\CompareContext();
             $context->addStrategy($app['eccube.cart.comparator.strategy.product_class']);
             return $context;
         };
-        $app['eccube.cart.comparator.strategy.product_class'] = function () {
+        $app['eccube.cart.comparator.strategy.product_class'] = function() {
             return new \Eccube\Service\CartComparator\Strategy\ProductClassStrategy();
         };
-        $app['eccube.service.order'] = function () use ($app) {
+        $app['eccube.service.order'] = function() use ($app) {
             return new \Eccube\Service\OrderService($app);
         };
-        $app['eccube.service.tax_rule'] = function () use ($app) {
+        $app['eccube.service.tax_rule'] = function() use ($app) {
             return new \Eccube\Service\TaxRuleService($app['eccube.repository.tax_rule']);
         };
-        $app['eccube.service.plugin'] = function () use ($app) {
+        $app['eccube.service.plugin'] = function() use ($app) {
             return new \Eccube\Service\PluginService($app);
         };
-        $app['eccube.service.mail'] = function () use ($app) {
+        $app['eccube.service.mail'] = function() use ($app) {
             return new \Eccube\Service\MailService($app);
         };
-        $app['eccube.calculate.context'] = function () use ($app) {
+        $app['eccube.calculate.context'] = function() use ($app) {
                 return new \Eccube\Service\Calculator\CalculateContext();
         };
-        $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'];
                 $Context->setCalculateStrategies($app['eccube.calculate.strategies']($Order));
@@ -91,40 +91,40 @@ 
                 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;
                 $Service->setApplication($app);
                 return $Service;
         });
 
-        $app['eccube.calculate.strategies'] = $app->protect(function ($Order) use ($app) {
+        $app['eccube.calculate.strategies'] = $app->protect(function($Order) use ($app) {
             $Strategies = new \Doctrine\Common\Collections\ArrayCollection(); // TODO 暫定的に ArrayCollection とする. 専用クラスにしたい
             // デフォルトのストラテジーをセットしておく
             $Strategies->add($app['eccube.calculate.strategy.shipping']($Order));
             $Strategies->add($app['eccube.calculate.strategy.tax']($Order));
             return $Strategies;
         });
-        $app['eccube.calculate.strategy.shipping'] = $app->protect(function ($Order) use ($app) {
+        $app['eccube.calculate.strategy.shipping'] = $app->protect(function($Order) use ($app) {
                 $Strategy = new \Eccube\Service\Calculator\Strategy\ShippingStrategy();
                 $Strategy->setApplication($app);
                 $Strategy->setOrder($Order);
                 return $Strategy;
         });
-        $app['eccube.calculate.strategy.tax'] = $app->protect(function ($Order) use ($app) {
+        $app['eccube.calculate.strategy.tax'] = $app->protect(function($Order) use ($app) {
                 $Strategy = new \Eccube\Service\Calculator\Strategy\TaxStrategy();
                 $Strategy->setApplication($app);
                 $Strategy->setOrder($Order);
                 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);
@@ -132,11 +132,11 @@ 
                 return $PaymentMethod;
         });
 
-        $app['eccube.helper.order'] = function ($app) {
+        $app['eccube.helper.order'] = function($app) {
             return new OrderHelper($app);
         };
 
-        $app['eccube.service.csv.export'] = function () use ($app) {
+        $app['eccube.service.csv.export'] = function() use ($app) {
             $csvService = new \Eccube\Service\CsvExportService();
             $csvService->setEntityManager($app['orm.em']);
             $csvService->setConfig($app['config']);
@@ -148,195 +148,195 @@ 
 
             return $csvService;
         };
-        $app['eccube.service.shopping'] = function () use ($app) {
+        $app['eccube.service.shopping'] = function() use ($app) {
             return new \Eccube\Service\ShoppingService($app, $app['eccube.service.cart'], $app['eccube.service.order']);
         };
 
         // Repository
-        $app['eccube.repository.master.authority'] = function () use ($app) {
+        $app['eccube.repository.master.authority'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Authority');
         };
-        $app['eccube.repository.master.tag'] = function () use ($app) {
+        $app['eccube.repository.master.tag'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Tag');
         };
-        $app['eccube.repository.master.pref'] = function () use ($app) {
+        $app['eccube.repository.master.pref'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Pref');
         };
-        $app['eccube.repository.master.sex'] = function () use ($app) {
+        $app['eccube.repository.master.sex'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Sex');
         };
-        $app['eccube.repository.master.disp'] = function () use ($app) {
+        $app['eccube.repository.master.disp'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\Disp');
         };
-        $app['eccube.repository.master.product_type'] = function () use ($app) {
+        $app['eccube.repository.master.product_type'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductType');
         };
-        $app['eccube.repository.master.page_max'] = function () use ($app) {
+        $app['eccube.repository.master.page_max'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\PageMax');
         };
-        $app['eccube.repository.master.order_status'] = function () use ($app) {
+        $app['eccube.repository.master.order_status'] = function() use ($app) {
         };
-        $app['eccube.repository.master.product_list_max'] = function () use ($app) {
+        $app['eccube.repository.master.product_list_max'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductListMax');
         };
-        $app['eccube.repository.master.product_list_order_by'] = function () use ($app) {
+        $app['eccube.repository.master.product_list_order_by'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductListOrderBy');
         };
-        $app['eccube.repository.master.order_status'] = function () use ($app) {
+        $app['eccube.repository.master.order_status'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus');
         };
-        $app['eccube.repository.master.device_type'] = function () use ($app) {
+        $app['eccube.repository.master.device_type'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\DeviceType');
         };
-        $app['eccube.repository.master.csv_type'] = function () use ($app) {
+        $app['eccube.repository.master.csv_type'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\CsvType');
         };
 
-        $app['eccube.repository.delivery'] = function () use ($app) {
+        $app['eccube.repository.delivery'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Delivery');
         };
-        $app['eccube.repository.delivery_date'] = function () use ($app) {
+        $app['eccube.repository.delivery_date'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryDate');
         };
-        $app['eccube.repository.delivery_fee'] = function () use ($app) {
+        $app['eccube.repository.delivery_fee'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryFee');
         };
-        $app['eccube.repository.delivery_time'] = function () use ($app) {
+        $app['eccube.repository.delivery_time'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\DeliveryTime');
         };
-        $app['eccube.repository.payment'] = function () use ($app) {
+        $app['eccube.repository.payment'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Payment');
         };
-        $app['eccube.repository.payment_option'] = function () use ($app) {
+        $app['eccube.repository.payment_option'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\PaymentOption');
         };
-        $app['eccube.repository.category'] = function () use ($app) {
+        $app['eccube.repository.category'] = function() use ($app) {
             $CategoryRepository = $app['orm.em']->getRepository('Eccube\Entity\Category');
             $CategoryRepository->setApplication($app);
 
             return $CategoryRepository;
         };
-        $app['eccube.repository.customer'] = function () use ($app) {
+        $app['eccube.repository.customer'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Customer');
         };
-        $app['eccube.repository.news'] = function () use ($app) {
+        $app['eccube.repository.news'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\News');
         };
-        $app['eccube.repository.mail_history'] = function () use ($app) {
+        $app['eccube.repository.mail_history'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\MailHistory');
         };
-        $app['eccube.repository.member'] = function () use ($app) {
+        $app['eccube.repository.member'] = function() use ($app) {
             $memberRepository = $app['orm.em']->getRepository('Eccube\Entity\Member');
             $memberRepository->setEncoderFactorty($app['security.encoder_factory']);
             return $memberRepository;
         };
-        $app['eccube.repository.order'] = function () use ($app) {
+        $app['eccube.repository.order'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Order');
         };
-        $app['eccube.repository.product'] = function () use ($app) {
+        $app['eccube.repository.product'] = function() use ($app) {
             $productRepository = $app['orm.em']->getRepository('Eccube\Entity\Product');
             $productRepository->setApplication($app);
 
             return $productRepository;
         };
-        $app['eccube.repository.product_image'] = function () use ($app) {
+        $app['eccube.repository.product_image'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductImage');
         };
-        $app['eccube.repository.product_class'] = function () use ($app) {
+        $app['eccube.repository.product_class'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductClass');
         };
-        $app['eccube.repository.product_stock'] = function () use ($app) {
+        $app['eccube.repository.product_stock'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductStock');
         };
-        $app['eccube.repository.product_tag'] = function () use ($app) {
+        $app['eccube.repository.product_tag'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ProductTag');
         };
-        $app['eccube.repository.class_name'] = function () use ($app) {
+        $app['eccube.repository.class_name'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ClassName');
         };
-        $app['eccube.repository.class_category'] = function () use ($app) {
+        $app['eccube.repository.class_category'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ClassCategory');
         };
-        $app['eccube.repository.customer_favorite_product'] = function () use ($app) {
+        $app['eccube.repository.customer_favorite_product'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\CustomerFavoriteProduct');
         };
-        $app['eccube.repository.base_info'] = function () use ($app) {
+        $app['eccube.repository.base_info'] = function() use ($app) {
             $BaseInfoRepository = $app['orm.em']->getRepository('Eccube\Entity\BaseInfo');
             $BaseInfoRepository->setApplication($app);
 
             return $BaseInfoRepository;
         };
-        $app['eccube.repository.tax_rule'] = function () use ($app) {
+        $app['eccube.repository.tax_rule'] = function() use ($app) {
             $taxRuleRepository = $app['orm.em']->getRepository('Eccube\Entity\TaxRule');
             $taxRuleRepository->setApplication($app);
 
             return $taxRuleRepository;
         };
-        $app['eccube.repository.page_layout'] = function () use ($app) {
+        $app['eccube.repository.page_layout'] = function() use ($app) {
             $pageLayoutRepository = $app['orm.em']->getRepository('Eccube\Entity\PageLayout');
             $pageLayoutRepository->setApplication($app);
 
             return $pageLayoutRepository;
         };
-        $app['eccube.repository.block'] = function () use ($app) {
+        $app['eccube.repository.block'] = function() use ($app) {
             $blockRepository = $app['orm.em']->getRepository('Eccube\Entity\Block');
             $blockRepository->setApplication($app);
 
             return $blockRepository;
         };
-        $app['eccube.repository.order'] = function () use ($app) {
+        $app['eccube.repository.order'] = function() use ($app) {
             $orderRepository = $app['orm.em']->getRepository('Eccube\Entity\Order');
             $orderRepository->setApplication($app);
 
             return $orderRepository;
         };
-        $app['eccube.repository.customer_address'] = function () use ($app) {
+        $app['eccube.repository.customer_address'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\CustomerAddress');
         };
-        $app['eccube.repository.shipping'] = function () use ($app) {
+        $app['eccube.repository.shipping'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Shipping');
         };
-        $app['eccube.repository.customer_status'] = function () use ($app) {
+        $app['eccube.repository.customer_status'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\CustomerStatus');
         };
-        $app['eccube.repository.order_status'] = function () use ($app) {
+        $app['eccube.repository.order_status'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus');
         };
-        $app['eccube.repository.mail_template'] = function () use ($app) {
+        $app['eccube.repository.mail_template'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\MailTemplate');
         };
-        $app['eccube.repository.csv'] = function () use ($app) {
+        $app['eccube.repository.csv'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Csv');
         };
-        $app['eccube.repository.template'] = function () use ($app) {
+        $app['eccube.repository.template'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Template');
         };
-        $app['eccube.repository.authority_role'] = function () use ($app) {
+        $app['eccube.repository.authority_role'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\AuthorityRole');
         };
 
-        $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['eccube.repository.help'] = function () use ($app) {
+        $app['eccube.repository.help'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Help');
         };
-        $app['eccube.repository.plugin'] = function () use ($app) {
+        $app['eccube.repository.plugin'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Plugin');
         };
-        $app['eccube.repository.plugin_event_handler'] = function () use ($app) {
+        $app['eccube.repository.plugin_event_handler'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\PluginEventHandler');
         };
 
-        $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 ' . ")
@@ -346,7 +346,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 ' . ")
@@ -357,7 +357,7 @@ 
         });
 
         // TODO 使用するか検討
-        $app['eccube.twig.generic_node_names'] = function () use ($app) {
+        $app['eccube.twig.generic_node_names'] = function() use ($app) {
             return [
                 'hello',
                 'jiro',
@@ -366,7 +366,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);
@@ -375,20 +375,20 @@ 
         };
 
         // TODO ServiceProvider から追加できるよう Collection にする
-        $app['eccube.twig.block.templates'] = function () {
+        $app['eccube.twig.block.templates'] = function() {
             return [
                 'render_block.twig',
             ];
         };
 
         // Form\Type
-        $app->extend('form.type.extensions', function ($extensions) use ($app) {
+        $app->extend('form.type.extensions', function($extensions) use ($app) {
             $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension();
             $extensions[] = new \Eccube\Form\Extension\FreezeTypeExtension();
             $extensions[] = new \Eccube\Form\Extension\DoctrineOrmExtension($app['orm.em']);
             return $extensions;
         });
-        $app->extend('form.types', function ($types) use ($app) {
+        $app->extend('form.types', function($types) use ($app) {
             $types[] = new \Eccube\Form\Type\NameType($app['config']);
             $types[] = new \Eccube\Form\Type\KanaType($app['config']);
             $types[] = new \Eccube\Form\Type\TelType($app['config']);