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

View File

@ -175,7 +175,7 @@ class SearchIndex
$names = [];
$values = [];
foreach($tags as $tag) {
foreach ($tags as $tag) {
$names[] = $tag->name;
$values[] = $tag->value;
}
@ -233,17 +233,16 @@ class SearchIndex
$entityType = $entity->getMorphClass();
foreach ($mergedScoreMap as $term => $score) {
$dataArray[] = [
'term' => $term,
'score' => $score,
'term' => $term,
'score' => $score,
'entity_type' => $entityType,
'entity_id' => $entityId,
'entity_id' => $entityId,
];
}
return $dataArray;
}
/**
* For the given term data arrays, Merge their contents by term
* while combining any scores.

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.
@ -136,7 +135,7 @@ class SearchOptions
$terms = explode(' ', $termString);
$indexDelimiters = SearchIndex::$delimiters;
$parsed = [
'terms' => [],
'terms' => [],
'exacts' => [],
];

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
@ -32,7 +32,7 @@ class SearchResultsFormatter
$terms = array_merge($options->exacts, $options->searches);
$originalContentByNewAttribute = [
'preview_name' => $entity->name,
'preview_name' => $entity->name,
'preview_content' => $textContent,
];
@ -49,7 +49,8 @@ class SearchResultsFormatter
/**
* Highlight tags which match the given terms.
* @param Tag[] $tags
*
* @param Tag[] $tags
* @param string[] $terms
*/
protected function highlightTagsContainingTerms(array $tags, array $terms): void
@ -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
@ -118,7 +120,7 @@ class SearchResultsFormatter
$mergedRefs[$start] = $end;
$lastStart = $start;
$lastEnd = $end;
} else if ($end > $lastEnd) {
} elseif ($end > $lastEnd) {
$mergedRefs[$lastStart] = $end;
$lastEnd = $end;
}
@ -194,7 +196,7 @@ class SearchResultsFormatter
$firstStart = $firstStart ?: 0;
if ($remainder > 10 && $firstStart !== 0) {
$padStart = max(0, $firstStart - $remainder);
$content = ($padStart === 0 ? '' : '...') . e(substr($originalText, $padStart, $firstStart - $padStart)) . substr($content, 4);
$content = ($padStart === 0 ? '' : '...') . e(substr($originalText, $padStart, $firstStart - $padStart)) . substr($content, 4);
}
// Add ellipsis if we're not at the end
@ -204,5 +206,4 @@ class SearchResultsFormatter
return $content;
}
}
}

View File

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

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;
}

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);
}
}