@@ -22,8 +22,6 @@ |
||
| 22 | 22 | use Doctrine\ORM\Query\AST\PartialObjectExpression; |
| 23 | 23 | use Doctrine\ORM\Query\AST\SelectExpression; |
| 24 | 24 | use Doctrine\ORM\Query\AST\SelectStatement; |
| 25 | -use Doctrine\ORM\Query\Expr\OrderBy; |
|
| 26 | -use Doctrine\ORM\Query\Expr\Select; |
|
| 27 | 25 | use Doctrine\ORM\Query\SqlWalker; |
| 28 | 26 | |
| 29 | 27 | /** |
@@ -33,7 +33,6 @@ |
||
| 33 | 33 | use Eccube\Entity\Plugin; |
| 34 | 34 | use Eccube\Entity\PluginEventHandler; |
| 35 | 35 | use Eccube\Exception\PluginException; |
| 36 | -use Eccube\Plugin\ConfigManager; |
|
| 37 | 36 | use Eccube\Plugin\ConfigManager as PluginConfigManager; |
| 38 | 37 | use Eccube\Repository\PluginEventHandlerRepository; |
| 39 | 38 | use Eccube\Repository\PluginRepository; |
@@ -40,6 +40,6 @@ |
||
| 40 | 40 | { |
| 41 | 41 | // $options = $this->eccubeConfig['doctrine_cache']; |
| 42 | 42 | // return $options['result_cache']['lifetime']; |
| 43 | - return 0; // FIXME |
|
| 43 | + return 0; // FIXME |
|
| 44 | 44 | } |
| 45 | 45 | } |
@@ -529,7 +529,7 @@ |
||
| 529 | 529 | { |
| 530 | 530 | $curl = curl_init($url); |
| 531 | 531 | |
| 532 | - $options = [ // オプション配列 |
|
| 532 | + $options = [// オプション配列 |
|
| 533 | 533 | //HEADER |
| 534 | 534 | CURLOPT_HTTPHEADER => [ |
| 535 | 535 | 'Authorization: '.base64_encode($authKey), |
@@ -877,7 +877,7 @@ |
||
| 877 | 877 | if ($dispatcher instanceof Response |
| 878 | 878 | && ($dispatcher->isRedirection() || $dispatcher->getContent()) |
| 879 | 879 | ) { // $paymentMethod->apply() が Response を返した場合は画面遷移 |
| 880 | - return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御? |
|
| 880 | + return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御? |
|
| 881 | 881 | } |
| 882 | 882 | $PaymentResult = $paymentService->doCheckout($paymentMethod); // 決済実行 |
| 883 | 883 | if (!$PaymentResult->isSuccess()) { |
@@ -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; |