@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | 'format' => 'yyyy-MM-dd', |
150 | 150 | 'required' => false, |
151 | 151 | )) |
152 | - ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($BaseInfo) { |
|
152 | + ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($BaseInfo) { |
|
153 | 153 | if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
154 | 154 | $form = $event->getForm(); |
155 | 155 | $form->add('ShipmentItems', CollectionType::class, array( |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | )); |
161 | 161 | } |
162 | 162 | }) |
163 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
163 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
164 | 164 | /** @var \Eccube\Entity\Shipping $data */ |
165 | 165 | $data = $event->getData(); |
166 | 166 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | 'choice_label' => 'delivery_time', |
180 | 180 | 'placeholder' => '指定なし', |
181 | 181 | 'required' => false, |
182 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
182 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
183 | 183 | return $er->createQueryBuilder('dt') |
184 | 184 | ->where('dt.Delivery = :Delivery') |
185 | 185 | ->setParameter('Delivery', $Delivery); |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | )); |
188 | 188 | |
189 | 189 | }) |
190 | - ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) { |
|
190 | + ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) { |
|
191 | 191 | $data = $event->getData(); |
192 | 192 | $form = $event->getForm(); |
193 | 193 | if (!$data) { |
@@ -207,14 +207,14 @@ discard block |
||
207 | 207 | 'choice_label' => 'delivery_time', |
208 | 208 | 'placeholder' => '指定なし', |
209 | 209 | 'required' => false, |
210 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
210 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
211 | 211 | return $er->createQueryBuilder('dt') |
212 | 212 | ->where('dt.Delivery = :Delivery') |
213 | 213 | ->setParameter('Delivery', $Delivery); |
214 | 214 | }, |
215 | 215 | )); |
216 | 216 | }) |
217 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) { |
|
217 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) { |
|
218 | 218 | if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
219 | 219 | $form = $event->getForm(); |
220 | 220 | $shipmentItems = $form['ShipmentItems']->getData(); |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | } |
226 | 226 | } |
227 | 227 | }) |
228 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) { |
|
228 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) { |
|
229 | 229 | $Shipping = $event->getData(); |
230 | 230 | $Delivery = $Shipping->getDelivery(); |
231 | 231 | $Shipping->setShippingDeliveryName($Delivery ? $Delivery : null); |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | |
42 | 42 | return $phpinfo; |
43 | 43 | |
44 | - break; |
|
44 | + break; |
|
45 | 45 | default: |
46 | 46 | break; |
47 | 47 | } |
@@ -53,8 +53,8 @@ discard block |
||
53 | 53 | )); |
54 | 54 | } |
55 | 55 | |
56 | - public function getSystemInfo(Application $app, Request $request) |
|
57 | - { |
|
56 | + public function getSystemInfo(Application $app, Request $request) |
|
57 | + { |
|
58 | 58 | $system = $app['eccube.service.system']; |
59 | 59 | |
60 | 60 | $arrSystemInfo = array( |
@@ -69,5 +69,5 @@ discard block |
||
69 | 69 | $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $request->headers->get('User-Agent')); |
70 | 70 | |
71 | 71 | return $arrSystemInfo; |
72 | - } |
|
72 | + } |
|
73 | 73 | } |
@@ -58,13 +58,13 @@ |
||
58 | 58 | $system = $app['eccube.service.system']; |
59 | 59 | |
60 | 60 | $arrSystemInfo = array( |
61 | - array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
62 | - array('title' => 'サーバーOS', 'value' => php_uname()), |
|
63 | - array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
64 | - array('title' => 'WEBサーバー', 'value' => $request->server->get("SERVER_SOFTWARE")), |
|
61 | + array('title' => 'EC-CUBE', 'value' => Constant::VERSION), |
|
62 | + array('title' => 'サーバーOS', 'value' => php_uname()), |
|
63 | + array('title' => 'DBサーバー', 'value' => $system->getDbversion()), |
|
64 | + array('title' => 'WEBサーバー', 'value' => $request->server->get("SERVER_SOFTWARE")), |
|
65 | 65 | ); |
66 | 66 | |
67 | - $value = phpversion() . ' (' . implode(', ', get_loaded_extensions()) . ')'; |
|
67 | + $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')'; |
|
68 | 68 | $arrSystemInfo[] = array('title' => 'PHP', 'value' => $value); |
69 | 69 | $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $request->headers->get('User-Agent')); |
70 | 70 |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | ))); |
97 | 97 | |
98 | 98 | $app = $this->app; |
99 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) { |
|
99 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) { |
|
100 | 100 | // モーダルからのPOST時に、金額等をセットする. |
101 | 101 | if ('modal' === $app['request_stack']->getCurrentRequest()->get('modal')) { |
102 | 102 | $data = $event->getData(); |
@@ -111,17 +111,13 @@ discard block |
||
111 | 111 | $data['product_name'] = $Product->getName(); |
112 | 112 | $data['product_code'] = $ProductClass->getCode(); |
113 | 113 | $data['class_name1'] = $ProductClass->hasClassCategory1() ? |
114 | - $ProductClass->getClassCategory1()->getClassName() : |
|
115 | - null; |
|
114 | + $ProductClass->getClassCategory1()->getClassName() : null; |
|
116 | 115 | $data['class_name2'] = $ProductClass->hasClassCategory2() ? |
117 | - $ProductClass->getClassCategory2()->getClassName() : |
|
118 | - null; |
|
116 | + $ProductClass->getClassCategory2()->getClassName() : null; |
|
119 | 117 | $data['class_category_name1'] = $ProductClass->hasClassCategory1() ? |
120 | - $ProductClass->getClassCategory1()->getName() : |
|
121 | - null; |
|
118 | + $ProductClass->getClassCategory1()->getName() : null; |
|
122 | 119 | $data['class_category_name2'] = $ProductClass->hasClassCategory2() ? |
123 | - $ProductClass->getClassCategory2()->getName() : |
|
124 | - null; |
|
120 | + $ProductClass->getClassCategory2()->getName() : null; |
|
125 | 121 | $data['price'] = $ProductClass->getPrice02(); |
126 | 122 | $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity']; |
127 | 123 | $event->setData($data); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | new Assert\Regex(array('pattern' => '/^\d+$/')), |
67 | 67 | ), |
68 | 68 | )) |
69 | - ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($app) { |
|
69 | + ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($app) { |
|
70 | 70 | $form = $event->getForm(); |
71 | 71 | |
72 | 72 | if ($app->isGranted('IS_AUTHENTICATED_FULLY')) { |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $form->add('customer_address', EntityType::class, array( |
76 | 76 | 'class' => 'Eccube\Entity\CustomerAddress', |
77 | 77 | 'choice_label' => 'shippingMultipleDefaultName', |
78 | - 'query_builder' => function (EntityRepository $er) use ($Customer) { |
|
78 | + 'query_builder' => function(EntityRepository $er) use ($Customer) { |
|
79 | 79 | return $er->createQueryBuilder('ca') |
80 | 80 | ->where('ca.Customer = :Customer') |
81 | 81 | ->orderBy("ca.id", "ASC") |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | } |
108 | 108 | } |
109 | 109 | }) |
110 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
110 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
111 | 111 | /** @var \Eccube\Entity\Shipping $data */ |
112 | 112 | $data = $event->getData(); |
113 | 113 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -38,14 +38,14 @@ |
||
38 | 38 | */ |
39 | 39 | public function buildForm(FormBuilderInterface $builder, array $options) |
40 | 40 | { |
41 | - $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
41 | + $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) { |
|
42 | 42 | $options = $event->getForm()->getConfig()->getOptions(); |
43 | 43 | if (!$event->getData()) { |
44 | 44 | $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues())); |
45 | 45 | $event->setData($data); |
46 | 46 | } |
47 | 47 | }); |
48 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
48 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) { |
|
49 | 49 | $options = $event->getForm()->getConfig()->getOptions(); |
50 | 50 | $values = $options['choice_loader']->loadChoiceList()->getValues(); |
51 | 51 | if (!in_array($event->getData(), $values)) { |
@@ -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 | /** |
@@ -38,14 +38,14 @@ |
||
38 | 38 | */ |
39 | 39 | public function buildForm(FormBuilderInterface $builder, array $options) |
40 | 40 | { |
41 | - $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
41 | + $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) { |
|
42 | 42 | $options = $event->getForm()->getConfig()->getOptions(); |
43 | 43 | if (!$event->getData()) { |
44 | 44 | $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues())); |
45 | 45 | $event->setData($data); |
46 | 46 | } |
47 | 47 | }); |
48 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
48 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) { |
|
49 | 49 | $options = $event->getForm()->getConfig()->getOptions(); |
50 | 50 | $values = $options['choice_loader']->loadChoiceList()->getValues(); |
51 | 51 | if (!in_array($event->getData(), $values)) { |
@@ -42,7 +42,7 @@ |
||
42 | 42 | 'expanded' => false, |
43 | 43 | 'required' => false, |
44 | 44 | 'placeholder' => false, |
45 | - 'query_builder' => function (EntityRepository $er) { |
|
45 | + 'query_builder' => function(EntityRepository $er) { |
|
46 | 46 | return $er->createQueryBuilder('m') |
47 | 47 | ->orderBy('m.rank', 'ASC'); |
48 | 48 | }, |
@@ -38,14 +38,14 @@ |
||
38 | 38 | */ |
39 | 39 | public function buildForm(FormBuilderInterface $builder, array $options) |
40 | 40 | { |
41 | - $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
41 | + $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) { |
|
42 | 42 | $options = $event->getForm()->getConfig()->getOptions(); |
43 | 43 | if (!$event->getData()) { |
44 | 44 | $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues())); |
45 | 45 | $event->setData($data); |
46 | 46 | } |
47 | 47 | }); |
48 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
48 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) { |
|
49 | 49 | $options = $event->getForm()->getConfig()->getOptions(); |
50 | 50 | $values = $options['choice_loader']->loadChoiceList()->getValues(); |
51 | 51 | if (!in_array($event->getData(), $values)) { |
@@ -14,7 +14,7 @@ |
||
14 | 14 | |
15 | 15 | public function setRequireHttps($requireHttps) |
16 | 16 | { |
17 | - $this->requireHttps = (bool)$requireHttps; |
|
17 | + $this->requireHttps = (bool) $requireHttps; |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | public function setAdminPrefix($adminPrefix) |