github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-01 05:51:52 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch 'laravel_upgrade'

Browse Source
This commit is contained in:
Dan Brown
2021-11-04 22:42:35 +00:00
parent a17be959d8 6f75aa9cdc
commit c9c4dbcb5b
308 changed files with 3347 additions and 2831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Entities/Tools/SearchOptions.php
View File

@ -29,7 +29,7 @@ class SearchOptions
/**
* Create a new instance from a search string.
*/
public static function fromString(string $search): SearchOptions
public static function fromString(string $search): self
{
$decoded = static::decode($search);
$instance = new static();
@ -45,7 +45,7 @@ class SearchOptions
* Will look for a classic string term and use that
* Otherwise we'll use the details from an advanced search form.
*/
public static function fromRequest(Request $request): SearchOptions
public static function fromRequest(Request $request): self
{
if (!$request->has('search') && !$request->has('term')) {
return static::fromString('');

2
app/Entities/Tools/SearchRunner.php
View File

@ -196,7 +196,7 @@ class SearchRunner
$escapedOperators[] = preg_quote($operator);
}
return join('|', $escapedOperators);
return implode('|', $escapedOperators);
}
/**