@@ -138,7 +138,7 @@ |
||
138 | 138 | 'allow_add' => true, |
139 | 139 | 'allow_delete' => true, |
140 | 140 | 'data' => $ProductClasses, |
141 | - )); |
|
141 | + )); |
|
142 | 142 | |
143 | 143 | $event = new EventArgs( |
144 | 144 | array( |
@@ -38,21 +38,21 @@ |
||
38 | 38 | */ |
39 | 39 | public function buildForm(FormBuilderInterface $builder, array $options) |
40 | 40 | { |
41 | - $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
42 | - $options = $event->getForm()->getConfig()->getOptions(); |
|
43 | - if (!$event->getData()) { |
|
44 | - $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues())); |
|
45 | - $event->setData($data); |
|
46 | - } |
|
47 | - }); |
|
48 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
49 | - $options = $event->getForm()->getConfig()->getOptions(); |
|
50 | - $values = $options['choice_loader']->loadChoiceList()->getValues(); |
|
51 | - if (!in_array($event->getData(), $values)) { |
|
52 | - $data = current($values); |
|
53 | - $event->setData($data); |
|
54 | - } |
|
55 | - }); |
|
41 | + $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
42 | + $options = $event->getForm()->getConfig()->getOptions(); |
|
43 | + if (!$event->getData()) { |
|
44 | + $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues())); |
|
45 | + $event->setData($data); |
|
46 | + } |
|
47 | + }); |
|
48 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
49 | + $options = $event->getForm()->getConfig()->getOptions(); |
|
50 | + $values = $options['choice_loader']->loadChoiceList()->getValues(); |
|
51 | + if (!in_array($event->getData(), $values)) { |
|
52 | + $data = current($values); |
|
53 | + $event->setData($data); |
|
54 | + } |
|
55 | + }); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
@@ -18,8 +18,8 @@ |
||
18 | 18 | $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode); |
19 | 19 | $migration = new Migration($config); |
20 | 20 | $migration->setNoMigrationException(true); |
21 | - // null 又は 'last' を渡すと最新バージョンまでマイグレートする |
|
22 | - // 0か'first'を渡すと最初に戻る |
|
21 | + // null 又は 'last' を渡すと最新バージョンまでマイグレートする |
|
22 | + // 0か'first'を渡すと最初に戻る |
|
23 | 23 | $migration->migrate($version, false); |
24 | 24 | |
25 | 25 |
@@ -59,7 +59,6 @@ |
||
59 | 59 | { |
60 | 60 | } |
61 | 61 | /** |
62 | - |
|
63 | 62 | * {@inheritdoc} |
64 | 63 | */ |
65 | 64 | public function buildForm(FormBuilderInterface $builder, array $options) |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php return [ |
2 | - 'http_cache' => |
|
3 | - [ |
|
2 | + 'http_cache' => |
|
3 | + [ |
|
4 | 4 | 'enabled' => false, |
5 | 5 | 'age' => 10, |
6 | 6 | // フロントでキャッシュを適用させる画面のrouteを設定 |
@@ -17,5 +17,5 @@ discard block |
||
17 | 17 | // 'help_tradelaw', |
18 | 18 | // 'help_agreement', |
19 | 19 | ], |
20 | - ], |
|
20 | + ], |
|
21 | 21 | ]; |
@@ -73,17 +73,17 @@ discard block |
||
73 | 73 | |
74 | 74 | $qb = $this->createQueryBuilder('e'); |
75 | 75 | $qb->andWhere("e.priority >= $range_end ") |
76 | - ->andWhere("e.priority <= $range_start ") |
|
77 | - ->andWhere('e.event = :event') |
|
78 | - ->setParameter('event',$event) |
|
79 | - ->setMaxResults(1) |
|
80 | - ->orderBy('e.priority','ASC'); |
|
76 | + ->andWhere("e.priority <= $range_start ") |
|
77 | + ->andWhere('e.event = :event') |
|
78 | + ->setParameter('event',$event) |
|
79 | + ->setMaxResults(1) |
|
80 | + ->orderBy('e.priority','ASC'); |
|
81 | 81 | |
82 | 82 | $result=$qb->getQuery()->getResult(); |
83 | 83 | if(count($result)){ |
84 | - return $result[0]->getPriority() -1; |
|
84 | + return $result[0]->getPriority() -1; |
|
85 | 85 | }else{ |
86 | - return $range_start; |
|
86 | + return $range_start; |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | } |
@@ -96,13 +96,13 @@ discard block |
||
96 | 96 | $qb = $this->createQueryBuilder('e'); |
97 | 97 | |
98 | 98 | $qb->andWhere("e.priority >= $range_end ") |
99 | - ->andWhere("e.priority <= $range_start ") |
|
100 | - ->andWhere('e.priority '.($up ? '>' : '<' ).' :pri') |
|
101 | - ->andWhere('e.event = :event') |
|
102 | - ->setParameter('event',$pluginEventHandler->getEvent()) |
|
103 | - ->setParameter('pri', $pluginEventHandler->getPriority() ) |
|
104 | - ->setMaxResults(1) |
|
105 | - ->orderBy('e.priority', ($up ? 'ASC':'DESC' ) ); |
|
99 | + ->andWhere("e.priority <= $range_start ") |
|
100 | + ->andWhere('e.priority '.($up ? '>' : '<' ).' :pri') |
|
101 | + ->andWhere('e.event = :event') |
|
102 | + ->setParameter('event',$pluginEventHandler->getEvent()) |
|
103 | + ->setParameter('pri', $pluginEventHandler->getPriority() ) |
|
104 | + ->setMaxResults(1) |
|
105 | + ->orderBy('e.priority', ($up ? 'ASC':'DESC' ) ); |
|
106 | 106 | |
107 | 107 | $result=$qb->getQuery()->getResult(); |
108 | 108 |
@@ -60,7 +60,7 @@ |
||
60 | 60 | */ |
61 | 61 | protected $appConfig; |
62 | 62 | |
63 | - /** |
|
63 | + /** |
|
64 | 64 | * get query builder. |
65 | 65 | * |
66 | 66 | * @param array $searchData |
@@ -77,8 +77,8 @@ |
||
77 | 77 | new Assert\NotBlank(), |
78 | 78 | new Assert\Length(array('max' => $this->appConfig['stext_len'])), |
79 | 79 | new Assert\Regex(array( |
80 | - 'pattern' => "/^[0-9a-zA-Z]+$/", |
|
81 | - )), |
|
80 | + 'pattern' => "/^[0-9a-zA-Z]+$/", |
|
81 | + )), |
|
82 | 82 | ), |
83 | 83 | )) |
84 | 84 | ->add('admin_allow_hosts', TextareaType::class, array( |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php return [ |
2 | - 'log' => |
|
3 | - [ |
|
2 | + 'log' => |
|
3 | + [ |
|
4 | 4 | 'suffix' => null, |
5 | 5 | 'filename' => 'site', |
6 | 6 | 'delimiter' => '_', |
@@ -13,8 +13,8 @@ discard block |
||
13 | 13 | 'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]', |
14 | 14 | 'channel' => |
15 | 15 | [ |
16 | - 'monolog' => |
|
17 | - [ |
|
16 | + 'monolog' => |
|
17 | + [ |
|
18 | 18 | 'name' => 'eccube', |
19 | 19 | 'filename' => 'site', |
20 | 20 | 'delimiter' => '_', |
@@ -25,9 +25,9 @@ discard block |
||
25 | 25 | 'max_files' => 90, |
26 | 26 | 'log_dateformat' => 'Y-m-d H:i:s,u', |
27 | 27 | 'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]', |
28 | - ], |
|
29 | - 'front' => |
|
30 | - [ |
|
28 | + ], |
|
29 | + 'front' => |
|
30 | + [ |
|
31 | 31 | 'name' => 'front', |
32 | 32 | 'filename' => 'front_site', |
33 | 33 | 'delimiter' => '_', |
@@ -38,9 +38,9 @@ discard block |
||
38 | 38 | 'max_files' => 90, |
39 | 39 | 'log_dateformat' => 'Y-m-d H:i:s,u', |
40 | 40 | 'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]', |
41 | - ], |
|
42 | - 'admin' => |
|
43 | - [ |
|
41 | + ], |
|
42 | + 'admin' => |
|
43 | + [ |
|
44 | 44 | 'name' => 'admin', |
45 | 45 | 'filename' => 'admin_site', |
46 | 46 | 'delimiter' => '_', |
@@ -51,12 +51,12 @@ discard block |
||
51 | 51 | 'max_files' => 90, |
52 | 52 | 'log_dateformat' => 'Y-m-d H:i:s,u', |
53 | 53 | 'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]', |
54 | - ], |
|
54 | + ], |
|
55 | 55 | ], |
56 | 56 | 'exclude_keys' => |
57 | 57 | [ |
58 | - 'password', |
|
59 | - 'app', |
|
58 | + 'password', |
|
59 | + 'app', |
|
60 | + ], |
|
60 | 61 | ], |
61 | - ], |
|
62 | 62 | ]; |