drop depricated is_readable and is_writable

4 files changed, 1 insertions, 36 deletions

diff --git a/lib/files.php b/lib/files.php
index 28c8d0b449f..ba111bee967 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -178,7 +178,7 @@ class OC_Files {
 			$filename=$dir.'/'.$files;
 		}
 		@ob_end_clean();
-		if($zip or \OC\Files\Filesystem::is_readable($filename)) {
+		if($zip or \OC\Files\Filesystem::isReadable($filename)) {
 			header('Content-Disposition: attachment; filename="'.basename($filename).'"');
 			header('Content-Transfer-Encoding: binary');
 			OC_Response::disableCaching();
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 94e8a562564..0dae774febe 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -440,20 +440,6 @@ class Filesystem {
 		return self::$defaultInstance->readfile($path);
 	}
 
-	/**
-	 * @deprecated Replaced by isReadable() as part of CRUDS
-	 */
-	static public function is_readable($path) {
-		return self::$defaultInstance->isReadable($path);
-	}
-
-	/**
-	 * @deprecated Replaced by isCreatable(), isUpdatable(), isDeletable() as part of CRUDS
-	 */
-	static public function is_writable($path) {
-		return self::$defaultInstance->is_writable($path);
-	}
-
 	static public function isCreatable($path) {
 		return self::$defaultInstance->isCreatable($path);
 	}
diff --git a/lib/files/view.php b/lib/files/view.php
index 58e3ee6f051..a59ad8105d6 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -195,20 +195,6 @@ class View {
 		return false;
 	}
 
-	/**
-	 * @deprecated Replaced by isReadable() as part of CRUDS
-	 */
-	public function is_readable($path) {
-		return $this->basicOperation('isReadable', $path);
-	}
-
-	/**
-	 * @deprecated Replaced by isCreatable(), isUpdatable(), isDeletable() as part of CRUDS
-	 */
-	public function is_writable($path) {
-		return $this->basicOperation('isUpdatable', $path);
-	}
-
 	public function isCreatable($path) {
 		return $this->basicOperation('isCreatable', $path);
 	}
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 9ce75aaf8ce..ea0a289c8d2 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -258,13 +258,6 @@ class OC_Filesystem {
 	}
 
 	/**
-	 * @deprecated Replaced by isCreatable(), isUpdatable(), isDeletable() as part of CRUDS
-	 */
-	static public function is_writable($path) {
-		return \OC\Files\Filesystem::is_writable($path);
-	}
-
-	/**
 	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
 	 */
 	static public function isCreatable($path) {