@@ -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 | { |
@@ -25,7 +25,6 @@ |
||
25 | 25 | use Eccube\Util\CacheUtil; |
26 | 26 | use Eccube\Util\StringUtil; |
27 | 27 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
28 | -use Symfony\Bundle\FrameworkBundle\Routing\Router; |
|
29 | 28 | use Symfony\Component\Filesystem\Filesystem; |
30 | 29 | use Symfony\Component\HttpFoundation\Request; |
31 | 30 | use Symfony\Component\Routing\Annotation\Route; |
@@ -13,8 +13,8 @@ |
||
13 | 13 | |
14 | 14 | namespace Eccube\EventListener; |
15 | 15 | |
16 | -use Doctrine\Dbal\Connection; |
|
17 | 16 | use Doctrine\DBAL\TransactionIsolationLevel; |
17 | +use Doctrine\Dbal\Connection; |
|
18 | 18 | use Doctrine\ORM\EntityManager; |
19 | 19 | use Doctrine\ORM\EntityManagerInterface; |
20 | 20 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
@@ -14,8 +14,8 @@ |
||
14 | 14 | namespace Eccube\Plugin; |
15 | 15 | |
16 | 16 | use Doctrine\DBAL\Connection; |
17 | -use Doctrine\DBAL\Migrations\Migration; |
|
18 | 17 | use Doctrine\DBAL\Migrations\Configuration\Configuration; |
18 | +use Doctrine\DBAL\Migrations\Migration; |
|
19 | 19 | use Symfony\Component\DependencyInjection\ContainerInterface; |
20 | 20 | |
21 | 21 | abstract class AbstractPluginManager |
@@ -22,11 +22,11 @@ |
||
22 | 22 | use Eccube\Exception\PluginException; |
23 | 23 | use Eccube\Repository\PluginRepository; |
24 | 24 | use Eccube\Service\Composer\ComposerServiceInterface; |
25 | +use Eccube\Service\SystemService; |
|
25 | 26 | use Eccube\Util\CacheUtil; |
26 | 27 | use Eccube\Util\StringUtil; |
27 | 28 | use Symfony\Component\DependencyInjection\ContainerInterface; |
28 | 29 | use Symfony\Component\Filesystem\Filesystem; |
29 | -use Eccube\Service\SystemService; |
|
30 | 30 | |
31 | 31 | class PluginService |
32 | 32 | { |
@@ -14,11 +14,11 @@ |
||
14 | 14 | namespace Eccube\Service; |
15 | 15 | |
16 | 16 | use Doctrine\ORM\EntityManagerInterface; |
17 | +use Symfony\Component\DependencyInjection\ContainerInterface; |
|
17 | 18 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
18 | 19 | use Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector; |
19 | -use Symfony\Component\DependencyInjection\ContainerInterface; |
|
20 | -use Symfony\Component\HttpKernel\KernelEvents; |
|
21 | 20 | use Symfony\Component\HttpKernel\Event\PostResponseEvent; |
21 | +use Symfony\Component\HttpKernel\KernelEvents; |
|
22 | 22 | |
23 | 23 | class SystemService implements EventSubscriberInterface |
24 | 24 | { |