ElasticSearch compatibility (#26)

* Remove useless code
* Use registered bundles to detect ElasticSearch

Jenkinsfile

@@ -7,19 +7,17 @@ def launchIntegrationTests = "yes"
 
 class Globals {
     static pimVersion = "1.6"
-    static extensionBranch = "dev-master"
+    static extensionBranch = "1.0.x-dev@dev"
 }
 
 stage("Checkout") {
     milestone 1
     if (env.BRANCH_NAME =~ /^PR-/) {
         userInput = input(message: 'Launch tests?', parameters: [
-            choice(choices: '1.6\n1.7', description: 'PIM version to use', name: 'pimVersion'),
             choice(choices: 'yes\nno', description: 'Run unit tests', name: 'launchUnitTests'),
             choice(choices: 'yes\nno', description: 'Run integration tests', name: 'launchIntegrationTests'),
         ])
 
-        Globals.pimVersion = userInput['pimVersion']
         launchUnitTests = userInput['launchUnitTests']
         launchIntegrationTests = userInput['launchIntegrationTests']
     }
@@ -49,7 +47,6 @@ if (launchUnitTests.equals("yes")) {
         def tasks = [:]
 
         tasks["phpspec-5.6"] = {runPhpSpecTest("5.6")}
-        tasks["phpspec-7.1"] = {runPhpSpecTest("7.1")}
         tasks["php-cs-fixer-5.6"] = {runPhpCsFixerTest("5.6")}
 
         parallel tasks

composer.json

@@ -34,7 +34,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1.x-dev"
+            "dev-master": "1.1.x-dev",
+            "dev-1.0": "1.0.x-dev"
         }
     }
 }

src/DependencyInjection/PimExtendedAttributeTypeExtension.php

@@ -2,6 +2,7 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle\DependencyInjection;
 
+use Pim\Bundle\ElasticSearchBundle\Query\ProductQueryUtility;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -28,7 +29,6 @@ public function load(array $config, ContainerBuilder $container)
         $loader->load('comparators.yml');
         $loader->load('completeness.yml');
         $loader->load('form_types.yml');
-        $loader->load('normalizers.yml');
         $loader->load('denormalizers.yml');
         $loader->load('providers.yml');
         $loader->load('query_builders.yml');
@@ -38,14 +38,13 @@ public function load(array $config, ContainerBuilder $container)
         $loader->load('datagrid/attribute_types.yml');
         $loader->load('datagrid/filters.yml');
         $loader->load('datagrid/formatters.yml');
-        $loader->load('datagrid/selectors.yml');
 
         $this->loadAttributeIcons($loader, $container);
 
-        // Enterprise Edition
-        $loader->load('enterprise/denormalizers.yml');
-        $loader->load('enterprise/presenters.yml');
-        $loader->load('enterprise/publishers.yml');
+        $registeredBundles = $container->getParameter('kernel.bundles');
+        if (array_key_exists('PimElasticSearchBundle', $registeredBundles)) {
+            $loader->load('storage_driver/doctrine/elasticsearch.yml');
+        }
     }
 
     /**

src/PimExtendedAttributeTypeBundle.php

@@ -2,6 +2,8 @@
 
 namespace Pim\Bundle\ExtendedAttributeTypeBundle;
 
+use Pim\Bundle\ElasticSearchBundle\Query\ProductQueryUtility;
+use Pim\Bundle\ExtendedAttributeTypeBundle\AttributeType\ExtendedAttributeTypes;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
@@ -11,4 +13,13 @@
  */
 class PimExtendedAttributeTypeBundle extends Bundle
 {
+    public function boot()
+    {
+        parent::boot();
+
+        $registeredBundles = $this->container->getParameter('kernel.bundles');
+        if (array_key_exists('PimElasticSearchBundle', $registeredBundles)) {
+            ProductQueryUtility::addTypeSuffix(ExtendedAttributeTypes::TEXT_COLLECTION, ProductQueryUtility::SUFFIX_TEXT);
+        }
+    }
 }

src/Resources/config/storage_driver/doctrine/elasticsearch.yml

@@ -0,0 +1,9 @@
+services:
+    pim_elastic_search.query.filter.text_collection:
+        class: %pim_elastic_search.query.filter.string.class%
+        arguments:
+            - @pim_catalog.validator.helper.attribute
+            - ['pim_catalog_text_collection']
+            - ['CONTAINS', 'DOES NOT CONTAIN', 'EMPTY', 'NOT EMPTY']
+        tags:
+            - { name: 'pim_elastic_search.query.filter', priority: 30 }

src/Resources/config/storage_driver/doctrine/mongodb-odm.yml

@@ -1,16 +0,0 @@
-parameters:
-#    pim_extended_attribute_type.doctrine.query.filter.range.class: Pim\Bundle\ExtendedAttributeTypeBundle\Doctrine\MongoDBODM\Filter\RangeFilter
-
-services:
-#    pim_extended_attribute_type.mongodb.normalizer.normalized_data.range:
-#        class: Pim\Bundle\ExtendedAttributeTypeBundle\MongoDB\Normalizer\NormalizedData\RangeNormalizer
-#        public: false
-#        tags:
-#            - { name: pim_serializer.normalizer }
-#
-#    pim_catalog.mongodb.normalizer.document.range:
-#        class: Pim\Bundle\ExtendedAttributeTypeBundle\MongoDB\Normalizer\Document\RangeNormalizer
-#        arguments:
-#            - '@pim_catalog.mongodb.mongo_objects_factory'
-#        tags:
-#            - { name: pim_serializer.normalizer, priority: 100 }

src/Resources/config/validators.yml

@@ -1,5 +1,3 @@
-parameters:
-
 services:
     pim_extended_attribute_type.validator.constraint_guesser.text_collection:
         public: false