Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 58 insertions, 0 deletions

diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/ConnectionException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/ConnectionException.php
new file mode 100644
index 00000000..b2376d2f
--- /dev/null
+++ b/vendor/ruflin/elastica/lib/Elastica/Exception/ConnectionException.php
@@ -0,0 +1,58 @@
+<?php
+namespace Elastica\Exception;
+
+use Elastica\Request;
+use Elastica\Response;
+
+/**
+ * Connection exception.
+ *
+ * @author Nicolas Ruflin <spam@ruflin.com>
+ */
+class ConnectionException extends \RuntimeException implements ExceptionInterface
+{
+    /**
+     * @var \Elastica\Request Request object
+     */
+    protected $_request;
+
+    /**
+     * @var \Elastica\Response Response object
+     */
+    protected $_response;
+
+    /**
+     * Construct Exception.
+     *
+     * @param string             $message  Message
+     * @param \Elastica\Request  $request
+     * @param \Elastica\Response $response
+     */
+    public function __construct($message, Request $request = null, Response $response = null)
+    {
+        $this->_request = $request;
+        $this->_response = $response;
+
+        parent::__construct($message);
+    }
+
+    /**
+     * Returns request object.
+     *
+     * @return \Elastica\Request Request object
+     */
+    public function getRequest()
+    {
+        return $this->_request;
+    }
+
+    /**
+     * Returns response object.
+     *
+     * @return \Elastica\Response Response object
+     */
+    public function getResponse()
+    {
+        return $this->_response;
+    }
+}