EC-CUBE / ec-cube

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

Doc Comments +1 added lines, -1 removed lines

@@ -650,7 +650,7 @@
      * - 受注ステータスが発送済に設定された場合に発送日を更新
      * - 受注ステータスが入金済に設定された場合に入金日を更新
      *
-     * @param $app
+     * @param Application $app
      * @param $TargetOrder
      * @param $OriginOrder
      *

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

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;
 
 /**
  * // FIXME UrlGenerator で {_admin} を認識しない問題あり

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 {

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 +9 added lines, -11 removed lines

@@ -256,7 +256,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;
@@ -266,17 +266,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) {
@@ -293,7 +292,7 @@ 
                     $orderDetail['quantity'] = 0;
 
                     // 受注詳細と同じ商品規格のみ抽出
-                    $productClassFilter = function ($v) use ($orderDetail) {
+                    $productClassFilter = function($v) use ($orderDetail) {
                         return $orderDetail['ProductClass'] === $v['ProductClass'];
                     };
 
@@ -302,10 +301,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);
 
@@ -334,7 +332,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)) {
@@ -342,7 +340,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/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/ShipmentItemType.php

Spacing +5 added lines, -9 removed lines

@@ -143,7 +143,7 @@ 
                 )));
 
         $app = $this->app;
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
             // モーダルからのPOST時に、金額等をセットする.
             if ('modal' === $app['request_stack']->getCurrentRequest()->get('modal')) {
                 $data = $event->getData();
@@ -213,17 +213,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;

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/Application.php

Spacing +27 added lines, -27 removed lines

@@ -160,7 +160,7 @@ 
         $this->register(new \Saxulum\Validator\Provider\SaxulumValidatorProvider());
         $this->register(new MobileDetectServiceProvider());
 
-        $this->error(function (\Exception $e, Request $request, $code) {
+        $this->error(function(\Exception $e, Request $request, $code) {
             if ($this['debug']) {
                 return;
             }
@@ -254,14 +254,14 @@ 
             return $router;
         });
 
-        $this['eccube.router.origin'] = function ($app) {
+        $this['eccube.router.origin'] = function($app) {
             $resource = __DIR__.'/Controller';
             $cachePrefix = 'Origin';
 
             return $app['eccube.router']($resource, $cachePrefix);
         };
 
-        $this['eccube.routers.plugin'] = function ($app) {
+        $this['eccube.routers.plugin'] = function($app) {
             // TODO 有効なプラグインを対象とする必要がある.
             $dirs = Finder::create()
                 ->in($app['config']['root_dir'].'/app/Plugin')
@@ -278,7 +278,7 @@ 
             return $routers;
         };
 
-        $this['eccube.router.extend'] = function ($app) {
+        $this['eccube.router.extend'] = function($app) {
             // TODO ディレクトリ名は暫定
             $resource = $app['config']['root_dir'].'/app/Acme/Controller';
             $cachePrefix = 'Extend';
@@ -288,7 +288,7 @@ 
             return $router;
         };
 
-        $this->extend('request_matcher', function ($matcher, $app) {
+        $this->extend('request_matcher', function($matcher, $app) {
             $matchers = [];
             $matchers[] = $app['eccube.router.extend'];
             foreach ($app['eccube.routers.plugin'] as $router) {
@@ -300,7 +300,7 @@ 
             return new ChainUrlMatcher($matchers, $app['request_context']);
         });
 
-        $this->extend('url_generator', function ($generator, $app) {
+        $this->extend('url_generator', function($generator, $app) {
             $generators = [];
             $generators[] = $app['eccube.router.extend'];
             foreach ($app['eccube.routers.plugin'] as $router) {
@@ -313,7 +313,7 @@ 
         });
 
         // TODO この設定が正しいか要確認
-        $this->extend('routes_factory', function ($routes, $app ) {
+        $this->extend('routes_factory', function($routes, $app) {
             return $this['sensio_framework_extra.routing.loader.annot_dir']->load($this['config']['root_dir'].'/src/Eccube/Controller');
         });
         // init http cache
@@ -335,7 +335,7 @@ 
             'translator.cache_dir' => $this['debug'] ? null : $this['config']['root_dir'].'/app/cache/translator',
             'locale_fallbacks' => ['ja', 'en'],
         ));
-        $this->extend('translator', function ($translator, \Silex\Application $app) {
+        $this->extend('translator', function($translator, \Silex\Application $app) {
             $translator->addLoader('yaml', new \Symfony\Component\Translation\Loader\YamlFileLoader());
 
             $file = __DIR__.'/Resource/locale/validator.'.$app['locale'].'.yml';
@@ -382,14 +382,14 @@ 
         $this->register(new \Silex\Provider\TwigServiceProvider(), array(
             'twig.form.templates' => array('Form/form_layout.twig'),
         ));
-        $this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) {
+        $this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) {
             $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app));
             $twig->addExtension(new \Twig_Extension_StringLoader());
 
             return $twig;
         });
 
-        $this->before(function (Request $request, \Silex\Application $app) {
+        $this->before(function(Request $request, \Silex\Application $app) {
             $app['admin'] = $app['front'] = false;
             $pathinfo = rawurldecode($request->getPathInfo());
             if (strpos($pathinfo, '/'.trim($app['config']['admin_route'], '/').'/') === 0) {
@@ -405,7 +405,7 @@ 
                 }
                 $paths[] = $app['config']['template_admin_realdir'];
                 $paths[] = __DIR__.'/../../app/Plugin';
-                $cacheDir =  __DIR__.'/../../app/cache/twig/admin';
+                $cacheDir = __DIR__.'/../../app/cache/twig/admin';
             } else {
                 // モバイル端末時、smartphoneディレクトリを探索パスに追加する.
                 if ($app['mobile_detect.device_type'] == \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP) {
@@ -420,7 +420,7 @@ 
                 }
                 $paths[] = $app['config']['template_default_realdir'];
                 $paths[] = __DIR__.'/../../app/Plugin';
-                $cacheDir =  __DIR__.'/../../app/cache/twig/'.$app['config']['template_code'];
+                $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code'];
             }
             $app['twig']->setCache($app['debug'] ? null : $cacheDir);
             $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths));
@@ -438,7 +438,7 @@ 
         }, self::EARLY_EVENT);
 
         // twigのグローバル変数を定義.
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) {
             // 未ログイン時にマイページや管理画面以下にアクセスするとSubRequestで実行されるため,
             // $event->isMasterRequest()ではなく、グローバル変数が初期化済かどうかの判定を行う
             if (isset($this['twig_global_initialized']) && $this['twig_global_initialized'] === true) {
@@ -524,7 +524,7 @@ 
         // メール送信時の文字エンコード指定(デフォルトはUTF-8)
         if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) {
             if ($this['config']['mail']['charset_iso_2022_jp'] === true) {
-                \Swift::init(function () {
+                \Swift::init(function() {
                     \Swift_DependencyContainer::getInstance()
                         ->register('mime.qpheaderencoder')
                         ->asAliasOf('mime.base64headerencoder');
@@ -559,7 +559,7 @@ 
         $this->register(new \Saxulum\DoctrineOrmManagerRegistry\Provider\DoctrineOrmManagerRegistryProvider());
 
         $app = $this;
-        $this->extend('db.event_manager', function ($evm) use ($app) {
+        $this->extend('db.event_manager', function($evm) use ($app) {
             $initSubscriber = new InitSubscriber($app);
             $evm->addEventSubscriber($initSubscriber);
 
@@ -654,7 +654,7 @@ 
 
         $this->extend(
             'orm.em.config',
-            function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
+            function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
 
                 /** @var $chain \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain */
                 $chain = $config->getMetadataDriverImpl();
@@ -676,7 +676,7 @@ 
             }
         );
 
-        $this->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
+        $this->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
             // tax_rule
             $taxRuleRepository = $em->getRepository('Eccube\Entity\TaxRule');
             $taxRuleRepository->setApplication($app);
@@ -705,7 +705,7 @@ 
             // second level cacheの設定.
             $this->extend(
                 'orm.em.config',
-                function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
+                function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
                     $config->setSecondLevelCacheEnabled();
                     $cacheConfig = $config->getSecondLevelCacheConfiguration();
                     $regionConfig = $cacheConfig->getRegionsConfiguration();
@@ -794,31 +794,31 @@ 
             array('^/mypage', 'ROLE_USER', $channel),
         );
 
-        $this['eccube.password_encoder'] = function ($app) {
+        $this['eccube.password_encoder'] = function($app) {
             return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']);
         };
-        $this['security.encoder_factory'] = function ($app) {
+        $this['security.encoder_factory'] = function($app) {
             return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array(
                 'Eccube\Entity\Customer' => $app['eccube.password_encoder'],
                 'Eccube\Entity\Member' => $app['eccube.password_encoder'],
             ));
         };
-        $this['eccube.event_listner.security'] = function ($app) {
+        $this['eccube.event_listner.security'] = function($app) {
             return new \Eccube\EventListener\SecurityEventListener($app['orm.em']);
         };
 
         // Voterの設定
-        $this['authority_voter'] = function ($app) {
+        $this['authority_voter'] = function($app) {
             return new \Eccube\Security\Voter\AuthorityVoter($app);
         };
 
-        $this->extend('security.voters', function ($voters, \Silex\Application $app) {
+        $this->extend('security.voters', function($voters, \Silex\Application $app) {
             $voters[] = $app['authority_voter'];
 
             return $voters;
         });
 
-        $this['security.access_manager'] = function ($app) {
+        $this['security.access_manager'] = function($app) {
             return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous');
         };
 
@@ -832,7 +832,7 @@ 
     {
         $config = $this['config'];
         if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) {
-            $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($config) {
+            $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($config) {
                 // サブリクエストのREMOTE_ADDRも動的に設定を行う必要があるため、KernelEvents::REQUESTを使用する
                 Request::setTrustedProxies(array_merge(array($event->getRequest()->server->get('REMOTE_ADDR')), $config['trusted_proxies']));
             }, self::EARLY_EVENT);
@@ -849,7 +849,7 @@ 
         $this->register(new ServiceProvider\EccubePluginServiceProvider());
 
         // TODO Acme\ServiceProvider の初期化はここで OK?
-        if (array_key_exists('service',$this['config'])) {
+        if (array_key_exists('service', $this['config'])) {
             foreach ($this['config']['service'] as $service) {
                 $this->register(new $service);
             }
@@ -1005,7 +1005,7 @@ 
         $app = $this;
 
         // Response Event(http cache対応、event実行は一番遅く設定)
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
 
             if (!$event->isMasterRequest()) {
                 return;

src/Eccube/ServiceProvider/EccubeServiceProvider.php

Spacing +80 added lines, -80 removed lines

@@ -45,31 +45,31 @@ 
     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.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));
@@ -78,40 +78,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);
@@ -119,11 +119,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']);
@@ -135,206 +135,206 @@ 
 
             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.master.order_item_type'] = function () use ($app) {
+        $app['eccube.repository.master.order_item_type'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderItemType');
         };
 
-        $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) {
             $customerRepository = $app['orm.em']->getRepository('Eccube\Entity\Customer');
             $customerRepository->setApplication($app);
             return $customerRepository;
         };
-        $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.shipment_item'] = function () use ($app) {
+        $app['eccube.repository.shipment_item'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\ShipmentItem');
         };
-        $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['eccube.repository.layout'] = function () use ($app) {
+        $app['eccube.repository.layout'] = function() use ($app) {
             return $app['orm.em']->getRepository('Eccube\Entity\Layout');
         };
 
-        $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 ' . ")
@@ -344,7 +344,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 ' . ")
@@ -355,7 +355,7 @@ 
         });
 
         // TODO 使用するか検討
-        $app['eccube.twig.generic_node_names'] = function () use ($app) {
+        $app['eccube.twig.generic_node_names'] = function() use ($app) {
             return [
                 'hello',
                 'jiro',
@@ -364,7 +364,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);
@@ -373,20 +373,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']);
@@ -489,7 +489,7 @@ 
             return $types;
         });
         $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の追加方法は要検討