EC-CUBE / ec-cube

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

Spacing +2 added lines, -2 removed lines

@@ -110,7 +110,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()) {
@@ -158,7 +158,7 @@ 
         // TODO Calculatorで行うのが適切.
         $builder->addEventListener(
             FormEvents::POST_SUBMIT,
-            function (FormEvent $event) {
+            function(FormEvent $event) {
                 /** @var Order $Order */
                 $Order = $event->getData();
                 // XXX 非会員購入の際, use_point が null で submit される？

src/Eccube/DI/DIServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 {
     public function register(Container $app)
     {
-        $app['eccube.di'] = function (Container $app) {
+        $app['eccube.di'] = function(Container $app) {
             $di = new DependencyBuilder(
                 $app['eccube.di.generator.dir'],
                 $app['eccube.di.generator.class'],
@@ -37,7 +37,7 @@ 
 
         // XXX これを入れないと EntityEventDispatcher が有効になった時テストがコケる
         if (!$app->offsetExists('eccube.event.dispatcher')) {
-            $app['eccube.event.dispatcher'] = function () use ($app) {
+            $app['eccube.event.dispatcher'] = function() use ($app) {
                 return $app['dispatcher'];
             };
         }

src/Eccube/ServiceProvider/ComposerServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
      */
     public function register(Container $app)
     {
-        $app['eccube.service.composer'] = function () use ($app) {
+        $app['eccube.service.composer'] = function() use ($app) {
             /**@var \Eccube\Service\SystemService $systemService */
             $systemService = $app['eccube.service.system'];
             $composerMemory = $app['config']['composer_memory_limit'];

src/Eccube/Service/Composer/ComposerApiService.php

Doc Comments +1 added lines, -1 removed lines

@@ -234,7 +234,7 @@
 
     /**
      * Get mode
-     * @return mixed|string
+     * @return string
      */
     public function getMode()
     {

src/Eccube/Service/Composer/ComposerProcessService.php

Doc Comments +1 added lines, -1 removed lines

@@ -234,7 +234,7 @@
 
     /**
      * Get mode
-     * @return mixed|string
+     * @return string
      */
     public function getMode()
     {

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
             if ($returnValue) {
                 throw new PluginException($outputString);
             }
-            log_info(PHP_EOL . $outputString . PHP_EOL);
+            log_info(PHP_EOL.$outputString.PHP_EOL);
         } catch (\Exception $exception) {
             throw new PluginException($exception->getMessage());
         }
@@ -273,7 +273,7 @@ 
     public function composerVersion()
     {
         $this->init();
-        $command = $this->pathPHP . ' ' . $this->composerFile . ' -V';
+        $command = $this->pathPHP.' '.$this->composerFile.' -V';
         return exec($command);
     }
 

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

Spacing +3 added lines, -3 removed lines

@@ -239,7 +239,7 @@ 
                 'class' => 'Eccube\Entity\Master\OrderStatus',
                 'choice_label' => 'name',
                 'placeholder' => '選択してください',
-                'query_builder' => function ($er) {
+                'query_builder' => function($er) {
                     return $er->createQueryBuilder('o')
                         ->orderBy('o.sort_no', 'ASC');
                 },
@@ -275,7 +275,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)) {
@@ -283,7 +283,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/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.tag'] = function () use ($app) {
+        $app['eccube.repository.tag'] = function() use ($app) {
             return $app['Eccube\Repository\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.sale_type'] = function () use ($app) {
+        $app['eccube.repository.master.sale_type'] = function() use ($app) {
             return $app['Eccube\Repository\Master\SaleTypeRepository'];
         };
-        $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_duration'] = function () use ($app) {
+        $app['eccube.repository.delivery_duration'] = function() use ($app) {
             return $app['Eccube\Repository\DeliveryDurationRepository'];
         };
-        $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/Controller/Admin/AdminController.php

Spacing +3 added lines, -3 removed lines

@@ -127,12 +127,12 @@ 
     {
         // install.phpのチェック.
         if (isset($this->appConfig['eccube_install']) && $this->appConfig['eccube_install'] == 1) {
-            $file = $this->appConfig['root_dir'] . '/html/install.php';
+            $file = $this->appConfig['root_dir'].'/html/install.php';
             if (file_exists($file)) {
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'html/install.php'));
                 $app->addWarning($message, 'admin');
             }
-            $fileOnRoot = $this->appConfig['root_dir'] . '/install.php';
+            $fileOnRoot = $this->appConfig['root_dir'].'/install.php';
             if (file_exists($fileOnRoot)) {
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'install.php'));
                 $app->addWarning($message, 'admin');
@@ -376,7 +376,7 @@ 
                     t1.order_status_id
                 ORDER BY
                     t1.order_status_id';
-        $rsm = new ResultSetMapping();;
+        $rsm = new ResultSetMapping(); ;
         $rsm->addScalarResult('status', 'status');
         $rsm->addScalarResult('count', 'count');
         $query = $em->createNativeQuery($sql, $rsm);

src/Eccube/Doctrine/Filter/OrderStatusFilter.php

Spacing +2 added lines, -2 removed lines

@@ -33,12 +33,12 @@
     {
         // 決済処理中/購入処理中を除く.
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Order') {
-            return $targetTableAlias . '.order_status_id <> 7 AND ' . $targetTableAlias . '.order_status_id <> 8';
+            return $targetTableAlias.'.order_status_id <> 7 AND '.$targetTableAlias.'.order_status_id <> 8';
         }
 
         // 決済処理中/購入処理中を除く.
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Master\OrderStatus') {
-            return $targetTableAlias . '.id <> 7 AND ' . $targetTableAlias . '.id <> 8';
+            return $targetTableAlias.'.id <> 7 AND '.$targetTableAlias.'.id <> 8';
         }
 
         return '';