nanasess / ec-cube

src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php

Indentation +8 added lines, -8 removed lines

@@ -126,14 +126,14 @@
                     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));
                 } else {
                     setcookie($this->sessionName, '',
-                              [
-                                  'expires' => 0,
-                                  'path' => $this->getCookiePath(),
-                                  'domain' => ini_get('session.cookie_domain'),
-                                  'secure' => filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN),
-                                  'httponly' => filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN),
-                                  'samesite' => $this->getCookieSameSite(),
-                              ]
+                                [
+                                    'expires' => 0,
+                                    'path' => $this->getCookiePath(),
+                                    'domain' => ini_get('session.cookie_domain'),
+                                    'secure' => filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN),
+                                    'httponly' => filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN),
+                                    'samesite' => $this->getCookieSameSite(),
+                                ]
                     );
                 }
             }

src/Eccube/DependencyInjection/EccubeExtension.php

Indentation +7 added lines, -7 removed lines

@@ -56,12 +56,12 @@ 
 
         // SSL強制時は, httpsのみにアクセス制限する
         $accessControl = [
-          ['path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
-          ['path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN'],
-          ['path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
-          ['path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
-          ['path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY'],
-          ['path' => '^/mypage/', 'roles' => 'ROLE_USER'],
+            ['path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
+            ['path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN'],
+            ['path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
+            ['path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
+            ['path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY'],
+            ['path' => '^/mypage/', 'roles' => 'ROLE_USER'],
         ];
         if ($forceSSL) {
             foreach ($accessControl as &$control) {
@@ -71,7 +71,7 @@ 
 
         // security.ymlでは制御できないため, ここで定義する.
         $container->prependExtensionConfig('security', [
-          'access_control' => $accessControl,
+            'access_control' => $accessControl,
         ]);
     }