@@ -28,12 +28,12 @@ |
||
28 | 28 | use Symfony\Component\Form\Extension\Core\Type\FormType; |
29 | 29 | use Symfony\Component\Form\Extension\Core\Type\TextType; |
30 | 30 | use Symfony\Component\HttpFoundation\JsonResponse; |
31 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
31 | 32 | use Symfony\Component\HttpFoundation\Request; |
32 | 33 | use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; |
33 | 34 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
34 | 35 | use Symfony\Component\Validator\Constraints\NotBlank; |
35 | 36 | use Twig\Environment as Twig; |
36 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
37 | 37 | |
38 | 38 | // todo プレビュー実装 |
39 | 39 | class LayoutController extends AbstractController |
@@ -21,8 +21,8 @@ |
||
21 | 21 | use Eccube\Event\EventArgs; |
22 | 22 | use Eccube\Form\Type\Admin\MainEditType; |
23 | 23 | use Eccube\Repository\Master\DeviceTypeRepository; |
24 | -use Eccube\Repository\PageRepository; |
|
25 | 24 | use Eccube\Repository\PageLayoutRepository; |
25 | +use Eccube\Repository\PageRepository; |
|
26 | 26 | use Eccube\Util\StringUtil; |
27 | 27 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
28 | 28 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
@@ -20,9 +20,9 @@ |
||
20 | 20 | use Eccube\Repository\ClassCategoryRepository; |
21 | 21 | use Eccube\Repository\ClassNameRepository; |
22 | 22 | use Eccube\Repository\ProductClassRepository; |
23 | +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
23 | 24 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
24 | 25 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
25 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
26 | 26 | use Symfony\Component\HttpFoundation\Request; |
27 | 27 | use Symfony\Component\HttpFoundation\Response; |
28 | 28 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
@@ -19,11 +19,11 @@ |
||
19 | 19 | use Eccube\Event\EventArgs; |
20 | 20 | use Eccube\Form\Type\Admin\MailType; |
21 | 21 | use Eccube\Repository\MailTemplateRepository; |
22 | +use Eccube\Util\StringUtil; |
|
22 | 23 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
23 | 24 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
24 | -use Symfony\Component\HttpFoundation\Request; |
|
25 | 25 | use Symfony\Component\Filesystem\Filesystem; |
26 | -use Eccube\Util\StringUtil; |
|
26 | +use Symfony\Component\HttpFoundation\Request; |
|
27 | 27 | use Twig\Environment; |
28 | 28 | |
29 | 29 | /** |
@@ -25,9 +25,9 @@ |
||
25 | 25 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
26 | 26 | use Symfony\Component\Filesystem\Filesystem; |
27 | 27 | use Symfony\Component\HttpFoundation\Request; |
28 | +use Symfony\Component\HttpFoundation\Response; |
|
28 | 29 | use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; |
29 | 30 | use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException; |
30 | -use Symfony\Component\HttpFoundation\Response; |
|
31 | 31 | |
32 | 32 | /** |
33 | 33 | * Class PaymentController |
@@ -23,8 +23,8 @@ |
||
23 | 23 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
24 | 24 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
25 | 25 | use Symfony\Component\HttpFoundation\Request; |
26 | -use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; |
|
27 | 26 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
27 | +use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; |
|
28 | 28 | |
29 | 29 | class MemberController extends AbstractController |
30 | 30 | { |
@@ -14,11 +14,11 @@ |
||
14 | 14 | namespace Eccube\Controller\Admin\Shipping; |
15 | 15 | |
16 | 16 | use Eccube\Controller\AbstractController; |
17 | +use Eccube\Exception\CsvImportException; |
|
18 | +use Eccube\Form\Type\Admin\CsvImportType; |
|
17 | 19 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
18 | 20 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
19 | -use Eccube\Form\Type\Admin\CsvImportType; |
|
20 | 21 | use Symfony\Component\Filesystem\Filesystem; |
21 | -use Eccube\Exception\CsvImportException; |
|
22 | 22 | |
23 | 23 | class CsvImportController extends AbstractController |
24 | 24 | { |
@@ -26,11 +26,11 @@ |
||
26 | 26 | use Eccube\Repository\Master\OrderItemTypeRepository; |
27 | 27 | use Eccube\Repository\Master\PrefRepository; |
28 | 28 | use Eccube\Repository\OrderRepository; |
29 | +use Eccube\Service\CartService; |
|
30 | +use Eccube\Service\OrderHelper; |
|
29 | 31 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
30 | 32 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
31 | 33 | use Eccube\Service\ShoppingService; |
32 | -use Eccube\Service\CartService; |
|
33 | -use Eccube\Service\OrderHelper; |
|
34 | 34 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
35 | 35 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
36 | 36 | use Symfony\Component\Form\Extension\Core\Type\CollectionType; |
@@ -206,9 +206,9 @@ discard block |
||
206 | 206 | * コピー元のオブジェクトのフィールド名を指定して、同名のフィールドに値をコピー |
207 | 207 | * |
208 | 208 | * @param object $srcObject コピー元のオブジェクト |
209 | - * @param array $excludeAttribute 除外したいフィールド名の配列 |
|
209 | + * @param string[] $excludeAttribute 除外したいフィールド名の配列 |
|
210 | 210 | * |
211 | - * @return object |
|
211 | + * @return AbstractEntity |
|
212 | 212 | */ |
213 | 213 | public function copyProperties($srcObject, array $excludeAttribute = []) |
214 | 214 | { |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | * |
223 | 223 | * @param Reader $Reader |
224 | 224 | * |
225 | - * @return object |
|
225 | + * @return AbstractEntity |
|
226 | 226 | */ |
227 | 227 | public function setAnnotationReader(Reader $Reader) |
228 | 228 | { |
@@ -16,12 +16,12 @@ |
||
16 | 16 | use Doctrine\Common\Annotations\Reader; |
17 | 17 | use Doctrine\Common\Collections\Collection; |
18 | 18 | use Doctrine\Common\Util\Inflector; |
19 | -use Doctrine\ORM\Mapping\MappedSuperclass; |
|
20 | 19 | use Doctrine\ORM\Mapping\Id; |
20 | +use Doctrine\ORM\Mapping\MappedSuperclass; |
|
21 | 21 | use Doctrine\ORM\Proxy\Proxy; |
22 | -use Symfony\Component\Serializer\Serializer; |
|
23 | 22 | use Symfony\Component\Serializer\Encoder\XmlEncoder; |
24 | 23 | use Symfony\Component\Serializer\Normalizer\PropertyNormalizer; |
24 | +use Symfony\Component\Serializer\Serializer; |
|
25 | 25 | |
26 | 26 | /** @MappedSuperclass */ |
27 | 27 | abstract class AbstractEntity implements \ArrayAccess |