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

Add class_alias for asset field definition adapters #267

Merged
merged 8 commits into from
Dec 5, 2024
Merged

Add class_alias for asset field definition adapters #267

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c9c476e
Add class_alias for asset field definition adapters
markus-moser Dec 3, 2024
11bd99e
Remove roave/security-advisories
markus-moser Dec 3, 2024
230e06a
Fix namespace
markus-moser Dec 3, 2024
9d467be
Try to re-enable roave/security-advisories
markus-moser Dec 3, 2024
0a664ab
Disable roave/security-advisories again for now
markus-moser Dec 3, 2024
5225805
Fix alias namespace
markus-moser Dec 3, 2024
51cf73c
Fix alias namespace
markus-moser Dec 3, 2024
db7721c
Try to re-enable roave/security-advisories
markus-moser Dec 3, 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
1 change: 0 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"symfony/messenger": "^6.4"
},
"require-dev": {
"roave/security-advisories": "dev-latest",
markus-moser marked this conversation as resolved.
Show resolved Hide resolved
"codeception/codeception": "^5.0.10",
"codeception/phpunit-wrapper": "^9",
"codeception/module-asserts": "^2",
Expand Down
12 changes: 12 additions & 0 deletions src/autoload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,17 @@
use Pimcore\Bundle\GenericDataIndexBundle\Model\OpenSearch\Traits\QueryObjectsToArrayTrait as OpenSearchQueryObjectsToArrayTrait;
use Pimcore\Bundle\GenericDataIndexBundle\Model\OpenSearch\Traits\SimplifySingleTypesTrait as OpenSearchSimplifySingleTypesTrait;
use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Asset\FieldDefinitionAdapter\AbstractAdapter as AssetAbstractAdapter;
use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Asset\FieldDefinitionAdapter\BooleanAdapter;
use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Asset\FieldDefinitionAdapter\DateAdapter;
use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Asset\FieldDefinitionAdapter\KeywordAdapter;
use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Asset\FieldDefinitionAdapter\RelationAdapter;
use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\Asset\FieldDefinitionAdapter\TextKeywordAdapter;
use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\DefaultSearch\DataObject\FieldDefinitionAdapter\AbstractAdapter as DataObjectAbstractAdapter;
use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\Asset\FieldDefinitionAdapter\AbstractAdapter as OpenSearchAssetAbstractAdapter;
use Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\DataObject\FieldDefinitionAdapter\AbstractAdapter as OpenSearchDataObjectAbstractAdapter;

const ASSET_FIELD_DEFINITION_ADAPTER_NAMESPACE = 'Pimcore\\Bundle\GenericDataIndexBundle\\SearchIndexAdapter\\OpenSearch\\Asset\\FieldDefinitionAdapter\\';

$classesToAlias = [
AttributeType::class => OpenSearchAttributeType::class,
ConditionType::class => OpenSearchConditionType::class,
Expand Down Expand Up @@ -101,6 +108,11 @@
DefaultSearchInterface::class => OpenSearchSearchInterface::class,
AssetAbstractAdapter::class => OpenSearchAssetAbstractAdapter::class,
DataObjectAbstractAdapter::class => OpenSearchDataObjectAbstractAdapter::class,
BooleanAdapter::class => ASSET_FIELD_DEFINITION_ADAPTER_NAMESPACE . 'BooleanAdapter',
DateAdapter::class => ASSET_FIELD_DEFINITION_ADAPTER_NAMESPACE . 'DateAdapter',
KeywordAdapter::class => ASSET_FIELD_DEFINITION_ADAPTER_NAMESPACE . 'KeywordAdapter',
RelationAdapter::class => ASSET_FIELD_DEFINITION_ADAPTER_NAMESPACE . 'RelationAdapter',
TextKeywordAdapter::class => ASSET_FIELD_DEFINITION_ADAPTER_NAMESPACE . 'TextKeywordAdapter',
];

foreach ($classesToAlias as $originalClass => $aliasClass) {
Expand Down
Loading