From 615f0f549927bbfd5a7da5766e1b314c478b7281 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 5 Feb 2016 17:46:43 +0100 Subject: [PATCH 1/3] add deprecation notice to search methods --- lib/public/files/cache/icache.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/public/files/cache/icache.php b/lib/public/files/cache/icache.php index 4ffb298a9e2..18e9256d3b7 100644 --- a/lib/public/files/cache/icache.php +++ b/lib/public/files/cache/icache.php @@ -59,6 +59,8 @@ interface ICache { /** * get the metadata of all files stored in $folder * + * Only returns files one level deep, no recursion + * * @param string $folder * @return ICacheEntry[] * @since 9.0.0 @@ -68,6 +70,8 @@ interface ICache { /** * get the metadata of all files stored in $folder * + * Only returns files one level deep, no recursion + * * @param int $fileId the file id of the folder * @return ICacheEntry[] * @since 9.0.0 @@ -192,6 +196,7 @@ interface ICache { * @param string $pattern the search pattern using SQL search syntax (e.g. '%searchstring%') * @return ICacheEntry[] an array of cache entries where the name matches the search pattern * @since 9.0.0 + * @deprecated 9.0.0 due to lack of pagination, not all backends might implement this */ public function search($pattern); @@ -202,6 +207,7 @@ interface ICache { * where it will search for all mimetypes in the group ('image/*') * @return ICacheEntry[] an array of cache entries where the mimetype matches the search * @since 9.0.0 + * @deprecated 9.0.0 due to lack of pagination, not all backends might implement this */ public function searchByMime($mimetype); @@ -214,6 +220,7 @@ interface ICache { * @param string $userId owner of the tags * @return ICacheEntry[] file data * @since 9.0.0 + * @deprecated 9.0.0 due to lack of pagination, not all backends might implement this */ public function searchByTag($tag, $userId); From 559189cf4741303545dc0463651f63d5aa7f7a2f Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 5 Feb 2016 17:52:19 +0100 Subject: [PATCH 2/3] additional phpdoc for search --- lib/public/files/cache/icache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/public/files/cache/icache.php b/lib/public/files/cache/icache.php index 18e9256d3b7..18641b29f9c 100644 --- a/lib/public/files/cache/icache.php +++ b/lib/public/files/cache/icache.php @@ -191,7 +191,7 @@ interface ICache { public function getStatus($file); /** - * search for files matching $pattern + * search for files matching $pattern, files are matched if their filename matches the search pattern * * @param string $pattern the search pattern using SQL search syntax (e.g. '%searchstring%') * @return ICacheEntry[] an array of cache entries where the name matches the search pattern From 282c1cb24f3bfa08421b89d6d88bbd5e18b684c7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 5 Feb 2016 17:52:37 +0100 Subject: [PATCH 3/3] remove unused Storage->search --- lib/public/files/storage/istorage.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lib/public/files/storage/istorage.php b/lib/public/files/storage/istorage.php index 4bc5e3536dc..5b10c966a1f 100644 --- a/lib/public/files/storage/istorage.php +++ b/lib/public/files/storage/istorage.php @@ -303,15 +303,6 @@ interface IStorage { */ public function free_space($path); - /** - * search for occurrences of $query in file names - * - * @param string $query - * @return array|false - * @since 9.0.0 - */ - public function search($query); - /** * see http://php.net/manual/en/function.touch.php * If the backend does not support the operation, false should be returned