@@ -106,7 +106,7 @@ |
||
106 | 106 | * Removes a user from a group |
107 | 107 | * @param string $uid Name of the user to remove from group |
108 | 108 | * @param string $gid Name of the group from which remove the user |
109 | - * @return bool |
|
109 | + * @return null|false |
|
110 | 110 | * |
111 | 111 | * removes the user from a group. |
112 | 112 | */ |
@@ -144,6 +144,9 @@ |
||
144 | 144 | return $this->getGroupObject($gid); |
145 | 145 | } |
146 | 146 | |
147 | + /** |
|
148 | + * @param string $gid |
|
149 | + */ |
|
147 | 150 | protected function getGroupObject($gid) { |
148 | 151 | $backends = array(); |
149 | 152 | foreach ($this->backends as $backend) { |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | } |
300 | 300 | |
301 | 301 | /** |
302 | - * @return resource Returns the image resource in any. |
|
302 | + * @return boolean Returns the image resource in any. |
|
303 | 303 | */ |
304 | 304 | public function resource() { |
305 | 305 | return $this->resource; |
@@ -474,7 +474,7 @@ discard block |
||
474 | 474 | * It is the responsibility of the caller to position the pointer at the correct place and to close the handle again. |
475 | 475 | * |
476 | 476 | * @param resource $handle |
477 | - * @return resource|false An image resource or false on error |
|
477 | + * @return boolean An image resource or false on error |
|
478 | 478 | */ |
479 | 479 | public function loadFromFileHandle($handle) { |
480 | 480 | $contents = stream_get_contents($handle); |
@@ -1023,6 +1023,7 @@ discard block |
||
1023 | 1023 | * @param string $fileName [optional] <p>The path to save the file to.</p> |
1024 | 1024 | * @param int $bit [optional] <p>Bit depth, (default is 24).</p> |
1025 | 1025 | * @param int $compression [optional] |
1026 | + * @param boolean $im |
|
1026 | 1027 | * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. |
1027 | 1028 | */ |
1028 | 1029 | function imagebmp($im, $fileName = '', $bit = 24, $compression = 0) { |
@@ -127,6 +127,7 @@ |
||
127 | 127 | |
128 | 128 | /** |
129 | 129 | * loads the api routes |
130 | + * @param string $app |
|
130 | 131 | * @return void |
131 | 132 | */ |
132 | 133 | public function loadRoutes($app = null) { |
@@ -856,7 +856,7 @@ |
||
856 | 856 | * Get the certificate manager for the user |
857 | 857 | * |
858 | 858 | * @param string $userId (optional) if not specified the current loggedin user is used |
859 | - * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in |
|
859 | + * @return null|CertificateManager | null if $uid is null and no user is logged in |
|
860 | 860 | */ |
861 | 861 | public function getCertificateManager($userId = null) { |
862 | 862 | if (is_null($userId)) { |
@@ -10,7 +10,6 @@ |
||
10 | 10 | use OC\Diagnostics\NullQueryLogger; |
11 | 11 | use OC\Diagnostics\EventLogger; |
12 | 12 | use OC\Diagnostics\QueryLogger; |
13 | -use OC\Files\Config\StorageManager; |
|
14 | 13 | use OC\Security\CertificateManager; |
15 | 14 | use OC\Files\Node\Root; |
16 | 15 | use OC\Files\View; |
@@ -91,5 +91,8 @@ |
||
91 | 91 | $this->tablePrefix = $dbTablePrefix; |
92 | 92 | } |
93 | 93 | |
94 | + /** |
|
95 | + * @param string $userName |
|
96 | + */ |
|
94 | 97 | abstract public function setupDatabase($userName); |
95 | 98 | } |
@@ -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) { |
@@ -36,6 +36,7 @@ discard block |
||
36 | 36 | * @param string $template |
37 | 37 | * @param \OC_L10N $l10n |
38 | 38 | * @param \OC_Defaults $theme |
39 | + * @param string $requesttoken |
|
39 | 40 | */ |
40 | 41 | public function __construct( $template, $requesttoken, $l10n, $theme ) { |
41 | 42 | $this->vars = array(); |
@@ -95,7 +96,7 @@ discard block |
||
95 | 96 | /** |
96 | 97 | * Appends a variable |
97 | 98 | * @param string $key key |
98 | - * @param mixed $value value |
|
99 | + * @param string $value value |
|
99 | 100 | * @return boolean|null |
100 | 101 | * |
101 | 102 | * This function assigns a variable in an array context. If the key already |
@@ -277,7 +277,7 @@ |
||
277 | 277 | * @param string $installedVersion previous version from which to upgrade from |
278 | 278 | * |
279 | 279 | * @throws \Exception |
280 | - * @return bool true if the operation succeeded, false otherwise |
|
280 | + * @return boolean|null true if the operation succeeded, false otherwise |
|
281 | 281 | */ |
282 | 282 | private function doUpgrade($currentVersion, $installedVersion) { |
283 | 283 | // Stop update if the update is over several major versions |
@@ -32,7 +32,6 @@ |
||
32 | 32 | |
33 | 33 | namespace OC; |
34 | 34 | |
35 | -use OC\Core\Command\Log\Manage; |
|
36 | 35 | use OC\Hooks\BasicEmitter; |
37 | 36 | use OC_App; |
38 | 37 | use OC_Installer; |