Merge pull request #39 from netgen/NGSTACK-995-upgrade-bundle-to-Ibexa-5

emodric · web-flow · commit 9f998098a13e · 2025-10-23T13:59:57.000+02:00
NGSTACK-995 upgrade bundle to ibexa 5
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,15 +15,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0', '8.1']
-        symfony: ['~5.4.0']
+        php: ['8.3']
+        symfony: ['~7.3.0']
         phpunit: ['phpunit.xml']
         deps: ['normal']
-        include:
-          - php: '7.4'
-            symfony: '~5.4.0'
-            phpunit: 'phpunit.xml'
-            deps: 'low'
 
     steps:
       - uses: actions/checkout@v2
diff --git a/bundle/Command/MigrateCommand.php b/bundle/Command/MigrateCommand.php
@@ -5,7 +5,7 @@
 namespace Netgen\Bundle\EnhancedSelectionBundle\Command;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver\Result;
+use Doctrine\DBAL\Result;
 use Netgen\Bundle\EnhancedSelectionBundle\Core\FieldType\EnhancedSelection\Type as EnhancedSelectionType;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -42,7 +42,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
         $this->io = new SymfonyStyle($input, $output);
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): ?int
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $statement = $this->getFields();
         $this->io->progressStart($statement->rowCount());
@@ -80,7 +80,7 @@ private function getFields(): Result
             )
             ->setParameter('data_type_string', $this->typeIdentifier);
 
-        return $builder->execute();
+        return $builder->executeQuery();
     }
 
     private function resetFieldData(int $id, int $version): void
@@ -96,7 +96,7 @@ private function resetFieldData(int $id, int $version): void
             ->setParameter('id', $id)
             ->setParameter('version', $version);
 
-        $builder->execute();
+        $builder->executeStatement();
     }
 
     private function removeSelectionDataForField(int $id, int $version): void
@@ -111,7 +111,7 @@ private function removeSelectionDataForField(int $id, int $version): void
             ->setParameter('id', $id)
             ->setParameter('version', $version);
 
-        $builder->execute();
+        $builder->executeStatement();
     }
 
     private function createSelections(int $id, int $version, array $identifiers): void
diff --git a/bundle/Core/FieldType/EnhancedSelection/EnhancedSelectionStorage.php b/bundle/Core/FieldType/EnhancedSelection/EnhancedSelectionStorage.php
@@ -10,7 +10,7 @@
 
 final class EnhancedSelectionStorage extends GatewayBasedStorage
 {
-    public function storeFieldData(VersionInfo $versionInfo, Field $field, array $context): ?bool
+    public function storeFieldData(VersionInfo $versionInfo, Field $field): ?bool
     {
         $this->gateway->deleteFieldData($versionInfo, [$field->id]);
         if (!empty($field->value->externalData)) {
@@ -20,12 +20,12 @@ public function storeFieldData(VersionInfo $versionInfo, Field $field, array $co
         return null;
     }
 
-    public function getFieldData(VersionInfo $versionInfo, Field $field, array $context): void
+    public function getFieldData(VersionInfo $versionInfo, Field $field): void
     {
         $this->gateway->getFieldData($versionInfo, $field);
     }
 
-    public function deleteFieldData(VersionInfo $versionInfo, array $fieldIds, array $context): bool
+    public function deleteFieldData(VersionInfo $versionInfo, array $fieldIds): bool
     {
         $this->gateway->deleteFieldData($versionInfo, $fieldIds);
 
@@ -37,7 +37,7 @@ public function hasFieldData(): bool
         return true;
     }
 
-    public function getIndexData(VersionInfo $versionInfo, Field $field, array $context)
+    public function getIndexData(VersionInfo $versionInfo, Field $field): bool
     {
         return false;
     }
diff --git a/bundle/Core/FieldType/EnhancedSelection/EnhancedSelectionStorage/Gateway/DoctrineStorage.php b/bundle/Core/FieldType/EnhancedSelection/EnhancedSelectionStorage/Gateway/DoctrineStorage.php
@@ -4,6 +4,7 @@
 
 namespace Netgen\Bundle\EnhancedSelectionBundle\Core\FieldType\EnhancedSelection\EnhancedSelectionStorage\Gateway;
 
+use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Types\Types;
 use Ibexa\Contracts\Core\Persistence\Content\Field;
@@ -34,11 +35,11 @@ public function storeFieldData(VersionInfo $versionInfo, Field $field): void
                         'identifier' => ':identifier',
                     ]
                 )
-                ->setParameter(':contentobject_attribute_id', $field->id, Types::INTEGER)
-                ->setParameter(':contentobject_attribute_version', $versionInfo->versionNo, Types::INTEGER)
-                ->setParameter(':identifier', $identifier, Types::STRING);
+                ->setParameter('contentobject_attribute_id', $field->id, Types::INTEGER)
+                ->setParameter('contentobject_attribute_version', $versionInfo->versionNo, Types::INTEGER)
+                ->setParameter('identifier', $identifier, Types::STRING);
 
-            $insertQuery->execute();
+            $insertQuery->executeStatement();
         }
     }
 
@@ -54,14 +55,14 @@ public function deleteFieldData(VersionInfo $versionInfo, array $fieldIds): void
             ->delete($this->connection->quoteIdentifier('sckenhancedselection'))
             ->where(
                 $query->expr()->and(
-                    $query->expr()->in('contentobject_attribute_id', [':contentobject_attribute_id']),
+                    $query->expr()->in('contentobject_attribute_id', ':contentobject_attribute_id'),
                     $query->expr()->eq('contentobject_attribute_version', ':contentobject_attribute_version')
                 )
             )
-            ->setParameter(':contentobject_attribute_id', $fieldIds, Connection::PARAM_INT_ARRAY)
-            ->setParameter(':contentobject_attribute_version', $versionInfo->versionNo, Types::INTEGER);
+            ->setParameter('contentobject_attribute_id', $fieldIds, ArrayParameterType::INTEGER)
+            ->setParameter('contentobject_attribute_version', $versionInfo->versionNo, Types::INTEGER);
 
-        $query->execute();
+        $query->executeStatement();
     }
 
     /**
@@ -81,12 +82,10 @@ private function loadFieldData(int $fieldId, int $versionNo): array
                     $query->expr()->eq('contentobject_attribute_version', ':contentobject_attribute_version')
                 )
             )
-            ->setParameter(':contentobject_attribute_id', $fieldId, Types::INTEGER)
-            ->setParameter(':contentobject_attribute_version', $versionNo, Types::INTEGER);
+            ->setParameter('contentobject_attribute_id', $fieldId, Types::INTEGER)
+            ->setParameter('contentobject_attribute_version', $versionNo, Types::INTEGER);
 
-        $statement = $query->execute();
-
-        $rows = $statement->fetchAllAssociative();
+        $rows = $query->executeQuery()->fetchAllAssociative();
 
         return array_map(
             static fn (array $row): string => $row['identifier'],
diff --git a/bundle/Core/FieldType/EnhancedSelection/Type.php b/bundle/Core/FieldType/EnhancedSelection/Type.php
@@ -316,9 +316,9 @@ public function validateFieldSettings($fieldSettings): array
 
                         if ($emptyCount > ($fieldSettings['isMultiple'] ? 0 : 1)) {
                             $validationErrors[] = new ValidationError(
-                                $fieldSettings['isMultiple'] ?
-                                    "'%setting%' setting value item's 'identifier' property must have a value" :
-                                    "'%setting%' setting value item's 'identifier' property must have only a single empty value",
+                                $fieldSettings['isMultiple']
+                                    ? "'%setting%' setting value item's 'identifier' property must have a value"
+                                    : "'%setting%' setting value item's 'identifier' property must have only a single empty value",
                                 null,
                                 [
                                     '%setting%' => $name,
diff --git a/bundle/Core/Search/Legacy/Content/Common/Gateway/CriterionHandler/EnhancedSelection.php b/bundle/Core/Search/Legacy/Content/Common/Gateway/CriterionHandler/EnhancedSelection.php
@@ -6,21 +6,28 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Query\QueryBuilder;
-use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\CriterionInterface;
 use Ibexa\Core\Base\Exceptions\InvalidArgumentException;
 use Ibexa\Core\Search\Legacy\Content\Common\Gateway\CriteriaConverter;
 use Ibexa\Core\Search\Legacy\Content\Common\Gateway\CriterionHandler\FieldBase;
 use Netgen\Bundle\EnhancedSelectionBundle\API\Repository\Values\Content\Query\Criterion\EnhancedSelection as EnhancedSelectionCriterion;
 
 final class EnhancedSelection extends FieldBase
 {
-    public function accept(Criterion $criterion): bool
+    public function accept(CriterionInterface $criterion): bool
     {
         return $criterion instanceof EnhancedSelectionCriterion;
     }
 
-    public function handle(CriteriaConverter $converter, QueryBuilder $queryBuilder, Criterion $criterion, array $languageSettings): string
-    {
+    /**
+     * @param \Netgen\Bundle\EnhancedSelectionBundle\API\Repository\Values\Content\Query\Criterion\EnhancedSelection $criterion
+     */
+    public function handle(
+        CriteriaConverter $converter,
+        QueryBuilder $queryBuilder,
+        CriterionInterface $criterion,
+        array $languageSettings,
+    ): string {
         $fieldDefinitionIds = $this->getFieldDefinitionIds($criterion->target);
 
         $subSelect = $this->connection->createQueryBuilder();
diff --git a/bundle/Core/Search/Solr/Query/CriterionVisitor/EnhancedSelection.php b/bundle/Core/Search/Solr/Query/CriterionVisitor/EnhancedSelection.php
@@ -4,7 +4,7 @@
 
 namespace Netgen\Bundle\EnhancedSelectionBundle\Core\Search\Solr\Query\CriterionVisitor;
 
-use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\CriterionInterface;
 use Ibexa\Contracts\Solr\Query\CriterionVisitor;
 use Ibexa\Core\Base\Exceptions\InvalidArgumentException;
 use Ibexa\Solr\Query\Common\CriterionVisitor\Field;
@@ -14,12 +14,17 @@
 
 final class EnhancedSelection extends Field
 {
-    public function canVisit(Criterion $criterion): bool
+    public function canVisit(CriterionInterface $criterion): bool
     {
         return $criterion instanceof EnhancedSelectionCriterion;
     }
 
-    public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null): string
+    /**
+     * @param \Netgen\Bundle\EnhancedSelectionBundle\API\Repository\Values\Content\Query\Criterion\EnhancedSelection $criterion
+     *
+     * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException
+     */
+    public function visit(CriterionInterface $criterion, ?CriterionVisitor $subVisitor = null): string
     {
         $searchFields = $this->getSearchFields($criterion);
 
diff --git a/bundle/Form/Type/FieldType/FieldValueTransformer.php b/bundle/Form/Type/FieldType/FieldValueTransformer.php
@@ -47,9 +47,9 @@ public function reverseTransform($value): Value
             return $this->fieldType->getEmptyValue();
         }
 
-        $hash = is_array($value['identifiers']) ?
-            $value['identifiers'] :
-            [$value['identifiers']];
+        $hash = is_array($value['identifiers'])
+            ? $value['identifiers']
+            : [$value['identifiers']];
 
         return $this->fieldType->fromHash($hash);
     }
diff --git a/composer.json b/composer.json
@@ -16,14 +16,15 @@
         }
     ],
     "require": {
-        "ibexa/core": "^4.0",
-        "ibexa/content-forms": "^4.0",
+        "ibexa/core": "^5.0",
+        "ibexa/content-forms": "^5.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0",
-        "netgen/ibexa-forms-bundle": "^4.0",
-        "friendsofphp/php-cs-fixer": "^3.3"
+        "phpunit/phpunit": "^12.0",
+        "netgen/ibexa-forms-bundle": "^5.0",
+        "friendsofphp/php-cs-fixer": "^3.3",
+        "ibexa/solr": "^5.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,38 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="vendor/autoload.php"
          backupGlobals="false"
-         backupStaticAttributes="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          colors="true"
-         verbose="true"
          processIsolation="false"
          stopOnFailure="false"
          beStrictAboutTestsThatDoNotTestAnything="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.4/phpunit.xsd"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false"
 >
     <testsuites>
         <testsuite name="Netgen\EnhancedSelectionBundle\Tests">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">bundle</directory>
-            <exclude>
-                <directory>bundle/DependencyInjection</directory>
-                <directory>bundle/Resources</directory>
-                <directory>vendor</directory>
-                <file>bundle/Core/Search/Legacy/Content/Common/Gateway/CriterionHandler/EnhancedSelection.php</file>
-                <file>bundle/Core/FieldType/EnhancedSelection/SearchField.php</file>
-                <file>bundle/NetgenEnhancedSelectionBundle.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
+
     <logging>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <junit outputFile="build/report.junit.xml"/>
     </logging>
+
+    <source>
+        <include>
+            <directory suffix=".php">bundle</directory>
+        </include>
+        <exclude>
+            <directory>bundle/DependencyInjection</directory>
+            <directory>bundle/Resources</directory>
+            <directory>vendor</directory>
+            <file>bundle/Core/Search/Legacy/Content/Common/Gateway/CriterionHandler/EnhancedSelection.php</file>
+            <file>bundle/Core/FieldType/EnhancedSelection/SearchField.php</file>
+            <file>bundle/NetgenEnhancedSelectionBundle.php</file>
+        </exclude>
+    </source>
 </phpunit>
diff --git a/tests/Core/FieldType/EnhancedSelection/EnhancedSelectionStorageTest.php b/tests/Core/FieldType/EnhancedSelection/EnhancedSelectionStorageTest.php
@@ -4,10 +4,10 @@
 
 namespace Netgen\Bundle\EnhancedSelectionBundle\Tests\Core\FieldType\EnhancedSelection;
 
+use Ibexa\Contracts\Core\FieldType\StorageGateway;
 use Ibexa\Contracts\Core\Persistence\Content\Field;
 use Ibexa\Contracts\Core\Persistence\Content\FieldValue;
 use Ibexa\Contracts\Core\Persistence\Content\VersionInfo;
-use Ibexa\Core\FieldType\StorageGateway;
 use Netgen\Bundle\EnhancedSelectionBundle\Core\FieldType\EnhancedSelection\EnhancedSelectionStorage;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -43,7 +43,7 @@ public function testGetIndexData(): void
             ->disableOriginalConstructor()
             ->getMock();
 
-        self::assertFalse($this->storage->getIndexData($versionInfo, $field, []));
+        self::assertFalse($this->storage->getIndexData($versionInfo, $field));
     }
 
     public function testStoreFieldData(): void
@@ -60,7 +60,7 @@ public function testStoreFieldData(): void
             ]
         );
 
-        $connection = $this->getMockForAbstractClass(StorageGateway::class);
+        $connection = $this->createMock(StorageGateway::class);
         $context = ['identifier' => 'enhancedselection', 'connection' => $connection];
 
         $this->gateway->expects(self::once())
@@ -86,7 +86,7 @@ public function testGetFieldData(): void
             ]
         );
 
-        $connection = $this->getMockForAbstractClass(StorageGateway::class);
+        $connection = $this->createMock(StorageGateway::class);
         $context = ['identifier' => 'enhancedselection', 'connection' => $connection];
 
         $this->gateway->expects(self::once())
@@ -100,7 +100,7 @@ public function testDeleteFieldData(): void
         $versionInfo = new VersionInfo();
         $fields = ['some_field'];
 
-        $connection = $this->getMockForAbstractClass(StorageGateway::class);
+        $connection = $this->createMock(StorageGateway::class);
         $context = ['identifier' => 'enhancedselection', 'connection' => $connection];
 
         $this->gateway->expects(self::once())
diff --git a/tests/Core/FieldType/EnhancedSelection/TypeTest.php b/tests/Core/FieldType/EnhancedSelection/TypeTest.php
@@ -375,8 +375,6 @@ public function testAcceptValueWithValueObject(): void
     {
         $this->expectException(InvalidArgumentType::class);
 
-        $value = new Value([true, true]);
-
-        $this->type->acceptValue($value);
+        $this->type->acceptValue([true, true]);
     }
 }
diff --git a/tests/Form/FieldTypeHandler/EnhancedSelectionTest.php b/tests/Form/FieldTypeHandler/EnhancedSelectionTest.php
@@ -108,7 +108,7 @@ public function testBuildFieldCreateForm(): void
 
         $fieldDefinition = new FieldDefinition(
             [
-                'id' => 'id',
+                'id' => 11,
                 'identifier' => 'identifier',
                 'isRequired' => true,
                 'descriptions' => ['fre-FR' => 'fre-FR'],
diff --git a/tests/Templating/Twig/NetgenEnhancedSelectionRuntimeTest.php b/tests/Templating/Twig/NetgenEnhancedSelectionRuntimeTest.php

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Netgen\Bundle\EnhancedSelectionBundle\Command;`
`6`	`6`
`7`	`7`	`use Doctrine\DBAL\Connection;`
`8`		`-use Doctrine\DBAL\Driver\Result;`
	`8`	`+use Doctrine\DBAL\Result;`
`9`	`9`	`use Netgen\Bundle\EnhancedSelectionBundle\Core\FieldType\EnhancedSelection\Type as EnhancedSelectionType;`
`10`	`10`	`use Symfony\Component\Console\Command\Command;`
`11`	`11`	`use Symfony\Component\Console\Input\InputInterface;`
`@@ -42,7 +42,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v`
`42`	`42`	`$this->io = new SymfonyStyle($input, $output);`
`43`	`43`	`}`
`44`	`44`
`45`		`- protected function execute(InputInterface $input, OutputInterface $output): ?int`
	`45`	`+ protected function execute(InputInterface $input, OutputInterface $output): int`
`46`	`46`	`{`
`47`	`47`	`$statement = $this->getFields();`
`48`	`48`	`$this->io->progressStart($statement->rowCount());`
`@@ -80,7 +80,7 @@ private function getFields(): Result`
`80`	`80`	`)`
`81`	`81`	`->setParameter('data_type_string', $this->typeIdentifier);`
`82`	`82`
`83`		`- return $builder->execute();`
	`83`	`+ return $builder->executeQuery();`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`private function resetFieldData(int $id, int $version): void`
`@@ -96,7 +96,7 @@ private function resetFieldData(int $id, int $version): void`
`96`	`96`	`->setParameter('id', $id)`
`97`	`97`	`->setParameter('version', $version);`
`98`	`98`
`99`		`- $builder->execute();`
	`99`	`+ $builder->executeStatement();`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`private function removeSelectionDataForField(int $id, int $version): void`
`@@ -111,7 +111,7 @@ private function removeSelectionDataForField(int $id, int $version): void`
`111`	`111`	`->setParameter('id', $id)`
`112`	`112`	`->setParameter('version', $version);`
`113`	`113`
`114`		`- $builder->execute();`
	`114`	`+ $builder->executeStatement();`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`private function createSelections(int $id, int $version, array $identifiers): void`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`final class EnhancedSelectionStorage extends GatewayBasedStorage`
`12`	`12`	`{`
`13`		`- public function storeFieldData(VersionInfo $versionInfo, Field $field, array $context): ?bool`
	`13`	`+ public function storeFieldData(VersionInfo $versionInfo, Field $field): ?bool`
`14`	`14`	`{`
`15`	`15`	`$this->gateway->deleteFieldData($versionInfo, [$field->id]);`
`16`	`16`	`if (!empty($field->value->externalData)) {`
`@@ -20,12 +20,12 @@ public function storeFieldData(VersionInfo $versionInfo, Field $field, array $co`
`20`	`20`	`return null;`
`21`	`21`	`}`
`22`	`22`
`23`		`- public function getFieldData(VersionInfo $versionInfo, Field $field, array $context): void`
	`23`	`+ public function getFieldData(VersionInfo $versionInfo, Field $field): void`
`24`	`24`	`{`
`25`	`25`	`$this->gateway->getFieldData($versionInfo, $field);`
`26`	`26`	`}`
`27`	`27`
`28`		`- public function deleteFieldData(VersionInfo $versionInfo, array $fieldIds, array $context): bool`
	`28`	`+ public function deleteFieldData(VersionInfo $versionInfo, array $fieldIds): bool`
`29`	`29`	`{`
`30`	`30`	`$this->gateway->deleteFieldData($versionInfo, $fieldIds);`
`31`	`31`
`@@ -37,7 +37,7 @@ public function hasFieldData(): bool`
`37`	`37`	`return true;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function getIndexData(VersionInfo $versionInfo, Field $field, array $context)`
	`40`	`+ public function getIndexData(VersionInfo $versionInfo, Field $field): bool`
`41`	`41`	`{`
`42`	`42`	`return false;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Netgen\Bundle\EnhancedSelectionBundle\Core\FieldType\EnhancedSelection\EnhancedSelectionStorage\Gateway;`
`6`	`6`
	`7`	`+use Doctrine\DBAL\ArrayParameterType;`
`7`	`8`	`use Doctrine\DBAL\Connection;`
`8`	`9`	`use Doctrine\DBAL\Types\Types;`
`9`	`10`	`use Ibexa\Contracts\Core\Persistence\Content\Field;`
`@@ -34,11 +35,11 @@ public function storeFieldData(VersionInfo $versionInfo, Field $field): void`
`34`	`35`	`'identifier' => ':identifier',`
`35`	`36`	`]`
`36`	`37`	`)`
`37`		`- ->setParameter(':contentobject_attribute_id', $field->id, Types::INTEGER)`
`38`		`- ->setParameter(':contentobject_attribute_version', $versionInfo->versionNo, Types::INTEGER)`
`39`		`- ->setParameter(':identifier', $identifier, Types::STRING);`
	`38`	`+ ->setParameter('contentobject_attribute_id', $field->id, Types::INTEGER)`
	`39`	`+ ->setParameter('contentobject_attribute_version', $versionInfo->versionNo, Types::INTEGER)`
	`40`	`+ ->setParameter('identifier', $identifier, Types::STRING);`
`40`	`41`
`41`		`- $insertQuery->execute();`
	`42`	`+ $insertQuery->executeStatement();`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`
`@@ -54,14 +55,14 @@ public function deleteFieldData(VersionInfo $versionInfo, array $fieldIds): void`
`54`	`55`	`->delete($this->connection->quoteIdentifier('sckenhancedselection'))`
`55`	`56`	`->where(`
`56`	`57`	`$query->expr()->and(`
`57`		`- $query->expr()->in('contentobject_attribute_id', [':contentobject_attribute_id']),`
	`58`	`+ $query->expr()->in('contentobject_attribute_id', ':contentobject_attribute_id'),`
`58`	`59`	`$query->expr()->eq('contentobject_attribute_version', ':contentobject_attribute_version')`
`59`	`60`	`)`
`60`	`61`	`)`
`61`		`- ->setParameter(':contentobject_attribute_id', $fieldIds, Connection::PARAM_INT_ARRAY)`
`62`		`- ->setParameter(':contentobject_attribute_version', $versionInfo->versionNo, Types::INTEGER);`
	`62`	`+ ->setParameter('contentobject_attribute_id', $fieldIds, ArrayParameterType::INTEGER)`
	`63`	`+ ->setParameter('contentobject_attribute_version', $versionInfo->versionNo, Types::INTEGER);`
`63`	`64`
`64`		`- $query->execute();`
	`65`	`+ $query->executeStatement();`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`/**`
`@@ -81,12 +82,10 @@ private function loadFieldData(int $fieldId, int $versionNo): array`
`81`	`82`	`$query->expr()->eq('contentobject_attribute_version', ':contentobject_attribute_version')`
`82`	`83`	`)`
`83`	`84`	`)`
`84`		`- ->setParameter(':contentobject_attribute_id', $fieldId, Types::INTEGER)`
`85`		`- ->setParameter(':contentobject_attribute_version', $versionNo, Types::INTEGER);`
	`85`	`+ ->setParameter('contentobject_attribute_id', $fieldId, Types::INTEGER)`
	`86`	`+ ->setParameter('contentobject_attribute_version', $versionNo, Types::INTEGER);`
`86`	`87`
`87`		`- $statement = $query->execute();`
`88`		`-`
`89`		`- $rows = $statement->fetchAllAssociative();`
	`88`	`+ $rows = $query->executeQuery()->fetchAllAssociative();`
`90`	`89`
`91`	`90`	`return array_map(`
`92`	`91`	`static fn (array $row): string => $row['identifier'],`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Netgen\Bundle\EnhancedSelectionBundle\Core\Search\Solr\Query\CriterionVisitor;`
`6`	`6`
`7`		`-use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;`
	`7`	`+use Ibexa\Contracts\Core\Repository\Values\Content\Query\CriterionInterface;`
`8`	`8`	`use Ibexa\Contracts\Solr\Query\CriterionVisitor;`
`9`	`9`	`use Ibexa\Core\Base\Exceptions\InvalidArgumentException;`
`10`	`10`	`use Ibexa\Solr\Query\Common\CriterionVisitor\Field;`
`@@ -14,12 +14,17 @@`
`14`	`14`
`15`	`15`	`final class EnhancedSelection extends Field`
`16`	`16`	`{`
`17`		`- public function canVisit(Criterion $criterion): bool`
	`17`	`+ public function canVisit(CriterionInterface $criterion): bool`
`18`	`18`	`{`
`19`	`19`	`return $criterion instanceof EnhancedSelectionCriterion;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null): string`
	`22`	`+ /**`
	`23`	`+ * @param \Netgen\Bundle\EnhancedSelectionBundle\API\Repository\Values\Content\Query\Criterion\EnhancedSelection $criterion`
	`24`	`+ *`
	`25`	`+ * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException`
	`26`	`+ */`
	`27`	`+ public function visit(CriterionInterface $criterion, ?CriterionVisitor $subVisitor = null): string`
`23`	`28`	`{`
`24`	`29`	`$searchFields = $this->getSearchFields($criterion);`
`25`	`30`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,9 @@ public function reverseTransform($value): Value`
`47`	`47`	`return $this->fieldType->getEmptyValue();`
`48`	`48`	`}`
`49`	`49`
`50`		`- $hash = is_array($value['identifiers']) ?`
`51`		`- $value['identifiers'] :`
`52`		`- [$value['identifiers']];`
	`50`	`+ $hash = is_array($value['identifiers'])`
	`51`	`+ ? $value['identifiers']`
	`52`	`+ : [$value['identifiers']];`
`53`	`53`
`54`	`54`	`return $this->fieldType->fromHash($hash);`
`55`	`55`	`}`