From 315344eb9cc58dda23bfe52c1413ad963265a9cb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 10 Sep 2013 19:34:38 +0200
Subject: [PATCH] move public files api to a clearer namespace
---
lib/public/files/{node => }/file.php | 2 +-
lib/public/files/{node => }/folder.php | 18 +++++++++---------
lib/public/files/{node => }/node.php | 6 +++---
3 files changed, 13 insertions(+), 13 deletions(-)
rename lib/public/files/{node => }/file.php (96%)
rename lib/public/files/{node => }/folder.php (84%)
rename lib/public/files/{node => }/node.php (94%)
diff --git a/lib/public/files/node/file.php b/lib/public/files/file.php
similarity index 96%
rename from lib/public/files/node/file.php
rename to lib/public/files/file.php
index 193663f60b..c571e184ce 100644
--- a/lib/public/files/node/file.php
+++ b/lib/public/files/file.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-namespace OCP\Files\Node;
+namespace OCP\Files;
use OC\Files\NotPermittedException;
diff --git a/lib/public/files/node/folder.php b/lib/public/files/folder.php
similarity index 84%
rename from lib/public/files/node/folder.php
rename to lib/public/files/folder.php
index af53bc9e58..a8e57f7ae2 100644
--- a/lib/public/files/node/folder.php
+++ b/lib/public/files/folder.php
@@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
-namespace OCP\Files\Node;
+namespace OCP\Files;
use OC\Files\Cache\Cache;
use OC\Files\Cache\Scanner;
@@ -31,7 +31,7 @@ interface Folder extends Node {
/**
* check if a node is a (grand-)child of the folder
*
- * @param \OCP\Files\Node\Node $node
+ * @param \OCP\Files\Node $node
* @return bool
*/
public function isSubNode($node);
@@ -40,7 +40,7 @@ interface Folder extends Node {
* get the content of this directory
*
* @throws \OC\Files\NotFoundException
- * @return \OCP\Files\Node\Node[]
+ * @return \OCP\Files\Node[]
*/
public function getDirectoryListing();
@@ -48,7 +48,7 @@ interface Folder extends Node {
* Get the node at $path
*
* @param string $path
- * @return \OCP\Files\Node\Node
+ * @return \OCP\Files\Node
* @throws \OC\Files\NotFoundException
*/
public function get($path);
@@ -61,14 +61,14 @@ interface Folder extends Node {
/**
* @param string $path
- * @return \OCP\Files\Node\Folder
+ * @return \OCP\Files\Folder
* @throws NotPermittedException
*/
public function newFolder($path);
/**
* @param string $path
- * @return \OCP\Files\Node\File
+ * @return \OCP\Files\File
* @throws NotPermittedException
*/
public function newFile($path);
@@ -77,7 +77,7 @@ interface Folder extends Node {
* search for files with the name matching $query
*
* @param string $query
- * @return \OCP\Files\Node\Node[]
+ * @return \OCP\Files\Node[]
*/
public function search($query);
@@ -85,13 +85,13 @@ interface Folder extends Node {
* search for files by mimetype
*
* @param string $mimetype
- * @return \OCP\Files\Node\Node[]
+ * @return \OCP\Files\Node[]
*/
public function searchByMime($mimetype);
/**
* @param $id
- * @return \OCP\Files\Node\Node[]
+ * @return \OCP\Files\Node[]
*/
public function getById($id);
diff --git a/lib/public/files/node/node.php b/lib/public/files/node.php
similarity index 94%
rename from lib/public/files/node/node.php
rename to lib/public/files/node.php
index b85f37e69a..d3b71803f5 100644
--- a/lib/public/files/node/node.php
+++ b/lib/public/files/node.php
@@ -6,13 +6,13 @@
* See the COPYING-README file.
*/
-namespace OCP\Files\Node;
+namespace OCP\Files;
interface Node {
/**
* @param string $targetPath
* @throws \OC\Files\NotPermittedException
- * @return \OCP\Files\Node\Node
+ * @return \OCP\Files\Node
*/
public function move($targetPath);
@@ -20,7 +20,7 @@ interface Node {
/**
* @param string $targetPath
- * @return \OCP\Files\Node\Node
+ * @return \OCP\Files\Node
*/
public function copy($targetPath);
--
GitLab