Merge pull request #97 from ibexa/temp_1.3_to_4.0

Merge branch '1.3' of ezsystems/ezplatform-kernel into 4.0

Author: adamwojs

composer.json

@@ -62,6 +62,7 @@
         "behat/behat": "^3.6.1",
         "jenner/simple_fork": "^1.2",
         "friends-of-behat/mink-extension": "^2.4",
+        "league/flysystem-memory": "^1.0",
         "ibexa/ci-scripts": "^0.2@dev",
         "ibexa/code-style": "^1.0",
         "phpunit/phpunit": "^8.2",

src/contracts/Test/IbexaTestKernel.php

@@ -16,7 +16,9 @@
 use Ibexa\Contracts\Core\Persistence\TransactionHandler;
 use Ibexa\Contracts\Core\Repository;
 use Ibexa\Contracts\Core\Test\Persistence\Fixture\YamlFixture;
+use Ibexa\Core\IO\Adapter\LocalAdapter;
 use JMS\TranslationBundle\JMSTranslationBundle;
+use League\Flysystem\Memory\MemoryAdapter;
 use Liip\ImagineBundle\LiipImagineBundle;
 use Psr\Log\NullLogger;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
@@ -150,6 +152,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
         $this->loadServices($loader);
 
         $loader->load(static function (ContainerBuilder $container): void {
+            self::prepareIOServices($container);
             self::createPublicAliasesForServicesUnderTest($container);
             self::setUpTestLogger($container);
         });
@@ -195,6 +198,11 @@ private static function getResourcesPath(): string
         return dirname(__DIR__, 3) . '/tests/bundle/Core/Resources';
     }
 
+    private static function prepareIOServices(ContainerBuilder $container): void
+    {
+        $container->setDefinition(LocalAdapter::class, new Definition(MemoryAdapter::class));
+    }
+
     private static function createPublicAliasesForServicesUnderTest(ContainerBuilder $container): void
     {
         foreach (static::getExposedServicesByClass() as $className) {

src/lib/FieldType/EmailAddress/SearchField.php

@@ -30,6 +30,11 @@ public function getIndexData(Field $field, FieldDefinition $fieldDefinition)
                 new Search\FieldType\FullTextField([
                     'space_normalize',
                     'latin1_lowercase',
+                    'ascii_lowercase',
+                    'cyrillic_lowercase',
+                    'greek_lowercase',
+                    'latin_lowercase',
+                    'latin-exta_lowercase',
                 ], false)
             ),
         ];

src/lib/Search/Legacy/Content/WordIndexer/Gateway/DoctrineDatabase.php

@@ -244,6 +244,7 @@ private function indexWords(FullTextData $fullTextData, array $indexArray, array
 
         for ($i = 0; $i < count($indexArray); ++$i) {
             $indexWord = $indexArray[$i]['Word'];
+            $indexWord = $this->transformationProcessor->transformByGroup($indexWord, 'lowercase');
             $contentFieldId = $indexArray[$i]['ContentClassAttributeID'];
             $identifier = $indexArray[$i]['identifier'];
             $integerValue = $indexArray[$i]['integer_value'];
@@ -257,6 +258,7 @@ private function indexWords(FullTextData $fullTextData, array $indexArray, array
 
             if (isset($indexArray[$i + 1])) {
                 $nextIndexWord = $indexArray[$i + 1]['Word'];
+                $nextIndexWord = $this->transformationProcessor->transformByGroup($nextIndexWord, 'lowercase');
                 $nextWordId = $wordIDArray[$nextIndexWord];
             } else {
                 $nextWordId = 0;

tests/integration/Core/Repository/SearchEngineIndexingTest.php

@@ -9,10 +9,12 @@
 use DateTime;
 use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Ibexa\Contracts\Core\Repository\SearchService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Ibexa\Contracts\Core\Repository\Values\Content\LocationQuery;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 
 /**
  * Test case for indexing operations with a search engine.
@@ -827,13 +829,59 @@ public function testIndexingSpecialFullTextCases($text, $searchForText)
         $query = new Query(['filter' => $criterion]);
         $result = $searchService->findContent($query);
 
+        $found = false;
         // for some cases there might be more than one hit, so check if proper one was found
         foreach ($result->searchHits as $searchHit) {
             if ($content->contentInfo->id === $searchHit->valueObject->versionInfo->contentInfo->id) {
-                return;
+                $found = true;
+                break;
+            }
+        }
+
+        self::assertTrue($found, 'Failed to find required Content in search results');
+    }
+
+    /**
+     * Check if FullText indexing works for email addresses.
+     *
+     * @dataProvider getEmailAddressesCases
+     */
+    public function testIndexingEmailFieldCases(string $email, string $searchForText): void
+    {
+        $repository = $this->getRepository();
+        $searchService = $repository->getSearchService();
+
+        $content = $this->createContentEmailWithAddress($email, [2]);
+        $this->refreshSearch($repository);
+
+        $criterion = new Criterion\FullText($searchForText);
+        $query = new Query(['filter' => $criterion]);
+        $result = $searchService->findContent($query);
+
+        $found = false;
+        // for some cases there might be more than one hit, so check if proper one was found
+        foreach ($result->searchHits as $searchHit) {
+            if ($content->contentInfo->id === $searchHit->valueObject->versionInfo->contentInfo->id) {
+                $found = true;
+                break;
             }
         }
-        $this->fail('Failed to find required Content in search results');
+
+        self::assertTrue($found, 'Failed to find required Content in search results');
+    }
+
+    /**
+     * Data Provider for {@see testIndexingSpecialFullTextCases()} method.
+     */
+    public function getEmailAddressesCases(): array
+    {
+        return [
+            ['test@TEST.com', 'test@test.com'],
+            ['TEST3@TEST.com', 'test3@test.com'],
+            ['TeSt1@TEST.com', 'test1@test.com'],
+            ['TeSt2@TesT.com', 'test2@test.com'],
+            ['test4@test.com', 'test4@test.com'],
+        ];
     }
 
     /**
@@ -1115,22 +1163,22 @@ public function testDeleteTranslation()
     }
 
     /**
-     * Will create if not exists a simple content type for test purposes with just one required field name.
-     *
-     * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType
+     * Will create if not exists a simple content type for test purposes with just one required field.
      */
-    protected function createTestContentType()
-    {
+    protected function createTestContentType(
+        string $identifier = 'name',
+        string $fieldTypeIdentifier = 'ezstring',
+        string $contentTypeIdentifier = 'test-type'
+    ): ContentType {
         $repository = $this->getRepository();
         $contentTypeService = $repository->getContentTypeService();
-        $contentTypeIdentifier = 'test-type';
         try {
             return $contentTypeService->loadContentTypeByIdentifier($contentTypeIdentifier);
         } catch (NotFoundException $e) {
             // continue creation process
         }
 
-        $nameField = $contentTypeService->newFieldDefinitionCreateStruct('name', 'ezstring');
+        $nameField = $contentTypeService->newFieldDefinitionCreateStruct($identifier, $fieldTypeIdentifier);
         $nameField->fieldGroup = 'main';
         $nameField->position = 1;
         $nameField->isTranslatable = true;
@@ -1156,30 +1204,55 @@ protected function createTestContentType()
      * Will create and publish an content with a filed with a given content name in location provided into
      * $parentLocationIdList.
      *
-     * @param string $contentName
-     * @param array $parentLocationIdList
+     * @param int[] $parentLocationIdList
+     */
+    protected function createContentWithName(string $contentName, array $parentLocationIdList = []): Content
+    {
+        $testableContentType = $this->createTestContentType();
+
+        return $this->createContent($testableContentType, $contentName, 'name', $parentLocationIdList);
+    }
+
+    /**
+     * Will create and publish an content with an email filed with a given content name in location provided into
+     * $parentLocationIdList.
      *
-     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Content
+     * @param string $address
+     * @param int[] $parentLocationIdList
+     *
+     * @throws \eZ\Publish\API\Repository\Exceptions\BadStateException
+     * @throws \eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException
+     * @throws \eZ\Publish\API\Repository\Exceptions\ContentValidationException
+     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
+     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
      */
-    protected function createContentWithName($contentName, array $parentLocationIdList = [])
+    protected function createContentEmailWithAddress(string $address, array $parentLocationIdList = []): Content
     {
+        $testableContentType = $this->createTestContentType('email', 'ezemail', 'test-email-type');
+
+        return $this->createContent($testableContentType, $address, 'email', $parentLocationIdList);
+    }
+
+    protected function createContent(
+        ContentType $testableContentType,
+        string $contentName,
+        string $fieldDefIdentifier,
+        array $parentLocationIdList
+    ): Content {
         $contentService = $this->getRepository()->getContentService();
         $locationService = $this->getRepository()->getLocationService();
 
-        $testableContentType = $this->createTestContentType();
-
         $rootContentStruct = $contentService->newContentCreateStruct($testableContentType, 'eng-GB');
-        $rootContentStruct->setField('name', $contentName);
+        $rootContentStruct->setField($fieldDefIdentifier, $contentName);
 
         $parentLocationList = [];
         foreach ($parentLocationIdList as $locationID) {
             $parentLocationList[] = $locationService->newLocationCreateStruct($locationID);
         }
 
         $contentDraft = $contentService->createContent($rootContentStruct, $parentLocationList);
-        $publishedContent = $contentService->publishVersion($contentDraft->getVersionInfo());
 
-        return $publishedContent;
+        return $contentService->publishVersion($contentDraft->getVersionInfo());
     }
 
     /**