Completed
Push — master ( a0bb97...1e5239 )
by chihiro
36:06
created
src/Eccube/Resource/doctrine/migration/Version20151023102323.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 
28 28
         $PageLayout = new PageLayout();
29 29
         $PageLayout->setDeviceType($DeviceType);
30
-        $PageLayout->setName( '商品購入/お届け先の追加');
30
+        $PageLayout->setName('商品購入/お届け先の追加');
31 31
         $PageLayout->setUrl('shopping_shipping_edit');
32 32
         $PageLayout->setFileName('Shopping/shipping_edit');
33 33
         $PageLayout->setEditFlg(2);
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
         $PageLayout = new PageLayout();
40 40
         $PageLayout->setDeviceType($DeviceType);
41
-        $PageLayout->setName( '商品購入/お届け先の複数指定(お届け先の追加)');
41
+        $PageLayout->setName('商品購入/お届け先の複数指定(お届け先の追加)');
42 42
         $PageLayout->setUrl('shopping_shipping_multiple_edit');
43 43
         $PageLayout->setFileName('Shopping/shipping_multiple_edit');
44 44
         $PageLayout->setEditFlg(2);
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 
50 50
         $PageLayout = new PageLayout();
51 51
         $PageLayout->setDeviceType($DeviceType);
52
-        $PageLayout->setName( '商品購入/購入エラー');
52
+        $PageLayout->setName('商品購入/購入エラー');
53 53
         $PageLayout->setUrl('shopping_error');
54 54
         $PageLayout->setFileName('Shopping/shopping_error');
55 55
         $PageLayout->setEditFlg(2);
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
         $PageLayout = new PageLayout();
62 62
         $PageLayout->setDeviceType($DeviceType);
63
-        $PageLayout->setName( 'ご利用ガイド');
63
+        $PageLayout->setName('ご利用ガイド');
64 64
         $PageLayout->setUrl('help_guide');
65 65
         $PageLayout->setFileName('Help/guide');
66 66
         $PageLayout->setEditFlg(2);
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 
71 71
         $PageLayout = new PageLayout();
72 72
         $PageLayout->setDeviceType($DeviceType);
73
-        $PageLayout->setName( 'パスワード再発行(入力ページ)');
73
+        $PageLayout->setName('パスワード再発行(入力ページ)');
74 74
         $PageLayout->setUrl('forgot');
75 75
         $PageLayout->setFileName('Forgot/index');
76 76
         $PageLayout->setEditFlg(2);
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 
81 81
         $PageLayout = new PageLayout();
82 82
         $PageLayout->setDeviceType($DeviceType);
83
-        $PageLayout->setName( 'パスワード再発行(完了ページ)');
83
+        $PageLayout->setName('パスワード再発行(完了ページ)');
84 84
         $PageLayout->setUrl('forgot_complete');
85 85
         $PageLayout->setFileName('Forgot/complete');
86 86
         $PageLayout->setEditFlg(2);
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
         $PageLayout = new PageLayout();
93 93
         $PageLayout->setDeviceType($DeviceType);
94
-        $PageLayout->setName( 'パスワード変更((完了ページ)');
94
+        $PageLayout->setName('パスワード変更((完了ページ)');
95 95
         $PageLayout->setUrl('forgot_reset');
96 96
         $PageLayout->setFileName('Forgot/reset');
97 97
         $PageLayout->setEditFlg(2);
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20151110174227.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
         $t_dtb_mail_history = $schema->getTable(self::DTB_MAIL_HISTORY);
25 25
 
26 26
         $keyName = '';
27
-        if($t_dtb_mail_history->hasColumn('creator_id')){
27
+        if ($t_dtb_mail_history->hasColumn('creator_id')) {
28 28
             $keys = $t_dtb_mail_history->getForeignKeys();
29 29
             foreach ($keys as $key) {
30 30
                 $column = $key->getColumns();
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20150806222639.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@
 block discarded – undo
39 39
     public function up(Schema $schema)
40 40
     {
41 41
         // this up() migration is auto-generated, please modify it to your needs
42
-        $t=$schema->getTable('dtb_product_class');
43
-        if($t->hasColumn('stock_unlimited_tmp')){
42
+        $t = $schema->getTable('dtb_product_class');
43
+        if ($t->hasColumn('stock_unlimited_tmp')) {
44 44
             $this->addSql('update dtb_product_class set stock_unlimited = stock_unlimited_tmp;');
45 45
             $t->dropColumn('stock_unlimited_tmp');
46 46
         }
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20150806184533.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
         $t = $schema->getTable('dtb_product_class');
43 43
         $c = $t->getColumn('stock_unlimited');
44 44
 
45
-        if($c->getType()->getName() != 'smallint'){
45
+        if ($c->getType()->getName() != 'smallint') {
46 46
             $this->addSql('ALTER TABLE dtb_product_class ADD stock_unlimited_tmp int ;');
47 47
             $this->addSql('UPDATE dtb_product_class SET stock_unlimited_tmp = 1 where stock_unlimited =  true ');
48 48
             $this->addSql('UPDATE dtb_product_class SET stock_unlimited_tmp = 0 where stock_unlimited <> true ');
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20160413151321.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 
22 22
         // path.ymlの更新
23 23
         $app = Application::getInstance();
24
-        $file = $app['config']['root_dir'] . '/app/config/eccube/path.yml';
24
+        $file = $app['config']['root_dir'].'/app/config/eccube/path.yml';
25 25
         $config = Yaml::parse(file_get_contents($file));
26 26
 
27 27
         if (!array_key_exists('public_path', $config)) {
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20151116142354.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 
27 27
         $PageLayout = new PageLayout();
28 28
         $PageLayout->setDeviceType($DeviceType);
29
-        $PageLayout->setName( '商品購入/配送方法選択');
29
+        $PageLayout->setName('商品購入/配送方法選択');
30 30
         $PageLayout->setUrl('shopping_delivery');
31 31
         $PageLayout->setFileName('Shopping/index');
32 32
         $PageLayout->setEditFlg(2);
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 
36 36
         $PageLayout = new PageLayout();
37 37
         $PageLayout->setDeviceType($DeviceType);
38
-        $PageLayout->setName( '商品購入/支払方法選択');
38
+        $PageLayout->setName('商品購入/支払方法選択');
39 39
         $PageLayout->setUrl('shopping_payment');
40 40
         $PageLayout->setFileName('Shopping/index');
41 41
         $PageLayout->setEditFlg(2);
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
         $PageLayout = new PageLayout();
46 46
         $PageLayout->setDeviceType($DeviceType);
47
-        $PageLayout->setName( '商品購入/お届け先変更');
47
+        $PageLayout->setName('商品購入/お届け先変更');
48 48
         $PageLayout->setUrl('shopping_shipping_change');
49 49
         $PageLayout->setFileName('Shopping/index');
50 50
         $PageLayout->setEditFlg(2);
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
         $PageLayout = new PageLayout();
55 55
         $PageLayout->setDeviceType($DeviceType);
56
-        $PageLayout->setName( '商品購入/お届け先変更');
56
+        $PageLayout->setName('商品購入/お届け先変更');
57 57
         $PageLayout->setUrl('shopping_shipping_edit_change');
58 58
         $PageLayout->setFileName('Shopping/index');
59 59
         $PageLayout->setEditFlg(2);
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
         $PageLayout = new PageLayout();
64 64
         $PageLayout->setDeviceType($DeviceType);
65
-        $PageLayout->setName( '商品購入/お届け先の複数指定');
65
+        $PageLayout->setName('商品購入/お届け先の複数指定');
66 66
         $PageLayout->setUrl('shopping_shipping_multiple_change');
67 67
         $PageLayout->setFileName('Shopping/index');
68 68
         $PageLayout->setEditFlg(2);
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20151022094610.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@  discard block
 block discarded – undo
11 11
 class Version20151022094610 extends AbstractMigration
12 12
 {
13 13
 
14
-    const DTB_CATEGORY='dtb_category';
15
-    const DTB_CLASS_CATEGORY='dtb_class_category';
16
-    const DTB_CLASS_NAME='dtb_class_name';
14
+    const DTB_CATEGORY = 'dtb_category';
15
+    const DTB_CLASS_CATEGORY = 'dtb_class_category';
16
+    const DTB_CLASS_NAME = 'dtb_class_name';
17 17
 
18 18
     /**
19 19
      * @param Schema $schema
@@ -22,27 +22,27 @@  discard block
 block discarded – undo
22 22
     {
23 23
         // this up() migration is auto-generated, please modify it to your needs
24 24
         // dtb_category
25
-        $t_dtb_category=$schema->getTable(self::DTB_CATEGORY);
26
-        if($t_dtb_category->hasColumn('category_name')){
25
+        $t_dtb_category = $schema->getTable(self::DTB_CATEGORY);
26
+        if ($t_dtb_category->hasColumn('category_name')) {
27 27
             $t_dtb_category->changeColumn('category_name', array('NotNull'=>true));
28 28
         }
29
-        if($t_dtb_category->hasColumn('rank')){
29
+        if ($t_dtb_category->hasColumn('rank')) {
30 30
             $t_dtb_category->changeColumn('rank', array('NotNull'=>true));
31 31
         }
32 32
         // dtb_class_category
33
-        $t_dtb_class_category=$schema->getTable(self::DTB_CLASS_CATEGORY);
34
-        if($t_dtb_class_category->hasColumn('name')){
33
+        $t_dtb_class_category = $schema->getTable(self::DTB_CLASS_CATEGORY);
34
+        if ($t_dtb_class_category->hasColumn('name')) {
35 35
             $t_dtb_class_category->changeColumn('name', array('NotNull'=>true));
36 36
         }
37
-        if($t_dtb_class_category->hasColumn('rank')){
37
+        if ($t_dtb_class_category->hasColumn('rank')) {
38 38
             $t_dtb_class_category->changeColumn('rank', array('NotNull'=>true));
39 39
         }
40 40
         // dtb_class_name
41
-        $t_dtb_class_name=$schema->getTable(self::DTB_CLASS_NAME);
42
-        if($t_dtb_class_name->hasColumn('name')){
41
+        $t_dtb_class_name = $schema->getTable(self::DTB_CLASS_NAME);
42
+        if ($t_dtb_class_name->hasColumn('name')) {
43 43
             $t_dtb_class_name->changeColumn('name', array('NotNull'=>true));
44 44
         }
45
-        if($t_dtb_class_name->hasColumn('rank')){
45
+        if ($t_dtb_class_name->hasColumn('rank')) {
46 46
             $t_dtb_class_name->changeColumn('rank', array('NotNull'=>true));
47 47
         }
48 48
     }
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20150806220909.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,8 +38,8 @@
 block discarded – undo
38 38
     public function up(Schema $schema)
39 39
     {
40 40
         // this up() migration is auto-generated, please modify it to your needs
41
-        $t=$schema->getTable('dtb_product_class');
42
-        if(!$t->hasColumn('stock_unlimited') && $t->hasColumn('stock_unlimited_tmp')){
41
+        $t = $schema->getTable('dtb_product_class');
42
+        if (!$t->hasColumn('stock_unlimited') && $t->hasColumn('stock_unlimited_tmp')) {
43 43
             $t->addColumn('stock_unlimited', 'smallint', array('NotNull'=>true, 'Default'=>0));
44 44
         }
45 45
     }
Please login to merge, or discard this patch.
src/Eccube/Service/MailService.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
         ));
60 60
 
61 61
         $message = \Swift_Message::newInstance()
62
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認')
62
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認')
63 63
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
64 64
             ->setTo(array($Customer->getEmail()))
65 65
             ->setBcc($this->BaseInfo->getEmail01())
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
         ));
96 96
 
97 97
         $message = \Swift_Message::newInstance()
98
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録が完了しました。')
98
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録が完了しました。')
99 99
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
100 100
             ->setTo(array($Customer->getEmail()))
101 101
             ->setBcc($this->BaseInfo->getEmail01())
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         ));
134 134
 
135 135
         $message = \Swift_Message::newInstance()
136
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 退会手続きのご完了')
136
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 退会手続きのご完了')
137 137
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
138 138
             ->setTo(array($email))
139 139
             ->setBcc($this->BaseInfo->getEmail01())
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 
173 173
         // 問い合わせ者にメール送信
174 174
         $message = \Swift_Message::newInstance()
175
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] お問い合わせを受け付けました。')
175
+            ->setSubject('['.$this->BaseInfo->getShopName().'] お問い合わせを受け付けました。')
176 176
             ->setFrom(array($this->BaseInfo->getEmail02() => $this->BaseInfo->getShopName()))
177 177
             ->setTo(array($formData['email']))
178 178
             ->setBcc($this->BaseInfo->getEmail02())
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
         ));
226 226
 
227 227
         $message = \Swift_Message::newInstance()
228
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $MailTemplate->getSubject())
228
+            ->setSubject('['.$this->BaseInfo->getShopName().'] '.$MailTemplate->getSubject())
229 229
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
230 230
             ->setTo(array($Order->getEmail()))
231 231
             ->setBcc($this->BaseInfo->getEmail01())
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
         ));
267 267
 
268 268
         $message = \Swift_Message::newInstance()
269
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認')
269
+            ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認')
270 270
             ->setFrom(array($this->BaseInfo->getEmail03() => $this->BaseInfo->getShopName()))
271 271
             ->setTo(array($Customer->getEmail()))
272 272
             ->setBcc($this->BaseInfo->getEmail01())
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
         ));
307 307
 
308 308
         $message = \Swift_Message::newInstance()
309
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $formData['subject'])
309
+            ->setSubject('['.$this->BaseInfo->getShopName().'] '.$formData['subject'])
310 310
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
311 311
             ->setTo(array($Order->getEmail()))
312 312
             ->setBcc($this->BaseInfo->getEmail01())
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
         ));
343 343
 
344 344
         $message = \Swift_Message::newInstance()
345
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のご確認')
345
+            ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のご確認')
346 346
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
347 347
             ->setTo(array($Customer->getEmail()))
348 348
             ->setBcc($this->BaseInfo->getEmail01())
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
         ));
379 379
 
380 380
         $message = \Swift_Message::newInstance()
381
-            ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のお知らせ')
381
+            ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のお知らせ')
382 382
             ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName()))
383 383
             ->setTo(array($Customer->getEmail()))
384 384
             ->setBcc($this->BaseInfo->getEmail01())
Please login to merge, or discard this patch.