EC-CUBE / ec-cube

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

Spacing +4 added lines, -4 removed lines

@@ -75,7 +75,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()) {
@@ -117,7 +117,7 @@ 
         // お届け日のプルダウンを生成
         $builder->addEventListener(
             FormEvents::PRE_SET_DATA,
-            function (FormEvent $event) {
+            function(FormEvent $event) {
                 $Shipping = $event->getData();
                 if (is_null($Shipping) || !$Shipping->getId()) {
                     return;
@@ -155,7 +155,7 @@ 
 
                 // 配送日数が設定されている
                 if ($deliveryDateFlag) {
-                    $period = new \DatePeriod (
+                    $period = new \DatePeriod(
                         new \DateTime($minDate.' day'),
                         new \DateInterval('P1D'),
                         new \DateTime($minDate + $this->appConfig['deliv_date_end_max'].' day')
@@ -183,7 +183,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/PriceType.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         $max = $this->appConfig['price_max'];
         $min = -$max;
 
-        $constraints = function (Options $options) use ($max, $min){
+        $constraints = function(Options $options) use ($max, $min){
             $constraints = [];
 
             // requiredがtrueに指定されている場合, NotBlankを追加

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

eccube_install.php

Spacing +14 added lines, -15 removed lines

@@ -31,7 +31,7 @@ 
 out('EC-CUBE3 installer use database driver of ', null, false);
 
 $database_driver = 'pdo_sqlite';
-switch($argv[1]) {
+switch ($argv[1]) {
     case 'mysql':
         $database_driver = 'pdo_mysql';
         break;
@@ -166,8 +166,7 @@ 
     putenv('MAIL_PASS='.(getenv('MAIL_PASS') ? getenv('MAIL_PASS') : null));
     putenv('ADMIN_ROUTE='.(getenv('ADMIN_ROUTE') ? getenv('ADMIN_ROUTE') : 'admin'));
     putenv('ROOT_URLPATH='.(getenv('ROOT_URLPATH') ? getenv('ROOT_URLPATH') : null));
-    putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') :
-                          substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32)));
+    putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') : substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32)));
 }
 
 function getExampleVariables()
@@ -277,7 +276,7 @@ 
 {
     $app = \Eccube\Application::getInstance();
     $app['debug'] = true;
-    $app['annotations'] = function () {
+    $app['annotations'] = function() {
         return new \Doctrine\Common\Annotations\AnnotationReader();
     };
     $app->initDoctrine();
@@ -389,15 +388,15 @@ 
     foreach ($finder as $content) {
         $permission = $content->getPerms();
         // see also http://www.php.net/fileperms
-        if (!($permission & 0x0010) || !($permission & 0x0002)) {
+        if (!($permission&0x0010) || !($permission&0x0002)) {
             $realPath = $content->getRealPath();
             if ($verbose) {
                 out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false);
             }
-            $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r
-            $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w
-            $permission = !($permission & 0x0004) ? $permission += 04 : $permission;  // o+r
-            $permission = !($permission & 0x0002) ? $permission += 02 : $permission;  // o+w
+            $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r
+            $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w
+            $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r
+            $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w
             $result = chmod($realPath, $permission);
             if ($verbose) {
                 if ($result) {
@@ -428,13 +427,13 @@ 
 
 function getConfig()
 {
-    $config = array (
+    $config = array(
         'auth_magic' => getenv('AUTH_MAGIC'),
         'password_hash_algos' => 'sha256',
         'shop_name' => getenv('SHOP_NAME'),
         'force_ssl' => NULL,
         'admin_allow_host' =>
-        array (
+        array(
         ),
         'cookie_lifetime' => 0,
         'locale' => 'ja',
@@ -447,9 +446,9 @@ 
 
 function getDatabaseConfig($database_driver)
 {
-    $database = array (
+    $database = array(
         'database' =>
-        array (
+        array(
             'driver' => $database_driver,
         )
     );
@@ -476,9 +475,9 @@ 
 
 function getMailConfig()
 {
-    $mail = array (
+    $mail = array(
         'mail' =>
-        array (
+        array(
             'transport' => getenv('MAIL_BACKEND'),
             'host' => getenv('MAIL_HOST'),
             'port' => getenv('MAIL_PORT'),