Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch '3.3' of ezsystems/ezplatform-solr-search-engine into 4.6 #71

Merged
merged 3 commits into from
Jul 10, 2024
Merged

Merge branch '3.3' of ezsystems/ezplatform-solr-search-engine into 4.6 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19ff229
IBX-8378: Fixed handling non-indexable field types
vidarl Jul 9, 2024
73dca96
Merged branch '3.3' of ezsystems/ezplatform-solr-search-engine into 4.6
alongosz Jul 9, 2024
c2333a0
[PHPStan] Aligned baseline with the changes
alongosz Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,36 +330,11 @@ parameters:
count: 1
path: src/lib/FieldMapper/ContentTranslationFieldMapper/Aggregate.php

-
message: "#^Access to protected property Ibexa\\\\Contracts\\\\Core\\\\Search\\\\Field\\:\\:\\$name\\.$#"
count: 1
path: src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php

-
message: "#^Access to protected property Ibexa\\\\Contracts\\\\Core\\\\Search\\\\Field\\:\\:\\$type\\.$#"
count: 2
path: src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php

-
message: "#^Access to protected property Ibexa\\\\Contracts\\\\Core\\\\Search\\\\Field\\:\\:\\$value\\.$#"
count: 2
path: src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php

-
message: "#^Property Ibexa\\\\Contracts\\\\Core\\\\Search\\\\FieldType\\:\\:\\$boost \\(int\\) does not accept float\\.$#"
count: 1
path: src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php

-
message: "#^Access to protected property Ibexa\\\\Contracts\\\\Core\\\\Search\\\\Field\\:\\:\\$type\\.$#"
count: 1
path: src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentFulltextFields.php

-
message: "#^Access to protected property Ibexa\\\\Contracts\\\\Core\\\\Search\\\\Field\\:\\:\\$value\\.$#"
count: 2
path: src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentFulltextFields.php

-
message: "#^Parameter \\#2 \\$array of function array_map expects array, iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Content\\> given\\.$#"
count: 1
Expand Down
2 changes: 1 addition & 1 deletion src/lib/FieldMapper/ContentTranslationFieldMapper/BlockDocumentsContentFields.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function mapFields(Content $content, $languageCode)
}

foreach ($contentType->fieldDefinitions as $fieldDefinition) {
if ($fieldDefinition->id !== $field->fieldDefinitionId) {
if ($fieldDefinition->id !== $field->fieldDefinitionId || !$fieldDefinition->isSearchable) {
continue;
}

Expand Down
4 changes: 2 additions & 2 deletions src/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentFulltextFields.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ private function doMapFields(Content $content, ContentType $contentType, $langua
}

foreach ($contentType->fieldDefinitions as $fieldDefinition) {
if ($fieldDefinition->id !== $field->fieldDefinitionId) {
if ($fieldDefinition->id !== $field->fieldDefinitionId || !$fieldDefinition->isSearchable) {
continue;
}

Expand All @@ -138,7 +138,7 @@ private function doMapFields(Content $content, ContentType $contentType, $langua
continue;
}

if (!$indexField->type instanceof FieldType\FullTextField || !$fieldDefinition->isSearchable) {
if (!$indexField->type instanceof FieldType\FullTextField) {
continue;
}

Expand Down
Loading