Merge remote-tracking branch 'vahidov/master'

# Conflicts:
#	composer.json

.travis.yml

@@ -11,7 +11,6 @@ php:
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
 
 env:
   matrix:
@@ -35,7 +34,6 @@ matrix:
     - php: 5.5
       env: NETTE=nette-2.4
   allow_failures:
-    - php: hhvm
     - php: 7.0
       env: NETTE=nette-2.4 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
 

composer.json

@@ -17,36 +17,14 @@
 		"issues": "https://github.com/Kdyby/ElasticSearch/issues"
 	},
 	"require": {
-		"nette/di": "~2.4",
-		"tracy/tracy": "~2.4",
-		"nette/utils": "~2.4",
-
-		"ruflin/elastica": "~5.1"
+		"nette/di": "^2.4",
+		"tracy/tracy": "^2.4",
+		"nette/utils": "^2.4",
+		"ruflin/elastica": "~6.0"
 	},
 	"require-dev": {
-		"nette/application": "~2.4",
-		"nette/bootstrap": "~2.4",
-		"nette/caching": "~2.4",
-		"nette/component-model": "~2.2",
-		"nette/database": "~2.4",
-		"nette/deprecated": "~2.4",
-		"nette/di": "~2.4",
-		"nette/finder": "~2.4",
-		"nette/forms": "~2.4",
-		"nette/http": "~2.4",
-		"nette/mail": "~2.4",
-		"nette/neon": "~2.4",
-		"nette/php-generator": "~2.4",
-		"nette/reflection": "~2.4",
-		"nette/robot-loader": "~2.4",
-		"nette/safe-stream": "~2.3",
-		"nette/security": "~2.4",
-		"nette/tokenizer": "~2.2",
-		"latte/latte": "~2.4",
-		"tracy/tracy": "~2.4",
-		"nette/utils": "~2.4",
-
-		"nette/tester": "~1.7"
+		"nette/nette": "^2.4",
+		"nette/tester": "~2.0"
 	},
 	"autoload": {
 		"psr-0": {

src/Kdyby/ElasticSearch/Client.php

@@ -34,15 +34,16 @@ class Client extends Elastica\Client
 	 * @param string $method
 	 * @param array $data
 	 * @param array $query
+     * @param string $contentType
 	 * @throws \Exception
 	 * @return Elastica\Response
 	 */
-	public function request($path, $method = Request::GET, $data = [], array $query = [])
+	public function request($path, $method = Request::GET, $data = [], array $query = [], $contentType = Request::DEFAULT_CONTENT_TYPE)
 	{
 		$begin = microtime(TRUE);
 
 		try {
-			$response = parent::request($path, $method, $data, $query);
+			$response = parent::request($path, $method, $data, $query, $contentType);
 			$this->onSuccess($this, $this->_lastRequest, $response, microtime(TRUE) - $begin);
 
 			return $response;

src/Kdyby/ElasticSearch/Diagnostics/Panel.php

@@ -25,8 +25,9 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class Panel extends Nette\Object implements IBarPanel
+class Panel implements IBarPanel
 {
+    use Nette\SmartObject;
 
 	/**
 	 * @var float