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

---
 .../lib/Elastica/Filter/AbstractGeoDistance.php    | 190 ---------------------
 1 file changed, 190 deletions(-)
 delete mode 100644 vendor/ruflin/elastica/lib/Elastica/Filter/AbstractGeoDistance.php

(limited to 'vendor/ruflin/elastica/lib/Elastica/Filter/AbstractGeoDistance.php')

diff --git a/vendor/ruflin/elastica/lib/Elastica/Filter/AbstractGeoDistance.php b/vendor/ruflin/elastica/lib/Elastica/Filter/AbstractGeoDistance.php
deleted file mode 100644
index 997ceab7..00000000
--- a/vendor/ruflin/elastica/lib/Elastica/Filter/AbstractGeoDistance.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-
-namespace Elastica\Filter;
-
-use Elastica\Exception\InvalidException;
-
-/**
- * Geo distance filter
- *
- * @category Xodoa
- * @package Elastica
- * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/geo-distance-filter.html
- */
-abstract class AbstractGeoDistance extends AbstractFilter
-{
-
-    const LOCATION_TYPE_GEOHASH = 'geohash';
-    const LOCATION_TYPE_LATLON = 'latlon';
-
-    /**
-     * Location type
-     *
-     * Decides if this filter uses latitude/longitude or geohash for the location.
-     * Values are "latlon" or "geohash".
-     *
-     * @var string
-     */
-    protected $_locationType = null;
-
-    /**
-     * Key
-     *
-     * @var string
-     */
-    protected $_key = null;
-
-    /**
-     * Latitude
-     *
-     * @var float
-     */
-    protected $_latitude = null;
-
-    /**
-     * Longitude
-     *
-     * @var float
-     */
-    protected $_longitude = null;
-
-    /**
-     * Geohash
-     *
-     * @var string
-     */
-    protected $_geohash = null;
-
-    /**
-     * Create GeoDistance object
-     *
-     * @param  string                              $key      Key
-     * @param  array|string                        $location Location as array or geohash: array('lat' => 48.86, 'lon' => 2.35) OR 'drm3btev3e86'
-     * @internal param string $distance Distance
-     */
-    public function __construct($key, $location)
-    {
-        // Key
-        $this->setKey($key);
-        $this->setLocation($location);
-    }
-
-    /**
-     * @param  string                                    $key
-     * @return \Elastica\Filter\AbstractGeoDistance current filter
-     */
-    public function setKey($key)
-    {
-        $this->_key = $key;
-
-        return $this;
-    }
-
-    /**
-     * @param  array|string                              $location
-     * @return \Elastica\Filter\AbstractGeoDistance
-     * @throws \Elastica\Exception\InvalidException
-     */
-    public function setLocation($location)
-    {
-        // Location
-        if (is_array($location)) { // Latitude/Longitude
-            // Latitude
-            if (isset($location['lat'])) {
-                $this->setLatitude($location['lat']);
-            } else {
-                throw new InvalidException('$location[\'lat\'] has to be set');
-            }
-
-            // Longitude
-            if (isset($location['lon'])) {
-                $this->setLongitude($location['lon']);
-            } else {
-                throw new InvalidException('$location[\'lon\'] has to be set');
-            }
-        } elseif (is_string($location)) { // Geohash
-            $this->setGeohash($location);
-        } else { // Invalid location
-            throw new InvalidException('$location has to be an array (latitude/longitude) or a string (geohash)');
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param  float                                     $latitude
-     * @return \Elastica\Filter\AbstractGeoDistance current filter
-     */
-    public function setLatitude($latitude)
-    {
-        $this->_latitude = (float) $latitude;
-        $this->_locationType = self::LOCATION_TYPE_LATLON;
-
-        return $this;
-    }
-
-    /**
-     * @param  float                                     $longitude
-     * @return \Elastica\Filter\AbstractGeoDistance current filter
-     */
-    public function setLongitude($longitude)
-    {
-        $this->_longitude = (float) $longitude;
-        $this->_locationType = self::LOCATION_TYPE_LATLON;
-
-        return $this;
-    }
-
-    /**
-     * @param  string                                    $geohash
-     * @return \Elastica\Filter\AbstractGeoDistance current filter
-     */
-    public function setGeohash($geohash)
-    {
-        $this->_geohash = $geohash;
-        $this->_locationType = self::LOCATION_TYPE_GEOHASH;
-
-        return $this;
-    }
-
-    /**
-     * @return array|string
-     * @throws \Elastica\Exception\InvalidException
-     */
-    protected function _getLocationData()
-    {
-        if ($this->_locationType === self::LOCATION_TYPE_LATLON) { // Latitude/longitude
-            $location = array();
-
-            if (isset($this->_latitude)) { // Latitude
-                $location['lat'] = $this->_latitude;
-            } else {
-                throw new InvalidException('Latitude has to be set');
-            }
-
-            if (isset($this->_longitude)) { // Geohash
-                $location['lon'] = $this->_longitude;
-            } else {
-                throw new InvalidException('Longitude has to be set');
-            }
-        } elseif ($this->_locationType === self::LOCATION_TYPE_GEOHASH) { // Geohash
-            $location = $this->_geohash;
-        } else { // Invalid location type
-            throw new InvalidException('Invalid location type');
-        }
-
-        return $location;
-    }
-
-    /**
-     * @see \Elastica\Param::toArray()
-     * @throws \Elastica\Exception\InvalidException
-     */
-    public function toArray()
-    {
-        $this->setParam($this->_key, $this->_getLocationData());
-
-        return parent::toArray();
-    }
-}
-- 
cgit v1.2.2