@@ -11,6 +11,7 @@ discard block |
||
11 | 11 | * file that was distributed with this source code. |
12 | 12 | */ |
13 | 13 | |
14 | +use Codeception\Util\Fixtures; |
|
14 | 15 | use Page\Admin\CsvSettingsPage; |
15 | 16 | use Page\Admin\DeliveryEditPage; |
16 | 17 | use Page\Admin\DeliveryManagePage; |
@@ -19,7 +20,6 @@ discard block |
||
19 | 20 | use Page\Admin\PaymentManagePage; |
20 | 21 | use Page\Admin\ShopSettingPage; |
21 | 22 | use Page\Admin\TaxManagePage; |
22 | -use Codeception\Util\Fixtures; |
|
23 | 23 | |
24 | 24 | /** |
25 | 25 | * @group admin |
@@ -4,10 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Doctrine\Bundle\DoctrineBundle\Command\Proxy\DoctrineCommandHelper; |
6 | 6 | use Doctrine\Bundle\DoctrineBundle\Command\Proxy\UpdateSchemaDoctrineCommand as BaseUpdateSchemaDoctrineCommand; |
7 | -use Doctrine\Common\Annotations\AnnotationReader; |
|
8 | -use Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand; |
|
9 | 7 | use Doctrine\ORM\Tools\SchemaTool; |
10 | -use Eccube\Doctrine\ORM\Mapping\Driver\ReloadSafeAnnotationDriver; |
|
11 | 8 | use Eccube\Repository\PluginRepository; |
12 | 9 | use Eccube\Service\PluginService; |
13 | 10 | use Eccube\Service\SchemaService; |
@@ -16,8 +13,8 @@ discard block |
||
16 | 13 | use Symfony\Component\Console\Input\InputOption; |
17 | 14 | use Symfony\Component\Console\Output\OutputInterface; |
18 | 15 | use Symfony\Component\Console\Style\SymfonyStyle; |
19 | -use Symfony\Component\Finder\Finder; |
|
20 | 16 | use Symfony\Component\Filesystem\Filesystem; |
17 | +use Symfony\Component\Finder\Finder; |
|
21 | 18 | |
22 | 19 | /** |
23 | 20 | * Command to generate the SQL needed to update the database schema to match |
@@ -14,7 +14,6 @@ |
||
14 | 14 | namespace Eccube\Controller\Admin\Content; |
15 | 15 | |
16 | 16 | use Eccube\Controller\AbstractController; |
17 | -use Eccube\Form\Type\Admin\MainEditType; |
|
18 | 17 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
19 | 18 | use Symfony\Component\Filesystem\Exception\IOException; |
20 | 19 | use Symfony\Component\Filesystem\Filesystem; |
@@ -13,7 +13,6 @@ |
||
13 | 13 | namespace Eccube\Controller\Admin\Content; |
14 | 14 | |
15 | 15 | use Eccube\Controller\AbstractController; |
16 | -use Eccube\Form\Type\Admin\MainEditType; |
|
17 | 16 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
18 | 17 | use Symfony\Component\Filesystem\Exception\IOException; |
19 | 18 | use Symfony\Component\Filesystem\Filesystem; |
@@ -16,24 +16,24 @@ |
||
16 | 16 | use Doctrine\ORM\NoResultException; |
17 | 17 | use Eccube\Controller\AbstractController; |
18 | 18 | use Eccube\Entity\Layout; |
19 | -use Eccube\Form\Type\Admin\LayoutType; |
|
20 | 19 | use Eccube\Entity\Master\ProductStatus; |
21 | -use Eccube\Repository\BlockRepository; |
|
20 | +use Eccube\Form\Type\Admin\LayoutType; |
|
22 | 21 | use Eccube\Repository\BlockPositionRepository; |
22 | +use Eccube\Repository\BlockRepository; |
|
23 | 23 | use Eccube\Repository\LayoutRepository; |
24 | +use Eccube\Repository\Master\DeviceTypeRepository; |
|
24 | 25 | use Eccube\Repository\PageLayoutRepository; |
25 | 26 | use Eccube\Repository\PageRepository; |
26 | 27 | use Eccube\Repository\ProductRepository; |
27 | -use Eccube\Repository\Master\DeviceTypeRepository; |
|
28 | 28 | use Eccube\Util\CacheUtil; |
29 | 29 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
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\Routing\Annotation\Route; |
35 | 36 | use Twig\Environment as Twig; |
36 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
37 | 37 | |
38 | 38 | class LayoutController extends AbstractController |
39 | 39 | { |
@@ -14,7 +14,6 @@ |
||
14 | 14 | namespace Eccube\Controller\Admin\Order; |
15 | 15 | |
16 | 16 | use Doctrine\Common\Collections\ArrayCollection; |
17 | -use Doctrine\Common\Collections\Criteria; |
|
18 | 17 | use Eccube\Controller\AbstractController; |
19 | 18 | use Eccube\Entity\Master\CustomerStatus; |
20 | 19 | use Eccube\Entity\Master\OrderItemType; |
@@ -17,9 +17,9 @@ |
||
17 | 17 | use Eccube\Event\EccubeEvents; |
18 | 18 | use Eccube\Event\EventArgs; |
19 | 19 | use Eccube\Form\Type\Admin\LogType; |
20 | -use Symfony\Component\Routing\Annotation\Route; |
|
21 | 20 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
22 | 21 | use Symfony\Component\HttpFoundation\Request; |
22 | +use Symfony\Component\Routing\Annotation\Route; |
|
23 | 23 | |
24 | 24 | class LogController extends AbstractController |
25 | 25 | { |
@@ -19,9 +19,9 @@ |
||
19 | 19 | use Eccube\Event\EventArgs; |
20 | 20 | use Eccube\Form\Type\Admin\MasterdataEditType; |
21 | 21 | use Eccube\Form\Type\Admin\MasterdataType; |
22 | -use Symfony\Component\Routing\Annotation\Route; |
|
23 | 22 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
24 | 23 | use Symfony\Component\HttpFoundation\Request; |
24 | +use Symfony\Component\Routing\Annotation\Route; |
|
25 | 25 | |
26 | 26 | class MasterdataController extends AbstractController |
27 | 27 | { |
@@ -20,9 +20,9 @@ |
||
20 | 20 | use Eccube\Event\EventArgs; |
21 | 21 | use Eccube\Form\Type\Admin\MemberType; |
22 | 22 | use Eccube\Repository\MemberRepository; |
23 | -use Symfony\Component\Routing\Annotation\Route; |
|
24 | 23 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
25 | 24 | use Symfony\Component\HttpFoundation\Request; |
25 | +use Symfony\Component\Routing\Annotation\Route; |
|
26 | 26 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
27 | 27 | use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; |
28 | 28 |