[PR #5919] [MERGED] Merge v25-11 changes into dev #6596

New Issue

OVERLORD · 2026-02-05T10:36:22+03:00

OVERLORD commented

2026-02-05 10:36:22 +03:00

📋 Pull Request Information

Original PR: https://github.com/BookStackApp/BookStack/pull/5919
Author: @ssddanbrown
Created: 11/25/2025
Status: ✅ Merged
Merged: 12/17/2025
Merged by: @ssddanbrown

Base: development ← Head: v25-11

📝 Commits (7)

98a09bc Deps: Updated PHP packages
9de2943 Notifications: Fixed error on comment notification
adfac3e OIDC: Updated state handling to prevent loss from other requests
2fde803 Deps: Updated PHP package versions
65f7b61 Sessions: Ignored extra meta/dist content in history tracking
1d87b51 Deps: Updated PHP package versions
313326b Updated translator & dependency attribution before release v25.11.6

📊 Changes

15 files changed (+838 additions, -602 deletions)

View changed files

📝 app/Access/Controllers/OidcController.php (+13 -9)
📝 app/Activity/Models/Comment.php (+13 -1)
📝 app/Activity/Notifications/Handlers/BaseNotificationHandler.php (+1 -0)
📝 app/Http/Middleware/StartSessionExtended.php (+4 -1)
📝 composer.json (+1 -1)
📝 composer.lock (+431 -345)
📝 dev/licensing/js-library-licenses.txt (+273 -209)
📝 dev/licensing/php-library-licenses.txt (+8 -1)
📝 tests/Api/ApiDocsTest.php (+1 -1)
📝 tests/Auth/OidcTest.php (+34 -5)
📝 tests/Auth/Saml2Test.php (+2 -2)
➕ tests/SessionTest.php (+53 -0)
📝 tests/ThemeTest.php (+2 -2)
📝 tests/Uploads/AttachmentTest.php (+2 -2)
📝 tests/Uploads/ImageTest.php (+0 -23)

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/BookStackApp/BookStack/pull/5919 **Author:** [@ssddanbrown](https://github.com/ssddanbrown) **Created:** 11/25/2025 **Status:** ✅ Merged **Merged:** 12/17/2025 **Merged by:** [@ssddanbrown](https://github.com/ssddanbrown) **Base:** `development` ← **Head:** `v25-11` --- ### 📝 Commits (7) - [`98a09bc`](https://github.com/BookStackApp/BookStack/commit/98a09bcc37549db7bf671a4e074767ea0989b10b) Deps: Updated PHP packages - [`9de2943`](https://github.com/BookStackApp/BookStack/commit/9de294343dd7309bb00e6a0011dfbd443e8620c4) Notifications: Fixed error on comment notification - [`adfac3e`](https://github.com/BookStackApp/BookStack/commit/adfac3e30ebb5a407cb72e3546f0756ab63f298d) OIDC: Updated state handling to prevent loss from other requests - [`2fde803`](https://github.com/BookStackApp/BookStack/commit/2fde803c766203b58f57a119aa96a50f55328167) Deps: Updated PHP package versions - [`65f7b61`](https://github.com/BookStackApp/BookStack/commit/65f7b61c1f55594607dfa152acec83a035d8aa5c) Sessions: Ignored extra meta/dist content in history tracking - [`1d87b51`](https://github.com/BookStackApp/BookStack/commit/1d87b513be321da7625c083387077da2f4209597) Deps: Updated PHP package versions - [`313326b`](https://github.com/BookStackApp/BookStack/commit/313326b32adc8a916420d77d1ce1aa6f1d6b8ebb) Updated translator & dependency attribution before release v25.11.6 ### 📊 Changes **15 files changed** (+838 additions, -602 deletions) <details> <summary>View changed files</summary> 📝 `app/Access/Controllers/OidcController.php` (+13 -9) 📝 `app/Activity/Models/Comment.php` (+13 -1) 📝 `app/Activity/Notifications/Handlers/BaseNotificationHandler.php` (+1 -0) 📝 `app/Http/Middleware/StartSessionExtended.php` (+4 -1) 📝 `composer.json` (+1 -1) 📝 `composer.lock` (+431 -345) 📝 `dev/licensing/js-library-licenses.txt` (+273 -209) 📝 `dev/licensing/php-library-licenses.txt` (+8 -1) 📝 `tests/Api/ApiDocsTest.php` (+1 -1) 📝 `tests/Auth/OidcTest.php` (+34 -5) 📝 `tests/Auth/Saml2Test.php` (+2 -2) ➕ `tests/SessionTest.php` (+53 -0) 📝 `tests/ThemeTest.php` (+2 -2) 📝 `tests/Uploads/AttachmentTest.php` (+2 -2) 📝 `tests/Uploads/ImageTest.php` (+0 -23) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

OVERLORD added the pull-request label 2026-02-05 10:36:22 +03:00

OVERLORD closed this issue

2026-02-05 10:36:22 +03:00

Sign in to join this conversation.

Branches Tags

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/BookStack#6596