Merge commit '80f7dc'

# Conflicts:
#	extensions/ArchInterWiki.sql

1 files changed, 0 insertions, 59 deletions

diff --git a/vendor/ruflin/elastica/lib/Elastica/Filter/GeoPolygon.php b/vendor/ruflin/elastica/lib/Elastica/Filter/GeoPolygon.php
deleted file mode 100644
index fa12c035..00000000
--- a/vendor/ruflin/elastica/lib/Elastica/Filter/GeoPolygon.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Elastica\Filter;
-
-use Elastica\Filter\AbstractFilter;
-
-/**
- * Geo polygon filter
- *
- * @category Xodoa
- * @package Elastica
- * @author Michael Maclean <mgdm@php.net>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/geo-polygon-filter.html
- */
-class GeoPolygon extends AbstractFilter
-{
-    /**
-     * Key
-     *
-     * @var string Key
-     */
-    protected $_key = '';
-
-    /**
-     * Points making up polygon
-     *
-     * @var array Points making up polygon
-     */
-    protected $_points = array();
-
-    /**
-     * Construct polygon filter
-     *
-     * @param string $key    Key
-     * @param array  $points Points making up polygon
-     */
-    public function __construct($key, array $points)
-    {
-        $this->_key = $key;
-        $this->_points = $points;
-    }
-
-    /**
-     * Converts filter to array
-     *
-     * @see \Elastica\Filter\AbstractFilter::toArray()
-     * @return array
-     */
-    public function toArray()
-    {
-        return array(
-            'geo_polygon' => array(
-                $this->_key => array(
-                    'points' => $this->_points
-                ),
-            )
-        );
-    }
-}