EC-CUBE / ec-cube

src/Eccube/Resource/doctrine/migration/Version20151022094610.php

Spacing +12 added lines, -12 removed lines

@@ -11,9 +11,9 @@ 
 class Version20151022094610 extends AbstractMigration
 {
 
-    const DTB_CATEGORY='dtb_category';
-    const DTB_CLASS_CATEGORY='dtb_class_category';
-    const DTB_CLASS_NAME='dtb_class_name';
+    const DTB_CATEGORY = 'dtb_category';
+    const DTB_CLASS_CATEGORY = 'dtb_class_category';
+    const DTB_CLASS_NAME = 'dtb_class_name';
 
     /**
      * @param Schema $schema
@@ -22,27 +22,27 @@ 
     {
         // this up() migration is auto-generated, please modify it to your needs
         // dtb_category
-        $t_dtb_category=$schema->getTable(self::DTB_CATEGORY);
-        if($t_dtb_category->hasColumn('category_name')){
+        $t_dtb_category = $schema->getTable(self::DTB_CATEGORY);
+        if ($t_dtb_category->hasColumn('category_name')) {
             $t_dtb_category->changeColumn('category_name', array('NotNull'=>true));
         }
-        if($t_dtb_category->hasColumn('rank')){
+        if ($t_dtb_category->hasColumn('rank')) {
             $t_dtb_category->changeColumn('rank', array('NotNull'=>true));
         }
         // dtb_class_category
-        $t_dtb_class_category=$schema->getTable(self::DTB_CLASS_CATEGORY);
-        if($t_dtb_class_category->hasColumn('name')){
+        $t_dtb_class_category = $schema->getTable(self::DTB_CLASS_CATEGORY);
+        if ($t_dtb_class_category->hasColumn('name')) {
             $t_dtb_class_category->changeColumn('name', array('NotNull'=>true));
         }
-        if($t_dtb_class_category->hasColumn('rank')){
+        if ($t_dtb_class_category->hasColumn('rank')) {
             $t_dtb_class_category->changeColumn('rank', array('NotNull'=>true));
         }
         // dtb_class_name
-        $t_dtb_class_name=$schema->getTable(self::DTB_CLASS_NAME);
-        if($t_dtb_class_name->hasColumn('name')){
+        $t_dtb_class_name = $schema->getTable(self::DTB_CLASS_NAME);
+        if ($t_dtb_class_name->hasColumn('name')) {
             $t_dtb_class_name->changeColumn('name', array('NotNull'=>true));
         }
-        if($t_dtb_class_name->hasColumn('rank')){
+        if ($t_dtb_class_name->hasColumn('rank')) {
             $t_dtb_class_name->changeColumn('rank', array('NotNull'=>true));
         }
     }

src/Eccube/Resource/doctrine/migration/Version20151023102323.php

Spacing +7 added lines, -7 removed lines

@@ -29,7 +29,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先の追加');
+        $PageLayout->setName('商品購入/お届け先の追加');
         $PageLayout->setUrl('shopping_shipping_edit');
         $PageLayout->setFileName('Shopping/shipping_edit');
         $PageLayout->setEditFlg(2);
@@ -38,7 +38,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先の複数指定(お届け先の追加)');
+        $PageLayout->setName('商品購入/お届け先の複数指定(お届け先の追加)');
         $PageLayout->setUrl('shopping_shipping_multiple_edit');
         $PageLayout->setFileName('Shopping/shipping_multiple_edit');
         $PageLayout->setEditFlg(2);
@@ -47,7 +47,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/購入エラー');
+        $PageLayout->setName('商品購入/購入エラー');
         $PageLayout->setUrl('shopping_error');
         $PageLayout->setFileName('Shopping/shopping_error');
         $PageLayout->setEditFlg(2);
@@ -56,7 +56,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( 'ご利用ガイド');
+        $PageLayout->setName('ご利用ガイド');
         $PageLayout->setUrl('help_guide');
         $PageLayout->setFileName('Help/guide');
         $PageLayout->setEditFlg(2);
@@ -64,7 +64,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( 'パスワード再発行(入力ページ)');
+        $PageLayout->setName('パスワード再発行(入力ページ)');
         $PageLayout->setUrl('forgot');
         $PageLayout->setFileName('Forgot/index');
         $PageLayout->setEditFlg(2);
@@ -72,7 +72,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( 'パスワード再発行(完了ページ)');
+        $PageLayout->setName('パスワード再発行(完了ページ)');
         $PageLayout->setUrl('forgot_complete');
         $PageLayout->setFileName('Forgot/complete');
         $PageLayout->setEditFlg(2);
@@ -81,7 +81,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( 'パスワード変更((完了ページ)');
+        $PageLayout->setName('パスワード変更((完了ページ)');
         $PageLayout->setUrl('forgot_reset');
         $PageLayout->setFileName('Forgot/reset');
         $PageLayout->setEditFlg(2);

src/Eccube/Resource/doctrine/migration/Version20151110174227.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         $t_dtb_mail_history = $schema->getTable(self::DTB_MAIL_HISTORY);
 
         $keyName = '';
-        if($t_dtb_mail_history->hasColumn('creator_id')){
+        if ($t_dtb_mail_history->hasColumn('creator_id')) {
             $keys = $t_dtb_mail_history->getForeignKeys();
             foreach ($keys as $key) {
                 $column = $key->getColumns();

src/Eccube/Resource/doctrine/migration/Version20151116142354.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/配送方法選択');
+        $PageLayout->setName('商品購入/配送方法選択');
         $PageLayout->setUrl('shopping_delivery');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);
@@ -37,7 +37,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/支払方法選択');
+        $PageLayout->setName('商品購入/支払方法選択');
         $PageLayout->setUrl('shopping_payment');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);
@@ -46,7 +46,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先変更');
+        $PageLayout->setName('商品購入/お届け先変更');
         $PageLayout->setUrl('shopping_shipping_change');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);
@@ -55,7 +55,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先変更');
+        $PageLayout->setName('商品購入/お届け先変更');
         $PageLayout->setUrl('shopping_shipping_edit_change');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);
@@ -64,7 +64,7 @@ 
 
         $PageLayout = new PageLayout();
         $PageLayout->setDeviceType($DeviceType);
-        $PageLayout->setName( '商品購入/お届け先の複数指定');
+        $PageLayout->setName('商品購入/お届け先の複数指定');
         $PageLayout->setUrl('shopping_shipping_multiple_change');
         $PageLayout->setFileName('Shopping/index');
         $PageLayout->setEditFlg(2);

src/Eccube/Security/Core/Encoder/PasswordEncoder.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
         if ($this->config['auth_type'] == 'PLAIN') {
             $res = $raw;
         } else {
-            $res = hash_hmac($this->config['password_hash_algos'], $raw . ':' . $this->config['auth_magic'], $salt);
+            $res = hash_hmac($this->config['password_hash_algos'], $raw.':'.$this->config['auth_magic'], $salt);
         }
 
         return $res;
@@ -81,7 +81,7 @@ 
         } else {
             // 旧バージョン(2.11未満)からの移行を考慮
             if (empty($salt)) {
-                $hash = sha1($raw . ':' . $this->config['auth_magic']);
+                $hash = sha1($raw.':'.$this->config['auth_magic']);
             } else {
                 $hash = $this->encodePassword($raw, $salt);
             }

src/Eccube/Service/CsvExportService.php

Spacing +1 added lines, -1 removed lines

@@ -307,7 +307,7 @@
     {
         $config = $this->config;
 
-        return function ($value) use ($config) {
+        return function($value) use ($config) {
             return mb_convert_encoding(
                 (string) $value, $config['csv_export_encoding'], 'UTF-8'
             );

src/Eccube/Service/CsvImportService.php

Spacing +4 added lines, -4 removed lines

@@ -117,9 +117,9 @@ 
 
         $this->file = $file;
         $this->file->setFlags(
-            \SplFileObject::READ_CSV |
-            \SplFileObject::SKIP_EMPTY |
-            \SplFileObject::READ_AHEAD |
+            \SplFileObject::READ_CSV|
+            \SplFileObject::SKIP_EMPTY|
+            \SplFileObject::READ_AHEAD|
             \SplFileObject::DROP_NEW_LINE
         );
         $this->file->setCsvControl(
@@ -358,7 +358,7 @@ 
             if ($count > 1) {
                 $incrementedHeaders[] = $header;
                 for ($i = 1; $i < $count; $i++) {
-                    $incrementedHeaders[] = $header . $i;
+                    $incrementedHeaders[] = $header.$i;
                 }
             } else {
                 $incrementedHeaders[] = $header;

src/Eccube/Service/MailService.php

Spacing +9 added lines, -9 removed lines

@@ -57,7 +57,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -82,7 +82,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録が完了しました。')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録が完了しました。')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -111,7 +111,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 退会手続きのご完了')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 退会手続きのご完了')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($email))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -139,7 +139,7 @@ 
 
         // 問い合わせ者にメール送信
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] お問い合わせを受け付けました。')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] お問い合わせを受け付けました。')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($formData['email']))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -169,7 +169,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $MailTemplate->getSubject())
+            ->setSubject('['.$this->BaseInfo->getShopName().'] '.$MailTemplate->getSubject())
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Order->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -197,7 +197,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認')
             ->setFrom(array($this->BaseInfo->getEmail03() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -226,7 +226,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $formData['subject'])
+            ->setSubject('['.$this->BaseInfo->getShopName().'] '.$formData['subject'])
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Order->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -251,7 +251,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のご確認')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のご確認')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())
@@ -276,7 +276,7 @@ 
         ));
 
         $message = \Swift_Message::newInstance()
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のお知らせ')
+            ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のお知らせ')
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
             ->setTo(array($Customer->getEmail()))
             ->setBcc($this->BaseInfo->getEmail01())

src/Eccube/Service/ShoppingService.php

Spacing +6 added lines, -6 removed lines

@@ -270,7 +270,7 @@ 
             ->setFax03($Customer->getFax03())
             ->setZip01($Customer->getZip01())
             ->setZip02($Customer->getZip02())
-            ->setZipCode($Customer->getZip01() . $Customer->getZip02())
+            ->setZipCode($Customer->getZip01().$Customer->getZip02())
             ->setPref($Customer->getPref())
             ->setAddr01($Customer->getAddr01())
             ->setAddr02($Customer->getAddr02())
@@ -409,7 +409,7 @@ 
                 ->setFax03($CustomerAddress->getFax03())
                 ->setZip01($CustomerAddress->getZip01())
                 ->setZip02($CustomerAddress->getZip02())
-                ->setZipCode($CustomerAddress->getZip01() . $CustomerAddress->getZip02())
+                ->setZipCode($CustomerAddress->getZip01().$CustomerAddress->getZip02())
                 ->setPref($CustomerAddress->getPref())
                 ->setAddr01($CustomerAddress->getAddr01())
                 ->setAddr02($CustomerAddress->getAddr02());
@@ -428,7 +428,7 @@ 
                 ->setFax03($Customer->getFax03())
                 ->setZip01($Customer->getZip01())
                 ->setZip02($Customer->getZip02())
-                ->setZipCode($Customer->getZip01() . $Customer->getZip02())
+                ->setZipCode($Customer->getZip01().$Customer->getZip02())
                 ->setPref($Customer->getPref())
                 ->setAddr01($Customer->getAddr01())
                 ->setAddr02($Customer->getAddr02());
@@ -913,10 +913,10 @@ 
 
         // 配送日数が設定されている
         if ($deliveryDateFlag) {
-            $period = new \DatePeriod (
-                new \DateTime($minDate . ' day'),
+            $period = new \DatePeriod(
+                new \DateTime($minDate.' day'),
                 new \DateInterval('P1D'),
-                new \DateTime($minDate + $this->app['config']['deliv_date_end_max'] . ' day')
+                new \DateTime($minDate + $this->app['config']['deliv_date_end_max'].' day')
             );
 
             foreach ($period as $day) {