@@ -21,7 +21,7 @@ |
||
21 | 21 | // this up() migration is auto-generated, please modify it to your needs |
22 | 22 | $t = $schema->getTable(self::NAME); |
23 | 23 | |
24 | - if($t->hasColumn('option_delivery_fee')){ |
|
24 | + if ($t->hasColumn('option_delivery_fee')) { |
|
25 | 25 | $t->dropColumn('option_delivery_fee'); |
26 | 26 | } |
27 | 27 |
@@ -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 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | )); |
58 | 58 | |
59 | 59 | $message = \Swift_Message::newInstance() |
60 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認') |
|
60 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認') |
|
61 | 61 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
62 | 62 | ->setTo(array($Customer->getEmail())) |
63 | 63 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | )); |
83 | 83 | |
84 | 84 | $message = \Swift_Message::newInstance() |
85 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録が完了しました。') |
|
85 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録が完了しました。') |
|
86 | 86 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
87 | 87 | ->setTo(array($Customer->getEmail())) |
88 | 88 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | )); |
112 | 112 | |
113 | 113 | $message = \Swift_Message::newInstance() |
114 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 退会手続きのご完了') |
|
114 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 退会手続きのご完了') |
|
115 | 115 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
116 | 116 | ->setTo(array($email)) |
117 | 117 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | |
140 | 140 | // 問い合わせ者にメール送信 |
141 | 141 | $message = \Swift_Message::newInstance() |
142 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] お問い合わせを受け付けました。') |
|
142 | + ->setSubject('['.$this->BaseInfo->getShopName().'] お問い合わせを受け付けました。') |
|
143 | 143 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
144 | 144 | ->setTo(array($formData['email'])) |
145 | 145 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | )); |
170 | 170 | |
171 | 171 | $message = \Swift_Message::newInstance() |
172 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $MailTemplate->getSubject()) |
|
172 | + ->setSubject('['.$this->BaseInfo->getShopName().'] '.$MailTemplate->getSubject()) |
|
173 | 173 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
174 | 174 | ->setTo(array($Order->getEmail())) |
175 | 175 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | )); |
198 | 198 | |
199 | 199 | $message = \Swift_Message::newInstance() |
200 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認') |
|
200 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認') |
|
201 | 201 | ->setFrom(array($this->BaseInfo->getEmail03() => $this->BaseInfo->getShopName())) |
202 | 202 | ->setTo(array($Customer->getEmail())) |
203 | 203 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | )); |
227 | 227 | |
228 | 228 | $message = \Swift_Message::newInstance() |
229 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $formData['subject']) |
|
229 | + ->setSubject('['.$this->BaseInfo->getShopName().'] '.$formData['subject']) |
|
230 | 230 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
231 | 231 | ->setTo(array($Order->getEmail())) |
232 | 232 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | )); |
252 | 252 | |
253 | 253 | $message = \Swift_Message::newInstance() |
254 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のご確認') |
|
254 | + ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のご確認') |
|
255 | 255 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
256 | 256 | ->setTo(array($Customer->getEmail())) |
257 | 257 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | )); |
277 | 277 | |
278 | 278 | $message = \Swift_Message::newInstance() |
279 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のお知らせ') |
|
279 | + ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のお知らせ') |
|
280 | 280 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
281 | 281 | ->setTo(array($Customer->getEmail())) |
282 | 282 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -41,28 +41,28 @@ discard block |
||
41 | 41 | public function register(BaseApplication $app) |
42 | 42 | { |
43 | 43 | // Service |
44 | - $app['eccube.service.system'] = $app->share(function () use ($app) { |
|
44 | + $app['eccube.service.system'] = $app->share(function() use ($app) { |
|
45 | 45 | return new \Eccube\Service\SystemService($app); |
46 | 46 | }); |
47 | - $app['view'] = $app->share(function () use ($app) { |
|
47 | + $app['view'] = $app->share(function() use ($app) { |
|
48 | 48 | return $app['twig']; |
49 | 49 | }); |
50 | - $app['eccube.service.cart'] = $app->share(function () use ($app) { |
|
50 | + $app['eccube.service.cart'] = $app->share(function() use ($app) { |
|
51 | 51 | return new \Eccube\Service\CartService($app); |
52 | 52 | }); |
53 | - $app['eccube.service.order'] = $app->share(function () use ($app) { |
|
53 | + $app['eccube.service.order'] = $app->share(function() use ($app) { |
|
54 | 54 | return new \Eccube\Service\OrderService($app); |
55 | 55 | }); |
56 | - $app['eccube.service.tax_rule'] = $app->share(function () use ($app) { |
|
56 | + $app['eccube.service.tax_rule'] = $app->share(function() use ($app) { |
|
57 | 57 | return new \Eccube\Service\TaxRuleService($app['eccube.repository.tax_rule']); |
58 | 58 | }); |
59 | - $app['eccube.service.plugin'] = $app->share(function () use ($app) { |
|
59 | + $app['eccube.service.plugin'] = $app->share(function() use ($app) { |
|
60 | 60 | return new \Eccube\Service\PluginService($app); |
61 | 61 | }); |
62 | - $app['eccube.service.mail'] = $app->share(function () use ($app) { |
|
62 | + $app['eccube.service.mail'] = $app->share(function() use ($app) { |
|
63 | 63 | return new \Eccube\Service\MailService($app); |
64 | 64 | }); |
65 | - $app['eccube.service.csv.export'] = $app->share(function () use ($app) { |
|
65 | + $app['eccube.service.csv.export'] = $app->share(function() use ($app) { |
|
66 | 66 | $csvService = new \Eccube\Service\CsvExportService(); |
67 | 67 | $csvService->setConfig($app['config']); |
68 | 68 | $csvService->setCsvRepository($app['eccube.repository.csv']); |
@@ -73,164 +73,164 @@ discard block |
||
73 | 73 | |
74 | 74 | return $csvService; |
75 | 75 | }); |
76 | - $app['eccube.service.shopping'] = $app->share(function () use ($app) { |
|
76 | + $app['eccube.service.shopping'] = $app->share(function() use ($app) { |
|
77 | 77 | return new \Eccube\Service\ShoppingService($app, $app['eccube.service.cart'], $app['eccube.service.order']); |
78 | 78 | }); |
79 | 79 | |
80 | 80 | // Repository |
81 | - $app['eccube.repository.master.tag'] = $app->share(function () use ($app) { |
|
81 | + $app['eccube.repository.master.tag'] = $app->share(function() use ($app) { |
|
82 | 82 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Tag'); |
83 | 83 | }); |
84 | - $app['eccube.repository.master.pref'] = $app->share(function () use ($app) { |
|
84 | + $app['eccube.repository.master.pref'] = $app->share(function() use ($app) { |
|
85 | 85 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Pref'); |
86 | 86 | }); |
87 | - $app['eccube.repository.master.sex'] = $app->share(function () use ($app) { |
|
87 | + $app['eccube.repository.master.sex'] = $app->share(function() use ($app) { |
|
88 | 88 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Sex'); |
89 | 89 | }); |
90 | - $app['eccube.repository.master.disp'] = $app->share(function () use ($app) { |
|
90 | + $app['eccube.repository.master.disp'] = $app->share(function() use ($app) { |
|
91 | 91 | return $app['orm.em']->getRepository('Eccube\Entity\Master\Disp'); |
92 | 92 | }); |
93 | - $app['eccube.repository.master.product_type'] = $app->share(function () use ($app) { |
|
93 | + $app['eccube.repository.master.product_type'] = $app->share(function() use ($app) { |
|
94 | 94 | return $app['orm.em']->getRepository('Eccube\Entity\Master\ProductType'); |
95 | 95 | }); |
96 | - $app['eccube.repository.master.page_max'] = $app->share(function () use ($app) { |
|
96 | + $app['eccube.repository.master.page_max'] = $app->share(function() use ($app) { |
|
97 | 97 | return $app['orm.em']->getRepository('Eccube\Entity\Master\PageMax'); |
98 | 98 | }); |
99 | - $app['eccube.repository.master.order_status'] = $app->share(function () use ($app) { |
|
99 | + $app['eccube.repository.master.order_status'] = $app->share(function() use ($app) { |
|
100 | 100 | return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus'); |
101 | 101 | }); |
102 | - $app['eccube.repository.master.device_type'] = $app->share(function () use ($app) { |
|
102 | + $app['eccube.repository.master.device_type'] = $app->share(function() use ($app) { |
|
103 | 103 | return $app['orm.em']->getRepository('Eccube\Entity\Master\DeviceType'); |
104 | 104 | }); |
105 | - $app['eccube.repository.master.csv_type'] = $app->share(function () use ($app) { |
|
105 | + $app['eccube.repository.master.csv_type'] = $app->share(function() use ($app) { |
|
106 | 106 | return $app['orm.em']->getRepository('Eccube\Entity\Master\CsvType'); |
107 | 107 | }); |
108 | 108 | |
109 | - $app['eccube.repository.delivery'] = $app->share(function () use ($app) { |
|
109 | + $app['eccube.repository.delivery'] = $app->share(function() use ($app) { |
|
110 | 110 | return $app['orm.em']->getRepository('Eccube\Entity\Delivery'); |
111 | 111 | }); |
112 | - $app['eccube.repository.delivery_date'] = $app->share(function () use ($app) { |
|
112 | + $app['eccube.repository.delivery_date'] = $app->share(function() use ($app) { |
|
113 | 113 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryDate'); |
114 | 114 | }); |
115 | - $app['eccube.repository.delivery_fee'] = $app->share(function () use ($app) { |
|
115 | + $app['eccube.repository.delivery_fee'] = $app->share(function() use ($app) { |
|
116 | 116 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryFee'); |
117 | 117 | }); |
118 | - $app['eccube.repository.delivery_time'] = $app->share(function () use ($app) { |
|
118 | + $app['eccube.repository.delivery_time'] = $app->share(function() use ($app) { |
|
119 | 119 | return $app['orm.em']->getRepository('Eccube\Entity\DeliveryTime'); |
120 | 120 | }); |
121 | - $app['eccube.repository.payment'] = $app->share(function () use ($app) { |
|
121 | + $app['eccube.repository.payment'] = $app->share(function() use ($app) { |
|
122 | 122 | return $app['orm.em']->getRepository('Eccube\Entity\Payment'); |
123 | 123 | }); |
124 | - $app['eccube.repository.payment_option'] = $app->share(function () use ($app) { |
|
124 | + $app['eccube.repository.payment_option'] = $app->share(function() use ($app) { |
|
125 | 125 | return $app['orm.em']->getRepository('Eccube\Entity\PaymentOption'); |
126 | 126 | }); |
127 | - $app['eccube.repository.category'] = $app->share(function () use ($app) { |
|
127 | + $app['eccube.repository.category'] = $app->share(function() use ($app) { |
|
128 | 128 | return $app['orm.em']->getRepository('Eccube\Entity\Category'); |
129 | 129 | }); |
130 | - $app['eccube.repository.customer'] = $app->share(function () use ($app) { |
|
130 | + $app['eccube.repository.customer'] = $app->share(function() use ($app) { |
|
131 | 131 | return $app['orm.em']->getRepository('Eccube\Entity\Customer'); |
132 | 132 | }); |
133 | - $app['eccube.repository.news'] = $app->share(function () use ($app) { |
|
133 | + $app['eccube.repository.news'] = $app->share(function() use ($app) { |
|
134 | 134 | return $app['orm.em']->getRepository('Eccube\Entity\News'); |
135 | 135 | }); |
136 | - $app['eccube.repository.mail_history'] = $app->share(function () use ($app) { |
|
136 | + $app['eccube.repository.mail_history'] = $app->share(function() use ($app) { |
|
137 | 137 | return $app['orm.em']->getRepository('Eccube\Entity\MailHistory'); |
138 | 138 | }); |
139 | - $app['eccube.repository.member'] = $app->share(function () use ($app) { |
|
139 | + $app['eccube.repository.member'] = $app->share(function() use ($app) { |
|
140 | 140 | $memberRepository = $app['orm.em']->getRepository('Eccube\Entity\Member'); |
141 | 141 | $memberRepository->setEncoderFactorty($app['security.encoder_factory']); |
142 | 142 | return $memberRepository; |
143 | 143 | }); |
144 | - $app['eccube.repository.order'] = $app->share(function () use ($app) { |
|
144 | + $app['eccube.repository.order'] = $app->share(function() use ($app) { |
|
145 | 145 | return $app['orm.em']->getRepository('Eccube\Entity\Order'); |
146 | 146 | }); |
147 | - $app['eccube.repository.product'] = $app->share(function () use ($app) { |
|
147 | + $app['eccube.repository.product'] = $app->share(function() use ($app) { |
|
148 | 148 | $productRepository = $app['orm.em']->getRepository('Eccube\Entity\Product'); |
149 | 149 | return $productRepository; |
150 | 150 | }); |
151 | - $app['eccube.repository.product_image'] = $app->share(function () use ($app) { |
|
151 | + $app['eccube.repository.product_image'] = $app->share(function() use ($app) { |
|
152 | 152 | return $app['orm.em']->getRepository('Eccube\Entity\ProductImage'); |
153 | 153 | }); |
154 | - $app['eccube.repository.product_class'] = $app->share(function () use ($app) { |
|
154 | + $app['eccube.repository.product_class'] = $app->share(function() use ($app) { |
|
155 | 155 | return $app['orm.em']->getRepository('Eccube\Entity\ProductClass'); |
156 | 156 | }); |
157 | - $app['eccube.repository.product_stock'] = $app->share(function () use ($app) { |
|
157 | + $app['eccube.repository.product_stock'] = $app->share(function() use ($app) { |
|
158 | 158 | return $app['orm.em']->getRepository('Eccube\Entity\ProductStock'); |
159 | 159 | }); |
160 | - $app['eccube.repository.class_name'] = $app->share(function () use ($app) { |
|
160 | + $app['eccube.repository.class_name'] = $app->share(function() use ($app) { |
|
161 | 161 | return $app['orm.em']->getRepository('Eccube\Entity\ClassName'); |
162 | 162 | }); |
163 | - $app['eccube.repository.class_category'] = $app->share(function () use ($app) { |
|
163 | + $app['eccube.repository.class_category'] = $app->share(function() use ($app) { |
|
164 | 164 | return $app['orm.em']->getRepository('Eccube\Entity\ClassCategory'); |
165 | 165 | }); |
166 | - $app['eccube.repository.customer_favorite_product'] = $app->share(function () use ($app) { |
|
166 | + $app['eccube.repository.customer_favorite_product'] = $app->share(function() use ($app) { |
|
167 | 167 | return $app['orm.em']->getRepository('Eccube\Entity\CustomerFavoriteProduct'); |
168 | 168 | }); |
169 | - $app['eccube.repository.base_info'] = $app->share(function () use ($app) { |
|
169 | + $app['eccube.repository.base_info'] = $app->share(function() use ($app) { |
|
170 | 170 | return $app['orm.em']->getRepository('Eccube\Entity\BaseInfo'); |
171 | 171 | }); |
172 | - $app['eccube.repository.tax_rule'] = $app->share(function () use ($app) { |
|
172 | + $app['eccube.repository.tax_rule'] = $app->share(function() use ($app) { |
|
173 | 173 | $taxRuleRepository = $app['orm.em']->getRepository('Eccube\Entity\TaxRule'); |
174 | 174 | $taxRuleRepository->setApplication($app); |
175 | 175 | |
176 | 176 | return $taxRuleRepository; |
177 | 177 | }); |
178 | - $app['eccube.repository.page_layout'] = $app->share(function () use ($app) { |
|
178 | + $app['eccube.repository.page_layout'] = $app->share(function() use ($app) { |
|
179 | 179 | $pageLayoutRepository = $app['orm.em']->getRepository('Eccube\Entity\PageLayout'); |
180 | 180 | $pageLayoutRepository->setApplication($app); |
181 | 181 | |
182 | 182 | return $pageLayoutRepository; |
183 | 183 | }); |
184 | - $app['eccube.repository.block'] = $app->share(function () use ($app) { |
|
184 | + $app['eccube.repository.block'] = $app->share(function() use ($app) { |
|
185 | 185 | $blockRepository = $app['orm.em']->getRepository('Eccube\Entity\Block'); |
186 | 186 | $blockRepository->setApplication($app); |
187 | 187 | |
188 | 188 | return $blockRepository; |
189 | 189 | }); |
190 | - $app['eccube.repository.order'] = $app->share(function () use ($app) { |
|
190 | + $app['eccube.repository.order'] = $app->share(function() use ($app) { |
|
191 | 191 | $orderRepository = $app['orm.em']->getRepository('Eccube\Entity\Order'); |
192 | 192 | $orderRepository->setApplication($app); |
193 | 193 | |
194 | 194 | return $orderRepository; |
195 | 195 | }); |
196 | - $app['eccube.repository.customer_address'] = $app->share(function () use ($app) { |
|
196 | + $app['eccube.repository.customer_address'] = $app->share(function() use ($app) { |
|
197 | 197 | return $app['orm.em']->getRepository('Eccube\Entity\CustomerAddress'); |
198 | 198 | }); |
199 | - $app['eccube.repository.shipping'] = $app->share(function () use ($app) { |
|
199 | + $app['eccube.repository.shipping'] = $app->share(function() use ($app) { |
|
200 | 200 | return $app['orm.em']->getRepository('Eccube\Entity\Shipping'); |
201 | 201 | }); |
202 | - $app['eccube.repository.customer_status'] = $app->share(function () use ($app) { |
|
202 | + $app['eccube.repository.customer_status'] = $app->share(function() use ($app) { |
|
203 | 203 | return $app['orm.em']->getRepository('Eccube\Entity\Master\CustomerStatus'); |
204 | 204 | }); |
205 | - $app['eccube.repository.order_status'] = $app->share(function () use ($app) { |
|
205 | + $app['eccube.repository.order_status'] = $app->share(function() use ($app) { |
|
206 | 206 | return $app['orm.em']->getRepository('Eccube\Entity\Master\OrderStatus'); |
207 | 207 | }); |
208 | - $app['eccube.repository.mail_template'] = $app->share(function () use ($app) { |
|
208 | + $app['eccube.repository.mail_template'] = $app->share(function() use ($app) { |
|
209 | 209 | return $app['orm.em']->getRepository('Eccube\Entity\MailTemplate'); |
210 | 210 | }); |
211 | - $app['eccube.repository.csv'] = $app->share(function () use ($app) { |
|
211 | + $app['eccube.repository.csv'] = $app->share(function() use ($app) { |
|
212 | 212 | return $app['orm.em']->getRepository('Eccube\Entity\Csv'); |
213 | 213 | }); |
214 | - $app['eccube.repository.template'] = $app->share(function () use ($app) { |
|
214 | + $app['eccube.repository.template'] = $app->share(function() use ($app) { |
|
215 | 215 | return $app['orm.em']->getRepository('Eccube\Entity\Template'); |
216 | 216 | }); |
217 | 217 | |
218 | - $app['paginator'] = $app->protect(function () { |
|
218 | + $app['paginator'] = $app->protect(function() { |
|
219 | 219 | return new \Knp\Component\Pager\Paginator(); |
220 | 220 | }); |
221 | 221 | |
222 | - $app['eccube.repository.help'] = $app->share(function () use ($app) { |
|
222 | + $app['eccube.repository.help'] = $app->share(function() use ($app) { |
|
223 | 223 | return $app['orm.em']->getRepository('Eccube\Entity\Help'); |
224 | 224 | }); |
225 | - $app['eccube.repository.plugin'] = $app->share(function () use ($app) { |
|
225 | + $app['eccube.repository.plugin'] = $app->share(function() use ($app) { |
|
226 | 226 | return $app['orm.em']->getRepository('Eccube\Entity\Plugin'); |
227 | 227 | }); |
228 | - $app['eccube.repository.plugin_event_handler'] = $app->share(function () use ($app) { |
|
228 | + $app['eccube.repository.plugin_event_handler'] = $app->share(function() use ($app) { |
|
229 | 229 | return $app['orm.em']->getRepository('Eccube\Entity\PluginEventHandler'); |
230 | 230 | }); |
231 | 231 | // em |
232 | 232 | if (isset($app['orm.em'])) { |
233 | - $app['orm.em'] = $app->share($app->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
233 | + $app['orm.em'] = $app->share($app->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
234 | 234 | // tax_rule |
235 | 235 | $taxRuleRepository = $em->getRepository('Eccube\Entity\TaxRule'); |
236 | 236 | $taxRuleRepository->setApplication($app); |
@@ -253,13 +253,13 @@ discard block |
||
253 | 253 | } |
254 | 254 | |
255 | 255 | // Form\Type |
256 | - $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function ($extensions) use ($app) { |
|
256 | + $app['form.type.extensions'] = $app->share($app->extend('form.type.extensions', function($extensions) use ($app) { |
|
257 | 257 | $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension(); |
258 | 258 | $extensions[] = new \Eccube\Form\Extension\FreezeTypeExtension(); |
259 | 259 | |
260 | 260 | return $extensions; |
261 | 261 | })); |
262 | - $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) { |
|
262 | + $app['form.types'] = $app->share($app->extend('form.types', function($types) use ($app) { |
|
263 | 263 | $types[] = new \Eccube\Form\Type\NameType($app['config']); |
264 | 264 | $types[] = new \Eccube\Form\Type\KanaType($app['config']); |
265 | 265 | $types[] = new \Eccube\Form\Type\TelType($app['config']); |
@@ -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); |