@@ -13,8 +13,8 @@ |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\Doctrine\Query; |
| 15 | 15 | |
| 16 | -use Doctrine\ORM\Query\Expr; |
|
| 17 | 16 | use Doctrine\ORM\QueryBuilder; |
| 17 | +use Doctrine\ORM\Query\Expr; |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * WHERE句を組み立てるクラス。 |
@@ -34,8 +34,8 @@ |
||
| 34 | 34 | use Symfony\Component\Form\Extension\Core\Type\EmailType; |
| 35 | 35 | use Symfony\Component\Form\Extension\Core\Type\HiddenType; |
| 36 | 36 | use Symfony\Component\Form\Extension\Core\Type\NumberType; |
| 37 | -use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
| 38 | 37 | use Symfony\Component\Form\Extension\Core\Type\TextType; |
| 38 | +use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
| 39 | 39 | use Symfony\Component\Form\FormBuilderInterface; |
| 40 | 40 | use Symfony\Component\Form\FormError; |
| 41 | 41 | use Symfony\Component\Form\FormEvent; |
@@ -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; |
@@ -64,12 +64,12 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | // SSL強制時は, httpsのみにアクセス制限する |
| 66 | 66 | $accessControl = [ |
| 67 | - ['path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 68 | - ['path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN'], |
|
| 69 | - ['path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 70 | - ['path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 71 | - ['path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY'], |
|
| 72 | - ['path' => '^/mypage/', 'roles' => 'ROLE_USER'], |
|
| 67 | + ['path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 68 | + ['path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN'], |
|
| 69 | + ['path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 70 | + ['path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'], |
|
| 71 | + ['path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY'], |
|
| 72 | + ['path' => '^/mypage/', 'roles' => 'ROLE_USER'], |
|
| 73 | 73 | ]; |
| 74 | 74 | if ($forceSSL) { |
| 75 | 75 | foreach ($accessControl as &$control) { |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | // security.ymlでは制御できないため, ここで定義する. |
| 81 | 81 | $container->prependExtensionConfig('security', [ |
| 82 | - 'access_control' => $accessControl, |
|
| 82 | + 'access_control' => $accessControl, |
|
| 83 | 83 | ]); |
| 84 | 84 | } |
| 85 | 85 | |
@@ -126,14 +126,14 @@ |
||
| 126 | 126 | setcookie($this->sessionName, '', 0, ini_get('session.cookie_path'), ini_get('session.cookie_domain'), filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN), filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN)); |
| 127 | 127 | } else { |
| 128 | 128 | setcookie($this->sessionName, '', |
| 129 | - [ |
|
| 130 | - 'expires' => 0, |
|
| 131 | - 'path' => $this->getCookiePath(), |
|
| 132 | - 'domain' => ini_get('session.cookie_domain'), |
|
| 133 | - 'secure' => filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN), |
|
| 134 | - 'httponly' => filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN), |
|
| 135 | - 'samesite' => $this->getCookieSameSite(), |
|
| 136 | - ] |
|
| 129 | + [ |
|
| 130 | + 'expires' => 0, |
|
| 131 | + 'path' => $this->getCookiePath(), |
|
| 132 | + 'domain' => ini_get('session.cookie_domain'), |
|
| 133 | + 'secure' => filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN), |
|
| 134 | + 'httponly' => filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN), |
|
| 135 | + 'samesite' => $this->getCookieSameSite(), |
|
| 136 | + ] |
|
| 137 | 137 | ); |
| 138 | 138 | } |
| 139 | 139 | } |
@@ -24,8 +24,8 @@ |
||
| 24 | 24 | use Symfony\Component\Form\Extension\Core\Type\CollectionType; |
| 25 | 25 | use Symfony\Component\Form\Extension\Core\Type\FileType; |
| 26 | 26 | use Symfony\Component\Form\Extension\Core\Type\HiddenType; |
| 27 | -use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
| 28 | 27 | use Symfony\Component\Form\Extension\Core\Type\TextType; |
| 28 | +use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
| 29 | 29 | use Symfony\Component\Form\FormBuilderInterface; |
| 30 | 30 | use Symfony\Component\Form\FormError; |
| 31 | 31 | use Symfony\Component\Form\FormEvent; |