@@ -31,7 +31,6 @@ |
||
31 | 31 | use Symfony\Component\Console\Input\InputInterface; |
32 | 32 | use Symfony\Component\Console\Input\InputOption; |
33 | 33 | use Symfony\Component\Console\Output\OutputInterface; |
34 | -use Symfony\Component\EventDispatcher\EventDispatcher; |
|
35 | 34 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
36 | 35 | use Symfony\Component\EventDispatcher\GenericEvent; |
37 | 36 |
@@ -256,6 +256,11 @@ |
||
256 | 256 | */ |
257 | 257 | // FIXME This method is only public, until OC_L10N does not need it anymore, |
258 | 258 | // FIXME This is also the reason, why it is not in the public interface |
259 | + |
|
260 | + /** |
|
261 | + * @param string|boolean $app |
|
262 | + * @param string|null $lang |
|
263 | + */ |
|
259 | 264 | public function getL10nFilesForApp($app, $lang) { |
260 | 265 | $languageFiles = []; |
261 | 266 |
@@ -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 |
@@ -111,7 +111,7 @@ |
||
111 | 111 | * Looks up a system wide defined value |
112 | 112 | * |
113 | 113 | * @param string $key the key of the value, under which it was saved |
114 | - * @param mixed $default the default value to be returned if the value isn't set |
|
114 | + * @param string $default the default value to be returned if the value isn't set |
|
115 | 115 | * @return mixed the value or $default |
116 | 116 | */ |
117 | 117 | public function getSystemValue($key, $default = '') { |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | /** |
94 | 94 | * Formats the date of the given timestamp |
95 | 95 | * |
96 | - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object |
|
96 | + * @param integer $timestamp Either a Unix timestamp or DateTime object |
|
97 | 97 | * @param string $format Either 'full', 'long', 'medium' or 'short' |
98 | 98 | * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014' |
99 | 99 | * long: e.g. 'MMMM d, y' => 'August 20, 2014' |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | /** |
193 | 193 | * Gives the relative past time of the timestamp |
194 | 194 | * |
195 | - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object |
|
195 | + * @param integer $timestamp Either a Unix timestamp or DateTime object |
|
196 | 196 | * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time |
197 | 197 | * @return string Dates returned are: |
198 | 198 | * < 60 sec => seconds ago |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | /** |
229 | 229 | * Formats the date and time of the given timestamp |
230 | 230 | * |
231 | - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object |
|
231 | + * @param integer $timestamp Either a Unix timestamp or DateTime object |
|
232 | 232 | * @param string $formatDate See formatDate() for description |
233 | 233 | * @param string $formatTime See formatTime() for description |
234 | 234 | * @param \DateTimeZone $timeZone The timezone to use |
@@ -383,6 +383,14 @@ discard block |
||
383 | 383 | return $size; |
384 | 384 | } |
385 | 385 | |
386 | + /** |
|
387 | + * @param string $path |
|
388 | + * @param boolean $recursive |
|
389 | + * @param integer $reuse |
|
390 | + * @param integer|null $folderId |
|
391 | + * @param boolean $lock |
|
392 | + * @param integer $size |
|
393 | + */ |
|
386 | 394 | private function handleChildren($path, $recursive, $reuse, $folderId, $lock, &$size) { |
387 | 395 | // we put this in it's own function so it cleans up the memory before we start recursing |
388 | 396 | $existingChildren = $this->getExistingChildren($folderId); |
@@ -479,6 +487,9 @@ discard block |
||
479 | 487 | } |
480 | 488 | } |
481 | 489 | |
490 | + /** |
|
491 | + * @param string|boolean $path |
|
492 | + */ |
|
482 | 493 | private function runBackgroundScanJob(callable $callback, $path) { |
483 | 494 | try { |
484 | 495 | $callback(); |
@@ -923,7 +923,7 @@ |
||
923 | 923 | * @param int $previewWidth |
924 | 924 | * @param int $previewHeight |
925 | 925 | * |
926 | - * @return int[] |
|
926 | + * @return double[] |
|
927 | 927 | */ |
928 | 928 | private function scale($image, $askedWidth, $askedHeight, $previewWidth, $previewHeight) { |
929 | 929 | $scalingUp = $this->getScalingUp(); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | * Returns expensive repair steps to be run on the |
143 | 143 | * command line with a special option. |
144 | 144 | * |
145 | - * @return IRepairStep[] |
|
145 | + * @return OldGroupMembershipShares[] |
|
146 | 146 | */ |
147 | 147 | public static function getExpensiveRepairSteps() { |
148 | 148 | return [ |
@@ -218,7 +218,6 @@ discard block |
||
218 | 218 | } |
219 | 219 | |
220 | 220 | /** |
221 | - * @param int $max |
|
222 | 221 | */ |
223 | 222 | public function finishProgress() { |
224 | 223 | // for now just emit as we did in the past |
@@ -741,11 +741,19 @@ discard block |
||
741 | 741 | } |
742 | 742 | |
743 | 743 | // case-insensitive array_search |
744 | + |
|
745 | + /** |
|
746 | + * @param string $needle |
|
747 | + */ |
|
744 | 748 | protected function array_searchi($needle, $haystack, $mem='getName') { |
745 | 749 | if(!is_array($haystack)) { |
746 | 750 | return false; |
747 | 751 | } |
748 | 752 | return array_search(strtolower($needle), array_map( |
753 | + |
|
754 | + /** |
|
755 | + * @param string $tag |
|
756 | + */ |
|
749 | 757 | function($tag) use($mem) { |
750 | 758 | return strtolower(call_user_func(array($tag, $mem))); |
751 | 759 | }, $haystack) |
@@ -770,7 +778,7 @@ discard block |
||
770 | 778 | * Get a tag by its name. |
771 | 779 | * |
772 | 780 | * @param string $name The tag name. |
773 | - * @return integer|bool The tag object's offset within the $this->tags |
|
781 | + * @return \OCP\AppFramework\Db\Entity The tag object's offset within the $this->tags |
|
774 | 782 | * array or false if it doesn't exist. |
775 | 783 | */ |
776 | 784 | private function getTagByName($name) { |
@@ -781,7 +789,7 @@ discard block |
||
781 | 789 | * Get a tag by its ID. |
782 | 790 | * |
783 | 791 | * @param string $id The tag ID to look for. |
784 | - * @return integer|bool The tag object's offset within the $this->tags |
|
792 | + * @return \OCP\AppFramework\Db\Entity The tag object's offset within the $this->tags |
|
785 | 793 | * array or false if it doesn't exist. |
786 | 794 | */ |
787 | 795 | private function getTagById($id) { |