From 0e3723c4e2ce49bb6f66fec2cc449c619446dea7 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 15 Dec 2020 22:03:52 +0100
Subject: [PATCH] Fix indentation and line length
---
1 | 7 +++++++
modules/saml/lib/SP/LogoutStore.php | 5 +++--
2 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 1
diff --git a/1 b/1
new file mode 100644
index 000000000..258f8b9a8
--- /dev/null
+++ b/1
@@ -0,0 +1,7 @@
+Merge branch 'simplesamlphp-1.19' of https://github.com/simplesamlphp/simplesamlphp into simplesamlphp-1.19
+
+# Please enter a commit message to explain why this merge is necessary,
+# especially if it merges an updated upstream into a topic branch.
+#
+# Lines starting with '#' will be ignored, and an empty message aborts
+# the commit.
diff --git a/modules/saml/lib/SP/LogoutStore.php b/modules/saml/lib/SP/LogoutStore.php
index 7bcc512c4..aa7de6184 100644
--- a/modules/saml/lib/SP/LogoutStore.php
+++ b/modules/saml/lib/SP/LogoutStore.php
@@ -124,9 +124,10 @@ class LogoutStore
'ALTER TABLE ' . $store->prefix .
'_saml_LogoutStore ALTER COLUMN _authSource TYPE VARCHAR(255)'];
break;
- case 'sqlsrv':
+ case 'sqlsrv':
$update = [
- 'ALTER TABLE ' . $store->prefix . '_saml_LogoutStore ALTER COLUMN _authSource VARCHAR(255) NOT NULL'
+ 'ALTER TABLE ' . $store->prefix .
+ '_saml_LogoutStore ALTER COLUMN _authSource VARCHAR(255) NOT NULL'
];
break;
case 'sqlite':
--
GitLab