Rebasing, cs and more typing

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Author: tcitworld

apps/dav/appinfo/v1/caldav.php

@@ -114,7 +114,7 @@
 $principalCollection = new Collection($principalBackend);
 $principalCollection->disableListing = !$debugging; // Disable listing
 
-$addressBookRoot = new CalendarRoot($principalBackend, $calDavBackend, 'principals', \OC::$server->get(LoggerInterface::class));
+$addressBookRoot = new CalendarRoot($principalBackend, $calDavBackend, \OC::$server->get(LoggerInterface::class), 'principals');
 $addressBookRoot->disableListing = !$debugging; // Disable listing
 
 $nodes = [

apps/dav/bin/chunkperf.php

@@ -45,7 +45,7 @@ function request(Client $client, string $method, string $uploadUrl, string $data
 	$result = $client->request($method, $uploadUrl, $data, $headers);
 	$t1 = microtime(true);
 	echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
-	if (!in_array($result['statusCode'],  [200, 201])) {
+	if (!in_array($result['statusCode'], [200, 201])) {
 		echo $result['body'] . PHP_EOL;
 	}
 	return $result;

apps/dav/lib/AppInfo/PluginManager.php

@@ -45,7 +45,6 @@
  * to the Sabre server.
  */
 class PluginManager {
-
 	private ServerContainer $container;
 	private IAppManager $appManager;
 

apps/dav/lib/Avatars/AvatarHome.php

@@ -32,19 +32,10 @@
 use Sabre\Uri;
 
 class AvatarHome implements ICollection {
+	private array $principalInfo;
+	private IAvatarManager $avatarManager;
 
-	/** @var array */
-	private $principalInfo;
-	/** @var IAvatarManager */
-	private $avatarManager;
-
-	/**
-	 * AvatarHome constructor.
-	 *
-	 * @param array $principalInfo
-	 * @param IAvatarManager $avatarManager
-	 */
-	public function __construct($principalInfo, IAvatarManager $avatarManager) {
+	public function __construct(array $principalInfo, IAvatarManager $avatarManager) {
 		$this->principalInfo = $principalInfo;
 		$this->avatarManager = $avatarManager;
 	}
@@ -59,8 +50,8 @@ public function createDirectory($name) {
 
 	public function getChild($name) {
 		$elements = pathinfo($name);
-		$ext = isset($elements['extension']) ? $elements['extension'] : '';
-		$size = (int)(isset($elements['filename']) ? $elements['filename'] : '64');
+		$ext = $elements['extension'] ?? '';
+		$size = (int)($elements['filename'] ?? '64');
 		if (!in_array($ext, ['jpeg', 'png'], true)) {
 			throw new MethodNotAllowed('File format not allowed');
 		}

apps/dav/lib/Avatars/AvatarNode.php

@@ -26,18 +26,11 @@
 use Sabre\DAV\File;
 
 class AvatarNode extends File {
-	private $ext;
-	private $size;
-	private $avatar;
+	private string $ext;
+	private int $size;
+	private IAvatar $avatar;
 
-	/**
-	 * AvatarNode constructor.
-	 *
-	 * @param integer $size
-	 * @param string $ext
-	 * @param IAvatar $avatar
-	 */
-	public function __construct($size, $ext, $avatar) {
+	public function __construct(int $size, string $ext, IAvatar $avatar) {
 		$this->size = $size;
 		$this->ext = $ext;
 		$this->avatar = $avatar;

apps/dav/lib/Avatars/RootCollection.php

@@ -1,6 +1,4 @@
-<?php	/**
-	 * @var IAppManager
-	 */
+<?php
 /**
  * @copyright Copyright (c) 2016 Thomas Müller <thomas.mueller@tmit.eu>
  *

apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php

@@ -31,7 +31,6 @@
 use OCP\IDBConnection;
 
 class CleanupInvitationTokenJob extends TimedJob {
-
 	private IDBConnection $db;
 
 	public function __construct(IDBConnection $db, ITimeFactory $time) {

apps/dav/lib/BackgroundJob/RefreshWebcalJob.php

@@ -40,7 +40,6 @@
 use Sabre\VObject\InvalidDataException;
 
 class RefreshWebcalJob extends Job {
-
 	private RefreshWebcalService $refreshWebcalService;
 	private IConfig $config;
 	private LoggerInterface $logger;

apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php

@@ -41,7 +41,6 @@
 use OCP\IDBConnection;
 
 class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
-
 	private IResourceManager $resourceManager;
 	private IRoomManager $roomManager;
 	private IDBConnection $dbConnection;

apps/dav/lib/CalDAV/Activity/Provider/Todo.php

@@ -28,7 +28,6 @@
 use OCP\Activity\IEvent;
 
 class Todo extends Event {
-
 	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
 		if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_todo') {
 			throw new InvalidArgumentException();