Merge commit '80f7dc'

# Conflicts:
#	extensions/ArchInterWiki.sql

1 files changed, 0 insertions, 31 deletions

diff --git a/vendor/ruflin/elastica/test/lib/Elastica/Test/Base.php b/vendor/ruflin/elastica/test/lib/Elastica/Test/Base.php
deleted file mode 100644
index 55cd8873..00000000
--- a/vendor/ruflin/elastica/test/lib/Elastica/Test/Base.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Elastica\Test;
-
-use Elastica\Client;
-
-class Base extends \PHPUnit_Framework_TestCase
-{
-    protected function _getClient()
-    {
-        return new Client(array(
-            'host' => getenv('ES_HOST') ?: 'localhost',
-            'port' => getenv('ES_PORT') ?: 9200,
-        ));
-    }
-
-    /**
-     * @param  string         $name Index name
-     * @param  bool           $delete Delete index if it exists
-     * @param  int            $shards Number of shards to create
-     * @return \Elastica\Index
-     */
-    protected function _createIndex($name = 'test', $delete = true, $shards = 1)
-    {
-        $client = $this->_getClient();
-        $index = $client->getIndex('elastica_' . $name);
-        $index->create(array('index' => array('number_of_shards' => $shards, 'number_of_replicas' => 0)), $delete);
-
-        return $index;
-    }
-}