@@ -152,7 +152,7 @@ |
||
| 152 | 152 | |
| 153 | 153 | /** |
| 154 | 154 | * @param string $gid |
| 155 | - * @return \OCP\IGroup |
|
| 155 | + * @return null|Group |
|
| 156 | 156 | */ |
| 157 | 157 | protected function getGroupObject($gid) { |
| 158 | 158 | $backends = array(); |
@@ -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(); |
@@ -25,7 +25,6 @@ |
||
| 25 | 25 | use OCA\DAV\Connector\Sabre\Auth; |
| 26 | 26 | use OCA\DAV\DAV\Sharing\Xml\Invite; |
| 27 | 27 | use OCP\IRequest; |
| 28 | -use Sabre\DAV\Exception\BadRequest; |
|
| 29 | 28 | use Sabre\DAV\Exception\NotFound; |
| 30 | 29 | use Sabre\DAV\INode; |
| 31 | 30 | use Sabre\DAV\PropFind; |
@@ -22,11 +22,6 @@ |
||
| 22 | 22 | namespace OCA\DAV\Command; |
| 23 | 23 | |
| 24 | 24 | use OCA\DAV\CardDAV\CardDavBackend; |
| 25 | -use OCA\DAV\Connector\Sabre\Principal; |
|
| 26 | -use OCP\IConfig; |
|
| 27 | -use OCP\IDBConnection; |
|
| 28 | -use OCP\IGroupManager; |
|
| 29 | -use OCP\ILogger; |
|
| 30 | 25 | use OCP\IUserManager; |
| 31 | 26 | use Symfony\Component\Console\Command\Command; |
| 32 | 27 | use Symfony\Component\Console\Input\InputArgument; |
@@ -21,10 +21,8 @@ |
||
| 21 | 21 | namespace OCA\DAV\Command; |
| 22 | 22 | |
| 23 | 23 | use OCA\DAV\CardDAV\SyncService; |
| 24 | -use OCP\IUserManager; |
|
| 25 | 24 | use Symfony\Component\Console\Command\Command; |
| 26 | 25 | use Symfony\Component\Console\Helper\ProgressBar; |
| 27 | -use Symfony\Component\Console\Input\InputArgument; |
|
| 28 | 26 | use Symfony\Component\Console\Input\InputInterface; |
| 29 | 27 | use Symfony\Component\Console\Output\OutputInterface; |
| 30 | 28 | |
@@ -59,6 +59,9 @@ |
||
| 59 | 59 | ); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | + /** |
|
| 63 | + * @param boolean $toV2 |
|
| 64 | + */ |
|
| 62 | 65 | private function convertPrincipal($principal, $toV2) { |
| 63 | 66 | list(, $name) = URLUtil::splitPath($principal); |
| 64 | 67 | if ($toV2) { |
@@ -144,6 +144,9 @@ |
||
| 144 | 144 | return true; |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | + /** |
|
| 148 | + * @param string $path |
|
| 149 | + */ |
|
| 147 | 150 | public function url_stat($path) { |
| 148 | 151 | if (isset(self::$data[$path])) { |
| 149 | 152 | $size = strlen(self::$data[$path]); |
@@ -22,14 +22,11 @@ |
||
| 22 | 22 | namespace OCA\DAV\Connector\Sabre; |
| 23 | 23 | |
| 24 | 24 | use Sabre\DAV\Exception\NotFound; |
| 25 | -use Sabre\DAV\IFile; |
|
| 26 | 25 | use Sabre\DAV\INode; |
| 27 | 26 | use \Sabre\DAV\PropFind; |
| 28 | 27 | use \Sabre\DAV\PropPatch; |
| 29 | -use Sabre\DAVACL\Exception\NeedPrivileges; |
|
| 30 | 28 | use \Sabre\HTTP\RequestInterface; |
| 31 | 29 | use \Sabre\HTTP\ResponseInterface; |
| 32 | -use Sabre\HTTP\URLUtil; |
|
| 33 | 30 | |
| 34 | 31 | /** |
| 35 | 32 | * Class DavAclPlugin is a wrapper around \Sabre\DAVACL\Plugin that returns 404 |
@@ -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)) { |