Completed
Push — master ( a56ab6...23ba41 )
by Christoph
14:05 queued 02:25
created
lib/private/Streamer.php 3 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
 				$fh = \OC\Files\Filesystem::fopen($file, 'r');
81 81
 				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
82 82
 				fclose($fh);
83
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
83
+			} elseif(\OC\Files\Filesystem::is_dir($file)) {
84 84
 				$this->addDirRecursive($file, $internalDir);
85 85
 			}
86 86
 		}
Please login to merge, or discard this patch.
Indentation   +121 added lines, -121 removed lines patch added patch discarded remove patch
@@ -29,135 +29,135 @@
 block discarded – undo
29 29
 use ZipStreamer\ZipStreamer;
30 30
 
31 31
 class Streamer {
32
-	// array of regexp. Matching user agents will get tar instead of zip
33
-	private $preferTarFor = [ '/macintosh|mac os x/i' ];
32
+    // array of regexp. Matching user agents will get tar instead of zip
33
+    private $preferTarFor = [ '/macintosh|mac os x/i' ];
34 34
 
35
-	// streamer instance
36
-	private $streamerInstance;
35
+    // streamer instance
36
+    private $streamerInstance;
37 37
 
38
-	/**
39
-	 * Streamer constructor.
40
-	 *
41
-	 * @param IRequest $request
42
-	 * @param int $size The size of the files in bytes
43
-	 * @param int $numberOfFiles The number of files (and directories) that will
44
-	 *        be included in the streamed file
45
-	 */
46
-	public function __construct(IRequest $request, int $size, int $numberOfFiles){
38
+    /**
39
+     * Streamer constructor.
40
+     *
41
+     * @param IRequest $request
42
+     * @param int $size The size of the files in bytes
43
+     * @param int $numberOfFiles The number of files (and directories) that will
44
+     *        be included in the streamed file
45
+     */
46
+    public function __construct(IRequest $request, int $size, int $numberOfFiles){
47 47
 
48
-		/**
49
-		 * zip32 constraints for a basic (without compression, volumes nor
50
-		 * encryption) zip file according to the Zip specification:
51
-		 * - No file size is larger than 4 bytes (file size < 4294967296); see
52
-		 *   4.4.9 uncompressed size
53
-		 * - The size of all files plus their local headers is not larger than
54
-		 *   4 bytes; see 4.4.16 relative offset of local header and 4.4.24
55
-		 *   offset of start of central directory with respect to the starting
56
-		 *   disk number
57
-		 * - The total number of entries (files and directories) in the zip file
58
-		 *   is not larger than 2 bytes (number of entries < 65536); see 4.4.22
59
-		 *   total number of entries in the central dir
60
-		 * - The size of the central directory is not larger than 4 bytes; see
61
-		 *   4.4.23 size of the central directory
62
-		 *
63
-		 * Due to all that, zip32 is used if the size is below 4GB and there are
64
-		 * less than 65536 files; the margin between 4*1000^3 and 4*1024^3
65
-		 * should give enough room for the extra zip metadata. Technically, it
66
-		 * would still be possible to create an invalid zip32 file (for example,
67
-		 * a zip file from files smaller than 4GB with a central directory
68
-		 * larger than 4GiB), but it should not happen in the real world.
69
-		 */
70
-		if ($size < 4 * 1000 * 1000 * 1000 && $numberOfFiles < 65536) {
71
-			$this->streamerInstance = new ZipStreamer(['zip64' => false]);
72
-		} else if ($request->isUserAgent($this->preferTarFor)) {
73
-			$this->streamerInstance = new TarStreamer();
74
-		} else {
75
-			$this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
76
-		}
77
-	}
48
+        /**
49
+         * zip32 constraints for a basic (without compression, volumes nor
50
+         * encryption) zip file according to the Zip specification:
51
+         * - No file size is larger than 4 bytes (file size < 4294967296); see
52
+         *   4.4.9 uncompressed size
53
+         * - The size of all files plus their local headers is not larger than
54
+         *   4 bytes; see 4.4.16 relative offset of local header and 4.4.24
55
+         *   offset of start of central directory with respect to the starting
56
+         *   disk number
57
+         * - The total number of entries (files and directories) in the zip file
58
+         *   is not larger than 2 bytes (number of entries < 65536); see 4.4.22
59
+         *   total number of entries in the central dir
60
+         * - The size of the central directory is not larger than 4 bytes; see
61
+         *   4.4.23 size of the central directory
62
+         *
63
+         * Due to all that, zip32 is used if the size is below 4GB and there are
64
+         * less than 65536 files; the margin between 4*1000^3 and 4*1024^3
65
+         * should give enough room for the extra zip metadata. Technically, it
66
+         * would still be possible to create an invalid zip32 file (for example,
67
+         * a zip file from files smaller than 4GB with a central directory
68
+         * larger than 4GiB), but it should not happen in the real world.
69
+         */
70
+        if ($size < 4 * 1000 * 1000 * 1000 && $numberOfFiles < 65536) {
71
+            $this->streamerInstance = new ZipStreamer(['zip64' => false]);
72
+        } else if ($request->isUserAgent($this->preferTarFor)) {
73
+            $this->streamerInstance = new TarStreamer();
74
+        } else {
75
+            $this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
76
+        }
77
+    }
78 78
 	
79
-	/**
80
-	 * Send HTTP headers
81
-	 * @param string $name 
82
-	 */
83
-	public function sendHeaders($name){
84
-		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
85
-		$fullName = $name . $extension;
86
-		$this->streamerInstance->sendHeaders($fullName);
87
-	}
79
+    /**
80
+     * Send HTTP headers
81
+     * @param string $name 
82
+     */
83
+    public function sendHeaders($name){
84
+        $extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
85
+        $fullName = $name . $extension;
86
+        $this->streamerInstance->sendHeaders($fullName);
87
+    }
88 88
 	
89
-	/**
90
-	 * Stream directory recursively
91
-	 * @param string $dir
92
-	 * @param string $internalDir
93
-	 */
94
-	public function addDirRecursive($dir, $internalDir='') {
95
-		$dirname = basename($dir);
96
-		$rootDir = $internalDir . $dirname;
97
-		if (!empty($rootDir)) {
98
-			$this->streamerInstance->addEmptyDir($rootDir);
99
-		}
100
-		$internalDir .= $dirname . '/';
101
-		// prevent absolute dirs
102
-		$internalDir = ltrim($internalDir, '/');
89
+    /**
90
+     * Stream directory recursively
91
+     * @param string $dir
92
+     * @param string $internalDir
93
+     */
94
+    public function addDirRecursive($dir, $internalDir='') {
95
+        $dirname = basename($dir);
96
+        $rootDir = $internalDir . $dirname;
97
+        if (!empty($rootDir)) {
98
+            $this->streamerInstance->addEmptyDir($rootDir);
99
+        }
100
+        $internalDir .= $dirname . '/';
101
+        // prevent absolute dirs
102
+        $internalDir = ltrim($internalDir, '/');
103 103
 
104
-		$files= \OC\Files\Filesystem::getDirectoryContent($dir);
105
-		foreach($files as $file) {
106
-			$filename = $file['name'];
107
-			$file = $dir . '/' . $filename;
108
-			if(\OC\Files\Filesystem::is_file($file)) {
109
-				$filesize = \OC\Files\Filesystem::filesize($file);
110
-				$fileTime = \OC\Files\Filesystem::filemtime($file);
111
-				$fh = \OC\Files\Filesystem::fopen($file, 'r');
112
-				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
113
-				fclose($fh);
114
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
115
-				$this->addDirRecursive($file, $internalDir);
116
-			}
117
-		}
118
-	}
104
+        $files= \OC\Files\Filesystem::getDirectoryContent($dir);
105
+        foreach($files as $file) {
106
+            $filename = $file['name'];
107
+            $file = $dir . '/' . $filename;
108
+            if(\OC\Files\Filesystem::is_file($file)) {
109
+                $filesize = \OC\Files\Filesystem::filesize($file);
110
+                $fileTime = \OC\Files\Filesystem::filemtime($file);
111
+                $fh = \OC\Files\Filesystem::fopen($file, 'r');
112
+                $this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
113
+                fclose($fh);
114
+            }elseif(\OC\Files\Filesystem::is_dir($file)) {
115
+                $this->addDirRecursive($file, $internalDir);
116
+            }
117
+        }
118
+    }
119 119
 	
120
-	/**
121
-	 * Add a file to the archive at the specified location and file name.
122
-	 *
123
-	 * @param string $stream Stream to read data from
124
-	 * @param string $internalName Filepath and name to be used in the archive.
125
-	 * @param int $size Filesize
126
-	 * @param int|bool $time File mtime as int, or false
127
-	 * @return bool $success
128
-	 */
129
-	public function addFileFromStream($stream, $internalName, $size, $time) {
130
-		$options = [];
131
-		if ($time) {
132
-			$options = [
133
-				'timestamp' => $time
134
-			];
135
-		}
120
+    /**
121
+     * Add a file to the archive at the specified location and file name.
122
+     *
123
+     * @param string $stream Stream to read data from
124
+     * @param string $internalName Filepath and name to be used in the archive.
125
+     * @param int $size Filesize
126
+     * @param int|bool $time File mtime as int, or false
127
+     * @return bool $success
128
+     */
129
+    public function addFileFromStream($stream, $internalName, $size, $time) {
130
+        $options = [];
131
+        if ($time) {
132
+            $options = [
133
+                'timestamp' => $time
134
+            ];
135
+        }
136 136
 
137
-		if ($this->streamerInstance instanceof ZipStreamer) {
138
-			return $this->streamerInstance->addFileFromStream($stream, $internalName, $options);
139
-		} else {
140
-			return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options);
141
-		}
142
-	}
137
+        if ($this->streamerInstance instanceof ZipStreamer) {
138
+            return $this->streamerInstance->addFileFromStream($stream, $internalName, $options);
139
+        } else {
140
+            return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options);
141
+        }
142
+    }
143 143
 
144
-	/**
145
-	 * Add an empty directory entry to the archive.
146
-	 *
147
-	 * @param string $dirName Directory Path and name to be added to the archive.
148
-	 * @return bool $success
149
-	 */
150
-	public function addEmptyDir($dirName){
151
-		return $this->streamerInstance->addEmptyDir($dirName);
152
-	}
144
+    /**
145
+     * Add an empty directory entry to the archive.
146
+     *
147
+     * @param string $dirName Directory Path and name to be added to the archive.
148
+     * @return bool $success
149
+     */
150
+    public function addEmptyDir($dirName){
151
+        return $this->streamerInstance->addEmptyDir($dirName);
152
+    }
153 153
 
154
-	/**
155
-	 * Close the archive.
156
-	 * A closed archive can no longer have new files added to it. After
157
-	 * closing, the file is completely written to the output stream.
158
-	 * @return bool $success
159
-	 */
160
-	public function finalize(){
161
-		return $this->streamerInstance->finalize();
162
-	}
154
+    /**
155
+     * Close the archive.
156
+     * A closed archive can no longer have new files added to it. After
157
+     * closing, the file is completely written to the output stream.
158
+     * @return bool $success
159
+     */
160
+    public function finalize(){
161
+        return $this->streamerInstance->finalize();
162
+    }
163 163
 }
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 
31 31
 class Streamer {
32 32
 	// array of regexp. Matching user agents will get tar instead of zip
33
-	private $preferTarFor = [ '/macintosh|mac os x/i' ];
33
+	private $preferTarFor = ['/macintosh|mac os x/i'];
34 34
 
35 35
 	// streamer instance
36 36
 	private $streamerInstance;
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 * @param int $numberOfFiles The number of files (and directories) that will
44 44
 	 *        be included in the streamed file
45 45
 	 */
46
-	public function __construct(IRequest $request, int $size, int $numberOfFiles){
46
+	public function __construct(IRequest $request, int $size, int $numberOfFiles) {
47 47
 
48 48
 		/**
49 49
 		 * zip32 constraints for a basic (without compression, volumes nor
@@ -80,9 +80,9 @@  discard block
 block discarded – undo
80 80
 	 * Send HTTP headers
81 81
 	 * @param string $name 
82 82
 	 */
83
-	public function sendHeaders($name){
83
+	public function sendHeaders($name) {
84 84
 		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
85
-		$fullName = $name . $extension;
85
+		$fullName = $name.$extension;
86 86
 		$this->streamerInstance->sendHeaders($fullName);
87 87
 	}
88 88
 	
@@ -91,27 +91,27 @@  discard block
 block discarded – undo
91 91
 	 * @param string $dir
92 92
 	 * @param string $internalDir
93 93
 	 */
94
-	public function addDirRecursive($dir, $internalDir='') {
94
+	public function addDirRecursive($dir, $internalDir = '') {
95 95
 		$dirname = basename($dir);
96
-		$rootDir = $internalDir . $dirname;
96
+		$rootDir = $internalDir.$dirname;
97 97
 		if (!empty($rootDir)) {
98 98
 			$this->streamerInstance->addEmptyDir($rootDir);
99 99
 		}
100
-		$internalDir .= $dirname . '/';
100
+		$internalDir .= $dirname.'/';
101 101
 		// prevent absolute dirs
102 102
 		$internalDir = ltrim($internalDir, '/');
103 103
 
104
-		$files= \OC\Files\Filesystem::getDirectoryContent($dir);
105
-		foreach($files as $file) {
104
+		$files = \OC\Files\Filesystem::getDirectoryContent($dir);
105
+		foreach ($files as $file) {
106 106
 			$filename = $file['name'];
107
-			$file = $dir . '/' . $filename;
108
-			if(\OC\Files\Filesystem::is_file($file)) {
107
+			$file = $dir.'/'.$filename;
108
+			if (\OC\Files\Filesystem::is_file($file)) {
109 109
 				$filesize = \OC\Files\Filesystem::filesize($file);
110 110
 				$fileTime = \OC\Files\Filesystem::filemtime($file);
111 111
 				$fh = \OC\Files\Filesystem::fopen($file, 'r');
112
-				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
112
+				$this->addFileFromStream($fh, $internalDir.$filename, $filesize, $fileTime);
113 113
 				fclose($fh);
114
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
114
+			}elseif (\OC\Files\Filesystem::is_dir($file)) {
115 115
 				$this->addDirRecursive($file, $internalDir);
116 116
 			}
117 117
 		}
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	 * @param string $dirName Directory Path and name to be added to the archive.
148 148
 	 * @return bool $success
149 149
 	 */
150
-	public function addEmptyDir($dirName){
150
+	public function addEmptyDir($dirName) {
151 151
 		return $this->streamerInstance->addEmptyDir($dirName);
152 152
 	}
153 153
 
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 	 * closing, the file is completely written to the output stream.
158 158
 	 * @return bool $success
159 159
 	 */
160
-	public function finalize(){
160
+	public function finalize() {
161 161
 		return $this->streamerInstance->finalize();
162 162
 	}
163 163
 }
Please login to merge, or discard this patch.
lib/private/Memcache/CASTrait.php 2 patches
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -23,35 +23,35 @@
 block discarded – undo
23 23
 namespace OC\Memcache;
24 24
 
25 25
 trait CASTrait {
26
-	abstract public function get($key);
26
+    abstract public function get($key);
27 27
 
28
-	abstract public function set($key, $value, $ttl = 0);
28
+    abstract public function set($key, $value, $ttl = 0);
29 29
 
30
-	abstract public function remove($key);
30
+    abstract public function remove($key);
31 31
 
32
-	abstract public function add($key, $value, $ttl = 0);
32
+    abstract public function add($key, $value, $ttl = 0);
33 33
 
34
-	/**
35
-	 * Compare and set
36
-	 *
37
-	 * @param string $key
38
-	 * @param mixed $old
39
-	 * @param mixed $new
40
-	 * @return bool
41
-	 */
42
-	public function cas($key, $old, $new) {
43
-		//no native cas, emulate with locking
44
-		if ($this->add($key . '_lock', true)) {
45
-			if ($this->get($key) === $old) {
46
-				$this->set($key, $new);
47
-				$this->remove($key . '_lock');
48
-				return true;
49
-			} else {
50
-				$this->remove($key . '_lock');
51
-				return false;
52
-			}
53
-		} else {
54
-			return false;
55
-		}
56
-	}
34
+    /**
35
+     * Compare and set
36
+     *
37
+     * @param string $key
38
+     * @param mixed $old
39
+     * @param mixed $new
40
+     * @return bool
41
+     */
42
+    public function cas($key, $old, $new) {
43
+        //no native cas, emulate with locking
44
+        if ($this->add($key . '_lock', true)) {
45
+            if ($this->get($key) === $old) {
46
+                $this->set($key, $new);
47
+                $this->remove($key . '_lock');
48
+                return true;
49
+            } else {
50
+                $this->remove($key . '_lock');
51
+                return false;
52
+            }
53
+        } else {
54
+            return false;
55
+        }
56
+    }
57 57
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,13 +41,13 @@
 block discarded – undo
41 41
 	 */
42 42
 	public function cas($key, $old, $new) {
43 43
 		//no native cas, emulate with locking
44
-		if ($this->add($key . '_lock', true)) {
44
+		if ($this->add($key.'_lock', true)) {
45 45
 			if ($this->get($key) === $old) {
46 46
 				$this->set($key, $new);
47
-				$this->remove($key . '_lock');
47
+				$this->remove($key.'_lock');
48 48
 				return true;
49 49
 			} else {
50
-				$this->remove($key . '_lock');
50
+				$this->remove($key.'_lock');
51 51
 				return false;
52 52
 			}
53 53
 		} else {
Please login to merge, or discard this patch.
lib/private/Memcache/Cache.php 1 patch
Indentation   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -26,72 +26,72 @@
 block discarded – undo
26 26
 namespace OC\Memcache;
27 27
 
28 28
 abstract class Cache implements \ArrayAccess, \OCP\ICache {
29
-	/**
30
-	 * @var string $prefix
31
-	 */
32
-	protected $prefix;
29
+    /**
30
+     * @var string $prefix
31
+     */
32
+    protected $prefix;
33 33
 
34
-	/**
35
-	 * @param string $prefix
36
-	 */
37
-	public function __construct($prefix = '') {
38
-		$this->prefix = $prefix;
39
-	}
34
+    /**
35
+     * @param string $prefix
36
+     */
37
+    public function __construct($prefix = '') {
38
+        $this->prefix = $prefix;
39
+    }
40 40
 
41
-	/**
42
-	 * @return string Prefix used for caching purposes
43
-	 */
44
-	public function getPrefix() {
45
-		return $this->prefix;
46
-	}
41
+    /**
42
+     * @return string Prefix used for caching purposes
43
+     */
44
+    public function getPrefix() {
45
+        return $this->prefix;
46
+    }
47 47
 
48
-	/**
49
-	 * @param string $key
50
-	 * @return mixed
51
-	 */
52
-	abstract public function get($key);
48
+    /**
49
+     * @param string $key
50
+     * @return mixed
51
+     */
52
+    abstract public function get($key);
53 53
 
54
-	/**
55
-	 * @param string $key
56
-	 * @param mixed $value
57
-	 * @param int $ttl
58
-	 * @return mixed
59
-	 */
60
-	abstract public function set($key, $value, $ttl = 0);
54
+    /**
55
+     * @param string $key
56
+     * @param mixed $value
57
+     * @param int $ttl
58
+     * @return mixed
59
+     */
60
+    abstract public function set($key, $value, $ttl = 0);
61 61
 
62
-	/**
63
-	 * @param string $key
64
-	 * @return mixed
65
-	 */
66
-	abstract public function hasKey($key);
62
+    /**
63
+     * @param string $key
64
+     * @return mixed
65
+     */
66
+    abstract public function hasKey($key);
67 67
 
68
-	/**
69
-	 * @param string $key
70
-	 * @return mixed
71
-	 */
72
-	abstract public function remove($key);
68
+    /**
69
+     * @param string $key
70
+     * @return mixed
71
+     */
72
+    abstract public function remove($key);
73 73
 
74
-	/**
75
-	 * @param string $prefix
76
-	 * @return mixed
77
-	 */
78
-	abstract public function clear($prefix = '');
74
+    /**
75
+     * @param string $prefix
76
+     * @return mixed
77
+     */
78
+    abstract public function clear($prefix = '');
79 79
 
80
-	//implement the ArrayAccess interface
80
+    //implement the ArrayAccess interface
81 81
 
82
-	public function offsetExists($offset) {
83
-		return $this->hasKey($offset);
84
-	}
82
+    public function offsetExists($offset) {
83
+        return $this->hasKey($offset);
84
+    }
85 85
 
86
-	public function offsetSet($offset, $value) {
87
-		$this->set($offset, $value);
88
-	}
86
+    public function offsetSet($offset, $value) {
87
+        $this->set($offset, $value);
88
+    }
89 89
 
90
-	public function offsetGet($offset) {
91
-		return $this->get($offset);
92
-	}
90
+    public function offsetGet($offset) {
91
+        return $this->get($offset);
92
+    }
93 93
 
94
-	public function offsetUnset($offset) {
95
-		$this->remove($offset);
96
-	}
94
+    public function offsetUnset($offset) {
95
+        $this->remove($offset);
96
+    }
97 97
 }
Please login to merge, or discard this patch.
lib/private/Memcache/CADTrait.php 2 patches
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -23,32 +23,32 @@
 block discarded – undo
23 23
 namespace OC\Memcache;
24 24
 
25 25
 trait CADTrait {
26
-	abstract public function get($key);
26
+    abstract public function get($key);
27 27
 
28
-	abstract public function remove($key);
28
+    abstract public function remove($key);
29 29
 
30
-	abstract public function add($key, $value, $ttl = 0);
30
+    abstract public function add($key, $value, $ttl = 0);
31 31
 
32
-	/**
33
-	 * Compare and delete
34
-	 *
35
-	 * @param string $key
36
-	 * @param mixed $old
37
-	 * @return bool
38
-	 */
39
-	public function cad($key, $old) {
40
-		//no native cas, emulate with locking
41
-		if ($this->add($key . '_lock', true)) {
42
-			if ($this->get($key) === $old) {
43
-				$this->remove($key);
44
-				$this->remove($key . '_lock');
45
-				return true;
46
-			} else {
47
-				$this->remove($key . '_lock');
48
-				return false;
49
-			}
50
-		} else {
51
-			return false;
52
-		}
53
-	}
32
+    /**
33
+     * Compare and delete
34
+     *
35
+     * @param string $key
36
+     * @param mixed $old
37
+     * @return bool
38
+     */
39
+    public function cad($key, $old) {
40
+        //no native cas, emulate with locking
41
+        if ($this->add($key . '_lock', true)) {
42
+            if ($this->get($key) === $old) {
43
+                $this->remove($key);
44
+                $this->remove($key . '_lock');
45
+                return true;
46
+            } else {
47
+                $this->remove($key . '_lock');
48
+                return false;
49
+            }
50
+        } else {
51
+            return false;
52
+        }
53
+    }
54 54
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -38,13 +38,13 @@
 block discarded – undo
38 38
 	 */
39 39
 	public function cad($key, $old) {
40 40
 		//no native cas, emulate with locking
41
-		if ($this->add($key . '_lock', true)) {
41
+		if ($this->add($key.'_lock', true)) {
42 42
 			if ($this->get($key) === $old) {
43 43
 				$this->remove($key);
44
-				$this->remove($key . '_lock');
44
+				$this->remove($key.'_lock');
45 45
 				return true;
46 46
 			} else {
47
-				$this->remove($key . '_lock');
47
+				$this->remove($key.'_lock');
48 48
 				return false;
49 49
 			}
50 50
 		} else {
Please login to merge, or discard this patch.
lib/private/Memcache/NullCache.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -27,47 +27,47 @@
 block discarded – undo
27 27
 namespace OC\Memcache;
28 28
 
29 29
 class NullCache extends Cache implements \OCP\IMemcache {
30
-	public function get($key) {
31
-		return null;
32
-	}
30
+    public function get($key) {
31
+        return null;
32
+    }
33 33
 
34
-	public function set($key, $value, $ttl = 0) {
35
-		return true;
36
-	}
34
+    public function set($key, $value, $ttl = 0) {
35
+        return true;
36
+    }
37 37
 
38
-	public function hasKey($key) {
39
-		return false;
40
-	}
38
+    public function hasKey($key) {
39
+        return false;
40
+    }
41 41
 
42
-	public function remove($key) {
43
-		return true;
44
-	}
42
+    public function remove($key) {
43
+        return true;
44
+    }
45 45
 
46
-	public function add($key, $value, $ttl = 0) {
47
-		return true;
48
-	}
46
+    public function add($key, $value, $ttl = 0) {
47
+        return true;
48
+    }
49 49
 
50
-	public function inc($key, $step = 1) {
51
-		return true;
52
-	}
50
+    public function inc($key, $step = 1) {
51
+        return true;
52
+    }
53 53
 
54
-	public function dec($key, $step = 1) {
55
-		return true;
56
-	}
54
+    public function dec($key, $step = 1) {
55
+        return true;
56
+    }
57 57
 
58
-	public function cas($key, $old, $new) {
59
-		return true;
60
-	}
58
+    public function cas($key, $old, $new) {
59
+        return true;
60
+    }
61 61
 
62
-	public function cad($key, $old) {
63
-		return true;
64
-	}
62
+    public function cad($key, $old) {
63
+        return true;
64
+    }
65 65
 
66
-	public function clear($prefix = '') {
67
-		return true;
68
-	}
66
+    public function clear($prefix = '') {
67
+        return true;
68
+    }
69 69
 
70
-	static public function isAvailable() {
71
-		return true;
72
-	}
70
+    static public function isAvailable() {
71
+        return true;
72
+    }
73 73
 }
Please login to merge, or discard this patch.
lib/private/OCS/Result.php 2 patches
Indentation   +124 added lines, -124 removed lines patch added patch discarded remove patch
@@ -32,129 +32,129 @@
 block discarded – undo
32 32
 
33 33
 class Result {
34 34
 
35
-	/** @var array  */
36
-	protected $data;
37
-
38
-	/** @var null|string */
39
-	protected $message;
40
-
41
-	/** @var int */
42
-	protected $statusCode;
43
-
44
-	/** @var integer */
45
-	protected $items;
46
-
47
-	/** @var integer */
48
-	protected $perPage;
49
-
50
-	/** @var array */
51
-	private $headers = [];
52
-
53
-	/**
54
-	 * create the OCS_Result object
55
-	 * @param mixed $data the data to return
56
-	 * @param int $code
57
-	 * @param null|string $message
58
-	 * @param array $headers
59
-	 */
60
-	public function __construct($data = null, $code = 100, $message = null, $headers = []) {
61
-		if ($data === null) {
62
-			$this->data = array();
63
-		} elseif (!is_array($data)) {
64
-			$this->data = array($this->data);
65
-		} else {
66
-			$this->data = $data;
67
-		}
68
-		$this->statusCode = $code;
69
-		$this->message = $message;
70
-		$this->headers = $headers;
71
-	}
72
-
73
-	/**
74
-	 * optionally set the total number of items available
75
-	 * @param int $items
76
-	 */
77
-	public function setTotalItems($items) {
78
-		$this->items = $items;
79
-	}
80
-
81
-	/**
82
-	 * optionally set the the number of items per page
83
-	 * @param int $items
84
-	 */
85
-	public function setItemsPerPage($items) {
86
-		$this->perPage = $items;
87
-	}
88
-
89
-	/**
90
-	 * get the status code
91
-	 * @return int
92
-	 */
93
-	public function getStatusCode() {
94
-		return $this->statusCode;
95
-	}
96
-
97
-	/**
98
-	 * get the meta data for the result
99
-	 * @return array
100
-	 */
101
-	public function getMeta() {
102
-		$meta = array();
103
-		$meta['status'] = $this->succeeded() ? 'ok' : 'failure';
104
-		$meta['statuscode'] = $this->statusCode;
105
-		$meta['message'] = $this->message;
106
-		if(isset($this->items)) {
107
-			$meta['totalitems'] = $this->items;
108
-		}
109
-		if(isset($this->perPage)) {
110
-			$meta['itemsperpage'] = $this->perPage;
111
-		}
112
-		return $meta;
113
-
114
-	}
115
-
116
-	/**
117
-	 * get the result data
118
-	 * @return array
119
-	 */
120
-	public function getData() {
121
-		return $this->data;
122
-	}
123
-
124
-	/**
125
-	 * return bool Whether the method succeeded
126
-	 * @return bool
127
-	 */
128
-	public function succeeded() {
129
-		return ($this->statusCode == 100);
130
-	}
131
-
132
-	/**
133
-	 * Adds a new header to the response
134
-	 * @param string $name The name of the HTTP header
135
-	 * @param string $value The value, null will delete it
136
-	 * @return $this
137
-	 */
138
-	public function addHeader($name, $value) {
139
-		$name = trim($name);  // always remove leading and trailing whitespace
140
-		// to be able to reliably check for security
141
-		// headers
142
-
143
-		if(is_null($value)) {
144
-			unset($this->headers[$name]);
145
-		} else {
146
-			$this->headers[$name] = $value;
147
-		}
148
-
149
-		return $this;
150
-	}
151
-
152
-	/**
153
-	 * Returns the set headers
154
-	 * @return array the headers
155
-	 */
156
-	public function getHeaders() {
157
-		return $this->headers;
158
-	}
35
+    /** @var array  */
36
+    protected $data;
37
+
38
+    /** @var null|string */
39
+    protected $message;
40
+
41
+    /** @var int */
42
+    protected $statusCode;
43
+
44
+    /** @var integer */
45
+    protected $items;
46
+
47
+    /** @var integer */
48
+    protected $perPage;
49
+
50
+    /** @var array */
51
+    private $headers = [];
52
+
53
+    /**
54
+     * create the OCS_Result object
55
+     * @param mixed $data the data to return
56
+     * @param int $code
57
+     * @param null|string $message
58
+     * @param array $headers
59
+     */
60
+    public function __construct($data = null, $code = 100, $message = null, $headers = []) {
61
+        if ($data === null) {
62
+            $this->data = array();
63
+        } elseif (!is_array($data)) {
64
+            $this->data = array($this->data);
65
+        } else {
66
+            $this->data = $data;
67
+        }
68
+        $this->statusCode = $code;
69
+        $this->message = $message;
70
+        $this->headers = $headers;
71
+    }
72
+
73
+    /**
74
+     * optionally set the total number of items available
75
+     * @param int $items
76
+     */
77
+    public function setTotalItems($items) {
78
+        $this->items = $items;
79
+    }
80
+
81
+    /**
82
+     * optionally set the the number of items per page
83
+     * @param int $items
84
+     */
85
+    public function setItemsPerPage($items) {
86
+        $this->perPage = $items;
87
+    }
88
+
89
+    /**
90
+     * get the status code
91
+     * @return int
92
+     */
93
+    public function getStatusCode() {
94
+        return $this->statusCode;
95
+    }
96
+
97
+    /**
98
+     * get the meta data for the result
99
+     * @return array
100
+     */
101
+    public function getMeta() {
102
+        $meta = array();
103
+        $meta['status'] = $this->succeeded() ? 'ok' : 'failure';
104
+        $meta['statuscode'] = $this->statusCode;
105
+        $meta['message'] = $this->message;
106
+        if(isset($this->items)) {
107
+            $meta['totalitems'] = $this->items;
108
+        }
109
+        if(isset($this->perPage)) {
110
+            $meta['itemsperpage'] = $this->perPage;
111
+        }
112
+        return $meta;
113
+
114
+    }
115
+
116
+    /**
117
+     * get the result data
118
+     * @return array
119
+     */
120
+    public function getData() {
121
+        return $this->data;
122
+    }
123
+
124
+    /**
125
+     * return bool Whether the method succeeded
126
+     * @return bool
127
+     */
128
+    public function succeeded() {
129
+        return ($this->statusCode == 100);
130
+    }
131
+
132
+    /**
133
+     * Adds a new header to the response
134
+     * @param string $name The name of the HTTP header
135
+     * @param string $value The value, null will delete it
136
+     * @return $this
137
+     */
138
+    public function addHeader($name, $value) {
139
+        $name = trim($name);  // always remove leading and trailing whitespace
140
+        // to be able to reliably check for security
141
+        // headers
142
+
143
+        if(is_null($value)) {
144
+            unset($this->headers[$name]);
145
+        } else {
146
+            $this->headers[$name] = $value;
147
+        }
148
+
149
+        return $this;
150
+    }
151
+
152
+    /**
153
+     * Returns the set headers
154
+     * @return array the headers
155
+     */
156
+    public function getHeaders() {
157
+        return $this->headers;
158
+    }
159 159
 
160 160
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -103,10 +103,10 @@  discard block
 block discarded – undo
103 103
 		$meta['status'] = $this->succeeded() ? 'ok' : 'failure';
104 104
 		$meta['statuscode'] = $this->statusCode;
105 105
 		$meta['message'] = $this->message;
106
-		if(isset($this->items)) {
106
+		if (isset($this->items)) {
107 107
 			$meta['totalitems'] = $this->items;
108 108
 		}
109
-		if(isset($this->perPage)) {
109
+		if (isset($this->perPage)) {
110 110
 			$meta['itemsperpage'] = $this->perPage;
111 111
 		}
112 112
 		return $meta;
@@ -136,11 +136,11 @@  discard block
 block discarded – undo
136 136
 	 * @return $this
137 137
 	 */
138 138
 	public function addHeader($name, $value) {
139
-		$name = trim($name);  // always remove leading and trailing whitespace
139
+		$name = trim($name); // always remove leading and trailing whitespace
140 140
 		// to be able to reliably check for security
141 141
 		// headers
142 142
 
143
-		if(is_null($value)) {
143
+		if (is_null($value)) {
144 144
 			unset($this->headers[$name]);
145 145
 		} else {
146 146
 			$this->headers[$name] = $value;
Please login to merge, or discard this patch.
lib/private/OCS/CoreCapabilities.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -33,27 +33,27 @@
 block discarded – undo
33 33
  */
34 34
 class CoreCapabilities implements ICapability {
35 35
 
36
-	/** @var IConfig */
37
-	private $config;
36
+    /** @var IConfig */
37
+    private $config;
38 38
 
39
-	/**
40
-	 * @param IConfig $config
41
-	 */
42
-	public function __construct(IConfig $config) {
43
-		$this->config = $config;
44
-	}
39
+    /**
40
+     * @param IConfig $config
41
+     */
42
+    public function __construct(IConfig $config) {
43
+        $this->config = $config;
44
+    }
45 45
 
46
-	/**
47
-	 * Return this classes capabilities
48
-	 *
49
-	 * @return array
50
-	 */
51
-	public function getCapabilities() {
52
-		return [
53
-			'core' => [
54
-				'pollinterval' => $this->config->getSystemValue('pollinterval', 60),
55
-				'webdav-root' => $this->config->getSystemValue('webdav-root', 'remote.php/webdav'),
56
-			]
57
-		];
58
-	}
46
+    /**
47
+     * Return this classes capabilities
48
+     *
49
+     * @return array
50
+     */
51
+    public function getCapabilities() {
52
+        return [
53
+            'core' => [
54
+                'pollinterval' => $this->config->getSystemValue('pollinterval', 60),
55
+                'webdav-root' => $this->config->getSystemValue('webdav-root', 'remote.php/webdav'),
56
+            ]
57
+        ];
58
+    }
59 59
 }
Please login to merge, or discard this patch.
lib/private/Files/Node/NonExistingFolder.php 1 patch
Indentation   +143 added lines, -143 removed lines patch added patch discarded remove patch
@@ -27,147 +27,147 @@
 block discarded – undo
27 27
 use OCP\Files\NotFoundException;
28 28
 
29 29
 class NonExistingFolder extends Folder {
30
-	/**
31
-	 * @param string $newPath
32
-	 * @throws \OCP\Files\NotFoundException
33
-	 */
34
-	public function rename($newPath) {
35
-		throw new NotFoundException();
36
-	}
37
-
38
-	public function delete() {
39
-		throw new NotFoundException();
40
-	}
41
-
42
-	public function copy($newPath) {
43
-		throw new NotFoundException();
44
-	}
45
-
46
-	public function touch($mtime = null) {
47
-		throw new NotFoundException();
48
-	}
49
-
50
-	public function getId() {
51
-		if ($this->fileInfo) {
52
-			return parent::getId();
53
-		} else {
54
-			throw new NotFoundException();
55
-		}
56
-	}
57
-
58
-	public function stat() {
59
-		throw new NotFoundException();
60
-	}
61
-
62
-	public function getMTime() {
63
-		if ($this->fileInfo) {
64
-			return parent::getMTime();
65
-		} else {
66
-			throw new NotFoundException();
67
-		}
68
-	}
69
-
70
-	public function getSize() {
71
-		if ($this->fileInfo) {
72
-			return parent::getSize();
73
-		} else {
74
-			throw new NotFoundException();
75
-		}
76
-	}
77
-
78
-	public function getEtag() {
79
-		if ($this->fileInfo) {
80
-			return parent::getEtag();
81
-		} else {
82
-			throw new NotFoundException();
83
-		}
84
-	}
85
-
86
-	public function getPermissions() {
87
-		if ($this->fileInfo) {
88
-			return parent::getPermissions();
89
-		} else {
90
-			throw new NotFoundException();
91
-		}
92
-	}
93
-
94
-	public function isReadable() {
95
-		if ($this->fileInfo) {
96
-			return parent::isReadable();
97
-		} else {
98
-			throw new NotFoundException();
99
-		}
100
-	}
101
-
102
-	public function isUpdateable() {
103
-		if ($this->fileInfo) {
104
-			return parent::isUpdateable();
105
-		} else {
106
-			throw new NotFoundException();
107
-		}
108
-	}
109
-
110
-	public function isDeletable() {
111
-		if ($this->fileInfo) {
112
-			return parent::isDeletable();
113
-		} else {
114
-			throw new NotFoundException();
115
-		}
116
-	}
117
-
118
-	public function isShareable() {
119
-		if ($this->fileInfo) {
120
-			return parent::isShareable();
121
-		} else {
122
-			throw new NotFoundException();
123
-		}
124
-	}
125
-
126
-	public function get($path) {
127
-		throw new NotFoundException();
128
-	}
129
-
130
-	public function getDirectoryListing() {
131
-		throw new NotFoundException();
132
-	}
133
-
134
-	public function nodeExists($path) {
135
-		return false;
136
-	}
137
-
138
-	public function newFolder($path) {
139
-		throw new NotFoundException();
140
-	}
141
-
142
-	public function newFile($path) {
143
-		throw new NotFoundException();
144
-	}
145
-
146
-	public function search($pattern) {
147
-		throw new NotFoundException();
148
-	}
149
-
150
-	public function searchByMime($mime) {
151
-		throw new NotFoundException();
152
-	}
153
-
154
-	public function searchByTag($tag, $userId) {
155
-		throw new NotFoundException();
156
-	}
157
-
158
-	public function getById($id) {
159
-		throw new NotFoundException();
160
-	}
161
-
162
-	public function getFreeSpace() {
163
-		throw new NotFoundException();
164
-	}
165
-
166
-	public function isCreatable() {
167
-		if ($this->fileInfo) {
168
-			return parent::isCreatable();
169
-		} else {
170
-			throw new NotFoundException();
171
-		}
172
-	}
30
+    /**
31
+     * @param string $newPath
32
+     * @throws \OCP\Files\NotFoundException
33
+     */
34
+    public function rename($newPath) {
35
+        throw new NotFoundException();
36
+    }
37
+
38
+    public function delete() {
39
+        throw new NotFoundException();
40
+    }
41
+
42
+    public function copy($newPath) {
43
+        throw new NotFoundException();
44
+    }
45
+
46
+    public function touch($mtime = null) {
47
+        throw new NotFoundException();
48
+    }
49
+
50
+    public function getId() {
51
+        if ($this->fileInfo) {
52
+            return parent::getId();
53
+        } else {
54
+            throw new NotFoundException();
55
+        }
56
+    }
57
+
58
+    public function stat() {
59
+        throw new NotFoundException();
60
+    }
61
+
62
+    public function getMTime() {
63
+        if ($this->fileInfo) {
64
+            return parent::getMTime();
65
+        } else {
66
+            throw new NotFoundException();
67
+        }
68
+    }
69
+
70
+    public function getSize() {
71
+        if ($this->fileInfo) {
72
+            return parent::getSize();
73
+        } else {
74
+            throw new NotFoundException();
75
+        }
76
+    }
77
+
78
+    public function getEtag() {
79
+        if ($this->fileInfo) {
80
+            return parent::getEtag();
81
+        } else {
82
+            throw new NotFoundException();
83
+        }
84
+    }
85
+
86
+    public function getPermissions() {
87
+        if ($this->fileInfo) {
88
+            return parent::getPermissions();
89
+        } else {
90
+            throw new NotFoundException();
91
+        }
92
+    }
93
+
94
+    public function isReadable() {
95
+        if ($this->fileInfo) {
96
+            return parent::isReadable();
97
+        } else {
98
+            throw new NotFoundException();
99
+        }
100
+    }
101
+
102
+    public function isUpdateable() {
103
+        if ($this->fileInfo) {
104
+            return parent::isUpdateable();
105
+        } else {
106
+            throw new NotFoundException();
107
+        }
108
+    }
109
+
110
+    public function isDeletable() {
111
+        if ($this->fileInfo) {
112
+            return parent::isDeletable();
113
+        } else {
114
+            throw new NotFoundException();
115
+        }
116
+    }
117
+
118
+    public function isShareable() {
119
+        if ($this->fileInfo) {
120
+            return parent::isShareable();
121
+        } else {
122
+            throw new NotFoundException();
123
+        }
124
+    }
125
+
126
+    public function get($path) {
127
+        throw new NotFoundException();
128
+    }
129
+
130
+    public function getDirectoryListing() {
131
+        throw new NotFoundException();
132
+    }
133
+
134
+    public function nodeExists($path) {
135
+        return false;
136
+    }
137
+
138
+    public function newFolder($path) {
139
+        throw new NotFoundException();
140
+    }
141
+
142
+    public function newFile($path) {
143
+        throw new NotFoundException();
144
+    }
145
+
146
+    public function search($pattern) {
147
+        throw new NotFoundException();
148
+    }
149
+
150
+    public function searchByMime($mime) {
151
+        throw new NotFoundException();
152
+    }
153
+
154
+    public function searchByTag($tag, $userId) {
155
+        throw new NotFoundException();
156
+    }
157
+
158
+    public function getById($id) {
159
+        throw new NotFoundException();
160
+    }
161
+
162
+    public function getFreeSpace() {
163
+        throw new NotFoundException();
164
+    }
165
+
166
+    public function isCreatable() {
167
+        if ($this->fileInfo) {
168
+            return parent::isCreatable();
169
+        } else {
170
+            throw new NotFoundException();
171
+        }
172
+    }
173 173
 }
Please login to merge, or discard this patch.
lib/private/Files/Node/Root.php 2 patches
Indentation   +334 added lines, -334 removed lines patch added patch discarded remove patch
@@ -59,338 +59,338 @@
 block discarded – undo
59 59
  * @package OC\Files\Node
60 60
  */
61 61
 class Root extends Folder implements IRootFolder {
62
-	/** @var Manager */
63
-	private $mountManager;
64
-	/** @var PublicEmitter */
65
-	private $emitter;
66
-	/** @var null|\OC\User\User */
67
-	private $user;
68
-	/** @var CappedMemoryCache */
69
-	private $userFolderCache;
70
-	/** @var IUserMountCache */
71
-	private $userMountCache;
72
-	/** @var ILogger */
73
-	private $logger;
74
-	/** @var IUserManager */
75
-	private $userManager;
76
-
77
-	/**
78
-	 * @param \OC\Files\Mount\Manager $manager
79
-	 * @param \OC\Files\View $view
80
-	 * @param \OC\User\User|null $user
81
-	 * @param IUserMountCache $userMountCache
82
-	 * @param ILogger $logger
83
-	 * @param IUserManager $userManager
84
-	 */
85
-	public function __construct($manager,
86
-								$view,
87
-								$user,
88
-								IUserMountCache $userMountCache,
89
-								ILogger $logger,
90
-								IUserManager $userManager) {
91
-		parent::__construct($this, $view, '');
92
-		$this->mountManager = $manager;
93
-		$this->user = $user;
94
-		$this->emitter = new PublicEmitter();
95
-		$this->userFolderCache = new CappedMemoryCache();
96
-		$this->userMountCache = $userMountCache;
97
-		$this->logger = $logger;
98
-		$this->userManager = $userManager;
99
-	}
100
-
101
-	/**
102
-	 * Get the user for which the filesystem is setup
103
-	 *
104
-	 * @return \OC\User\User
105
-	 */
106
-	public function getUser() {
107
-		return $this->user;
108
-	}
109
-
110
-	/**
111
-	 * @param string $scope
112
-	 * @param string $method
113
-	 * @param callable $callback
114
-	 */
115
-	public function listen($scope, $method, callable $callback) {
116
-		$this->emitter->listen($scope, $method, $callback);
117
-	}
118
-
119
-	/**
120
-	 * @param string $scope optional
121
-	 * @param string $method optional
122
-	 * @param callable $callback optional
123
-	 */
124
-	public function removeListener($scope = null, $method = null, callable $callback = null) {
125
-		$this->emitter->removeListener($scope, $method, $callback);
126
-	}
127
-
128
-	/**
129
-	 * @param string $scope
130
-	 * @param string $method
131
-	 * @param Node[] $arguments
132
-	 */
133
-	public function emit($scope, $method, $arguments = array()) {
134
-		$this->emitter->emit($scope, $method, $arguments);
135
-	}
136
-
137
-	/**
138
-	 * @param \OC\Files\Storage\Storage $storage
139
-	 * @param string $mountPoint
140
-	 * @param array $arguments
141
-	 */
142
-	public function mount($storage, $mountPoint, $arguments = array()) {
143
-		$mount = new MountPoint($storage, $mountPoint, $arguments);
144
-		$this->mountManager->addMount($mount);
145
-	}
146
-
147
-	/**
148
-	 * @param string $mountPoint
149
-	 * @return \OC\Files\Mount\MountPoint
150
-	 */
151
-	public function getMount($mountPoint) {
152
-		return $this->mountManager->find($mountPoint);
153
-	}
154
-
155
-	/**
156
-	 * @param string $mountPoint
157
-	 * @return \OC\Files\Mount\MountPoint[]
158
-	 */
159
-	public function getMountsIn($mountPoint) {
160
-		return $this->mountManager->findIn($mountPoint);
161
-	}
162
-
163
-	/**
164
-	 * @param string $storageId
165
-	 * @return \OC\Files\Mount\MountPoint[]
166
-	 */
167
-	public function getMountByStorageId($storageId) {
168
-		return $this->mountManager->findByStorageId($storageId);
169
-	}
170
-
171
-	/**
172
-	 * @param int $numericId
173
-	 * @return MountPoint[]
174
-	 */
175
-	public function getMountByNumericStorageId($numericId) {
176
-		return $this->mountManager->findByNumericId($numericId);
177
-	}
178
-
179
-	/**
180
-	 * @param \OC\Files\Mount\MountPoint $mount
181
-	 */
182
-	public function unMount($mount) {
183
-		$this->mountManager->remove($mount);
184
-	}
185
-
186
-	/**
187
-	 * @param string $path
188
-	 * @throws \OCP\Files\NotFoundException
189
-	 * @throws \OCP\Files\NotPermittedException
190
-	 * @return string
191
-	 */
192
-	public function get($path) {
193
-		$path = $this->normalizePath($path);
194
-		if ($this->isValidPath($path)) {
195
-			$fullPath = $this->getFullPath($path);
196
-			$fileInfo = $this->view->getFileInfo($fullPath);
197
-			if ($fileInfo) {
198
-				return $this->createNode($fullPath, $fileInfo);
199
-			} else {
200
-				throw new NotFoundException($path);
201
-			}
202
-		} else {
203
-			throw new NotPermittedException();
204
-		}
205
-	}
206
-
207
-	//most operations can't be done on the root
208
-
209
-	/**
210
-	 * @param string $targetPath
211
-	 * @throws \OCP\Files\NotPermittedException
212
-	 * @return \OC\Files\Node\Node
213
-	 */
214
-	public function rename($targetPath) {
215
-		throw new NotPermittedException();
216
-	}
217
-
218
-	public function delete() {
219
-		throw new NotPermittedException();
220
-	}
221
-
222
-	/**
223
-	 * @param string $targetPath
224
-	 * @throws \OCP\Files\NotPermittedException
225
-	 * @return \OC\Files\Node\Node
226
-	 */
227
-	public function copy($targetPath) {
228
-		throw new NotPermittedException();
229
-	}
230
-
231
-	/**
232
-	 * @param int $mtime
233
-	 * @throws \OCP\Files\NotPermittedException
234
-	 */
235
-	public function touch($mtime = null) {
236
-		throw new NotPermittedException();
237
-	}
238
-
239
-	/**
240
-	 * @return \OC\Files\Storage\Storage
241
-	 * @throws \OCP\Files\NotFoundException
242
-	 */
243
-	public function getStorage() {
244
-		throw new NotFoundException();
245
-	}
246
-
247
-	/**
248
-	 * @return string
249
-	 */
250
-	public function getPath() {
251
-		return '/';
252
-	}
253
-
254
-	/**
255
-	 * @return string
256
-	 */
257
-	public function getInternalPath() {
258
-		return '';
259
-	}
260
-
261
-	/**
262
-	 * @return int
263
-	 */
264
-	public function getId() {
265
-		return null;
266
-	}
267
-
268
-	/**
269
-	 * @return array
270
-	 */
271
-	public function stat() {
272
-		return null;
273
-	}
274
-
275
-	/**
276
-	 * @return int
277
-	 */
278
-	public function getMTime() {
279
-		return null;
280
-	}
281
-
282
-	/**
283
-	 * @return int
284
-	 */
285
-	public function getSize() {
286
-		return null;
287
-	}
288
-
289
-	/**
290
-	 * @return string
291
-	 */
292
-	public function getEtag() {
293
-		return null;
294
-	}
295
-
296
-	/**
297
-	 * @return int
298
-	 */
299
-	public function getPermissions() {
300
-		return \OCP\Constants::PERMISSION_CREATE;
301
-	}
302
-
303
-	/**
304
-	 * @return bool
305
-	 */
306
-	public function isReadable() {
307
-		return false;
308
-	}
309
-
310
-	/**
311
-	 * @return bool
312
-	 */
313
-	public function isUpdateable() {
314
-		return false;
315
-	}
316
-
317
-	/**
318
-	 * @return bool
319
-	 */
320
-	public function isDeletable() {
321
-		return false;
322
-	}
323
-
324
-	/**
325
-	 * @return bool
326
-	 */
327
-	public function isShareable() {
328
-		return false;
329
-	}
330
-
331
-	/**
332
-	 * @return Node
333
-	 * @throws \OCP\Files\NotFoundException
334
-	 */
335
-	public function getParent() {
336
-		throw new NotFoundException();
337
-	}
338
-
339
-	/**
340
-	 * @return string
341
-	 */
342
-	public function getName() {
343
-		return '';
344
-	}
345
-
346
-	/**
347
-	 * Returns a view to user's files folder
348
-	 *
349
-	 * @param String $userId user ID
350
-	 * @return \OCP\Files\Folder
351
-	 * @throws \OC\User\NoUserException
352
-	 */
353
-	public function getUserFolder($userId) {
354
-		$userObject = $this->userManager->get($userId);
355
-
356
-		if (is_null($userObject)) {
357
-			$this->logger->error(
358
-				sprintf(
359
-					'Backends provided no user object for %s',
360
-					$userId
361
-				),
362
-				[
363
-					'app' => 'files',
364
-				]
365
-			);
366
-			throw new \OC\User\NoUserException('Backends provided no user object');
367
-		}
368
-
369
-		$userId = $userObject->getUID();
370
-
371
-		if (!$this->userFolderCache->hasKey($userId)) {
372
-			\OC\Files\Filesystem::initMountPoints($userId);
373
-
374
-			try {
375
-				$folder = $this->get('/' . $userId . '/files');
376
-			} catch (NotFoundException $e) {
377
-				if (!$this->nodeExists('/' . $userId)) {
378
-					$this->newFolder('/' . $userId);
379
-				}
380
-				$folder = $this->newFolder('/' . $userId . '/files');
381
-			}
382
-
383
-			$this->userFolderCache->set($userId, $folder);
384
-		}
385
-
386
-		return $this->userFolderCache->get($userId);
387
-	}
388
-
389
-	public function clearCache() {
390
-		$this->userFolderCache = new CappedMemoryCache();
391
-	}
392
-
393
-	public function getUserMountCache() {
394
-		return $this->userMountCache;
395
-	}
62
+    /** @var Manager */
63
+    private $mountManager;
64
+    /** @var PublicEmitter */
65
+    private $emitter;
66
+    /** @var null|\OC\User\User */
67
+    private $user;
68
+    /** @var CappedMemoryCache */
69
+    private $userFolderCache;
70
+    /** @var IUserMountCache */
71
+    private $userMountCache;
72
+    /** @var ILogger */
73
+    private $logger;
74
+    /** @var IUserManager */
75
+    private $userManager;
76
+
77
+    /**
78
+     * @param \OC\Files\Mount\Manager $manager
79
+     * @param \OC\Files\View $view
80
+     * @param \OC\User\User|null $user
81
+     * @param IUserMountCache $userMountCache
82
+     * @param ILogger $logger
83
+     * @param IUserManager $userManager
84
+     */
85
+    public function __construct($manager,
86
+                                $view,
87
+                                $user,
88
+                                IUserMountCache $userMountCache,
89
+                                ILogger $logger,
90
+                                IUserManager $userManager) {
91
+        parent::__construct($this, $view, '');
92
+        $this->mountManager = $manager;
93
+        $this->user = $user;
94
+        $this->emitter = new PublicEmitter();
95
+        $this->userFolderCache = new CappedMemoryCache();
96
+        $this->userMountCache = $userMountCache;
97
+        $this->logger = $logger;
98
+        $this->userManager = $userManager;
99
+    }
100
+
101
+    /**
102
+     * Get the user for which the filesystem is setup
103
+     *
104
+     * @return \OC\User\User
105
+     */
106
+    public function getUser() {
107
+        return $this->user;
108
+    }
109
+
110
+    /**
111
+     * @param string $scope
112
+     * @param string $method
113
+     * @param callable $callback
114
+     */
115
+    public function listen($scope, $method, callable $callback) {
116
+        $this->emitter->listen($scope, $method, $callback);
117
+    }
118
+
119
+    /**
120
+     * @param string $scope optional
121
+     * @param string $method optional
122
+     * @param callable $callback optional
123
+     */
124
+    public function removeListener($scope = null, $method = null, callable $callback = null) {
125
+        $this->emitter->removeListener($scope, $method, $callback);
126
+    }
127
+
128
+    /**
129
+     * @param string $scope
130
+     * @param string $method
131
+     * @param Node[] $arguments
132
+     */
133
+    public function emit($scope, $method, $arguments = array()) {
134
+        $this->emitter->emit($scope, $method, $arguments);
135
+    }
136
+
137
+    /**
138
+     * @param \OC\Files\Storage\Storage $storage
139
+     * @param string $mountPoint
140
+     * @param array $arguments
141
+     */
142
+    public function mount($storage, $mountPoint, $arguments = array()) {
143
+        $mount = new MountPoint($storage, $mountPoint, $arguments);
144
+        $this->mountManager->addMount($mount);
145
+    }
146
+
147
+    /**
148
+     * @param string $mountPoint
149
+     * @return \OC\Files\Mount\MountPoint
150
+     */
151
+    public function getMount($mountPoint) {
152
+        return $this->mountManager->find($mountPoint);
153
+    }
154
+
155
+    /**
156
+     * @param string $mountPoint
157
+     * @return \OC\Files\Mount\MountPoint[]
158
+     */
159
+    public function getMountsIn($mountPoint) {
160
+        return $this->mountManager->findIn($mountPoint);
161
+    }
162
+
163
+    /**
164
+     * @param string $storageId
165
+     * @return \OC\Files\Mount\MountPoint[]
166
+     */
167
+    public function getMountByStorageId($storageId) {
168
+        return $this->mountManager->findByStorageId($storageId);
169
+    }
170
+
171
+    /**
172
+     * @param int $numericId
173
+     * @return MountPoint[]
174
+     */
175
+    public function getMountByNumericStorageId($numericId) {
176
+        return $this->mountManager->findByNumericId($numericId);
177
+    }
178
+
179
+    /**
180
+     * @param \OC\Files\Mount\MountPoint $mount
181
+     */
182
+    public function unMount($mount) {
183
+        $this->mountManager->remove($mount);
184
+    }
185
+
186
+    /**
187
+     * @param string $path
188
+     * @throws \OCP\Files\NotFoundException
189
+     * @throws \OCP\Files\NotPermittedException
190
+     * @return string
191
+     */
192
+    public function get($path) {
193
+        $path = $this->normalizePath($path);
194
+        if ($this->isValidPath($path)) {
195
+            $fullPath = $this->getFullPath($path);
196
+            $fileInfo = $this->view->getFileInfo($fullPath);
197
+            if ($fileInfo) {
198
+                return $this->createNode($fullPath, $fileInfo);
199
+            } else {
200
+                throw new NotFoundException($path);
201
+            }
202
+        } else {
203
+            throw new NotPermittedException();
204
+        }
205
+    }
206
+
207
+    //most operations can't be done on the root
208
+
209
+    /**
210
+     * @param string $targetPath
211
+     * @throws \OCP\Files\NotPermittedException
212
+     * @return \OC\Files\Node\Node
213
+     */
214
+    public function rename($targetPath) {
215
+        throw new NotPermittedException();
216
+    }
217
+
218
+    public function delete() {
219
+        throw new NotPermittedException();
220
+    }
221
+
222
+    /**
223
+     * @param string $targetPath
224
+     * @throws \OCP\Files\NotPermittedException
225
+     * @return \OC\Files\Node\Node
226
+     */
227
+    public function copy($targetPath) {
228
+        throw new NotPermittedException();
229
+    }
230
+
231
+    /**
232
+     * @param int $mtime
233
+     * @throws \OCP\Files\NotPermittedException
234
+     */
235
+    public function touch($mtime = null) {
236
+        throw new NotPermittedException();
237
+    }
238
+
239
+    /**
240
+     * @return \OC\Files\Storage\Storage
241
+     * @throws \OCP\Files\NotFoundException
242
+     */
243
+    public function getStorage() {
244
+        throw new NotFoundException();
245
+    }
246
+
247
+    /**
248
+     * @return string
249
+     */
250
+    public function getPath() {
251
+        return '/';
252
+    }
253
+
254
+    /**
255
+     * @return string
256
+     */
257
+    public function getInternalPath() {
258
+        return '';
259
+    }
260
+
261
+    /**
262
+     * @return int
263
+     */
264
+    public function getId() {
265
+        return null;
266
+    }
267
+
268
+    /**
269
+     * @return array
270
+     */
271
+    public function stat() {
272
+        return null;
273
+    }
274
+
275
+    /**
276
+     * @return int
277
+     */
278
+    public function getMTime() {
279
+        return null;
280
+    }
281
+
282
+    /**
283
+     * @return int
284
+     */
285
+    public function getSize() {
286
+        return null;
287
+    }
288
+
289
+    /**
290
+     * @return string
291
+     */
292
+    public function getEtag() {
293
+        return null;
294
+    }
295
+
296
+    /**
297
+     * @return int
298
+     */
299
+    public function getPermissions() {
300
+        return \OCP\Constants::PERMISSION_CREATE;
301
+    }
302
+
303
+    /**
304
+     * @return bool
305
+     */
306
+    public function isReadable() {
307
+        return false;
308
+    }
309
+
310
+    /**
311
+     * @return bool
312
+     */
313
+    public function isUpdateable() {
314
+        return false;
315
+    }
316
+
317
+    /**
318
+     * @return bool
319
+     */
320
+    public function isDeletable() {
321
+        return false;
322
+    }
323
+
324
+    /**
325
+     * @return bool
326
+     */
327
+    public function isShareable() {
328
+        return false;
329
+    }
330
+
331
+    /**
332
+     * @return Node
333
+     * @throws \OCP\Files\NotFoundException
334
+     */
335
+    public function getParent() {
336
+        throw new NotFoundException();
337
+    }
338
+
339
+    /**
340
+     * @return string
341
+     */
342
+    public function getName() {
343
+        return '';
344
+    }
345
+
346
+    /**
347
+     * Returns a view to user's files folder
348
+     *
349
+     * @param String $userId user ID
350
+     * @return \OCP\Files\Folder
351
+     * @throws \OC\User\NoUserException
352
+     */
353
+    public function getUserFolder($userId) {
354
+        $userObject = $this->userManager->get($userId);
355
+
356
+        if (is_null($userObject)) {
357
+            $this->logger->error(
358
+                sprintf(
359
+                    'Backends provided no user object for %s',
360
+                    $userId
361
+                ),
362
+                [
363
+                    'app' => 'files',
364
+                ]
365
+            );
366
+            throw new \OC\User\NoUserException('Backends provided no user object');
367
+        }
368
+
369
+        $userId = $userObject->getUID();
370
+
371
+        if (!$this->userFolderCache->hasKey($userId)) {
372
+            \OC\Files\Filesystem::initMountPoints($userId);
373
+
374
+            try {
375
+                $folder = $this->get('/' . $userId . '/files');
376
+            } catch (NotFoundException $e) {
377
+                if (!$this->nodeExists('/' . $userId)) {
378
+                    $this->newFolder('/' . $userId);
379
+                }
380
+                $folder = $this->newFolder('/' . $userId . '/files');
381
+            }
382
+
383
+            $this->userFolderCache->set($userId, $folder);
384
+        }
385
+
386
+        return $this->userFolderCache->get($userId);
387
+    }
388
+
389
+    public function clearCache() {
390
+        $this->userFolderCache = new CappedMemoryCache();
391
+    }
392
+
393
+    public function getUserMountCache() {
394
+        return $this->userMountCache;
395
+    }
396 396
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -372,12 +372,12 @@
 block discarded – undo
372 372
 			\OC\Files\Filesystem::initMountPoints($userId);
373 373
 
374 374
 			try {
375
-				$folder = $this->get('/' . $userId . '/files');
375
+				$folder = $this->get('/'.$userId.'/files');
376 376
 			} catch (NotFoundException $e) {
377
-				if (!$this->nodeExists('/' . $userId)) {
378
-					$this->newFolder('/' . $userId);
377
+				if (!$this->nodeExists('/'.$userId)) {
378
+					$this->newFolder('/'.$userId);
379 379
 				}
380
-				$folder = $this->newFolder('/' . $userId . '/files');
380
+				$folder = $this->newFolder('/'.$userId.'/files');
381 381
 			}
382 382
 
383 383
 			$this->userFolderCache->set($userId, $folder);
Please login to merge, or discard this patch.