@@ -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)) { | 
                                                        
@@ -28,7 +28,6 @@  | 
                                                    ||
| 28 | 28 | use Symfony\Component\Console\Command\Command;  | 
                                                        
| 29 | 29 | use Symfony\Component\Console\Helper\Table;  | 
                                                        
| 30 | 30 | use Symfony\Component\Console\Input\InputInterface;  | 
                                                        
| 31 | -use Symfony\Component\Console\Input\InputOption;  | 
                                                        |
| 32 | 31 | use Symfony\Component\Console\Output\OutputInterface;  | 
                                                        
| 33 | 32 | |
| 34 | 33 |  class ListCertificates extends Base { | 
                                                        
@@ -131,7 +131,7 @@  | 
                                                    ||
| 131 | 131 | }  | 
                                                        
| 132 | 132 | |
| 133 | 133 | /**  | 
                                                        
| 134 | - * @param $message  | 
                                                        |
| 134 | + * @param string $message  | 
                                                        |
| 135 | 135 | * @param array $additional  | 
                                                        
| 136 | 136 | * @return array  | 
                                                        
| 137 | 137 | */  | 
                                                        
@@ -97,7 +97,7 @@  | 
                                                    ||
| 97 | 97 | }  | 
                                                        
| 98 | 98 | |
| 99 | 99 | /**  | 
                                                        
| 100 | - * @param string|int $category  | 
                                                        |
| 100 | + * @param string $category  | 
                                                        |
| 101 | 101 | * @return int  | 
                                                        
| 102 | 102 | */  | 
                                                        
| 103 | 103 |  	protected function getCategory($category) { | 
                                                        
@@ -70,7 +70,7 @@ discard block  | 
                                                    ||
| 70 | 70 | *  | 
                                                        
| 71 | 71 | * @NoAdminRequired  | 
                                                        
| 72 | 72 | * @NoSubadminRequired  | 
                                                        
| 73 | - * @return array  | 
                                                        |
| 73 | + * @return DataResponse  | 
                                                        |
| 74 | 74 | */  | 
                                                        
| 75 | 75 |  	public function addPersonalRootCertificate() { | 
                                                        
| 76 | 76 | return $this->addCertificate($this->userCertificateManager);  | 
                                                        
@@ -80,7 +80,7 @@ discard block  | 
                                                    ||
| 80 | 80 | * Add a new root certificate to a trust store  | 
                                                        
| 81 | 81 | *  | 
                                                        
| 82 | 82 | * @param ICertificateManager $certificateManager  | 
                                                        
| 83 | - * @return array  | 
                                                        |
| 83 | + * @return DataResponse  | 
                                                        |
| 84 | 84 | */  | 
                                                        
| 85 | 85 |  	private function addCertificate(ICertificateManager $certificateManager) { | 
                                                        
| 86 | 86 | $headers = [];  | 
                                                        
@@ -158,7 +158,7 @@ discard block  | 
                                                    ||
| 158 | 158 | /**  | 
                                                        
| 159 | 159 | * Add a new personal root certificate to the system's trust store  | 
                                                        
| 160 | 160 | *  | 
                                                        
| 161 | - * @return array  | 
                                                        |
| 161 | + * @return DataResponse  | 
                                                        |
| 162 | 162 | */  | 
                                                        
| 163 | 163 |  	public function addSystemRootCertificate() { | 
                                                        
| 164 | 164 | return $this->addCertificate($this->systemCertificateManager);  | 
                                                        
@@ -88,7 +88,7 @@ discard block  | 
                                                    ||
| 88 | 88 | /**  | 
                                                        
| 89 | 89 | * List all installed apps  | 
                                                        
| 90 | 90 | *  | 
                                                        
| 91 | - * @return string[]  | 
                                                        |
| 91 | + * @return integer[]  | 
                                                        |
| 92 | 92 | */  | 
                                                        
| 93 | 93 |  	public function getInstalledApps() { | 
                                                        
| 94 | 94 | return array_keys($this->getInstalledAppsValues());  | 
                                                        
@@ -216,7 +216,7 @@ discard block  | 
                                                    ||
| 216 | 216 | /**  | 
                                                        
| 217 | 217 | * Returns a list of apps that need upgrade  | 
                                                        
| 218 | 218 | *  | 
                                                        
| 219 | - * @param array $version ownCloud version as array of version components  | 
                                                        |
| 219 | + * @param array $ocVersion ownCloud version as array of version components  | 
                                                        |
| 220 | 220 | * @return array list of app info from apps that need an upgrade  | 
                                                        
| 221 | 221 | *  | 
                                                        
| 222 | 222 | * @internal  | 
                                                        
@@ -289,6 +289,9 @@ discard block  | 
                                                    ||
| 289 | 289 | return in_array($appId, $this->shippedApps);  | 
                                                        
| 290 | 290 | }  | 
                                                        
| 291 | 291 | |
| 292 | + /**  | 
                                                        |
| 293 | + * @param string $appId  | 
                                                        |
| 294 | + */  | 
                                                        |
| 292 | 295 |  	private function isAlwaysEnabled($appId) { | 
                                                        
| 293 | 296 | $alwaysEnabled = $this->getAlwaysEnabledApps();  | 
                                                        
| 294 | 297 | return in_array($appId, $alwaysEnabled);  | 
                                                        
@@ -22,7 +22,6 @@  | 
                                                    ||
| 22 | 22 | |
| 23 | 23 | namespace OC\App;  | 
                                                        
| 24 | 24 | |
| 25 | -use OC_Util;  | 
                                                        |
| 26 | 25 | use OCP\IConfig;  | 
                                                        
| 27 | 26 | |
| 28 | 27 | /**  | 
                                                        
@@ -20,7 +20,6 @@  | 
                                                    ||
| 20 | 20 | */  | 
                                                        
| 21 | 21 | |
| 22 | 22 | use OC\Share\MailNotifications;  | 
                                                        
| 23 | -use OCP\IConfig;  | 
                                                        |
| 24 | 23 | use OCP\IL10N;  | 
                                                        
| 25 | 24 | use OCP\IUser;  | 
                                                        
| 26 | 25 | use OCP\Mail\IMailer;  | 
                                                        
@@ -153,7 +153,7 @@  | 
                                                    ||
| 153 | 153 | |
| 154 | 154 | /**  | 
                                                        
| 155 | 155 | * @param mixed $offset  | 
                                                        
| 156 | - * @return mixed  | 
                                                        |
| 156 | + * @return string|null  | 
                                                        |
| 157 | 157 | */  | 
                                                        
| 158 | 158 |  	public function offsetGet($offset) { | 
                                                        
| 159 | 159 | return $this->get($offset);  |