[SearchBundle][NodeSearchBundle] Elastica/Elasticsearch <7 deprecations

Kunstmaan · Jun 25, 2020 · 3925ce9 · 3925ce9
1 parent ddbc8c3
commit 3925ce9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 1 deletion.
diff --git a/src/Kunstmaan/NodeSearchBundle/DependencyInjection/KunstmaanNodeSearchExtension.php b/src/Kunstmaan/NodeSearchBundle/DependencyInjection/KunstmaanNodeSearchExtension.php
@@ -45,6 +45,11 @@ public function load(array $configs, ContainerBuilder $container)
             ->addMethodCall('setDefaultProperties', [$config['mapping']]);
 
         $container->setParameter('kunstmaan_node_search.contexts', $config['contexts']);
+
+        if (class_exists(\Elastica\Type\Mapping::class)) {
+            $nodeSearch = $container->getDefinition('kunstmaan_node_search.search.node');
+            $nodeSearch->addMethodCall('setIndexType', ['%kunstmaan_node_search.indextype%']);
+        }
     }
 
     /**

diff --git a/src/Kunstmaan/NodeSearchBundle/Resources/config/services.yml b/src/Kunstmaan/NodeSearchBundle/Resources/config/services.yml
@@ -23,7 +23,6 @@ services:
         parent: kunstmaan_node_search.search.abstract_elastica_searcher
         calls:
             - [ setIndexName, ['%kunstmaan_node_search.indexname%']]
-            - [ setIndexType, ['%kunstmaan_node_search.indextype%']]
             - [ setTokenStorage, ['@security.token_storage']]
             - [ setDomainConfiguration, ['@kunstmaan_admin.domain_configuration']]
             - [ setEntityManager, ['@doctrine.orm.entity_manager']]

diff --git a/src/Kunstmaan/NodeSearchBundle/Search/AbstractElasticaSearcher.php b/src/Kunstmaan/NodeSearchBundle/Search/AbstractElasticaSearcher.php
@@ -146,22 +146,30 @@ public function getIndexName()
     }
 
     /**
+     * @deprecated upgrade to ruflin/elastica and elasticsearch v7 and don't set an index type
+     *
      * @param string $indexType
      *
      * @return SearcherInterface
      */
     public function setIndexType($indexType)
     {
+        @trigger_error(sprintf('The "setIndexType" method in "%s" is deprecated since KunstmaanSearchBundle 5.6 and will be removed in KunstmaanSearchBundle 6.0. Upgrade to ruflin/elastica and elasticsearch v7 and don\'t set an index type.', __CLASS__), E_USER_DEPRECATED);
+
         $this->indexType = $indexType;
 
         return $this;
     }
 
     /**
+     * @deprecated upgrade to ruflin/elastica and elasticsearch v7 and don't set an index type
+     *
      * @return string
      */
     public function getIndexType()
     {
+        @trigger_error(sprintf('The "getIndexType" method in "%s" is deprecated since KunstmaanSearchBundle 5.6 and will be removed in KunstmaanSearchBundle 6.0. Upgrade to ruflin/elastica and elasticsearch v7 and don\'t set an index type.', __CLASS__), E_USER_DEPRECATED);
+
         return $this->indexType;
     }
 

diff --git a/src/Kunstmaan/NodeSearchBundle/Search/SearcherInterface.php b/src/Kunstmaan/NodeSearchBundle/Search/SearcherInterface.php
@@ -83,13 +83,17 @@ public function setIndexName($name);
     public function getIndexName();
 
     /**
+     * @deprecated upgrade to ruflin/elastica and elasticsearch v7 and don't set an index type
+     *
      * @param string $indexType
      *
      * @return SearcherInterface
      */
     public function setIndexType($indexType);
 
     /**
+     * @deprecated upgrade to ruflin/elastica and elasticsearch v7 and don't set an index type
+     *
      * @return string
      */
     public function getIndexType();

diff --git a/src/Kunstmaan/SearchBundle/Provider/ElasticaProvider.php b/src/Kunstmaan/SearchBundle/Provider/ElasticaProvider.php
@@ -24,6 +24,11 @@ public function getClient()
                 array('connections' => $this->nodes,
                 )
             );
+
+            //NEXT_MAJOR: remove checks and update ruflin/elastica dependency constraints
+            if (!class_exists(\Elastica\Mapping::class)) {
+                @trigger_error('Using a version of ruflin/elastica below v7.0 is deprecated since KunstmaanSearchBundle 5.6 and support for older versions will be removed in KunstmaanSearchBundle 6.0. Upgrade to ruflin/elastica and elasticsearch v7 instead.', E_USER_DEPRECATED);
+            }
         }
 
         return $this->client;