make search non-static, add ISearch to server container, make legacy a static wrapper for it, move provider and result to public api

4 files changed, 3 insertions, 115 deletions

diff --git a/lib/private/search/provider.php b/lib/private/search/provider.php
deleted file mode 100644
index 45d9f823c55..00000000000
--- a/lib/private/search/provider.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OC\Search;
-
-/**
- * Provides a template for search functionality throughout ownCloud; 
- */
-abstract class Provider {
-
-	/**
-	 * List of options (currently unused)
-	 * @var array
-	 */
-	private $options;
-
-	/**
-	 * Constructor
-	 * @param array $options
-	 */
-	public function __construct($options) {
-		$this->options = $options;
-	}
-
-	/**
-	 * Search for $query
-	 * @param string $query
-	 * @return array An array of OC\Search\Result's
-	 */
-	abstract public function search($query);
-}
diff --git a/lib/private/search/provider/file.php b/lib/private/search/provider/file.php
index daf73cf79c2..cbd3a253732 100644
--- a/lib/private/search/provider/file.php
+++ b/lib/private/search/provider/file.php
@@ -23,12 +23,12 @@ use OC\Files\Filesystem;
 /**
  * Provide search results from the 'files' app
  */
-class File extends \OC\Search\Provider {
+class File extends \OCP\Search\Provider {
 
 	/**
 	 * Search for files and folders matching the given query
 	 * @param string $query
-	 * @return \OC\Search\Result
+	 * @return \OCP\Search\Result
 	 */
 	function search($query) {
 		$files = Filesystem::search($query);
diff --git a/lib/private/search/result.php b/lib/private/search/result.php
deleted file mode 100644
index d228f833810..00000000000
--- a/lib/private/search/result.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OC\Search;
-
-/**
- * The generic result of a search
- */
-class Result {
-
-	/**
-	 * A unique identifier for the result, usually given as the item ID in its
-	 * corresponding application.
-	 * @var string
-	 */
-	public $id;
-
-	/**
-	 * The name of the item returned; this will be displayed in the search
-	 * results.
-	 * @var string
-	 */
-	public $name;
-
-	/**
-	 * URL to the application item.
-	 * @var string
-	 */
-	public $link;
-
-	/**
-	 * The type of search result returned; for consistency, name this the same
-	 * as the class name (e.g. \OC\Search\File -> 'file') in lowercase. 
-	 * @var string
-	 */
-	public $type = 'generic';
-
-	/**
-	 * Create a new search result
-	 * @param string $id unique identifier from application: '[app_name]/[item_identifier_in_app]'
-	 * @param string $name displayed text of result
-	 * @param string $link URL to the result within its app
-	 */
-	public function __construct($id = null, $name = null, $link = null) {
-		$this->id = $id;
-		$this->name = $name;
-		$this->link = $link;
-	}
-}
diff --git a/lib/private/search/result/file.php b/lib/private/search/result/file.php
index 32a4aebc700..da5fa64ef45 100644
--- a/lib/private/search/result/file.php
+++ b/lib/private/search/result/file.php
@@ -22,7 +22,7 @@ use \OC\Files\Filesystem;
 /**
  * A found file
  */
-class File extends \OC\Search\Result {
+class File extends \OCP\Search\Result {
 
 	/**
 	 * Type name; translated in templates