@@ -30,8 +30,8 @@ |
||
30 | 30 | { |
31 | 31 | /** |
32 | 32 | * RepositoryDefinition constructor. |
33 | - * @param $id |
|
34 | - * @param $refClass |
|
33 | + * @param string $id |
|
34 | + * @param \ReflectionClass $refClass |
|
35 | 35 | */ |
36 | 36 | public function __construct($id, $refClass) |
37 | 37 | { |
@@ -30,7 +30,7 @@ |
||
30 | 30 | { |
31 | 31 | /** |
32 | 32 | * RepositoryAutoWiring constructor. |
33 | - * @param array|string[] $scanDirs |
|
33 | + * @param string[] $scanDirs |
|
34 | 34 | */ |
35 | 35 | public function __construct($scanDirs) |
36 | 36 | { |
@@ -161,7 +161,9 @@ |
||
161 | 161 | } |
162 | 162 | |
163 | 163 | if (!empty($components)) { |
164 | - if ($snippets) $snippets .= PHP_EOL; |
|
164 | + if ($snippets) { |
|
165 | + $snippets .= PHP_EOL; |
|
166 | + } |
|
165 | 167 | $snippets .= $wiring->generate($twig, $components); |
166 | 168 | $snippets .= $wiring->generateExtend($twig, $components); |
167 | 169 | } |
@@ -13,7 +13,7 @@ |
||
13 | 13 | { |
14 | 14 | public function register(Container $app) |
15 | 15 | { |
16 | - $app['eccube.di'] = function (Container $app) { |
|
16 | + $app['eccube.di'] = function(Container $app) { |
|
17 | 17 | $di = new Di( |
18 | 18 | $app['eccube.di.generator.dir'], |
19 | 19 | $app['eccube.di.generator.class'], |
@@ -27,7 +27,6 @@ discard block |
||
27 | 27 | use Doctrine\ORM\EntityRepository; |
28 | 28 | use Eccube\Annotation\FormType; |
29 | 29 | use Eccube\Annotation\Inject; |
30 | -use Eccube\Application; |
|
31 | 30 | use Eccube\Common\Constant; |
32 | 31 | use Eccube\Entity\BaseInfo; |
33 | 32 | use Eccube\Form\Type\AddressType; |
@@ -35,7 +34,6 @@ discard block |
||
35 | 34 | use Eccube\Form\Type\NameType; |
36 | 35 | use Eccube\Form\Type\TelType; |
37 | 36 | use Eccube\Form\Type\ZipType; |
38 | -use Eccube\Repository\BaseInfoRepository; |
|
39 | 37 | use Eccube\Repository\DeliveryRepository; |
40 | 38 | use Symfony\Bridge\Doctrine\Form\Type\EntityType; |
41 | 39 | use Symfony\Component\Form\AbstractType; |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | 'prototype' => true, |
200 | 200 | )) |
201 | 201 | |
202 | - ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
202 | + ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) { |
|
203 | 203 | if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
204 | 204 | $form = $event->getForm(); |
205 | 205 | $form->add('OrderItems', CollectionType::class, array( |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | )); |
211 | 211 | } |
212 | 212 | }) |
213 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
213 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
214 | 214 | /** @var \Eccube\Entity\Shipping $data */ |
215 | 215 | $data = $event->getData(); |
216 | 216 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | 'choice_label' => 'delivery_time', |
230 | 230 | 'placeholder' => '指定なし', |
231 | 231 | 'required' => false, |
232 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
232 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
233 | 233 | return $er->createQueryBuilder('dt') |
234 | 234 | ->where('dt.Delivery = :Delivery') |
235 | 235 | ->setParameter('Delivery', $Delivery); |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | )); |
238 | 238 | |
239 | 239 | }) |
240 | - ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { |
|
240 | + ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) { |
|
241 | 241 | $data = $event->getData(); |
242 | 242 | $form = $event->getForm(); |
243 | 243 | if (!$data) { |
@@ -257,14 +257,14 @@ discard block |
||
257 | 257 | 'choice_label' => 'delivery_time', |
258 | 258 | 'placeholder' => '指定なし', |
259 | 259 | 'required' => false, |
260 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
260 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
261 | 261 | return $er->createQueryBuilder('dt') |
262 | 262 | ->where('dt.Delivery = :Delivery') |
263 | 263 | ->setParameter('Delivery', $Delivery); |
264 | 264 | }, |
265 | 265 | )); |
266 | 266 | }) |
267 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
267 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
268 | 268 | if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
269 | 269 | $form = $event->getForm(); |
270 | 270 | $OrderItems = $form['OrderItems']->getData(); |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | } |
276 | 276 | } |
277 | 277 | }) |
278 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) { |
|
278 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { |
|
279 | 279 | $Shipping = $event->getData(); |
280 | 280 | $Delivery = $Shipping->getDelivery(); |
281 | 281 | $Shipping->setShippingDeliveryName($Delivery ? $Delivery : null); |
@@ -4,7 +4,6 @@ |
||
4 | 4 | use Eccube\Entity\Order; |
5 | 5 | use Eccube\Entity\PurchaseInterface; |
6 | 6 | use Eccube\Entity\OrderItem; |
7 | -use Eccube\Service\Calculator\Strategy\CalculateStrategyInterface; |
|
8 | 7 | |
9 | 8 | class CalculateContext |
10 | 9 | { |
@@ -23,7 +23,7 @@ |
||
23 | 23 | $this->buildCalculator($this->CalculateStrategies); |
24 | 24 | |
25 | 25 | /** @var OrderItem $OrderItem */ |
26 | - foreach($this->OrderItems as $OrderItem) { |
|
26 | + foreach ($this->OrderItems as $OrderItem) { |
|
27 | 27 | if ($OrderItem instanceof OrderItem) { |
28 | 28 | if (!$this->Order->getItems()->contains($OrderItem)) { |
29 | 29 | $OrderItem->setOrder($this->Order); |
@@ -2,13 +2,9 @@ |
||
2 | 2 | namespace Eccube\Service\Calculator\Strategy; |
3 | 3 | |
4 | 4 | use Eccube\Application; |
5 | -use Eccube\Entity\Master\OrderItemType; |
|
6 | -use Eccube\Entity\Master\TaxType; |
|
7 | -use Eccube\Entity\Master\TaxDisplayType; |
|
8 | 5 | use Eccube\Entity\Order; |
9 | 6 | use Eccube\Entity\PurchaseInterface; |
10 | 7 | use Eccube\Entity\OrderItem; |
11 | -use Eccube\Entity\Shipping; |
|
12 | 8 | use Eccube\Repository\Master\OrderItemTypeRepository; |
13 | 9 | use Eccube\Service\Calculator\OrderItemCollection; |
14 | 10 |
@@ -2,13 +2,9 @@ |
||
2 | 2 | namespace Eccube\Service\Calculator\Strategy; |
3 | 3 | |
4 | 4 | use Eccube\Application; |
5 | -use Eccube\Entity\Master\OrderItemType; |
|
6 | -use Eccube\Entity\Master\TaxType; |
|
7 | -use Eccube\Entity\Master\TaxDisplayType; |
|
8 | 5 | use Eccube\Entity\Order; |
9 | 6 | use Eccube\Entity\PurchaseInterface; |
10 | 7 | use Eccube\Entity\OrderItem; |
11 | -use Eccube\Entity\Shipping; |
|
12 | 8 | use Eccube\Repository\Master\OrderItemTypeRepository; |
13 | 9 | use Eccube\Service\Calculator\OrderItemCollection; |
14 | 10 |
@@ -2,14 +2,10 @@ |
||
2 | 2 | namespace Eccube\Service\Calculator\Strategy; |
3 | 3 | |
4 | 4 | use Eccube\Application; |
5 | -use Eccube\Entity\Master\OrderItemType; |
|
6 | -use Eccube\Entity\Master\TaxType; |
|
7 | -use Eccube\Entity\Master\TaxDisplayType; |
|
8 | 5 | use Eccube\Entity\Cart; |
9 | 6 | use Eccube\Entity\Order; |
10 | 7 | use Eccube\Entity\PurchaseInterface; |
11 | 8 | use Eccube\Entity\OrderItem; |
12 | -use Eccube\Entity\Shipping; |
|
13 | 9 | use Eccube\Repository\Master\OrderItemTypeRepository; |
14 | 10 | use Eccube\Service\Calculator\OrderItemCollection; |
15 | 11 |