Merge pull request #35 from AlexeyKosov/v6-compatibility

makasim · web-flow · commit b82867c739aa · 2021-10-04T13:53:13.000+03:00
V6 compatibility
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -38,7 +38,6 @@ public function getConfigTreeBuilder()
                                     ->booleanNode('remove')->defaultTrue()->end()
                                     ->scalarNode('connection')->defaultValue('default')->cannotBeEmpty()->end()
                                     ->scalarNode('index_name')->isRequired()->cannotBeEmpty()->end()
-                                    ->scalarNode('type_name')->isRequired()->cannotBeEmpty()->end()
                                     ->scalarNode('model_class')->isRequired()->cannotBeEmpty()->end()
                                     ->scalarNode('model_id')->defaultValue('id')->cannotBeEmpty()->end()
                                     ->scalarNode('repository_method')->defaultValue('find')->cannotBeEmpty()->end()
diff --git a/DependencyInjection/EnqueueElasticaExtension.php b/DependencyInjection/EnqueueElasticaExtension.php
@@ -45,7 +45,7 @@ public function load(array $configs, ContainerBuilder $container)
             ->addTag('kernel.event_subscriber')
         ;
 
-        $container->register('enqueue_elastica.queue_pager_perister', QueuePagerPersister::class)
+        $container->register('enqueue_elastica.queue_pager_persister', QueuePagerPersister::class)
             ->addArgument(new Reference('enqueue_elastica.context'))
             ->addArgument(new Reference('fos_elastica.persister_registry'))
             ->addArgument(new Reference('event_dispatcher'))
@@ -67,9 +67,8 @@ public function load(array $configs, ContainerBuilder $container)
 
             foreach ($config['doctrine']['queue_listeners'] as $listenerConfig) {
                 $listenerId = sprintf(
-                    'enqueue_elastica.doctrine_queue_listener.%s.%s',
-                    $listenerConfig['index_name'],
-                    $listenerConfig['type_name']
+                    'enqueue_elastica.doctrine_queue_listener.%s',
+                    $listenerConfig['index_name']
                 );
 
                 $container->register($listenerId, SyncIndexWithObjectChangeListener::class)
diff --git a/Doctrine/Queue/SyncIndexWithObjectChangeProcessor.php b/Doctrine/Queue/SyncIndexWithObjectChangeProcessor.php
@@ -10,7 +10,7 @@
 use Interop\Queue\Context;
 use Interop\Queue\Message;
 use Interop\Queue\Processor;
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 
 final class SyncIndexWithObjectChangeProcessor implements Processor, CommandSubscriberInterface, QueueSubscriberInterface
 {
@@ -49,9 +49,6 @@ public function process(Message $message, Context $context): Result
         if (false == isset($data['index_name'])) {
             return Result::reject('The message data misses index_name');
         }
-        if (false == isset($data['type_name'])) {
-            return Result::reject('The message data misses type_name');
-        }
         if (false == isset($data['repository_method'])) {
             return Result::reject('The message data misses repository_method');
         }
@@ -60,11 +57,10 @@ public function process(Message $message, Context $context): Result
         $modelClass = $data['model_class'];
         $id = $data['id'];
         $index = $data['index_name'];
-        $type = $data['type_name'];
         $repositoryMethod = $data['repository_method'];
 
         $repository = $this->doctrine->getManagerForClass($modelClass)->getRepository($modelClass);
-        $persister = $this->persisterRegistry->getPersister($index, $type);
+        $persister = $this->persisterRegistry->getPersister($index);
 
         switch ($action) {
             case self::UPDATE_ACTION:
@@ -75,7 +71,7 @@ public function process(Message $message, Context $context): Result
                 }
 
                 if ($persister->handlesObject($object)) {
-                    if ($this->indexable->isObjectIndexable($index, $type, $object)) {
+                    if ($this->indexable->isObjectIndexable($index, $object)) {
                         $persister->replaceOne($object);
                     } else {
                         $persister->deleteOne($object);
@@ -90,7 +86,7 @@ public function process(Message $message, Context $context): Result
                     return Result::ack(sprintf('The object "%s" with id "%s" could not be found.', $modelClass, $id));
                 }
 
-                if ($persister->handlesObject($object) && $this->indexable->isObjectIndexable($index, $type, $object)) {
+                if ($persister->handlesObject($object) && $this->indexable->isObjectIndexable($index, $object)) {
                     $persister->insertOne($object);
                 }
 
diff --git a/Doctrine/SyncIndexWithObjectChangeListener.php b/Doctrine/SyncIndexWithObjectChangeListener.php
@@ -1,7 +1,7 @@
 <?php
 namespace Enqueue\ElasticaBundle\Doctrine;
 
-use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
+use Doctrine\Persistence\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\PostFlushEventArgs;
 use Enqueue\ElasticaBundle\Doctrine\Queue\Commands;
 use Enqueue\ElasticaBundle\Doctrine\Queue\SyncIndexWithObjectChangeProcessor as SyncProcessor;
@@ -100,7 +100,6 @@ private function sendUpdateIndexMessage($action, $id)
             'model_id' => $this->config['model_id'],
             'id' => $id,
             'index_name' => $this->config['index_name'],
-            'type_name' => $this->config['type_name'],
             'repository_method' => $this->config['repository_method'],
         ]));
 
diff --git a/Persister/Listener/PurgePopulateQueueListener.php b/Persister/Listener/PurgePopulateQueueListener.php
@@ -3,7 +3,6 @@
 
 use FOS\ElasticaBundle\Persister\Event\PrePersistEvent;
 use Interop\Queue\Context;
-use FOS\ElasticaBundle\Persister\Event\Events;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class PurgePopulateQueueListener implements EventSubscriberInterface
@@ -44,7 +43,7 @@ public function purgePopulateQueue(PrePersistEvent $event)
     public static function getSubscribedEvents()
     {
         return [
-            Events::PRE_PERSIST => 'purgePopulateQueue',
+            PrePersistEvent::class => 'purgePopulateQueue',
         ];
     }
 }
diff --git a/Persister/QueuePagerPersister.php b/Persister/QueuePagerPersister.php
@@ -3,7 +3,6 @@
 
 use Enqueue\ElasticaBundle\Queue\Commands;
 use Enqueue\Util\JSON;
-use FOS\ElasticaBundle\Persister\Event\Events;
 use FOS\ElasticaBundle\Persister\Event\PostAsyncInsertObjectsEvent;
 use FOS\ElasticaBundle\Persister\Event\PostPersistEvent;
 use FOS\ElasticaBundle\Persister\Event\PrePersistEvent;
@@ -55,10 +54,10 @@ public function insert(PagerInterface $pager, array $options = array())
 
         $pager->setCurrentPage($options['first_page']);
 
-        $objectPersister = $this->registry->getPersister($options['indexName'], $options['typeName']);
+        $objectPersister = $this->registry->getPersister($options['indexName']);
 
         $event = new PrePersistEvent($pager, $objectPersister, $options);
-        $this->dispatcher->dispatch($event, Events::PRE_PERSIST);
+        $this->dispatcher->dispatch($event);
         $pager = $event->getPager();
         $options = $event->getOptions();
 
@@ -122,7 +121,7 @@ public function insert(PagerInterface $pager, array $options = array())
                     $errorMessage,
                     $data['options']
                 );
-                $this->dispatcher->dispatch($event, Events::POST_ASYNC_INSERT_OBJECTS);
+                $this->dispatcher->dispatch($event);
             }
 
             if (microtime(true) > $limitTime) {
@@ -131,6 +130,6 @@ public function insert(PagerInterface $pager, array $options = array())
         }
 
         $event = new PostPersistEvent($pager, $objectPersister, $options);
-        $this->dispatcher->dispatch($event, Events::POST_PERSIST);
+        $this->dispatcher->dispatch($event);
     }
 }
diff --git a/Queue/PopulateProcessor.php b/Queue/PopulateProcessor.php
@@ -48,15 +48,12 @@ public function process(Message $message, Context $context): Result
             if (!isset($data['options']['indexName'])) {
                 return Result::reply($this->createReplyMessage($context, $message, 0,'The message is invalid. Missing indexName option.'));
             }
-            if (!isset($data['options']['typeName'])) {
-                return Result::reply($this->createReplyMessage($context, $message, 0,'The message is invalid. Missing typeName option.'));
-            }
 
             $options = $data['options'];
             $options['first_page'] = $data['page'];
             $options['last_page'] = $data['page'];
 
-            $provider = $this->pagerProviderRegistry->getProvider($options['indexName'], $options['typeName']);
+            $provider = $this->pagerProviderRegistry->getProvider($options['indexName']);
             $pager = $provider->provide($options);
             $pager->setMaxPerPage($options['max_per_page']);
             $pager->setCurrentPage($options['first_page']);
diff --git a/composer.json b/composer.json
@@ -7,9 +7,12 @@
     "require": {
         "php": "^7.1",
         "symfony/framework-bundle": "^4.0|^5.0",
-        "friendsofsymfony/elastica-bundle": "^5.0|^6.0",
+        "friendsofsymfony/elastica-bundle": "^6.0",
         "enqueue/enqueue-bundle": "^0.10"
     },
+    "require-dev": {
+        "doctrine/orm": "^2.0"
+    },
     "autoload": {
         "psr-4": { "Enqueue\\ElasticaBundle\\": "" }
     },

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`use FOS\ElasticaBundle\Persister\Event\PrePersistEvent;`
`5`	`5`	`use Interop\Queue\Context;`
`6`		`-use FOS\ElasticaBundle\Persister\Event\Events;`
`7`	`6`	`use Symfony\Component\EventDispatcher\EventSubscriberInterface;`
`8`	`7`
`9`	`8`	`class PurgePopulateQueueListener implements EventSubscriberInterface`
`@@ -44,7 +43,7 @@ public function purgePopulateQueue(PrePersistEvent $event)`
`44`	`43`	`public static function getSubscribedEvents()`
`45`	`44`	`{`
`46`	`45`	`return [`
`47`		`- Events::PRE_PERSIST => 'purgePopulateQueue',`
	`46`	`+ PrePersistEvent::class => 'purgePopulateQueue',`
`48`	`47`	`];`
`49`	`48`	`}`
`50`	`49`	`}`