Merge commit '80f7dc'

# Conflicts:
#	extensions/ArchInterWiki.sql

1 files changed, 0 insertions, 33 deletions

diff --git a/vendor/ruflin/elastica/lib/Elastica/Aggregation/AbstractSimpleAggregation.php b/vendor/ruflin/elastica/lib/Elastica/Aggregation/AbstractSimpleAggregation.php
deleted file mode 100644
index af7c1940..00000000
--- a/vendor/ruflin/elastica/lib/Elastica/Aggregation/AbstractSimpleAggregation.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Elastica\Aggregation;
-
-
-use Elastica\Script;
-
-abstract class AbstractSimpleAggregation extends AbstractAggregation
-{
-    /**
-     * Set the field for this aggregation
-     * @param string $field the name of the document field on which to perform this aggregation
-     * @return AbstractSimpleAggregation
-     */
-    public function setField($field)
-    {
-        return $this->setParam('field', $field);
-    }
-
-    /**
-     * Set a script for this aggregation
-     * @param string|Script $script
-     * @return AbstractSimpleAggregation
-     */
-    public function setScript($script)
-    {
-        if ($script instanceof Script) {
-            $this->setParam('params', $script->getParams());
-            $script = $script->getScript();
-        }
-        return $this->setParam('script', $script);
-    }
-} 
\ No newline at end of file