Completed
Pull Request — experimental/3.1 (#1985)
by Kentaro
68:43
created
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/Version20151023102323.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
         $PageLayout = new PageLayout();
31 31
         $PageLayout->setDeviceType($DeviceType);
32
-        $PageLayout->setName( '商品購入/お届け先の追加');
32
+        $PageLayout->setName('商品購入/お届け先の追加');
33 33
         $PageLayout->setUrl('shopping_shipping_edit');
34 34
         $PageLayout->setFileName('Shopping/shipping_edit');
35 35
         $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);
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 
48 48
         $PageLayout = new PageLayout();
49 49
         $PageLayout->setDeviceType($DeviceType);
50
-        $PageLayout->setName( '商品購入/購入エラー');
50
+        $PageLayout->setName('商品購入/購入エラー');
51 51
         $PageLayout->setUrl('shopping_error');
52 52
         $PageLayout->setFileName('Shopping/shopping_error');
53 53
         $PageLayout->setEditFlg(2);
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
         $PageLayout = new PageLayout();
58 58
         $PageLayout->setDeviceType($DeviceType);
59
-        $PageLayout->setName( 'ご利用ガイド');
59
+        $PageLayout->setName('ご利用ガイド');
60 60
         $PageLayout->setUrl('help_guide');
61 61
         $PageLayout->setFileName('Help/guide');
62 62
         $PageLayout->setEditFlg(2);
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
         $PageLayout = new PageLayout();
66 66
         $PageLayout->setDeviceType($DeviceType);
67
-        $PageLayout->setName( 'パスワード再発行(入力ページ)');
67
+        $PageLayout->setName('パスワード再発行(入力ページ)');
68 68
         $PageLayout->setUrl('forgot');
69 69
         $PageLayout->setFileName('Forgot/index');
70 70
         $PageLayout->setEditFlg(2);
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 
73 73
         $PageLayout = new PageLayout();
74 74
         $PageLayout->setDeviceType($DeviceType);
75
-        $PageLayout->setName( 'パスワード再発行(完了ページ)');
75
+        $PageLayout->setName('パスワード再発行(完了ページ)');
76 76
         $PageLayout->setUrl('forgot_complete');
77 77
         $PageLayout->setFileName('Forgot/complete');
78 78
         $PageLayout->setEditFlg(2);
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
         $PageLayout = new PageLayout();
83 83
         $PageLayout->setDeviceType($DeviceType);
84
-        $PageLayout->setName( 'パスワード変更((完了ページ)');
84
+        $PageLayout->setName('パスワード変更((完了ページ)');
85 85
         $PageLayout->setUrl('forgot_reset');
86 86
         $PageLayout->setFileName('Forgot/reset');
87 87
         $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/Version20151116142354.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
         $PageLayout = new PageLayout();
30 30
         $PageLayout->setDeviceType($DeviceType);
31
-        $PageLayout->setName( '商品購入/配送方法選択');
31
+        $PageLayout->setName('商品購入/配送方法選択');
32 32
         $PageLayout->setUrl('shopping_delivery');
33 33
         $PageLayout->setFileName('Shopping/index');
34 34
         $PageLayout->setEditFlg(2);
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
         $PageLayout = new PageLayout();
39 39
         $PageLayout->setDeviceType($DeviceType);
40
-        $PageLayout->setName( '商品購入/支払方法選択');
40
+        $PageLayout->setName('商品購入/支払方法選択');
41 41
         $PageLayout->setUrl('shopping_payment');
42 42
         $PageLayout->setFileName('Shopping/index');
43 43
         $PageLayout->setEditFlg(2);
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 
47 47
         $PageLayout = new PageLayout();
48 48
         $PageLayout->setDeviceType($DeviceType);
49
-        $PageLayout->setName( '商品購入/お届け先変更');
49
+        $PageLayout->setName('商品購入/お届け先変更');
50 50
         $PageLayout->setUrl('shopping_shipping_change');
51 51
         $PageLayout->setFileName('Shopping/index');
52 52
         $PageLayout->setEditFlg(2);
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
         $PageLayout = new PageLayout();
57 57
         $PageLayout->setDeviceType($DeviceType);
58
-        $PageLayout->setName( '商品購入/お届け先変更');
58
+        $PageLayout->setName('商品購入/お届け先変更');
59 59
         $PageLayout->setUrl('shopping_shipping_edit_change');
60 60
         $PageLayout->setFileName('Shopping/index');
61 61
         $PageLayout->setEditFlg(2);
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
         $PageLayout = new PageLayout();
66 66
         $PageLayout->setDeviceType($DeviceType);
67
-        $PageLayout->setName( '商品購入/お届け先の複数指定');
67
+        $PageLayout->setName('商品購入/お届け先の複数指定');
68 68
         $PageLayout->setUrl('shopping_shipping_multiple_change');
69 69
         $PageLayout->setFileName('Shopping/index');
70 70
         $PageLayout->setEditFlg(2);
Please login to merge, or discard this patch.
src/Eccube/Security/Core/Encoder/PasswordEncoder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         if ($this->config['auth_type'] == 'PLAIN') {
54 54
             $res = $raw;
55 55
         } else {
56
-            $res = hash_hmac($this->config['password_hash_algos'], $raw . ':' . $this->config['auth_magic'], $salt);
56
+            $res = hash_hmac($this->config['password_hash_algos'], $raw.':'.$this->config['auth_magic'], $salt);
57 57
         }
58 58
 
59 59
         return $res;
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
         } else {
82 82
             // 旧バージョン(2.11未満)からの移行を考慮
83 83
             if (empty($salt)) {
84
-                $hash = sha1($raw . ':' . $this->config['auth_magic']);
84
+                $hash = sha1($raw.':'.$this->config['auth_magic']);
85 85
             } else {
86 86
                 $hash = $this->encodePassword($raw, $salt);
87 87
             }
Please login to merge, or discard this patch.
src/Eccube/Util/Str.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
             return $value;
160 160
         }
161 161
 
162
-        return rtrim(mb_substr($value, 0, $length, 'UTF-8')) . $end;
162
+        return rtrim(mb_substr($value, 0, $length, 'UTF-8')).$end;
163 163
     }
164 164
 
165 165
 
@@ -186,18 +186,18 @@  discard block
 block discarded – undo
186 186
         }
187 187
         if ($diff->m == 1 || $diff->days > 0) {
188 188
             if ($diff->days <= 31) {
189
-                return $diff->days . '日前';
189
+                return $diff->days.'日前';
190 190
             }
191 191
             // return $date->format("Y/m/d H:i");
192 192
             return $date->format("Y/m/d");
193 193
         }
194 194
         if ($diff->h > 0) {
195
-            return $diff->h . "時間前";
195
+            return $diff->h."時間前";
196 196
         }
197 197
         if ($diff->i > 0) {
198
-            return $diff->i . "分前";
198
+            return $diff->i."分前";
199 199
         }
200
-        return $diff->s . "秒前";
200
+        return $diff->s."秒前";
201 201
     }
202 202
 
203 203
     /**
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/AuthorityRoleType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
                 'label' => '拒否URL',
60 60
                 'required' => false,
61 61
             ))
62
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
62
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
63 63
                 $form = $event->getForm();
64 64
 
65 65
                 $Authority = $form['Authority']->getData();
Please login to merge, or discard this patch.
src/Eccube/Security/Voter/AuthorityVoter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 
37 37
     public function __construct(Application $app)
38 38
     {
39
-        $this->app     = $app;
39
+        $this->app = $app;
40 40
     }
41 41
 
42 42
     public function supportsAttribute($attribute)
Please login to merge, or discard this patch.
src/Eccube/Controller/Mypage/WithdrawController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
                     // 会員削除
61 61
                     $email = $Customer->getEmail();
62 62
                     // メールアドレスにダミーをセット
63
-                    $Customer->setEmail(Str::random(60) . '@dummy.dummy');
63
+                    $Customer->setEmail(Str::random(60).'@dummy.dummy');
64 64
                     $Customer->setDelFlg(Constant::ENABLED);
65 65
 
66 66
                     $app['orm.em']->flush();
Please login to merge, or discard this patch.