@@ -11,9 +11,9 @@ discard block |
||
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 |
||
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 | } |
@@ -29,7 +29,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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); |
@@ -24,7 +24,7 @@ |
||
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(); |
@@ -28,7 +28,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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); |
@@ -53,7 +53,7 @@ discard block |
||
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 |
||
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 | } |
@@ -40,13 +40,13 @@ |
||
40 | 40 | */ |
41 | 41 | public function register(BaseApplication $app) |
42 | 42 | { |
43 | - $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function ($extensions) use ($app) { |
|
43 | + $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function($extensions) use ($app) { |
|
44 | 44 | $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension(); |
45 | 45 | |
46 | 46 | return $extensions; |
47 | 47 | })); |
48 | 48 | |
49 | - $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) { |
|
49 | + $app['form.types'] = $app->share($app->extend('form.types', function($types) use ($app) { |
|
50 | 50 | $types[] = new \Eccube\Form\Type\Install\Step1Type($app); |
51 | 51 | $types[] = new \Eccube\Form\Type\Install\Step3Type($app); |
52 | 52 | $types[] = new \Eccube\Form\Type\Install\Step4Type($app); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | { |
29 | 29 | public function register(Application $app) |
30 | 30 | { |
31 | - $app['validator'] = $app->share(function ($app) { |
|
31 | + $app['validator'] = $app->share(function($app) { |
|
32 | 32 | |
33 | 33 | return new Validator( |
34 | 34 | $app['validator.mapping.class_metadata_factory'], |
@@ -39,17 +39,17 @@ discard block |
||
39 | 39 | ); |
40 | 40 | }); |
41 | 41 | |
42 | - $app['validator.mapping.class_metadata_factory'] = $app->share(function ($app) { |
|
42 | + $app['validator.mapping.class_metadata_factory'] = $app->share(function($app) { |
|
43 | 43 | return new ClassMetadataFactory(new StaticMethodLoader()); |
44 | 44 | }); |
45 | 45 | |
46 | - $app['validator.validator_factory'] = $app->share(function () use ($app) { |
|
46 | + $app['validator.validator_factory'] = $app->share(function() use ($app) { |
|
47 | 47 | $validators = isset($app['validator.validator_service_ids']) ? $app['validator.validator_service_ids'] : array(); |
48 | 48 | |
49 | 49 | return new ConstraintValidatorFactory($app, $validators); |
50 | 50 | }); |
51 | 51 | |
52 | - $app['validator.object_initializers'] = $app->share(function ($app) { |
|
52 | + $app['validator.object_initializers'] = $app->share(function($app) { |
|
53 | 53 | return array(); |
54 | 54 | }); |
55 | 55 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | public function getCsrfTokenForAnchor() |
112 | 112 | { |
113 | 113 | $token = $this->app['form.csrf_provider']->getToken(Constant::TOKEN_NAME)->getValue(); |
114 | - return 'token-for-anchor=\'' . $token . '\''; |
|
114 | + return 'token-for-anchor=\''.$token.'\''; |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | public function getPriceFilter($number, $decimals = 0, $decPoint = '.', $thousandsSep = ',') |
147 | 147 | { |
148 | 148 | $price = number_format($number, $decimals, $decPoint, $thousandsSep); |
149 | - $price = '¥ ' . $price; |
|
149 | + $price = '¥ '.$price; |
|
150 | 150 | |
151 | 151 | return $price; |
152 | 152 | } |
@@ -159,7 +159,7 @@ discard block |
||
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 |
||
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 | /** |