コマンドライン実行時, Undefined index になるのを修正

EC-CUBE · Apr 21, 2020 · 61d51bb · 61d51bb
1 parent b14b021
commit 61d51bb
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php b/src/Eccube/Session/Storage/Handler/SameSiteNoneCompatSessionHandler.php
@@ -122,20 +122,21 @@ public function destroy($sessionId)
                     header($h, false);
                 }
             } else {
-                if (\PHP_VERSION_ID < 70300) {
-                    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(),
-                              ]
-                    );
-                }
+                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));
+                // if (\PHP_VERSION_ID < 70300) {
+                //     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(),
+                //               ]
+                //     );
+                // }
             }
         }
 
@@ -207,6 +208,7 @@ public function getCookieSecure()
      */
     private function shouldSendSameSiteNone()
     {
-        return SameSite::handle($_SERVER['HTTP_USER_AGENT']);
+        $userAgent = array_key_exists('HTTP_USER_AGENT', $_SERVER) ? $_SERVER['HTTP_USER_AGENT'] : null;
+        return SameSite::handle($userAgent);
     }
 }