From 80f7dc77d430774192b929d780f96260066df2ee Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 18 Oct 2015 09:31:31 +0200
Subject: Update to MediaWiki 1.25.3

---
 .../Exception/Connection/GuzzleException.php       | 51 -------------
 .../Exception/Connection/HttpException.php         | 88 ----------------------
 .../Exception/Connection/ThriftException.php       | 51 -------------
 3 files changed, 190 deletions(-)
 delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/Connection/GuzzleException.php
 delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/Connection/HttpException.php
 delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/Connection/ThriftException.php

(limited to 'vendor/ruflin/elastica/lib/Elastica/Exception/Connection')

diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/Connection/GuzzleException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/Connection/GuzzleException.php
deleted file mode 100644
index 645c0eff..00000000
--- a/vendor/ruflin/elastica/lib/Elastica/Exception/Connection/GuzzleException.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Elastica\Exception\Connection;
-
-use Elastica\Exception\ConnectionException;
-use Elastica\Request;
-use Elastica\Response;
-use GuzzleHttp\Exception\TransferException;
-
-/**
- * Transport exception
- *
- * @package Elastica
- * @author Milan Magudia <milan@magudia.com>
- */
-class GuzzleException extends ConnectionException
-{
-    /**
-     * @var TransferException
-     */
-    protected $_guzzleException;
-
-    /**
-     * @param \GuzzleHttp\Exception\TransferException $guzzleException
-     * @param \Elastica\Request $request
-     * @param \Elastica\Response $response
-     */
-    public function __construct(TransferException $guzzleException, Request $request = null, Response $response = null)
-    {
-        $this->_guzzleException = $guzzleException;
-        $message = $this->getErrorMessage($this->getGuzzleException());
-        parent::__construct($message, $request, $response);
-    }
-
-    /**
-     * @param \GuzzleHttp\Exception\TransferException $guzzleException
-     * @return string
-     */
-    public function getErrorMessage(TransferException $guzzleException)
-    {
-        return $guzzleException->getMessage();
-    }
-
-    /**
-     * @return TransferException
-     */
-    public function getGuzzleException()
-    {
-        return $this->_guzzleException;
-    }
-}
diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/Connection/HttpException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/Connection/HttpException.php
deleted file mode 100644
index 2a36fe48..00000000
--- a/vendor/ruflin/elastica/lib/Elastica/Exception/Connection/HttpException.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Elastica\Exception\Connection;
-
-use Elastica\Exception\ConnectionException;
-use Elastica\Request;
-use Elastica\Response;
-
-/**
- * Connection exception
- *
- * @category Xodoa
- * @package Elastica
- * @author Nicolas Ruflin <spam@ruflin.com>
- */
-class HttpException extends ConnectionException
-{
-    /**
-     * Error code / message
-     *
-     * @var string Error code / message
-     */
-    protected $_error = 0;
-
-    /**
-     * Construct Exception
-     *
-     * @param string            $error    Error
-     * @param \Elastica\Request  $request
-     * @param \Elastica\Response $response
-     */
-    public function __construct($error, Request $request = null, Response $response = null)
-    {
-        $this->_error = $error;
-
-        $message = $this->getErrorMessage($this->getError());
-        parent::__construct($message, $request, $response);
-    }
-
-    /**
-     * Returns the error message corresponding to the error code
-     * cUrl error code reference can be found here {@link http://curl.haxx.se/libcurl/c/libcurl-errors.html}
-     *
-     * @param  string $error Error code
-     * @return string Error message
-     */
-    public function getErrorMessage($error)
-    {
-        switch ($error) {
-            case CURLE_UNSUPPORTED_PROTOCOL:
-                $error = "Unsupported protocol";
-                break;
-            case CURLE_FAILED_INIT:
-                $error = "Internal cUrl error?";
-                break;
-            case CURLE_URL_MALFORMAT:
-                $error = "Malformed URL";
-                break;
-            case CURLE_COULDNT_RESOLVE_PROXY:
-                $error = "Couldn't resolve proxy";
-                break;
-            case CURLE_COULDNT_RESOLVE_HOST:
-                $error = "Couldn't resolve host";
-                break;
-            case CURLE_COULDNT_CONNECT:
-                $error = "Couldn't connect to host, Elasticsearch down?";
-                break;
-            case 28:
-                $error = "Operation timed out";
-                break;
-            default:
-                $error = "Unknown error:" . $error;
-                break;
-        }
-
-        return $error;
-    }
-
-    /**
-     * Return Error code / message
-     *
-     * @return string Error code / message
-     */
-    public function getError()
-    {
-        return $this->_error;
-    }
-}
diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/Connection/ThriftException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/Connection/ThriftException.php
deleted file mode 100644
index 0ca331c7..00000000
--- a/vendor/ruflin/elastica/lib/Elastica/Exception/Connection/ThriftException.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Elastica\Exception\Connection;
-
-use Elastica\Exception\ConnectionException;
-use Elastica\Request;
-use Elastica\Response;
-use Thrift\Exception\TException;
-
-/**
- * Transport exception
- *
- * @category Xodoa
- * @package Elastica
- * @author Mikhail Shamin <munk13@gmail.com>
- */
-class ThriftException extends ConnectionException
-{
-    /**
-     * @var TException
-     */
-    protected $_thriftException;
-
-    /**
-     * @param \Thrift\Exception\TException $thriftException
-     * @param \Elastica\Request $request
-     * @param \Elastica\Response $response
-     */
-    public function __construct(TException $thriftException, Request $request = null, Response $response = null)
-    {
-        $this->_thriftException = $thriftException;
-        $message = $this->getErrorMessage($this->getThriftException());
-        parent::__construct($message, $request, $response);
-    }
-
-    /**
-     * @param \Thrift\Exception\TException $thriftException
-     * @return string
-     */
-    public function getErrorMessage(TException $thriftException)
-    {
-        return $thriftException->getMessage();
-    }
-    /**
-     * @return TException
-     */
-    public function getThriftException()
-    {
-        return $this->_thriftException;
-    }
-}
-- 
cgit v1.2.3-54-g00ecf