Upgrades (#821)

* upgrade elastic to 5.6.3, remove hhvm testing, add sf 3.3 adn 3.4

* Add compatibility with Symfony 3.4 for DataCollectorInterface

Author: saimaz

.travis.yml

@@ -4,19 +4,17 @@ php:
   - 5.6
   - 7.0
   - 7.1
-  - hhvm
 env:
   global:
     - JAVA_HOME="/usr/lib/jvm/java-8-oracle/jre"
-    - ES_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.1.2.zip"
+    - ES_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.3.zip"
   matrix:
     - SYMFONY="~2.8"
     - SYMFONY="~3.0"
     - SYMFONY="~3.1"
     - SYMFONY="~3.2"
-matrix:
-  allow_failures:
-    - php: hhvm
+    - SYMFONY="~3.3"
+    - SYMFONY="~3.4"
 addons:
   apt:
     packages:

Profiler/ElasticsearchProfiler.php

@@ -75,6 +75,16 @@ public function collect(Request $request, Response $response, \Exception $except
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->queries = [];
+        $this->count = 0;
+        $this->time = 0;
+    }
+
     /**
      * Returns total time queries took.
      *

Service/Manager.php

@@ -523,7 +523,9 @@ public function dropIndex()
     public function dropAndCreateIndex($noMapping = false)
     {
         try {
-            $this->dropIndex();
+            if ($this->indexExists()) {
+                $this->dropIndex();
+            }
         } catch (\Exception $e) {
             // Do nothing, our target is to create new index.
         }

Tests/Functional/Service/RepositoryTest.php

@@ -479,7 +479,14 @@ public function testCountApiRawResponse()
             'failed' => 0,
         ];
 
-        $this->assertEquals($shards, $count['_shards']);
+        $this->assertEquals($shards['total'], $count['_shards']['total']);
+        $this->assertEquals($shards['successful'], $count['_shards']['successful']);
+        $this->assertEquals($shards['failed'], $count['_shards']['failed']);
+
+        #TODO remove if statement after bundle drops sf 3.0 support
+        if (isset($count['_shards']['skipped'])) {
+            $this->assertEquals(0, $count['_shards']['skipped']);
+        }
     }
 
     /**