github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-23 02:00:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Applied StyleCI changes

Browse Source
This commit is contained in:
Dan Brown 2021-11-13 13:28:17 +00:00
parent 63d8d72d7e
commit 2633b94deb
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
6 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Entities/Tools/SearchIndex.php
View File

@ -243,7 +243,6 @@ class SearchIndex
return $dataArray;
}
/**
* For the given term data arrays, Merge their contents by term
* while combining any scores.

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

@ -124,7 +124,6 @@ class SearchOptions
return $terms;
}
/**
* Parse a standard search term string into individual search terms and
* extract any exact terms searches to be made.

5
app/Entities/Tools/SearchResultsFormatter.php
View File

@ -8,10 +8,10 @@ use Illuminate\Support\HtmlString;
class SearchResultsFormatter
{
/**
* For the given array of entities, Prepare the models to be shown in search result
* output. This sets a series of additional attributes.
*
* @param Entity[] $results
*/
public function format(array $results, SearchOptions $options): void
@ -49,6 +49,7 @@ class SearchResultsFormatter
/**
* Highlight tags which match the given terms.
*
* @param Tag[] $tags
* @param string[] $terms
*/
@ -104,6 +105,7 @@ class SearchResultsFormatter
* adjacent or where they overlap.
*
* @param array<int, int> $matchPositions
*
* @return array<int, int>
*/
protected function sortAndMergeMatchPositions(array $matchPositions): array
@ -204,5 +206,4 @@ class SearchResultsFormatter
return $content;
}
}

3
app/Http/Controllers/SearchController.php
View File

@ -14,7 +14,8 @@ class SearchController extends Controller
protected $searchRunner;
protected $entityContextManager;
public function __construct(SearchRunner $searchRunner) {
public function __construct(SearchRunner $searchRunner)
{
$this->searchRunner = $searchRunner;
}

2
tests/Entity/EntitySearchTest.php
View File

@ -7,7 +7,6 @@ use BookStack\Entities\Models\Book;
use BookStack\Entities\Models\Bookshelf;
use BookStack\Entities\Models\Chapter;
use BookStack\Entities\Models\Page;
use BookStack\Entities\Models\SearchTerm;
use Tests\TestCase;
class EntitySearchTest extends TestCase
@ -410,5 +409,4 @@ class EntitySearchTest extends TestCase
$search->assertSee('My &lt;cool&gt; <strong>TestPageContent</strong>', false);
$search->assertSee('My supercool &lt;great&gt; <strong>TestPageContent</strong> page', false);
}
}