From 80f7dc77d430774192b929d780f96260066df2ee Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 18 Oct 2015 09:31:31 +0200 Subject: Update to MediaWiki 1.25.3 --- .../Exception/Bulk/Response/ActionException.php | 66 ------------- .../Elastica/Exception/Bulk/ResponseException.php | 103 --------------------- .../lib/Elastica/Exception/Bulk/UdpException.php | 9 -- .../lib/Elastica/Exception/BulkException.php | 7 -- .../lib/Elastica/Exception/ClientException.php | 14 --- .../Exception/Connection/GuzzleException.php | 51 ---------- .../Exception/Connection/HttpException.php | 88 ------------------ .../Exception/Connection/ThriftException.php | 51 ---------- .../lib/Elastica/Exception/ConnectionException.php | 65 ------------- .../Elastica/Exception/ElasticsearchException.php | 99 -------------------- .../lib/Elastica/Exception/ExceptionInterface.php | 14 --- .../lib/Elastica/Exception/InvalidException.php | 14 --- .../lib/Elastica/Exception/JSONParseException.php | 12 --- .../lib/Elastica/Exception/NotFoundException.php | 14 --- .../Elastica/Exception/NotImplementedException.php | 16 ---- .../Exception/PartialShardFailureException.php | 33 ------- .../lib/Elastica/Exception/ResponseException.php | 76 --------------- .../lib/Elastica/Exception/RuntimeException.php | 14 --- 18 files changed, 746 deletions(-) delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/Response/ActionException.php delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/ResponseException.php delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/UdpException.php delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/BulkException.php delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/ClientException.php 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 delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/ConnectionException.php delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/ElasticsearchException.php delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/ExceptionInterface.php delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/InvalidException.php delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/JSONParseException.php delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/NotFoundException.php delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/NotImplementedException.php delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/PartialShardFailureException.php delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/ResponseException.php delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Exception/RuntimeException.php (limited to 'vendor/ruflin/elastica/lib/Elastica/Exception') diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/Response/ActionException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/Response/ActionException.php deleted file mode 100644 index 6500e040..00000000 --- a/vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/Response/ActionException.php +++ /dev/null @@ -1,66 +0,0 @@ -_response = $response; - - parent::__construct($this->getErrorMessage($response)); - } - - /** - * @return \Elastica\Bulk\Action - */ - public function getAction() - { - return $this->getResponse()->getAction(); - } - - /** - * @return \Elastica\Bulk\Response - */ - public function getResponse() - { - return $this->_response; - } - - /** - * @param \Elastica\Bulk\Response $response - * @return string - */ - public function getErrorMessage(Response $response) - { - $error = $response->getError(); - $opType = $response->getOpType(); - $data = $response->getData(); - - $path = ''; - if (isset($data['_index'])) { - $path.= '/' . $data['_index']; - } - if (isset($data['_type'])) { - $path.= '/' . $data['_type']; - } - if (isset($data['_id'])) { - $path.= '/' . $data['_id']; - } - $message = "$opType: $path caused $error"; - - return $message; - } -} diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/ResponseException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/ResponseException.php deleted file mode 100644 index 9df1b3e8..00000000 --- a/vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/ResponseException.php +++ /dev/null @@ -1,103 +0,0 @@ -_init($responseSet); - - $message = 'Error in one or more bulk request actions:' . PHP_EOL . PHP_EOL; - $message.= $this->getActionExceptionsAsString(); - - parent::__construct($message); - } - - /** - * @param \Elastica\Bulk\ResponseSet $responseSet - */ - protected function _init(ResponseSet $responseSet) - { - $this->_responseSet = $responseSet; - - foreach ($responseSet->getBulkResponses() as $bulkResponse) { - if ($bulkResponse->hasError()) { - $this->_actionExceptions[] = new ActionException($bulkResponse); - } - } - } - - /** - * Returns bulk response set object - * - * @return \Elastica\Bulk\ResponseSet - */ - public function getResponseSet() - { - return $this->_responseSet; - } - - /** - * Returns array of failed actions - * - * @return array Array of failed actions - */ - public function getFailures() - { - $errors = array(); - - foreach ($this->getActionExceptions() as $actionException) { - $errors[] = $actionException->getMessage(); - } - - return $errors; - } - - /** - * @return \Elastica\Exception\Bulk\Response\ActionException[] - */ - public function getActionExceptions() - { - return $this->_actionExceptions; - } - - /** - * @return string - */ - public function getActionExceptionsAsString() - { - $message = ''; - foreach ($this->getActionExceptions() as $actionException) { - $message.= $actionException->getMessage() . PHP_EOL; - } - return $message; - } -} diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/UdpException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/UdpException.php deleted file mode 100644 index 0b2d4d2e..00000000 --- a/vendor/ruflin/elastica/lib/Elastica/Exception/Bulk/UdpException.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -class ClientException extends \RuntimeException implements ExceptionInterface -{ -} 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 @@ - - */ -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 @@ - - */ -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 @@ - - */ -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; - } -} diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/ConnectionException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/ConnectionException.php deleted file mode 100644 index 35d60472..00000000 --- a/vendor/ruflin/elastica/lib/Elastica/Exception/ConnectionException.php +++ /dev/null @@ -1,65 +0,0 @@ - - */ -class ConnectionException extends \RuntimeException implements ExceptionInterface -{ - /** - * Request - * - * @var \Elastica\Request Request object - */ - protected $_request; - - /** - * Response - * - * @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; - } -} diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/ElasticsearchException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/ElasticsearchException.php deleted file mode 100644 index 0f7509f9..00000000 --- a/vendor/ruflin/elastica/lib/Elastica/Exception/ElasticsearchException.php +++ /dev/null @@ -1,99 +0,0 @@ - - */ -class ElasticsearchException extends \Exception -{ - - const REMOTE_TRANSPORT_EXCEPTION = 'RemoteTransportException'; - - /** - * Elasticsearch exception name - * - * @var string|null - */ - private $_exception; - - /** - * Whether exception was local to server node or remote - * - * @var bool - */ - private $_isRemote = false; - - /** - * Constructs elasticsearch exception - * - * @param int $code Error code - * @param string $error Error message from elasticsearch - */ - public function __construct($code, $error) - { - $this->_parseError($error); - parent::__construct($error, $code); - } - - /** - * Parse error message from elasticsearch - * - * @param string $error Error message - */ - protected function _parseError($error) - { - $errors = explode(']; nested: ', $error); - - if (count($errors) == 1) { - $this->_exception = $this->_extractException($errors[0]); - } else { - if ($this->_extractException($errors[0]) == self::REMOTE_TRANSPORT_EXCEPTION) { - $this->_isRemote = true; - $this->_exception = $this->_extractException($errors[1]); - } else { - $this->_exception = $this->_extractException($errors[0]); - } - } - } - - /** - * Extract exception name from error response - * - * @param string $error - * @return null|string - */ - protected function _extractException($error) - { - if (preg_match('/^(\w+)\[.*\]/', $error, $matches)) { - return $matches[1]; - } else { - return null; - } - } - - /** - * Returns elasticsearch exception name - * - * @return string|null - */ - public function getExceptionName() - { - return $this->_exception; - } - - /** - * Returns whether exception was local to server node or remote - * - * @return bool - */ - public function isRemoteTransportException() - { - return $this->_isRemote; - } - -} diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/ExceptionInterface.php b/vendor/ruflin/elastica/lib/Elastica/Exception/ExceptionInterface.php deleted file mode 100644 index 746c9c81..00000000 --- a/vendor/ruflin/elastica/lib/Elastica/Exception/ExceptionInterface.php +++ /dev/null @@ -1,14 +0,0 @@ - - */ -interface ExceptionInterface -{ -} diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/InvalidException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/InvalidException.php deleted file mode 100644 index ff4a4cd3..00000000 --- a/vendor/ruflin/elastica/lib/Elastica/Exception/InvalidException.php +++ /dev/null @@ -1,14 +0,0 @@ - - */ -class InvalidException extends \InvalidArgumentException implements ExceptionInterface -{ -} diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/JSONParseException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/JSONParseException.php deleted file mode 100644 index 3cf39911..00000000 --- a/vendor/ruflin/elastica/lib/Elastica/Exception/JSONParseException.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -class NotFoundException extends \RuntimeException implements ExceptionInterface -{ -} diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/NotImplementedException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/NotImplementedException.php deleted file mode 100644 index 49d3918b..00000000 --- a/vendor/ruflin/elastica/lib/Elastica/Exception/NotImplementedException.php +++ /dev/null @@ -1,16 +0,0 @@ - - */ -class NotImplementedException extends \BadMethodCallException implements ExceptionInterface -{ -} diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/PartialShardFailureException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/PartialShardFailureException.php deleted file mode 100644 index f853bf96..00000000 --- a/vendor/ruflin/elastica/lib/Elastica/Exception/PartialShardFailureException.php +++ /dev/null @@ -1,33 +0,0 @@ - - */ -class PartialShardFailureException extends ResponseException -{ - - /** - * Construct Exception - * - * @param \Elastica\Request $request - * @param \Elastica\Response $response - */ - public function __construct(Request $request, Response $response) - { - parent::__construct($request, $response); - - $shardsStatistics = $response->getShardsStatistics(); - $this->message = JSON::stringify($shardsStatistics['failed']); - } - -} diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/ResponseException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/ResponseException.php deleted file mode 100644 index 63244487..00000000 --- a/vendor/ruflin/elastica/lib/Elastica/Exception/ResponseException.php +++ /dev/null @@ -1,76 +0,0 @@ - - */ -class ResponseException extends \RuntimeException implements ExceptionInterface -{ - /** - * Request - * - * @var \Elastica\Request Request object - */ - protected $_request = null; - - /** - * Response - * - * @var \Elastica\Response Response object - */ - protected $_response = null; - - /** - * Construct Exception - * - * @param \Elastica\Request $request - * @param \Elastica\Response $response - */ - public function __construct(Request $request, Response $response) - { - $this->_request = $request; - $this->_response = $response; - parent::__construct($response->getError()); - } - - /** - * 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; - } - - /** - * Returns elasticsearch exception - * - * @return ElasticsearchException - */ - public function getElasticsearchException() { - $response = $this->getResponse(); - $transfer = $response->getTransferInfo(); - $code = array_key_exists('http_code', $transfer) ? $transfer['http_code'] : 0; - - return new ElasticsearchException($code, $response->getError()); - } -} diff --git a/vendor/ruflin/elastica/lib/Elastica/Exception/RuntimeException.php b/vendor/ruflin/elastica/lib/Elastica/Exception/RuntimeException.php deleted file mode 100644 index 5ee420e1..00000000 --- a/vendor/ruflin/elastica/lib/Elastica/Exception/RuntimeException.php +++ /dev/null @@ -1,14 +0,0 @@ - - */ -class RuntimeException extends \RuntimeException implements ExceptionInterface -{ -} -- cgit v1.2.3-54-g00ecf