Merge branch 'release/0.0.17'

Working on DI 0.0.16

config/packages/doctrine.yaml

@@ -0,0 +1,5 @@
+doctrine:
+    orm:
+        dql:
+            string_functions:
+                match: DoctrineExtensions\Query\Mysql\MatchAgainst

config/services.yaml

@@ -3,6 +3,11 @@ services:
         autowire: true
         autoconfigure: true
 
+    pcm_search.command.index:
+        class: Pcm\SearchBundle\Command\SearchIndexCommand
+        tags:
+            - { name: 'console.command', command: 'pcm:search:reindex' }
+
     pcm_search.searchable_subscriber:
         class: Pcm\SearchBundle\EventSubscriber\SearchableSubscriber
         public: true
@@ -14,3 +19,7 @@ services:
         public: true
 
     Pcm\SearchBundle\Service\SearchService: ~
+
+    Pcm\SearchBundle\Repository\SearchIndexRepository:
+        autowire: true
+        tags: ['doctrine.repository_service']

src/DependencyInjection/PcmSearchExtension.php

@@ -18,5 +18,6 @@ class PcmSearchExtension extends Extension
             new FileLocator(__DIR__.'/../../config')
         );
         $loader->load('services.yaml');
+        $loader->load('packages/doctrine.yaml');
     }
 }

src/Repository/SearchIndexRepository.php

@@ -0,0 +1,124 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pcm\SearchBundle\Repository;
+
+use Pcm\SearchBundle\Entity\SearchIndex;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\ORM\Query;
+use Doctrine\Persistence\ManagerRegistry;
+
+class SearchIndexRepository extends ServiceEntityRepository
+{
+    /**
+     * @param ManagerRegistry $registry
+     */
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, SearchIndex::class);
+    }
+
+    /**
+     * Saves a SearchIndex entity
+     *
+     * @param SearchIndex $entity
+     * @param boolean $flush
+     * @return void
+     */
+    public function add(SearchIndex $entity, bool $flush = false): void
+    {
+        $this->getEntityManager()->persist($entity);
+
+        if ($flush) {
+            $this->getEntityManager()->flush();
+        }
+    }
+
+    /**
+     * Removes a SearchIndex entity
+     *
+     * @param SearchIndex $entity
+     * @param boolean $flush
+     * @return void
+     */
+    public function remove(SearchIndex $entity, bool $flush = false): void
+    {
+        $this->getEntityManager()->remove($entity);
+
+        if ($flush) {
+            $this->getEntityManager()->flush();
+        }
+    }
+
+    /**
+     * Returns a Query object ready to be paginated or used to present results.
+     *
+     * @param string $query
+     * @param integer $minScore
+     * @return Query
+     */
+    public function findAllPagination(string $query, int $minScore = 0): Query
+    {
+        $qb = $this->createQueryBuilder('r')
+            ->addSelect('MATCH(r.data) AGAINST(:searchText boolean) AS score')
+            ->where(
+                sprintf(
+                    'MATCH(r.data) AGAINST(:searchText boolean) > %f',
+                    $minScore
+                )
+            )->orderBy('score', 'DESC')
+            ->setParameter(
+                'searchText',
+                $this->convertSearchTerm($query)
+            );
+        return $qb->getQuery();
+    }
+
+    /**
+     * Takes a string $query and explodes into individual words. Each word
+     * is then prefixed with + and ends with *, making the full text search
+     * operate as wildcard on all words
+     *
+     * @param string $query
+     * @return string
+     */
+    private function convertSearchTerm(string $query): string
+    {
+        $extractedWords = [];
+        $sanitisedString = preg_replace('/[^\w^\d]/', ' ', $query);
+        $words = mb_split('\s', preg_replace(['/([^\w+])/','/(\s+)/'], ' ', $sanitisedString));
+
+        foreach ($words as $word) {
+            if (strlen($word)< 1) {
+                //
+                continue;
+            }
+            $word = strtoupper($word);
+            $extractedWords[$word] = $word;
+        }
+
+        array_walk(
+            $extractedWords,
+            function(&$word) {
+                // require every word but allow matching just the start
+                $word = '+' . $word . '*';
+            }
+        );
+
+        return implode(' ', $extractedWords);
+    }
+
+    /**
+     * Clears the index table of all results
+     * @return void
+     */
+    public function clearIndex(): void
+    {
+        $this
+            ->createQueryBuilder('s')
+            ->delete()
+            ->getQuery()
+            ->execute();
+    }
+}