Skip to content

Commit 4f02dfc

Browse files
committed
refactor: improve code readability
1 parent c5de598 commit 4f02dfc

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

psalm-baseline.xml

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
</file>
3939
<file src="src/Infrastructure/Repository/WpQueryArgsBuilder.php">
4040
<RiskyTruthyFalsyComparison>
41-
<code><![CDATA[!$languageCode]]></code>
4241
<code><![CDATA[!$orderBy]]></code>
4342
<code><![CDATA[!$taxonomy]]></code>
4443
<code><![CDATA[$languageCode]]></code>

src/Infrastructure/Repository/WpQueryArgsBuilder.php

+4-7
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,12 @@
1717
use Fau\DegreeProgram\Common\Application\Filter\SubjectGroupFilter;
1818
use Fau\DegreeProgram\Common\Application\Filter\TeachingLanguageFilter;
1919
use Fau\DegreeProgram\Common\Application\Repository\CollectionCriteria;
20-
use Fau\DegreeProgram\Common\Domain\CampoKeys;
2120
use Fau\DegreeProgram\Common\Domain\DegreeProgram;
2221
use Fau\DegreeProgram\Common\Domain\MultilingualString;
2322
use Fau\DegreeProgram\Common\Infrastructure\Content\PostType\DegreeProgramPostType;
2423
use Fau\DegreeProgram\Common\Infrastructure\Content\Taxonomy\BachelorOrTeachingDegreeAdmissionRequirementTaxonomy;
2524
use Fau\DegreeProgram\Common\Infrastructure\Content\Taxonomy\MasterDegreeAdmissionRequirementTaxonomy;
2625
use Fau\DegreeProgram\Common\Infrastructure\Content\Taxonomy\TaxonomiesList;
27-
use Fau\DegreeProgram\Common\Infrastructure\Content\Taxonomy\TeachingDegreeHigherSemesterAdmissionRequirementTaxonomy;
28-
use RuntimeException;
2926
use WP_Term;
3027

3128
/**
@@ -272,19 +269,19 @@ private function applySearchFilter(SearchKeywordFilter $filter, WpQueryArgs $que
272269
{
273270
$keywords = array_filter(array_map('trim', explode(' ', $filter->value())));
274271
$metaKeyPrefix = 'fau_degree_program_searchable_content_';
275-
$metaKeys = $languageCode
272+
$metaKeys = is_string($languageCode) && $languageCode
276273
? [$metaKeyPrefix . $languageCode]
277274
: [$metaKeyPrefix . MultilingualString::EN, $metaKeyPrefix . MultilingualString::DE];
278275

279-
$metaQuery = array_reduce($keywords, static function ($metaQuery, $keyword) use ($metaKeys): array {
280-
$keywordConditions = array_values(array_map(
276+
$metaQuery = array_reduce($keywords, static function (array $metaQuery, string $keyword) use ($metaKeys): array {
277+
$keywordConditions = array_map(
281278
static fn($key) => [
282279
'key' => $key,
283280
'value' => $keyword,
284281
'compare' => 'LIKE',
285282
],
286283
$metaKeys
287-
));
284+
);
288285

289286
$metaQuery[] = ['relation' => 'OR'] + $keywordConditions;
290287

0 commit comments

Comments
 (0)