From caed605ea7f279a16bef1693e5533112e0783f3d Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 9 Jun 2021 21:32:43 +0200
Subject: [PATCH] PHP 7.4 will not cast null to an empty string
---
config-templates/config.php | 4 ++--
package-lock.json | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/config-templates/config.php b/config-templates/config.php
index 0bf9def7c..6a531e159 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -544,7 +544,7 @@ $config = [
* Example:
* 'session.cookie.domain' => '.example.org',
*/
- 'session.cookie.domain' => null,
+ 'session.cookie.domain' => '',
/*
* Set the secure flag in the cookie.
@@ -788,7 +788,7 @@ $config = [
* Options to override the default settings for the language cookie
*/
'language.cookie.name' => 'language',
- 'language.cookie.domain' => null,
+ 'language.cookie.domain' => '',
'language.cookie.path' => '/',
'language.cookie.secure' => true,
'language.cookie.httponly' => false,
diff --git a/package-lock.json b/package-lock.json
index 06bdb17ec..75e50e872 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,7 @@
"requires": true,
"packages": {
"": {
+ "name": "simplesamlphp",
"license": "MIT",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.2",
--
GitLab