Merge commit '80f7dc'

# Conflicts:
#	extensions/ArchInterWiki.sql

1 files changed, 0 insertions, 60 deletions

diff --git a/vendor/ruflin/elastica/lib/Elastica/Filter/Nested.php b/vendor/ruflin/elastica/lib/Elastica/Filter/Nested.php
deleted file mode 100644
index 16293519..00000000
--- a/vendor/ruflin/elastica/lib/Elastica/Filter/Nested.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Elastica\Filter;
-
-use Elastica\Query\AbstractQuery;
-
-/**
- * Nested filter
- *
- * @category Xodoa
- * @package Elastica
- * @author Nicolas Ruflin <spam@ruflin.com>
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/nested-filter.html
- */
-class Nested extends AbstractFilter
-{
-    /**
-     * Adds field to mlt filter
-     *
-     * @param  string                       $path Nested object path
-     * @return \Elastica\Filter\Nested
-     */
-    public function setPath($path)
-    {
-        return $this->setParam('path', $path);
-    }
-
-    /**
-     * Sets nested query
-     *
-     * @param  \Elastica\Query\AbstractQuery $query
-     * @return \Elastica\Filter\Nested
-     */
-    public function setQuery(AbstractQuery $query)
-    {
-        return $this->setParam('query', $query->toArray());
-    }
-
-    /**
-     * Sets nested filter
-     *
-     * @param  \Elastica\Filter\AbstractFilter $filter
-     * @return \Elastica\Filter\Nested
-     */
-    public function setFilter(AbstractFilter $filter)
-    {
-        return $this->setParam('filter', $filter->toArray());
-    }
-
-    /**
-     * Set score mode
-     *
-     * @param  string                       $scoreMode Options: avg, total, max and none.
-     * @return \Elastica\Filter\Nested
-     */
-    public function setScoreMode($scoreMode)
-    {
-        return $this->setParam('score_mode', $scoreMode);
-    }
-}