EC-CUBE / ec-cube

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

Indentation +2 added lines, -2 removed lines

@@ -77,8 +77,8 @@
                     new Assert\NotBlank(),
                     new Assert\Length(array('max' => $this->appConfig['stext_len'])),
                     new Assert\Regex(array(
-                       'pattern' => "/^[0-9a-zA-Z]+$/",
-                   )),
+                        'pattern' => "/^[0-9a-zA-Z]+$/",
+                    )),
                 ),
             ))
             ->add('admin_allow_host', TextareaType::class, array(

Spacing +3 added lines, -3 removed lines

@@ -92,19 +92,19 @@
                 'label' => 'SSLを強制',
                 'required' => false,
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use($app) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) use($app) {
                 $form = $event->getForm();
                 $data = $form->getData();
 
                 $ips = preg_split("/\R/", $data['admin_allow_host'], null, PREG_SPLIT_NO_EMPTY);
 
-                foreach($ips as $ip) {
+                foreach ($ips as $ip) {
                     $errors = $this->recursiveValidator->validate($ip, array(
                             new Assert\Ip(),
                         )
                     );
                     if ($errors->count() != 0) {
-                        $form['admin_allow_host']->addError(new FormError($ip . 'はIPv4アドレスではありません。'));
+                        $form['admin_allow_host']->addError(new FormError($ip.'はIPv4アドレスではありません。'));
                     }
                 }
             })

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

Spacing +6 added lines, -10 removed lines

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

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

Spacing +2 added lines, -2 removed lines

@@ -67,8 +67,8 @@
                 'constraints' => array(
                     new Assert\NotBlank(array('message' => 'ファイルを選択してください。')),
                     new Assert\File(array(
-                        'maxSize' => $this->appConfig['csv_size'] . 'M',
-                        'maxSizeMessage' => 'CSVファイルは' . $this->appConfig['csv_size'] . 'M以下でアップロードしてください。',
+                        'maxSize' => $this->appConfig['csv_size'].'M',
+                        'maxSizeMessage' => 'CSVファイルは'.$this->appConfig['csv_size'].'M以下でアップロードしてください。',
                     )),
                 ),
             ));

src/Eccube/Form/Type/Install/Step3Type.php

Spacing +3 added lines, -3 removed lines

@@ -166,19 +166,19 @@
                 'help' => 'メーラーバックエンドがSMTPかつSMTP-AUTH使用時のみ指定',
                 'required' => false,
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
                 $form = $event->getForm();
                 $data = $form->getData();
 
                 $ips = preg_split("/\R/", $data['admin_allow_hosts'], null, PREG_SPLIT_NO_EMPTY);
 
-                foreach($ips as $ip) {
+                foreach ($ips as $ip) {
                     $errors = $this->validator->validate($ip, array(
                             new Assert\Ip(),
                         )
                     );
                     if ($errors->count() != 0) {
-                        $form['admin_allow_hosts']->addError(new FormError($ip . 'はIPv4アドレスではありません。'));
+                        $form['admin_allow_hosts']->addError(new FormError($ip.'はIPv4アドレスではありません。'));
                     }
                 }
             })

src/Eccube/Form/Type/Install/Step4Type.php

Spacing +3 added lines, -3 removed lines

@@ -106,7 +106,7 @@ 
                 'label' => 'パスワード',
                 'required' => false,
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
                 $form = $event->getForm();
                 $data = $form->getData();
                 try {
@@ -131,7 +131,7 @@ 
                     $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
                     $conn->connect();
                 } catch (\Exception $e) {
-                    $form['database']->addError(new FormError('データベースに接続できませんでした。' . $e->getMessage()));
+                    $form['database']->addError(new FormError('データベースに接続できませんでした。'.$e->getMessage()));
                 }
             });
     }
@@ -147,7 +147,7 @@ 
     public function validate($data, ExecutionContext $context, $param = null)
     {
         $parameters = $this->requestStack->getCurrentRequest()->get('install_step4');
-        if ($parameters['database'] != 'pdo_sqlite'){
+        if ($parameters['database'] != 'pdo_sqlite') {
             $context->getValidator()->validate($data, array(
                 new Assert\NotBlank()
             ));

src/Eccube/Form/Type/Install/Step1Type.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
 use Eccube\Annotation\FormType;
 use \Symfony\Component\Form\AbstractType;
-use \Symfony\Component\Form\Extension\Core\Type\CheckboxType;;
+use \Symfony\Component\Form\Extension\Core\Type\CheckboxType; ;
 use \Symfony\Component\Form\FormBuilderInterface;
 
 /**

src/Eccube/Service/MailService.php

Spacing +9 added lines, -9 removed lines

@@ -80,7 +80,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $BaseInfo->getShopName() . '] 会員登録のご確認')
+            ->setSubject('['.$BaseInfo->getShopName().'] 会員登録のご確認')
             ->setFrom(array($BaseInfo->getEmail01() => $BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($BaseInfo->getEmail01())
@@ -122,7 +122,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $BaseInfo->getShopName() . '] 会員登録が完了しました。')
+            ->setSubject('['.$BaseInfo->getShopName().'] 会員登録が完了しました。')
             ->setFrom(array($BaseInfo->getEmail01() => $BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($BaseInfo->getEmail01())
@@ -165,7 +165,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $BaseInfo->getShopName() . '] 退会手続きのご完了')
+            ->setSubject('['.$BaseInfo->getShopName().'] 退会手続きのご完了')
             ->setFrom(array($BaseInfo->getEmail01() => $BaseInfo->getShopName()))
             ->setTo(array($email))
             ->setBcc($BaseInfo->getEmail01())
@@ -209,7 +209,7 @@ 
 
         // 問い合わせ者にメール送信
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $BaseInfo->getShopName() . '] お問い合わせを受け付けました。')
+            ->setSubject('['.$BaseInfo->getShopName().'] お問い合わせを受け付けました。')
             ->setFrom(array($BaseInfo->getEmail02() => $BaseInfo->getShopName()))
             ->setTo(array($formData['email']))
             ->setBcc($BaseInfo->getEmail02())
@@ -267,7 +267,7 @@ 
 
         $BaseInfo = $this->baseInfoRepository->get();
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $BaseInfo->getShopName() . '] ' . $MailTemplate->getSubject())
+            ->setSubject('['.$BaseInfo->getShopName().'] '.$MailTemplate->getSubject())
             ->setFrom(array($BaseInfo->getEmail01() => $BaseInfo->getShopName()))
             ->setTo(array($Order->getEmail()))
             ->setBcc($BaseInfo->getEmail01())
@@ -312,7 +312,7 @@ 
 
         $BaseInfo = $this->baseInfoRepository->get();
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $BaseInfo->getShopName() . '] 会員登録のご確認')
+            ->setSubject('['.$BaseInfo->getShopName().'] 会員登録のご確認')
             ->setFrom(array($BaseInfo->getEmail03() => $BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($BaseInfo->getEmail01())
@@ -357,7 +357,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $BaseInfo->getShopName() . '] ' . $formData['subject'])
+            ->setSubject('['.$BaseInfo->getShopName().'] '.$formData['subject'])
             ->setFrom(array($BaseInfo->getEmail01() => $BaseInfo->getShopName()))
             ->setTo(array($Order->getEmail()))
             ->setBcc($BaseInfo->getEmail01())
@@ -399,7 +399,7 @@ 
 
         $BaseInfo = $this->baseInfoRepository->get();
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $BaseInfo->getShopName() . '] パスワード変更のご確認')
+            ->setSubject('['.$BaseInfo->getShopName().'] パスワード変更のご確認')
             ->setFrom(array($BaseInfo->getEmail01() => $BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($BaseInfo->getEmail01())
@@ -441,7 +441,7 @@ 
 
         $BaseInfo = $this->baseInfoRepository->get();
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $BaseInfo->getShopName() . '] パスワード変更のお知らせ')
+            ->setSubject('['.$BaseInfo->getShopName().'] パスワード変更のお知らせ')
             ->setFrom(array($BaseInfo->getEmail01() => $BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($BaseInfo->getEmail01())

src/Eccube/Di/ProviderGenerator.php

Spacing +2 added lines, -2 removed lines

@@ -113,13 +113,13 @@
 
         $formTypes = array_filter(
             $components,
-            function ($component) {
+            function($component) {
                 return get_class($component['anno']) === FormType::class;
             }
         );
         $formExtensions = array_filter(
             $components,
-            function ($component) {
+            function($component) {
                 return get_class($component['anno']) === FormExtension::class;
             }
         );

src/Eccube/ServiceProvider/CompatServiceProvider.php

Spacing +10 added lines, -10 removed lines

@@ -20,34 +20,34 @@
 
     public function register(Container $app)
     {
-        $app['eccube.service.cart'] = function () use ($app) {
+        $app['eccube.service.cart'] = function() use ($app) {
             return $app[CartService::class];
         };
-        $app['eccube.service.order'] = function () use ($app) {
+        $app['eccube.service.order'] = function() use ($app) {
             return $app[OrderService::class];
         };
-        $app['eccube.service.tax_rule'] = function () use ($app) {
+        $app['eccube.service.tax_rule'] = function() use ($app) {
             return $app[TaxRuleService::class];
         };
-        $app['eccube.service.plugin'] = function () use ($app) {
+        $app['eccube.service.plugin'] = function() use ($app) {
             return $app[PluginService::class];
         };
-        $app['eccube.service.mail'] = function () use ($app) {
+        $app['eccube.service.mail'] = function() use ($app) {
             return $app[MailService::class];
         };
-        $app['eccube.helper.order'] = function ($app) {
+        $app['eccube.helper.order'] = function($app) {
             return $app[OrderHelper::class];
         };
-        $app['eccube.service.csv.export'] = function () use ($app) {
+        $app['eccube.service.csv.export'] = function() use ($app) {
             return $app[CsvExportService::class];
         };
-        $app['eccube.service.shopping'] = function () use ($app) {
+        $app['eccube.service.shopping'] = function() use ($app) {
             return $app[ShoppingService::class];
         };
-        $app['eccube.service.payment'] = function () use ($app) {
+        $app['eccube.service.payment'] = function() use ($app) {
             return $app[PaymentService::class];
         };
-        $app['eccube.service.system'] = function () use ($app) {
+        $app['eccube.service.system'] = function() use ($app) {
             return $app[SystemService::class];
         };