@@ -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; |
@@ -89,7 +89,6 @@ |
||
89 | 89 | * Doctrineのキャッシュを削除します. |
90 | 90 | * APP_ENV=prodの場合のみ実行されます. |
91 | 91 | * |
92 | - * @param null $env |
|
93 | 92 | * @return string |
94 | 93 | * @throws \Exception |
95 | 94 | */ |
@@ -44,7 +44,7 @@ |
||
44 | 44 | $BaseInfo = $this->find($id); |
45 | 45 | |
46 | 46 | if (null === $BaseInfo) { |
47 | - throw new \Exception('BaseInfo not found. id = '. $id); |
|
47 | + throw new \Exception('BaseInfo not found. id = '.$id); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | return $this->find($id); |