starred/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-05-04 18:08:46 +03:00
Code Issues 784 Packages Projects Releases 15 Wiki Activity

[PR #3011] [MERGED] Laravel 7.x Shift #6107

New Issue
Closed
opened 2026-02-05 10:24:43 +03:00 by OVERLORD · 0 comments
OVERLORD commented 2026-02-05 10:24:43 +03:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/BookStackApp/BookStack/pull/3011
Author: @ssddanbrown
Created: 10/26/2021
Status: ✅ Merged
Merged: 10/27/2021
Merged by: @ssddanbrown

Base: laravel_upgrade ← Head: shift-51217

📝 Commits (10+)

📊 Changes

225 files changed (+1700 additions, -1886 deletions)

View changed files

📝 app/Actions/Activity.php (+1 -1)
📝 app/Api/ApiToken.php (+1 -1)
📝 app/Api/ApiTokenGuard.php (+2 -2)
📝 app/Auth/Role.php (+3 -3)
📝 app/Auth/SocialAccount.php (+1 -1)
📝 app/Auth/User.php (+3 -3)
📝 app/Config/mail.php (+2 -0)
📝 app/Entities/Models/Deletion.php (+1 -1)
📝 app/Entities/Models/Entity.php (+5 -5)
📝 app/Entities/Models/Page.php (+1 -1)
📝 app/Entities/Tools/SearchOptions.php (+2 -2)
📝 app/Entities/Tools/SearchRunner.php (+1 -1)
📝 app/Exceptions/Handler.php (+5 -4)
📝 app/Exceptions/NotifyException.php (+1 -1)
📝 app/Exceptions/PrettyException.php (+1 -1)
📝 app/Exceptions/StoppedAuthenticationException.php (+1 -1)
📝 app/Http/Controllers/PageController.php (+1 -1)
➕ app/Http/Middleware/TrustHosts.php (+20 -0)
📝 app/Uploads/Attachment.php (+1 -1)
📝 composer.json (+18 -13)

...and 80 more files

📄 Description

This pull request includes the changes for upgrading to Laravel 7.x. Feel free to commit any additional changes to the shift-51217 branch.

Before merging, you need to:

  • Checkout the shift-51217 branch
  • Review all pull request comments for additional changes
  • Run composer update (if the scripts fail, add --no-scripts)
  • Clear any config, route, or view cache
  • Thoroughly test your application (no tests?)

If you need help with your upgrade, check out the Human Shifts. You may also join the Shifty Coders Slack workspace to level-up your Laravel skills.

🔄 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/3011 **Author:** [@ssddanbrown](https://github.com/ssddanbrown) **Created:** 10/26/2021 **Status:** ✅ Merged **Merged:** 10/27/2021 **Merged by:** [@ssddanbrown](https://github.com/ssddanbrown) **Base:** `laravel_upgrade` ← **Head:** `shift-51217` --- ### 📝 Commits (10+) - [`b2c97ec`](https://github.com/BookStackApp/BookStack/commit/b2c97ec4dadd6b445ea4cd5a0efc9c807b3c5b82) Apply Laravel coding style - [`c0889f6`](https://github.com/BookStackApp/BookStack/commit/c0889f6e511e21e3e3ab7937ea8f37e12a197273) Shift bindings - [`4627155`](https://github.com/BookStackApp/BookStack/commit/46271552e663ce2b58a7bd240ba40d6bb94eaabd) Shift core files - [`37101ce`](https://github.com/BookStackApp/BookStack/commit/37101ce3aaf2a4b6df76bd4a1403e9d983927e0a) Shift to Throwable - [`a966fe4`](https://github.com/BookStackApp/BookStack/commit/a966fe4b45719c0c9676f5644ebbd150445fa146) Add laravel/ui dependency - [`55a1f86`](https://github.com/BookStackApp/BookStack/commit/55a1f8615053b3b19e4cc3b72d758573c688ab17) Shift Eloquent methods - [`4d2d27f`](https://github.com/BookStackApp/BookStack/commit/4d2d27fe72ee9c3c280735ec86117934628f0b1a) Shift config files - [`1b7daba`](https://github.com/BookStackApp/BookStack/commit/1b7daba4c3d0b12c96fe240a4a30cd2c7d2e6951) Shift Laravel dependencies - [`cdb85e7`](https://github.com/BookStackApp/BookStack/commit/cdb85e751f8cd11053300d0b8b91984aa9c17b9d) Shift cleanup - [`d19a1f2`](https://github.com/BookStackApp/BookStack/commit/d19a1f2f27a1a4b0b64df27ea97ffe44402259b4) Shift test config and references ### 📊 Changes **225 files changed** (+1700 additions, -1886 deletions) <details> <summary>View changed files</summary> 📝 `app/Actions/Activity.php` (+1 -1) 📝 `app/Api/ApiToken.php` (+1 -1) 📝 `app/Api/ApiTokenGuard.php` (+2 -2) 📝 `app/Auth/Role.php` (+3 -3) 📝 `app/Auth/SocialAccount.php` (+1 -1) 📝 `app/Auth/User.php` (+3 -3) 📝 `app/Config/mail.php` (+2 -0) 📝 `app/Entities/Models/Deletion.php` (+1 -1) 📝 `app/Entities/Models/Entity.php` (+5 -5) 📝 `app/Entities/Models/Page.php` (+1 -1) 📝 `app/Entities/Tools/SearchOptions.php` (+2 -2) 📝 `app/Entities/Tools/SearchRunner.php` (+1 -1) 📝 `app/Exceptions/Handler.php` (+5 -4) 📝 `app/Exceptions/NotifyException.php` (+1 -1) 📝 `app/Exceptions/PrettyException.php` (+1 -1) 📝 `app/Exceptions/StoppedAuthenticationException.php` (+1 -1) 📝 `app/Http/Controllers/PageController.php` (+1 -1) ➕ `app/Http/Middleware/TrustHosts.php` (+20 -0) 📝 `app/Uploads/Attachment.php` (+1 -1) 📝 `composer.json` (+18 -13) _...and 80 more files_ </details> ### 📄 Description This pull request includes the changes for upgrading to Laravel 7.x. Feel free to commit any additional changes to the `shift-51217` branch. **Before merging**, you need to: - Checkout the `shift-51217` branch - Review **all** pull request comments for additional changes - Run `composer update` (if the scripts fail, add `--no-scripts`) - Clear any config, route, or view cache - Thoroughly test your application ([no tests?](https://laravelshift.com/laravel-test-generator)) If you need help with your upgrade, check out the [Human Shifts](https://laravelshift.com/human-shifts). You may also join the [Shifty Coders](https://laravelshift.com/shifty-coders) Slack workspace to level-up your Laravel skills. --- <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:24:43 +03:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
🎨 Design
📖 Docs Update
🐛 Bug
🐛 Bug
:cat2:🐈 Possible duplicate
💿 Database
☕ Open to discussion
💻 Front-End
🐕 Support
🚪 Authentication
🌍 Translations
🔌 API Task
🏭 Back-End
⛲ Upstream
🔨 Feature Request
🛠️ Enhancement
🛠️ Enhancement
🛠️ Enhancement
❤️ Happy feedback
🔒 Security
🔍 Pending Validation
💆 UX
📝 WYSIWYG Editor
🌔 Out of scope
🔩 API Request
:octocat: Admin/Meta
🖌️ View Customization
❓ Question
🚀 Priority
🛡️ Blocked
🚚 Export System
♿ A11y
🔧 Maintenance
> Markdown Editor
pull-request
Mirrored from GitHub Pull Request
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
OVERLORD
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/BookStack#6107
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?