@@ -53,8 +53,8 @@ |
||
53 | 53 | 'constraints' => array( |
54 | 54 | new Assert\NotBlank(array('message' => 'ファイルを選択してください。')), |
55 | 55 | new Assert\File(array( |
56 | - 'maxSize' => $app['config']['csv_size'] . 'M', |
|
57 | - 'maxSizeMessage' => 'CSVファイルは' . $app['config']['csv_size'] . 'M以下でアップロードしてください。', |
|
56 | + 'maxSize' => $app['config']['csv_size'].'M', |
|
57 | + 'maxSizeMessage' => 'CSVファイルは'.$app['config']['csv_size'].'M以下でアップロードしてください。', |
|
58 | 58 | )), |
59 | 59 | ), |
60 | 60 | )); |
@@ -41,7 +41,7 @@ |
||
41 | 41 | 'label' => false, |
42 | 42 | 'class' => 'Eccube\Entity\PageLayout', |
43 | 43 | 'property' => 'name', |
44 | - 'query_builder' => function (EntityRepository $er) { |
|
44 | + 'query_builder' => function(EntityRepository $er) { |
|
45 | 45 | return $er |
46 | 46 | ->createQueryBuilder('l') |
47 | 47 | ->where('l.id <> 0') |
@@ -59,7 +59,7 @@ |
||
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(); |
@@ -33,7 +33,7 @@ |
||
33 | 33 | { |
34 | 34 | protected $config; |
35 | 35 | |
36 | - public function __construct ($config) |
|
36 | + public function __construct($config) |
|
37 | 37 | { |
38 | 38 | $this->config = $config; |
39 | 39 | } |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | 'format' => 'yyyy-MM-dd', |
142 | 142 | 'required' => false, |
143 | 143 | )) |
144 | - ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($BaseInfo) { |
|
144 | + ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($BaseInfo) { |
|
145 | 145 | if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
146 | 146 | $form = $event->getForm(); |
147 | 147 | $form->add('ShipmentItems', 'collection', array( |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | )); |
153 | 153 | } |
154 | 154 | }) |
155 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
155 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
156 | 156 | /** @var \Eccube\Entity\Shipping $data */ |
157 | 157 | $data = $event->getData(); |
158 | 158 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | 'empty_value' => '指定なし', |
173 | 173 | 'empty_data' => null, |
174 | 174 | 'required' => false, |
175 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
175 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
176 | 176 | return $er->createQueryBuilder('dt') |
177 | 177 | ->where('dt.Delivery = :Delivery') |
178 | 178 | ->setParameter('Delivery', $Delivery); |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | )); |
181 | 181 | |
182 | 182 | }) |
183 | - ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) { |
|
183 | + ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) { |
|
184 | 184 | $data = $event->getData(); |
185 | 185 | $form = $event->getForm(); |
186 | 186 | if (!$data) { |
@@ -201,14 +201,14 @@ discard block |
||
201 | 201 | 'empty_value' => '指定なし', |
202 | 202 | 'empty_data' => null, |
203 | 203 | 'required' => false, |
204 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
204 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
205 | 205 | return $er->createQueryBuilder('dt') |
206 | 206 | ->where('dt.Delivery = :Delivery') |
207 | 207 | ->setParameter('Delivery', $Delivery); |
208 | 208 | }, |
209 | 209 | )); |
210 | 210 | }) |
211 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) { |
|
211 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) { |
|
212 | 212 | if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
213 | 213 | $form = $event->getForm(); |
214 | 214 | $shipmentItems = $form['ShipmentItems']->getData(); |
@@ -47,7 +47,7 @@ |
||
47 | 47 | $app = $this->app; |
48 | 48 | |
49 | 49 | $builder |
50 | - ->addEventListener(FormEvents::POST_SET_DATA, function ($event) use ($app) { |
|
50 | + ->addEventListener(FormEvents::POST_SET_DATA, function($event) use ($app) { |
|
51 | 51 | /** @var \Eccube\Entity\ShipmentItem $data */ |
52 | 52 | $data = $event->getData(); |
53 | 53 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -17,8 +17,8 @@ |
||
17 | 17 | $config->registerMigrationsFromDirectory($migrationFilePath ); |
18 | 18 | $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode); |
19 | 19 | $migration = new Migration($config); |
20 | - // null 又は 'last' を渡すと最新バージョンまでマイグレートする |
|
21 | - // 0か'first'を渡すと最初に戻る |
|
20 | + // null 又は 'last' を渡すと最新バージョンまでマイグレートする |
|
21 | + // 0か'first'を渡すと最初に戻る |
|
22 | 22 | $migration->migrate($version, false); |
23 | 23 | |
24 | 24 |
@@ -9,12 +9,12 @@ |
||
9 | 9 | |
10 | 10 | CONST MIGRATION_TABLE_PREFIX = 'migration_'; |
11 | 11 | |
12 | - public function migrationSchema($app,$migrationFilePath,$pluginCode,$version=null) |
|
12 | + public function migrationSchema($app, $migrationFilePath, $pluginCode, $version = null) |
|
13 | 13 | { |
14 | 14 | $config = new Configuration($app['db']); |
15 | 15 | $config->setMigrationsNamespace('DoctrineMigrations'); |
16 | 16 | $config->setMigrationsDirectory($migrationFilePath); |
17 | - $config->registerMigrationsFromDirectory($migrationFilePath ); |
|
17 | + $config->registerMigrationsFromDirectory($migrationFilePath); |
|
18 | 18 | $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode); |
19 | 19 | $migration = new Migration($config); |
20 | 20 | // null 又は 'last' を渡すと最新バージョンまでマイグレートする |
@@ -35,7 +35,7 @@ |
||
35 | 35 | |
36 | 36 | public function __construct(Application $app) |
37 | 37 | { |
38 | - $this->app = $app; |
|
38 | + $this->app = $app; |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | public function supportsAttribute($attribute) |
@@ -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 | } |