@@ -920,7 +920,7 @@ discard block |
||
| 920 | 920 | * @param int $previewWidth |
| 921 | 921 | * @param int $previewHeight |
| 922 | 922 | * |
| 923 | - * @return int[] |
|
| 923 | + * @return double[] |
|
| 924 | 924 | */ |
| 925 | 925 | private function scale($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) { |
| 926 | 926 | $scalingUp = $this->getScalingUp(); |
@@ -1083,6 +1083,7 @@ discard block |
||
| 1083 | 1083 | /** |
| 1084 | 1084 | * Returns the path to the folder where the previews are stored, identified by the fileId |
| 1085 | 1085 | * |
| 1086 | + * @param integer $fileId |
|
| 1086 | 1087 | * @return string |
| 1087 | 1088 | */ |
| 1088 | 1089 | private function getPreviewPath($fileId = null) { |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | 49 | * @param string $table name |
| 50 | - * @return int id of last insert statement |
|
| 50 | + * @return string id of last insert statement |
|
| 51 | 51 | */ |
| 52 | 52 | public function lastInsertId($table) { |
| 53 | 53 | return $this->conn->realLastInsertId($table); |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | |
| 119 | 119 | /** |
| 120 | 120 | * Inserts, or updates a row into the database. Returns the inserted or updated rows |
| 121 | - * @param $table string table name including **PREFIX** |
|
| 121 | + * @param string $table string table name including **PREFIX** |
|
| 122 | 122 | * @param $input array the key=>value pairs to insert into the db row |
| 123 | 123 | * @param $compare array columns that should be compared to look for existing arrays |
| 124 | 124 | * @return int the number of rows affected by the operation |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | /** |
| 149 | 149 | * @param string $data |
| 150 | - * @return int |
|
| 150 | + * @return boolean |
|
| 151 | 151 | */ |
| 152 | 152 | public function stream_write($data) { |
| 153 | 153 | return false; |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | /** |
| 256 | - * @param $pos |
|
| 256 | + * @param integer $pos |
|
| 257 | 257 | * @return IFile | null |
| 258 | 258 | */ |
| 259 | 259 | protected function getNodeForPosition($pos) { |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | /** |
| 157 | 157 | * @param IFile[] $nodes |
| 158 | 158 | * @param IFile $backingFile |
| 159 | - * @param $fileLength |
|
| 159 | + * @param string $fileLength |
|
| 160 | 160 | * @return resource |
| 161 | 161 | * |
| 162 | 162 | * @throws \BadMethodCallException |
@@ -180,6 +180,9 @@ discard block |
||
| 180 | 180 | return $wrapped; |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | + /** |
|
| 184 | + * @param integer $current |
|
| 185 | + */ |
|
| 183 | 186 | protected function getNextNodeStart($current) { |
| 184 | 187 | foreach($this->sortedNodes as $node) { |
| 185 | 188 | if ($current >= $node['start'] && $current < $node['end']) |
@@ -191,7 +194,7 @@ discard block |
||
| 191 | 194 | } |
| 192 | 195 | |
| 193 | 196 | /** |
| 194 | - * @param $pos |
|
| 197 | + * @param integer $pos |
|
| 195 | 198 | */ |
| 196 | 199 | protected function getNodeForPosition($pos) { |
| 197 | 200 | foreach($this->sortedNodes as $node) { |
@@ -449,7 +449,7 @@ |
||
| 449 | 449 | * In some environments the system config file is readonly. Find out if this |
| 450 | 450 | * is the case. |
| 451 | 451 | * |
| 452 | - * @return boolean |
|
| 452 | + * @return false|string |
|
| 453 | 453 | * @since 10.0.3 |
| 454 | 454 | */ |
| 455 | 455 | public function isSystemConfigReadOnly() { |
@@ -699,7 +699,7 @@ |
||
| 699 | 699 | } |
| 700 | 700 | |
| 701 | 701 | /** |
| 702 | - * @param $internalPath |
|
| 702 | + * @param string $internalPath |
|
| 703 | 703 | * @return array |
| 704 | 704 | */ |
| 705 | 705 | private function convertInternalPathToGlobalPath($internalPath) { |
@@ -20,8 +20,6 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | namespace OCA\DAV\Upload; |
| 22 | 22 | |
| 23 | -use OCA\DAV\Connector\Sabre\Directory; |
|
| 24 | -use Sabre\DAV\Exception\Forbidden; |
|
| 25 | 23 | use Sabre\DAV\IFile; |
| 26 | 24 | |
| 27 | 25 | /** |
@@ -21,8 +21,6 @@ |
||
| 21 | 21 | namespace OCA\DAV\Files; |
| 22 | 22 | |
| 23 | 23 | use OC\AppFramework\Http; |
| 24 | -use OCP\Files\NotFoundException; |
|
| 25 | -use OCP\Files\NotPermittedException; |
|
| 26 | 24 | use Sabre\DAV\Server; |
| 27 | 25 | use Sabre\DAV\ServerPlugin; |
| 28 | 26 | use Sabre\DAV\PropFind; |
@@ -310,6 +310,9 @@ |
||
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | |
| 313 | + /** |
|
| 314 | + * @param string $revision |
|
| 315 | + */ |
|
| 313 | 316 | public static function restoreVersion($uid, $filename, $fileToRestore, $revision) { |
| 314 | 317 | if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED) !== true) { |
| 315 | 318 | return false; |