Merge commit '80f7dc'

# Conflicts:
#	extensions/ArchInterWiki.sql

1 files changed, 0 insertions, 48 deletions

diff --git a/vendor/ruflin/elastica/lib/Elastica/Query/Prefix.php b/vendor/ruflin/elastica/lib/Elastica/Query/Prefix.php
deleted file mode 100644
index 4306fd9c..00000000
--- a/vendor/ruflin/elastica/lib/Elastica/Query/Prefix.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Elastica\Query;
-
-/**
- * Prefix query
- *
- * @category Xodoa
- * @package Elastica
- * @link http://www.elasticsearch.org/guide/reference/query-dsl/prefix-query.html
- */
-class Prefix extends AbstractQuery
-{
-    /**
-     * Constructs the Prefix query object
-     *
-     * @param array $prefix OPTIONAL Calls setRawPrefix with the given $prefix array
-     */
-    public function __construct(array $prefix = array())
-    {
-        $this->setRawPrefix($prefix);
-    }
-
-    /**
-     * setRawPrefix can be used instead of setPrefix if some more special
-     * values for a prefix have to be set.
-     *
-     * @param  array                      $prefix Prefix array
-     * @return \Elastica\Query\Prefix Current object
-     */
-    public function setRawPrefix(array $prefix)
-    {
-        return $this->setParams($prefix);
-    }
-
-    /**
-     * Adds a prefix to the prefix query
-     *
-     * @param  string                     $key   Key to query
-     * @param  string|array               $value Values(s) for the query. Boost can be set with array
-     * @param  float                      $boost OPTIONAL Boost value (default = 1.0)
-     * @return \Elastica\Query\Prefix Current object
-     */
-    public function setPrefix($key, $value, $boost = 1.0)
-    {
-        return $this->setRawPrefix(array($key => array('value' => $value, 'boost' => $boost)));
-    }
-}