Fixed conflict with master

Author: ezimuel

src/Elasticsearch/ClientBuilder.php

@@ -56,6 +56,9 @@ class ClientBuilder
      */
     private $connectionFactory;
 
+    /**
+     * @var callable
+     */
     private $handler;
 
     /**

src/Elasticsearch/Common/Exceptions/AlreadyExpiredException.php

@@ -27,6 +27,9 @@ class JsonErrorException extends \Exception implements ElasticsearchException
      */
     private $result;
 
+    /**
+     * @var string[]
+     */
     private static $messages = array(
         JSON_ERROR_DEPTH => 'The maximum stack depth has been exceeded',
         JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON',

src/Elasticsearch/Common/Exceptions/Serializer/JsonErrorException.php

@@ -5,7 +5,6 @@
 namespace Elasticsearch\Connections;
 
 use Elasticsearch\Client;
-use Elasticsearch\Common\Exceptions\AlreadyExpiredException;
 use Elasticsearch\Common\Exceptions\BadRequest400Exception;
 use Elasticsearch\Common\Exceptions\Conflict409Exception;
 use Elasticsearch\Common\Exceptions\Curl\CouldNotConnectToHost;
@@ -110,6 +109,9 @@ class Connection implements ConnectionInterface
      */
     private $failedPings = 0;
 
+    /**
+     * @var mixed[]
+     */
     private $lastRequest = array();
 
     /**
@@ -611,9 +613,7 @@ private function process4xxError(array $request, array $response, array $ignore)
             $responseBody = json_encode($responseBody);
         }
 
-        if ($statusCode === 400 && strpos($responseBody, "AlreadyExpiredException") !== false) {
-            $exception = new AlreadyExpiredException($responseBody, $statusCode);
-        } elseif ($statusCode === 403) {
+        if ($statusCode === 403) {
             $exception = new Forbidden403Exception($responseBody, $statusCode);
         } elseif ($statusCode === 404) {
             $exception = new Missing404Exception($responseBody, $statusCode);

src/Elasticsearch/Connections/Connection.php

@@ -18,7 +18,25 @@
  */
 class Snapshots extends AbstractEndpoint
 {
+<<<<<<< HEAD
     protected $repository;
+=======
+    /**
+     * @var string
+     */
+    private $repository;
+
+    public function setRepository(?string $repository): Snapshots
+    {
+        if (isset($repository) !== true) {
+            return $this;
+        }
+
+        $this->repository = $repository;
+
+        return $this;
+    }
+>>>>>>> elasticsearch-php/master
 
     public function getURI(): string
     {

src/Elasticsearch/Endpoints/Cat/Snapshots.php

@@ -18,7 +18,20 @@
  */
 class Templates extends AbstractEndpoint
 {
+<<<<<<< HEAD
     protected $name;
+=======
+    /**
+     * @var string|null
+     */
+    private $name;
+
+    public function setName(?string $name): Templates
+    {
+        $this->name = $name;
+        return $this;
+    }
+>>>>>>> elasticsearch-php/master
 
     public function getURI(): string
     {

src/Elasticsearch/Endpoints/Cat/Templates.php

@@ -18,7 +18,22 @@
  */
 class ThreadPool extends AbstractEndpoint
 {
+<<<<<<< HEAD
     protected $thread_pool_patterns;
+=======
+    /**
+     * @var string
+     */
+    protected $threadPoolPatterns;
+
+    public function setThreadPoolPatterns(?string $threadPoolPatterns): ThreadPool
+    {
+        if ($threadPoolPatterns !== null) {
+            $this->threadPoolPatterns = $threadPoolPatterns;
+        }
+        return $this;
+    }
+>>>>>>> elasticsearch-php/master
 
     public function getURI(): string
     {

src/Elasticsearch/Endpoints/Cat/ThreadPool.php

@@ -8,6 +8,9 @@
 
 class ArrayLogger implements LoggerInterface
 {
+    /**
+     * @var mixed[]
+     */
     public $output = [];
 
     public function emergency($message, array $context = array())

tests/Elasticsearch/Tests/ClientBuilder/ArrayLogger.php

@@ -12,8 +12,17 @@
 
 class ConnectionTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject&\Psr\Log\LoggerInterface
+     */
     private $logger;
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject&\Psr\Log\LoggerInterface
+     */
     private $trace;
+    /**
+     * @var \Elasticsearch\Serializers\SerializerInterface&\PHPUnit\Framework\MockObject\MockObject
+     */
     private $serializer;
 
     protected function setUp()

tests/Elasticsearch/Tests/Connections/ConnectionTest.php

@@ -8,6 +8,9 @@
 
 class AbstractEndpointTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Elasticsearch\Endpoints\AbstractEndpoint&\PHPUnit\Framework\MockObject\MockObject
+     */
     private $endpoint;
 
     protected function setUp()