@@ -13,8 +13,8 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\Doctrine\Query; |
| 15 | 15 | |
| 16 | -use Doctrine\ORM\Query\Expr; |
|
| 17 | 16 | use Doctrine\ORM\QueryBuilder; |
| 17 | +use Doctrine\ORM\Query\Expr; |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * WHERE句を組み立てるクラス。 |
@@ -34,8 +34,8 @@ |
||
| 34 | 34 | use Symfony\Component\Form\Extension\Core\Type\EmailType; |
| 35 | 35 | use Symfony\Component\Form\Extension\Core\Type\HiddenType; |
| 36 | 36 | use Symfony\Component\Form\Extension\Core\Type\NumberType; |
| 37 | -use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
| 38 | 37 | use Symfony\Component\Form\Extension\Core\Type\TextType; |
| 38 | +use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
| 39 | 39 | use Symfony\Component\Form\FormBuilderInterface; |
| 40 | 40 | use Symfony\Component\Form\FormError; |
| 41 | 41 | use Symfony\Component\Form\FormEvent; |
@@ -1761,7 +1761,7 @@ |
||
| 1761 | 1761 | /** |
| 1762 | 1762 | * Set orderStatus. |
| 1763 | 1763 | * |
| 1764 | - * @param \Eccube\Entity\Master\OrderStatus|object|null $orderStatus |
|
| 1764 | + * @param null|Master\OrderStatus $orderStatus |
|
| 1765 | 1765 | * |
| 1766 | 1766 | * @return Order |
| 1767 | 1767 | */ |
@@ -392,7 +392,6 @@ discard block |
||
| 392 | 392 | } |
| 393 | 393 | |
| 394 | 394 | /** |
| 395 | - * @param \Doctrine\ORM\EntityManagerInterface $em |
|
| 396 | 395 | * |
| 397 | 396 | * @return Request|null |
| 398 | 397 | */ |
@@ -424,9 +423,9 @@ discard block |
||
| 424 | 423 | } |
| 425 | 424 | |
| 426 | 425 | /** |
| 427 | - * @param $dateTime |
|
| 426 | + * @param \DateTime $dateTime |
|
| 428 | 427 | * |
| 429 | - * @return array|mixed |
|
| 428 | + * @return null|Request |
|
| 430 | 429 | * |
| 431 | 430 | * @throws \Doctrine\ORM\NonUniqueResultException |
| 432 | 431 | */ |
@@ -462,9 +461,9 @@ discard block |
||
| 462 | 461 | } |
| 463 | 462 | |
| 464 | 463 | /** |
| 465 | - * @param $dateTime |
|
| 464 | + * @param \DateTime $dateTime |
|
| 466 | 465 | * |
| 467 | - * @return array|mixed |
|
| 466 | + * @return null|Request |
|
| 468 | 467 | * |
| 469 | 468 | * @throws \Doctrine\ORM\NonUniqueResultException |
| 470 | 469 | */ |
@@ -502,7 +501,7 @@ discard block |
||
| 502 | 501 | /** |
| 503 | 502 | * 在庫切れ商品数を取得 |
| 504 | 503 | * |
| 505 | - * @return mixed |
|
| 504 | + * @return null|Request |
|
| 506 | 505 | * |
| 507 | 506 | * @throws \Doctrine\ORM\NonUniqueResultException |
| 508 | 507 | */ |
@@ -522,7 +521,7 @@ discard block |
||
| 522 | 521 | /** |
| 523 | 522 | * 商品数を取得 |
| 524 | 523 | * |
| 525 | - * @return mixed |
|
| 524 | + * @return null|Request |
|
| 526 | 525 | * |
| 527 | 526 | * @throws \Doctrine\ORM\NonUniqueResultException |
| 528 | 527 | */ |
@@ -539,7 +538,7 @@ discard block |
||
| 539 | 538 | /** |
| 540 | 539 | * 本会員数を取得 |
| 541 | 540 | * |
| 542 | - * @return mixed |
|
| 541 | + * @return null|Request |
|
| 543 | 542 | * |
| 544 | 543 | * @throws \Doctrine\ORM\NonUniqueResultException |
| 545 | 544 | */ |
@@ -556,7 +555,7 @@ discard block |
||
| 556 | 555 | /** |
| 557 | 556 | * 期間指定のデータを取得 |
| 558 | 557 | * |
| 559 | - * @param $format |
|
| 558 | + * @param string $format |
|
| 560 | 559 | * |
| 561 | 560 | * @return array |
| 562 | 561 | */ |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | /** |
| 54 | 54 | * MailController constructor. |
| 55 | 55 | * |
| 56 | - * @param twig $twig |
|
| 56 | + * @param Environment $twig |
|
| 57 | 57 | */ |
| 58 | 58 | public function __construct( |
| 59 | 59 | MailService $mailService, |
@@ -224,6 +224,9 @@ discard block |
||
| 224 | 224 | ]; |
| 225 | 225 | } |
| 226 | 226 | |
| 227 | + /** |
|
| 228 | + * @param Order $Order |
|
| 229 | + */ |
|
| 227 | 230 | private function createBody($Order, $twig = 'Mail/order.twig') |
| 228 | 231 | { |
| 229 | 232 | return $this->renderView($twig, [ |