colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied StyleCI changes

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

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

@ -175,7 +175,7 @@ class SearchIndex
$names = []; $names = [];
$values = []; $values = [];
foreach($tags as $tag) { foreach ($tags as $tag) {
$names[] = $tag->name; $names[] = $tag->name;
$values[] = $tag->value; $values[] = $tag->value;
} }
@ -243,7 +243,6 @@ class SearchIndex
return $dataArray; return $dataArray;
} }
/** /**
* For the given term data arrays, Merge their contents by term * For the given term data arrays, Merge their contents by term
* while combining any scores. * while combining any scores.

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

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

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

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

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

@ -141,13 +141,13 @@ class SearchRunner
$relations = ['tags']; $relations = ['tags'];
if ($entityModelInstance instanceof BookChild) { if ($entityModelInstance instanceof BookChild) {
$relations['book'] = function(BelongsTo $query) { $relations['book'] = function (BelongsTo $query) {
$query->visible(); $query->visible();
}; };
} }
if ($entityModelInstance instanceof Page) { if ($entityModelInstance instanceof Page) {
$relations['chapter'] = function(BelongsTo $query) { $relations['chapter'] = function (BelongsTo $query) {
$query->visible(); $query->visible();
}; };
} }

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

@ -14,7 +14,8 @@ class SearchController extends Controller
protected $searchRunner; protected $searchRunner;
protected $entityContextManager; protected $entityContextManager;
public function __construct(SearchRunner $searchRunner) { public function __construct(SearchRunner $searchRunner)
{
$this->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\Bookshelf;
use BookStack\Entities\Models\Chapter; use BookStack\Entities\Models\Chapter;
use BookStack\Entities\Models\Page; use BookStack\Entities\Models\Page;
use BookStack\Entities\Models\SearchTerm;
use Tests\TestCase; use Tests\TestCase;
class EntitySearchTest extends 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 &lt;cool&gt; <strong>TestPageContent</strong>', false);
$search->assertSee('My supercool &lt;great&gt; <strong>TestPageContent</strong> page', false); $search->assertSee('My supercool &lt;great&gt; <strong>TestPageContent</strong> page', false);
} }
} }