@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | * columns or sequences. |
| 161 | 161 | * |
| 162 | 162 | * @param string $seqName Name of the sequence object from which the ID should be returned. |
| 163 | - * @return string A string representation of the last inserted ID. |
|
| 163 | + * @return integer A string representation of the last inserted ID. |
|
| 164 | 164 | */ |
| 165 | 165 | public function lastInsertId($seqName = null) |
| 166 | 166 | { |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | * |
| 181 | 181 | * @param string $table The table name (will replace *PREFIX* with the actual prefix) |
| 182 | 182 | * @param array $input data that should be inserted into the table (column name => value) |
| 183 | - * @param array|null $compare List of values that should be checked for "if not exists" |
|
| 183 | + * @param string[] $compare List of values that should be checked for "if not exists" |
|
| 184 | 184 | * If this is null or an empty array, all keys of $input will be compared |
| 185 | 185 | * Please note: text fields (clob) must not be used in the compare array |
| 186 | 186 | * @return int number of inserted rows |
@@ -26,13 +26,10 @@ |
||
| 26 | 26 | namespace OC\Encryption; |
| 27 | 27 | |
| 28 | 28 | use OC\Files\Filesystem; |
| 29 | -use OC\Files\Storage\Shared; |
|
| 30 | 29 | use OC\Files\Storage\Wrapper\Encryption; |
| 31 | 30 | use OC\Files\View; |
| 32 | -use OC\Search\Provider\File; |
|
| 33 | 31 | use OCP\Encryption\IEncryptionModule; |
| 34 | 32 | use OCP\Encryption\IManager; |
| 35 | -use OCP\Files\Mount\IMountPoint; |
|
| 36 | 33 | use OCP\IConfig; |
| 37 | 34 | use OCP\IL10N; |
| 38 | 35 | use OCP\ILogger; |
@@ -153,6 +153,9 @@ discard block |
||
| 153 | 153 | return $result['physic_path']; |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | + /** |
|
| 157 | + * @param string|false $physicalPath |
|
| 158 | + */ |
|
| 156 | 159 | private function resolvePhysicalPath($physicalPath) { |
| 157 | 160 | $physicalPath = $this->resolveRelativePath($physicalPath); |
| 158 | 161 | $sql = \OC_DB::prepare('SELECT * FROM `*PREFIX*file_map` WHERE `physic_path_hash` = ?'); |
@@ -210,6 +213,10 @@ discard block |
||
| 210 | 213 | return $physicalPath; |
| 211 | 214 | } |
| 212 | 215 | |
| 216 | + /** |
|
| 217 | + * @param string|false $logicPath |
|
| 218 | + * @param string|false $physicalPath |
|
| 219 | + */ |
|
| 213 | 220 | private function insert($logicPath, $physicalPath) { |
| 214 | 221 | $sql = 'INSERT INTO `*PREFIX*file_map` (`logic_path`, `physic_path`, `logic_path_hash`, `physic_path_hash`) |
| 215 | 222 | VALUES (?, ?, ?, ?)'; |
@@ -192,7 +192,7 @@ |
||
| 192 | 192 | * |
| 193 | 193 | * @param string $path |
| 194 | 194 | * @param string $data |
| 195 | - * @return bool |
|
| 195 | + * @return integer |
|
| 196 | 196 | */ |
| 197 | 197 | public function file_put_contents($path, $data) { |
| 198 | 198 | // file put content will always be translated to a stream write |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | * and does not take the chroot into account ) |
| 186 | 186 | * |
| 187 | 187 | * @param string $path |
| 188 | - * @return \OCP\Files\Mount\IMountPoint |
|
| 188 | + * @return Mount\MountPoint|null |
|
| 189 | 189 | */ |
| 190 | 190 | public function getMount($path) { |
| 191 | 191 | return Filesystem::getMountManager()->find($this->getAbsolutePath($path)); |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | |
| 427 | 427 | /** |
| 428 | 428 | * @param string $path |
| 429 | - * @return bool|mixed |
|
| 429 | + * @return string|boolean |
|
| 430 | 430 | */ |
| 431 | 431 | public function file_exists($path) { |
| 432 | 432 | if ($path == '/') { |
@@ -856,7 +856,7 @@ discard block |
||
| 856 | 856 | |
| 857 | 857 | /** |
| 858 | 858 | * @param string $path |
| 859 | - * @return bool|string |
|
| 859 | + * @return string|false |
|
| 860 | 860 | * @throws \OCP\Files\InvalidPathException |
| 861 | 861 | */ |
| 862 | 862 | public function toTmpFile($path) { |
@@ -1574,6 +1574,9 @@ discard block |
||
| 1574 | 1574 | return null; |
| 1575 | 1575 | } |
| 1576 | 1576 | |
| 1577 | + /** |
|
| 1578 | + * @param string $path |
|
| 1579 | + */ |
|
| 1577 | 1580 | private function assertPathLength($path) { |
| 1578 | 1581 | $maxLen = min(PHP_MAXPATHLEN, 4000); |
| 1579 | 1582 | // Check for the string length - performed using isset() instead of strlen() |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | /** |
| 198 | 198 | * returns the max width set in ownCloud's config |
| 199 | 199 | * |
| 200 | - * @return string |
|
| 200 | + * @return integer |
|
| 201 | 201 | */ |
| 202 | 202 | public function getConfigMaxX() { |
| 203 | 203 | return $this->configMaxWidth; |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | /** |
| 207 | 207 | * returns the max height set in ownCloud's config |
| 208 | 208 | * |
| 209 | - * @return string |
|
| 209 | + * @return integer |
|
| 210 | 210 | */ |
| 211 | 211 | public function getConfigMaxY() { |
| 212 | 212 | return $this->configMaxHeight; |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | /** |
| 510 | 510 | * Determines the size of the preview we should be looking for in the cache |
| 511 | 511 | * |
| 512 | - * @return int[] |
|
| 512 | + * @return integer[] |
|
| 513 | 513 | */ |
| 514 | 514 | private function simulatePreviewDimensions() { |
| 515 | 515 | $askedWidth = $this->getMaxX(); |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | * @param int $askedWidth |
| 532 | 532 | * @param int $askedHeight |
| 533 | 533 | * |
| 534 | - * @return \int[] |
|
| 534 | + * @return integer[] |
|
| 535 | 535 | */ |
| 536 | 536 | private function applyAspectRatio($askedWidth, $askedHeight) { |
| 537 | 537 | $originalRatio = $this->maxPreviewWidth / $this->maxPreviewHeight; |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | * @param int $askedWidth |
| 558 | 558 | * @param int $askedHeight |
| 559 | 559 | * |
| 560 | - * @return \int[] |
|
| 560 | + * @return integer[] |
|
| 561 | 561 | */ |
| 562 | 562 | private function fixSize($askedWidth, $askedHeight) { |
| 563 | 563 | if ($this->scalingUp) { |
@@ -844,9 +844,9 @@ discard block |
||
| 844 | 844 | * @param int $askedWidth |
| 845 | 845 | * @param int $askedHeight |
| 846 | 846 | * @param int $previewWidth |
| 847 | - * @param null $previewHeight |
|
| 847 | + * @param integer $previewHeight |
|
| 848 | 848 | * |
| 849 | - * @return int[] |
|
| 849 | + * @return double[] |
|
| 850 | 850 | */ |
| 851 | 851 | private function scale($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) { |
| 852 | 852 | $scalingUp = $this->getScalingUp(); |
@@ -894,7 +894,7 @@ discard block |
||
| 894 | 894 | * @param int $askedWidth |
| 895 | 895 | * @param int $askedHeight |
| 896 | 896 | * @param int $previewWidth |
| 897 | - * @param null $previewHeight |
|
| 897 | + * @param double $previewHeight |
|
| 898 | 898 | */ |
| 899 | 899 | private function crop($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight = null) { |
| 900 | 900 | $cropX = floor(abs($askedWidth - $previewWidth) * 0.5); |
@@ -913,7 +913,7 @@ discard block |
||
| 913 | 913 | * @param int $askedWidth |
| 914 | 914 | * @param int $askedHeight |
| 915 | 915 | * @param int $previewWidth |
| 916 | - * @param null $previewHeight |
|
| 916 | + * @param double $previewHeight |
|
| 917 | 917 | */ |
| 918 | 918 | private function cropAndFill($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) { |
| 919 | 919 | if ($previewWidth > $askedWidth) { |
@@ -1138,7 +1138,7 @@ discard block |
||
| 1138 | 1138 | * @param int $maxDim |
| 1139 | 1139 | * @param string $dimName |
| 1140 | 1140 | * |
| 1141 | - * @return mixed |
|
| 1141 | + * @return integer |
|
| 1142 | 1142 | */ |
| 1143 | 1143 | private function limitMaxDim($dim, $maxDim, $dimName) { |
| 1144 | 1144 | if (!is_null($maxDim)) { |
@@ -144,6 +144,8 @@ |
||
| 144 | 144 | * {@inheritDoc} |
| 145 | 145 | * |
| 146 | 146 | * Re-declared as public to allow invocation from within the closure above in php 5.3 |
| 147 | + * @param string $scope |
|
| 148 | + * @param string $method |
|
| 147 | 149 | */ |
| 148 | 150 | public function emit($scope, $method, array $arguments = array()) { |
| 149 | 151 | parent::emit($scope, $method, $arguments); |
@@ -105,7 +105,6 @@ |
||
| 105 | 105 | /** |
| 106 | 106 | * Add an empty directory entry to the archive. |
| 107 | 107 | * |
| 108 | - * @param string $directoryPath Directory Path and name to be added to the archive. |
|
| 109 | 108 | * @return bool $success |
| 110 | 109 | */ |
| 111 | 110 | public function addEmptyDir($dirName){ |
@@ -136,7 +136,7 @@ |
||
| 136 | 136 | * Returns the list of members for a group-principal |
| 137 | 137 | * |
| 138 | 138 | * @param string $principal |
| 139 | - * @return array |
|
| 139 | + * @return string[] |
|
| 140 | 140 | */ |
| 141 | 141 | function getGroupMemberSet($principal) { |
| 142 | 142 | // TODO: for now the group principal has only one member, the user itself |