Fix regression in symfony 2 compatibility (#10)

Author: alexander-schranz

.travis.yml

@@ -6,7 +6,7 @@ matrix:
     - language: php
       php: 5.6
       env:
-        - SYMFONY=^3.4
+        - SYMFONY=^2.8
         - ES_VERSION=^5.0
         - ES_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.14.zip"
         - ENABLE_SWAP=true

DependencyInjection/Compiler/ManagerPass.php

@@ -17,11 +17,27 @@ public function process(ContainerBuilder $container)
             $managers[$key] = $container->getDefinition($key);
         }
 
-        $container->getDefinition('es.command.cache_clear')->setArgument('$managers', $managers);
-        $container->getDefinition('es.command.document_generate')->setArgument('$managers', $managers);
-        $container->getDefinition('es.command.index_create')->setArgument('$managers', $managers);
-        $container->getDefinition('es.command.index_export')->setArgument('$managers', $managers);
-        $container->getDefinition('es.command.index_import')->setArgument('$managers', $managers);
-        $container->getDefinition('es.command.index_drop')->setArgument('$managers', $managers);
+        $this->addManagers($container, 'es.command.cache_clear', $managers);
+        $this->addManagers($container, 'es.command.document_generate', $managers);
+        $this->addManagers($container, 'es.command.index_create', $managers);
+        $this->addManagers($container, 'es.command.index_export', $managers);
+        $this->addManagers($container, 'es.command.index_import', $managers);
+        $this->addManagers($container, 'es.command.index_drop', $managers);
+    }
+
+    private function addManagers(ContainerBuilder $container, $definitionName, array $managers)
+    {
+        $definition = $container->getDefinition($definitionName);
+
+        if (method_exists($definition, 'setArgument')) {
+            $definition->setArgument('$managers', $managers);
+
+            return;
+        }
+
+        $arguments = $definition->getArguments();
+        $arguments[] = $managers;
+
+        $definition->setArguments($arguments);
     }
 }

Profiler/ElasticsearchProfiler.php

@@ -17,6 +17,8 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
 use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
+use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\VarDumper\Caster\CutStub;
 use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Cloner\Stub;
@@ -113,6 +115,18 @@ public function getQueries()
         return $this->cloneVar($this->data['queries']);
     }
 
+    /**
+     * Backward compatibility Layer can be removed when Symfony 2.8 is dropped.
+     */
+    protected function cloneVar($var)
+    {
+        if (class_exists(Kernel::class) && Kernel::VERSION_ID < 30000) {
+            return $var;
+        }
+
+        return parent::cloneVar($var);
+    }
+
     /**
      * @return array
      */

Resources/config/services.yml

@@ -85,7 +85,7 @@ services:
     es.command.cache_clear:
         class: 'ONGR\ElasticsearchBundle\Command\CacheClearCommand'
         tags:
-            - console.command
+            - { name: 'console.command', command: 'ongr:es:cache:clear' }
 
     es.command.document_generate:
         class: 'ONGR\ElasticsearchBundle\Command\DocumentGenerateCommand'
@@ -95,30 +95,30 @@ services:
             - '@es.metadata_collector'
             - '@es.annotations.cached_reader'
         tags:
-            - console.command
+            - { name: 'console.command', command: 'ongr:es:document:generate' }
 
     es.command.index_create:
         class: 'ONGR\ElasticsearchBundle\Command\IndexCreateCommand'
         arguments:
             - '@es.client.index_suffix_finder'
         tags:
-            - console.command
+            - { name: 'console.command', command: 'ongr:es:index:create' }
 
     es.command.index_export:
         class: 'ONGR\ElasticsearchBundle\Command\IndexExportCommand'
         arguments:
             - '@es.export'
         tags:
-            - console.command
+            - { name: 'console.command', command: 'ongr:es:index:export' }
 
     es.command.index_import:
         class: 'ONGR\ElasticsearchBundle\Command\IndexImportCommand'
         arguments:
             - '@es.import'
         tags:
-            - console.command
+            - { name: 'console.command', command: 'ongr:es:index:import' }
 
     es.command.index_drop:
         class: 'ONGR\ElasticsearchBundle\Command\IndexDropCommand'
         tags:
-            - console.command
+            - { name: 'console.command', command: 'ongr:es:index:drop' }

Tests/Functional/Profiler/ElasticsearchProfilerTest.php

@@ -18,6 +18,7 @@
 use ONGR\ElasticsearchBundle\Test\AbstractElasticsearchTestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\VarDumper\Cloner\Data;
 
 class ElasticsearchProfilerTest extends AbstractElasticsearchTestCase
@@ -85,7 +86,9 @@ public function testGetQueries()
 
         // guard
         $queries = $this->getCollector()->getQueries();
-        $this->assertInstanceOf(Data::class, $queries);
+        if (Kernel::VERSION_ID >= 30000) {
+            $this->assertInstanceOf(Data::class, $queries);
+        }
         $this->assertCount(1, $queries);
 
         $queries = $this->readAttribute($this->getCollector(), 'data')['queries'];
@@ -120,7 +123,9 @@ public function testGetTermQuery()
 
         // guard
         $queries = $this->getCollector()->getQueries();
-        $this->assertInstanceOf(Data::class, $queries);
+        if (Kernel::VERSION_ID >= 30000) {
+            $this->assertInstanceOf(Data::class, $queries);
+        }
         $this->assertCount(1, $queries);
 
         $queries = $this->readAttribute($this->getCollector(), 'data')['queries'];
@@ -185,7 +190,9 @@ public function testMatchAllQuery()
 
         // guard
         $queries = $this->getCollector()->getQueries();
-        $this->assertInstanceOf(Data::class, $queries);
+        if (Kernel::VERSION_ID >= 30000) {
+            $this->assertInstanceOf(Data::class, $queries);
+        }
         $this->assertCount(1, $queries);
 
         $queries = $this->readAttribute($this->getCollector(), 'data')['queries'];

composer.json

@@ -29,20 +29,19 @@
         "handcraftedinthealps/elasticsearch-dsl": "^5.0.7.1|^6.2.0.1|^7.2.0.1"
     },
     "require-dev": {
-        "elasticsearch/elasticsearch": "~5.0|~6.0|~7.0",
         "mikey179/vfsstream": "~1.4",
         "squizlabs/php_codesniffer": "~2.0",
         "satooshi/php-coveralls": "~1.0 || ~2.0",
-        "symfony/browser-kit" : "^3.4|^4|^5",
-        "symfony/expression-language" : "^3.4|^4|^5",
-        "symfony/twig-bundle": "^3.4|^4|^5",
-        "symfony/serializer": "^3.4|^4|^5",
-        "symfony/yaml": "^3.4|^4|^5",
+        "symfony/browser-kit" : "^2.8|^3.4|^4|^5",
+        "symfony/expression-language" : "^2.8|^3.4|^4|^5",
+        "symfony/twig-bundle": "^2.8|^3.4|^4|^5",
+        "symfony/serializer": "^2.8|^3.4|^4|^5",
+        "symfony/yaml": "^2.8|^3.4|^4|^5",
         "symfony/phpunit-bridge": "^5.1",
-        "symfony/dependency-injection": "^3.4|^4|^5",
-        "symfony/validator": "^3.4|^4|^5",
-        "symfony/options-resolver": "^3.4|^4|^5",
-        "symfony/var-dumper": "^3.4|^4|^5"
+        "symfony/dependency-injection": "^2.8|^3.4|^4|^5",
+        "symfony/validator": "^2.8|^3.4|^4|^5",
+        "symfony/options-resolver": "^2.8|^3.4|^4|^5",
+        "symfony/var-dumper": "^2.8|^3.4|^4|^5"
     },
     "autoload": {
         "psr-4": { "ONGR\\ElasticsearchBundle\\": "" },