@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | use Codeception\Util\Fixtures; |
4 | 4 | use Page\Admin\CsvSettingsPage; |
5 | -use Page\Admin\CustomerManagePage; |
|
6 | 5 | use Page\Admin\CustomerEditPage; |
6 | +use Page\Admin\CustomerManagePage; |
|
7 | 7 | |
8 | 8 | /** |
9 | 9 | * @group admin |
@@ -6,10 +6,10 @@ |
||
6 | 6 | use Page\Admin\FileManagePage; |
7 | 7 | use Page\Admin\LayoutEditPage; |
8 | 8 | use Page\Admin\LayoutManagePage; |
9 | -use Page\Admin\NewsManagePage; |
|
10 | 9 | use Page\Admin\NewsEditPage; |
11 | -use Page\Admin\PageManagePage; |
|
10 | +use Page\Admin\NewsManagePage; |
|
12 | 11 | use Page\Admin\PageEditPage; |
12 | +use Page\Admin\PageManagePage; |
|
13 | 13 | |
14 | 14 | /** |
15 | 15 | * @group admin |
@@ -2,10 +2,9 @@ |
||
2 | 2 | |
3 | 3 | use Codeception\Util\Fixtures; |
4 | 4 | use Page\Admin\CsvSettingsPage; |
5 | -use Page\Admin\ShippingManagePage; |
|
6 | -use Page\Admin\ShippingEditPage; |
|
7 | 5 | use Page\Admin\OrderEditPage; |
8 | -use Eccube\Entity\Master\ShippingStatus; |
|
6 | +use Page\Admin\ShippingEditPage; |
|
7 | +use Page\Admin\ShippingManagePage; |
|
9 | 8 | |
10 | 9 | /** |
11 | 10 | * @group admin |
@@ -2,14 +2,14 @@ |
||
2 | 2 | |
3 | 3 | use Codeception\Util\Fixtures; |
4 | 4 | use Page\Front\CartPage; |
5 | +use Page\Front\CustomerAddressAddPage; |
|
6 | +use Page\Front\MultipleShippingPage; |
|
5 | 7 | use Page\Front\ProductDetailPage; |
6 | 8 | use Page\Front\ShippingEditPage; |
7 | 9 | use Page\Front\ShoppingCompletePage; |
8 | 10 | use Page\Front\ShoppingConfirmPage; |
9 | 11 | use Page\Front\ShoppingLoginPage; |
10 | 12 | use Page\Front\ShoppingPage; |
11 | -use Page\Front\MultipleShippingPage; |
|
12 | -use Page\Front\CustomerAddressAddPage; |
|
13 | 13 | |
14 | 14 | /** |
15 | 15 | * @group front |
@@ -1,6 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use Codeception\Util\Fixtures; |
|
4 | 3 | use Page\Admin\OwnersPluginPage; |
5 | 4 | |
6 | 5 | /** |
@@ -14,8 +14,8 @@ |
||
14 | 14 | namespace Eccube\Controller\Admin; |
15 | 15 | |
16 | 16 | use Doctrine\ORM\NoResultException; |
17 | -use Doctrine\ORM\Query\ResultSetMapping; |
|
18 | 17 | use Doctrine\ORM\QueryBuilder; |
18 | +use Doctrine\ORM\Query\ResultSetMapping; |
|
19 | 19 | use Eccube\Controller\AbstractController; |
20 | 20 | use Eccube\Entity\Master\OrderStatus; |
21 | 21 | use Eccube\Entity\ProductStock; |
@@ -14,22 +14,22 @@ |
||
14 | 14 | namespace Eccube\Controller\Admin\Content; |
15 | 15 | |
16 | 16 | use Eccube\Controller\AbstractController; |
17 | +use Eccube\Util\FilesystemUtil; |
|
18 | +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
17 | 19 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
18 | 20 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
19 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
21 | +use Symfony\Component\Filesystem\Exception\IOException; |
|
20 | 22 | use Symfony\Component\Filesystem\Filesystem; |
21 | 23 | use Symfony\Component\Finder\Finder; |
22 | 24 | use Symfony\Component\Form\Extension\Core\Type\FileType; |
23 | 25 | use Symfony\Component\Form\Extension\Core\Type\FormType; |
24 | 26 | use Symfony\Component\Form\Extension\Core\Type\TextType; |
25 | 27 | use Symfony\Component\HttpFoundation\BinaryFileResponse; |
28 | +use Symfony\Component\HttpFoundation\File\Exception\FileException; |
|
26 | 29 | use Symfony\Component\HttpFoundation\Request; |
27 | 30 | use Symfony\Component\HttpFoundation\ResponseHeaderBag; |
28 | 31 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
29 | -use Symfony\Component\HttpFoundation\File\Exception\FileException; |
|
30 | 32 | use Symfony\Component\Validator\Constraints as Assert; |
31 | -use Eccube\Util\FilesystemUtil; |
|
32 | -use Symfony\Component\Filesystem\Exception\IOException; |
|
33 | 33 | |
34 | 34 | class FileController extends AbstractController |
35 | 35 | { |
@@ -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; |