Inspection of "Merge pull request #36268 from nextcloud/bugfix/no..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 078203...c81798 )

by Joas

created 2023-01-23 17:46 UTC

Status

Indentation +55 added lines, -55 removed lines patch added patch discarded remove patch

@@ -34,67 +34,67 @@
 block discarded – undo
  */
 class CardDeletedEvent extends Event {
 
-	/** @var int */
-	private $addressBookId;
+    /** @var int */
+    private $addressBookId;
 
-	/** @var array */
-	private $addressBookData;
+    /** @var array */
+    private $addressBookData;
 
-	/** @var array */
-	private $shares;
+    /** @var array */
+    private $shares;
 
-	/** @var array */
-	private $cardData;
+    /** @var array */
+    private $cardData;
 
-	/**
-	 * CardDeletedEvent constructor.
-	 *
-	 * @param int $addressBookId
-	 * @param array $addressBookData
-	 * @param array $shares
-	 * @param array $cardData
-	 * @since 20.0.0
-	 */
-	public function __construct(int $addressBookId,
-								array $addressBookData,
-								array $shares,
-								array $cardData) {
-		parent::__construct();
-		$this->addressBookId = $addressBookId;
-		$this->addressBookData = $addressBookData;
-		$this->shares = $shares;
-		$this->cardData = $cardData;
-	}
+    /**
+     * CardDeletedEvent constructor.
+     *
+     * @param int $addressBookId
+     * @param array $addressBookData
+     * @param array $shares
+     * @param array $cardData
+     * @since 20.0.0
+     */
+    public function __construct(int $addressBookId,
+                                array $addressBookData,
+                                array $shares,
+                                array $cardData) {
+        parent::__construct();
+        $this->addressBookId = $addressBookId;
+        $this->addressBookData = $addressBookData;
+        $this->shares = $shares;
+        $this->cardData = $cardData;
+    }
 
-	/**
-	 * @return int
-	 * @since 20.0.0
-	 */
-	public function getAddressBookId(): int {
-		return $this->addressBookId;
-	}
+    /**
+     * @return int
+     * @since 20.0.0
+     */
+    public function getAddressBookId(): int {
+        return $this->addressBookId;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getAddressBookData(): array {
-		return $this->addressBookData;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getAddressBookData(): array {
+        return $this->addressBookData;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getShares(): array {
-		return $this->shares;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getShares(): array {
+        return $this->shares;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getCardData(): array {
-		return $this->cardData;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getCardData(): array {
+        return $this->cardData;
+    }
 }

Please login to merge, or discard this patch.

apps/dav/lib/Events/AddressBookShareUpdatedEvent.php 1 patch

Indentation +67 added lines, -67 removed lines patch added patch discarded remove patch

@@ -34,81 +34,81 @@
 block discarded – undo
  */
 class AddressBookShareUpdatedEvent extends Event {
 
-	/** @var int */
-	private $addressBookId;
+    /** @var int */
+    private $addressBookId;
 
-	/** @var array */
-	private $addressBookData;
+    /** @var array */
+    private $addressBookData;
 
-	/** @var array */
-	private $oldShares;
+    /** @var array */
+    private $oldShares;
 
-	/** @var array */
-	private $added;
+    /** @var array */
+    private $added;
 
-	/** @var array */
-	private $removed;
+    /** @var array */
+    private $removed;
 
-	/**
-	 * AddressBookShareUpdatedEvent constructor.
-	 *
-	 * @param int $addressBookId
-	 * @param array $addressBookData
-	 * @param array $oldShares
-	 * @param array $added
-	 * @param array $removed
-	 * @since 20.0.0
-	 */
-	public function __construct(int $addressBookId,
-								array $addressBookData,
-								array $oldShares,
-								array $added,
-								array $removed) {
-		parent::__construct();
-		$this->addressBookId = $addressBookId;
-		$this->addressBookData = $addressBookData;
-		$this->oldShares = $oldShares;
-		$this->added = $added;
-		$this->removed = $removed;
-	}
+    /**
+     * AddressBookShareUpdatedEvent constructor.
+     *
+     * @param int $addressBookId
+     * @param array $addressBookData
+     * @param array $oldShares
+     * @param array $added
+     * @param array $removed
+     * @since 20.0.0
+     */
+    public function __construct(int $addressBookId,
+                                array $addressBookData,
+                                array $oldShares,
+                                array $added,
+                                array $removed) {
+        parent::__construct();
+        $this->addressBookId = $addressBookId;
+        $this->addressBookData = $addressBookData;
+        $this->oldShares = $oldShares;
+        $this->added = $added;
+        $this->removed = $removed;
+    }
 
-	/**
-	 * @return int
-	 * @since 20.0.0
-	 */
-	public function getAddressBookId(): int {
-		return $this->addressBookId;
-	}
+    /**
+     * @return int
+     * @since 20.0.0
+     */
+    public function getAddressBookId(): int {
+        return $this->addressBookId;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getAddressBookData(): array {
-		return $this->addressBookData;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getAddressBookData(): array {
+        return $this->addressBookData;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getOldShares(): array {
-		return $this->oldShares;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getOldShares(): array {
+        return $this->oldShares;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getAdded(): array {
-		return $this->added;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getAdded(): array {
+        return $this->added;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getRemoved(): array {
-		return $this->removed;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getRemoved(): array {
+        return $this->removed;
+    }
 }

Please login to merge, or discard this patch.

apps/dav/lib/Events/AddressBookCreatedEvent.php 1 patch

Indentation +31 added lines, -31 removed lines patch added patch discarded remove patch

@@ -34,39 +34,39 @@
 block discarded – undo
  */
 class AddressBookCreatedEvent extends Event {
 
-	/** @var int */
-	private $addressBookId;
+    /** @var int */
+    private $addressBookId;
 
-	/** @var array */
-	private $addressBookData;
+    /** @var array */
+    private $addressBookData;
 
-	/**
-	 * AddressBookCreatedEvent constructor.
-	 *
-	 * @param int $addressBookId
-	 * @param array $addressBookData
-	 * @since 20.0.0
-	 */
-	public function __construct(int $addressBookId,
-								array $addressBookData) {
-		parent::__construct();
-		$this->addressBookId = $addressBookId;
-		$this->addressBookData = $addressBookData;
-	}
+    /**
+     * AddressBookCreatedEvent constructor.
+     *
+     * @param int $addressBookId
+     * @param array $addressBookData
+     * @since 20.0.0
+     */
+    public function __construct(int $addressBookId,
+                                array $addressBookData) {
+        parent::__construct();
+        $this->addressBookId = $addressBookId;
+        $this->addressBookData = $addressBookData;
+    }
 
-	/**
-	 * @return int
-	 * @since 20.0.0
-	 */
-	public function getAddressBookId(): int {
-		return $this->addressBookId;
-	}
+    /**
+     * @return int
+     * @since 20.0.0
+     */
+    public function getAddressBookId(): int {
+        return $this->addressBookId;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getAddressBookData(): array {
-		return $this->addressBookData;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getAddressBookData(): array {
+        return $this->addressBookData;
+    }
 }

Please login to merge, or discard this patch.

apps/dav/lib/Events/CalendarDeletedEvent.php 1 patch

Indentation +43 added lines, -43 removed lines patch added patch discarded remove patch

@@ -34,53 +34,53 @@
 block discarded – undo
  */
 class CalendarDeletedEvent extends Event {
 
-	/** @var int */
-	private $calendarId;
+    /** @var int */
+    private $calendarId;
 
-	/** @var array */
-	private $calendarData;
+    /** @var array */
+    private $calendarData;
 
-	/** @var array  */
-	private $shares;
+    /** @var array  */
+    private $shares;
 
-	/**
-	 * CalendarDeletedEvent constructor.
-	 *
-	 * @param int $calendarId
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @since 20.0.0
-	 */
-	public function __construct(int $calendarId,
-								array $calendarData,
-								array $shares) {
-		parent::__construct();
-		$this->calendarId = $calendarId;
-		$this->calendarData = $calendarData;
-		$this->shares = $shares;
-	}
+    /**
+     * CalendarDeletedEvent constructor.
+     *
+     * @param int $calendarId
+     * @param array $calendarData
+     * @param array $shares
+     * @since 20.0.0
+     */
+    public function __construct(int $calendarId,
+                                array $calendarData,
+                                array $shares) {
+        parent::__construct();
+        $this->calendarId = $calendarId;
+        $this->calendarData = $calendarData;
+        $this->shares = $shares;
+    }
 
-	/**
-	 * @return int
-	 * @since 20.0.0
-	 */
-	public function getCalendarId(): int {
-		return $this->calendarId;
-	}
+    /**
+     * @return int
+     * @since 20.0.0
+     */
+    public function getCalendarId(): int {
+        return $this->calendarId;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getCalendarData(): array {
-		return $this->calendarData;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getCalendarData(): array {
+        return $this->calendarData;
+    }
 
-	/**
-	 * @return array
-	 * @since 20.0.0
-	 */
-	public function getShares(): array {
-		return $this->shares;
-	}
+    /**
+     * @return array
+     * @since 20.0.0
+     */
+    public function getShares(): array {
+        return $this->shares;
+    }
 }

Please login to merge, or discard this patch.

apps/settings/lib/SetupChecks/LegacySSEKeyFormat.php 1 patch

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -32,32 +32,32 @@
 block discarded – undo
 use OCP\IURLGenerator;
 
 class LegacySSEKeyFormat {
-	/** @var IL10N */
-	private $l10n;
-	/** @var IConfig */
-	private $config;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IL10N $l10n, IConfig $config, IURLGenerator $urlGenerator) {
-		$this->l10n = $l10n;
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	public function description(): string {
-		return $this->l10n->t('The old server-side-encryption format is enabled. We recommend disabling this.');
-	}
-
-	public function severity(): string {
-		return 'warning';
-	}
-
-	public function run(): bool {
-		return $this->config->getSystemValueBool('encryption.legacy_format_support', false) === false;
-	}
-
-	public function linkToDocumentation(): string {
-		return $this->urlGenerator->linkToDocs('admin-sse-legacy-format');
-	}
+    /** @var IL10N */
+    private $l10n;
+    /** @var IConfig */
+    private $config;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    public function __construct(IL10N $l10n, IConfig $config, IURLGenerator $urlGenerator) {
+        $this->l10n = $l10n;
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    public function description(): string {
+        return $this->l10n->t('The old server-side-encryption format is enabled. We recommend disabling this.');
+    }
+
+    public function severity(): string {
+        return 'warning';
+    }
+
+    public function run(): bool {
+        return $this->config->getSystemValueBool('encryption.legacy_format_support', false) === false;
+    }
+
+    public function linkToDocumentation(): string {
+        return $this->urlGenerator->linkToDocs('admin-sse-legacy-format');
+    }
 }

Please login to merge, or discard this patch.

apps/dashboard/lib/Controller/LayoutApiController.php 1 patch

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -33,31 +33,31 @@
 block discarded – undo
 
 class LayoutApiController extends OCSController {
 
-	/** @var IConfig */
-	private $config;
-	/** @var string */
-	private $userId;
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IConfig $config,
-		$userId
-	) {
-		parent::__construct($appName, $request);
-
-		$this->config = $config;
-		$this->userId = $userId;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $layout
-	 * @return JSONResponse
-	 */
-	public function create(string $layout): JSONResponse {
-		$this->config->setUserValue($this->userId, 'dashboard', 'layout', $layout);
-		return new JSONResponse(['layout' => $layout]);
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var string */
+    private $userId;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IConfig $config,
+        $userId
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->userId = $userId;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $layout
+     * @return JSONResponse
+     */
+    public function create(string $layout): JSONResponse {
+        $this->config->setUserValue($this->userId, 'dashboard', 'layout', $layout);
+        return new JSONResponse(['layout' => $layout]);
+    }
 }

Please login to merge, or discard this patch.

apps/weather_status/lib/AppInfo/Application.php 1 patch

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -42,31 +42,31 @@
 block discarded – undo
  */
 class Application extends App implements IBootstrap {
 
-	/** @var string */
-	public const APP_ID = 'weather_status';
+    /** @var string */
+    public const APP_ID = 'weather_status';
 
-	/**
-	 * Application constructor.
-	 *
-	 * @param array $urlParams
-	 */
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
+    /**
+     * Application constructor.
+     *
+     * @param array $urlParams
+     */
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
 
-		$dispatcher = $this->getContainer()->query(IEventDispatcher::class);
-		$dispatcher->addListener(RegisterWidgetEvent::class, function (Event $e) {
-			Util::addScript(self::APP_ID, 'weather-status');
-		});
-	}
+        $dispatcher = $this->getContainer()->query(IEventDispatcher::class);
+        $dispatcher->addListener(RegisterWidgetEvent::class, function (Event $e) {
+            Util::addScript(self::APP_ID, 'weather-status');
+        });
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function register(IRegistrationContext $context): void {
-		// Register OCS Capabilities
-		$context->registerCapability(Capabilities::class);
-	}
+    /**
+     * @inheritDoc
+     */
+    public function register(IRegistrationContext $context): void {
+        // Register OCS Capabilities
+        $context->registerCapability(Capabilities::class);
+    }
 
-	public function boot(IBootContext $context): void {
-	}
+    public function boot(IBootContext $context): void {
+    }
 }

Please login to merge, or discard this patch.

apps/weather_status/lib/Capabilities.php 1 patch

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -35,21 +35,21 @@
 block discarded – undo
  */
 class Capabilities implements ICapability {
 
-	/**
-	 * Capabilities constructor.
-	 *
-	 */
-	public function __construct() {
-	}
+    /**
+     * Capabilities constructor.
+     *
+     */
+    public function __construct() {
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getCapabilities() {
-		return [
-			Application::APP_ID => [
-				'enabled' => true,
-			],
-		];
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getCapabilities() {
+        return [
+            Application::APP_ID => [
+                'enabled' => true,
+            ],
+        ];
+    }
 }

Please login to merge, or discard this patch.

apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php 1 patch

Indentation +87 added lines, -87 removed lines patch added patch discarded remove patch

@@ -34,91 +34,91 @@
 block discarded – undo
 
 class BuildCalendarSearchIndexBackgroundJob extends QueuedJob {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param CalDavBackend $calDavBackend
-	 * @param ILogger $logger
-	 * @param IJobList $jobList
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(IDBConnection $db,
-								CalDavBackend $calDavBackend,
-								ILogger $logger,
-								IJobList $jobList,
-								ITimeFactory $timeFactory) {
-		$this->db = $db;
-		$this->calDavBackend = $calDavBackend;
-		$this->logger = $logger;
-		$this->jobList = $jobList;
-		$this->timeFactory = $timeFactory;
-	}
-
-	public function run($arguments) {
-		$offset = (int) $arguments['offset'];
-		$stopAt = (int) $arguments['stopAt'];
-
-		$this->logger->info('Building calendar index (' . $offset .'/' . $stopAt . ')');
-
-		$startTime = $this->timeFactory->getTime();
-		while (($this->timeFactory->getTime() - $startTime) < 15) {
-			$offset = $this->buildIndex($offset, $stopAt);
-			if ($offset >= $stopAt) {
-				break;
-			}
-		}
-
-		if ($offset >= $stopAt) {
-			$this->logger->info('Building calendar index done');
-		} else {
-			$this->jobList->add(self::class, [
-				'offset' => $offset,
-				'stopAt' => $stopAt
-			]);
-			$this->logger->info('New building calendar index job scheduled with offset ' . $offset);
-		}
-	}
-
-	/**
-	 * @param int $offset
-	 * @param int $stopAt
-	 * @return int
-	 */
-	private function buildIndex(int $offset, int $stopAt): int {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'calendarid', 'uri', 'calendardata'])
-			->from('calendarobjects')
-			->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
-			->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
-			->orderBy('id', 'ASC')
-			->setMaxResults(500);
-
-		$result = $query->execute();
-		while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
-			$offset = $row['id'];
-
-			$calendarData = $row['calendardata'];
-			if (is_resource($calendarData)) {
-				$calendarData = stream_get_contents($calendarData);
-			}
-
-			$this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
-		}
-
-		return $offset;
-	}
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * @param IDBConnection $db
+     * @param CalDavBackend $calDavBackend
+     * @param ILogger $logger
+     * @param IJobList $jobList
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(IDBConnection $db,
+                                CalDavBackend $calDavBackend,
+                                ILogger $logger,
+                                IJobList $jobList,
+                                ITimeFactory $timeFactory) {
+        $this->db = $db;
+        $this->calDavBackend = $calDavBackend;
+        $this->logger = $logger;
+        $this->jobList = $jobList;
+        $this->timeFactory = $timeFactory;
+    }
+
+    public function run($arguments) {
+        $offset = (int) $arguments['offset'];
+        $stopAt = (int) $arguments['stopAt'];
+
+        $this->logger->info('Building calendar index (' . $offset .'/' . $stopAt . ')');
+
+        $startTime = $this->timeFactory->getTime();
+        while (($this->timeFactory->getTime() - $startTime) < 15) {
+            $offset = $this->buildIndex($offset, $stopAt);
+            if ($offset >= $stopAt) {
+                break;
+            }
+        }
+
+        if ($offset >= $stopAt) {
+            $this->logger->info('Building calendar index done');
+        } else {
+            $this->jobList->add(self::class, [
+                'offset' => $offset,
+                'stopAt' => $stopAt
+            ]);
+            $this->logger->info('New building calendar index job scheduled with offset ' . $offset);
+        }
+    }
+
+    /**
+     * @param int $offset
+     * @param int $stopAt
+     * @return int
+     */
+    private function buildIndex(int $offset, int $stopAt): int {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'calendarid', 'uri', 'calendardata'])
+            ->from('calendarobjects')
+            ->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
+            ->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
+            ->orderBy('id', 'ASC')
+            ->setMaxResults(500);
+
+        $result = $query->execute();
+        while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
+            $offset = $row['id'];
+
+            $calendarData = $row['calendardata'];
+            if (is_resource($calendarData)) {
+                $calendarData = stream_get_contents($calendarData);
+            }
+
+            $this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
+        }
+
+        return $offset;
+    }
 }

Please login to merge, or discard this patch.

		@@ -34,67 +34,67 @@
		block discarded – undo
34	34	*/
35	35	class CardDeletedEvent extends Event {
36	36
37		- /** @var int */
38		- private $addressBookId;
	37	+ /** @var int */
	38	+ private $addressBookId;
39	39
40		- /** @var array */
41		- private $addressBookData;
	40	+ /** @var array */
	41	+ private $addressBookData;
42	42
43		- /** @var array */
44		- private $shares;
	43	+ /** @var array */
	44	+ private $shares;
45	45
46		- /** @var array */
47		- private $cardData;
	46	+ /** @var array */
	47	+ private $cardData;
48	48
49		- /**
50		- * CardDeletedEvent constructor.
51		- *
52		- * @param int $addressBookId
53		- * @param array $addressBookData
54		- * @param array $shares
55		- * @param array $cardData
56		- * @since 20.0.0
57		- */
58		- public function __construct(int $addressBookId,
59		- array $addressBookData,
60		- array $shares,
61		- array $cardData) {
62		- parent::__construct();
63		- $this->addressBookId = $addressBookId;
64		- $this->addressBookData = $addressBookData;
65		- $this->shares = $shares;
66		- $this->cardData = $cardData;
67		- }
	49	+ /**
	50	+ * CardDeletedEvent constructor.
	51	+ *
	52	+ * @param int $addressBookId
	53	+ * @param array $addressBookData
	54	+ * @param array $shares
	55	+ * @param array $cardData
	56	+ * @since 20.0.0
	57	+ */
	58	+ public function __construct(int $addressBookId,
	59	+ array $addressBookData,
	60	+ array $shares,
	61	+ array $cardData) {
	62	+ parent::__construct();
	63	+ $this->addressBookId = $addressBookId;
	64	+ $this->addressBookData = $addressBookData;
	65	+ $this->shares = $shares;
	66	+ $this->cardData = $cardData;
	67	+ }
68	68
69		- /**
70		- * @return int
71		- * @since 20.0.0
72		- */
73		- public function getAddressBookId(): int {
74		- return $this->addressBookId;
75		- }
	69	+ /**
	70	+ * @return int
	71	+ * @since 20.0.0
	72	+ */
	73	+ public function getAddressBookId(): int {
	74	+ return $this->addressBookId;
	75	+ }
76	76
77		- /**
78		- * @return array
79		- * @since 20.0.0
80		- */
81		- public function getAddressBookData(): array {
82		- return $this->addressBookData;
83		- }
	77	+ /**
	78	+ * @return array
	79	+ * @since 20.0.0
	80	+ */
	81	+ public function getAddressBookData(): array {
	82	+ return $this->addressBookData;
	83	+ }
84	84
85		- /**
86		- * @return array
87		- * @since 20.0.0
88		- */
89		- public function getShares(): array {
90		- return $this->shares;
91		- }
	85	+ /**
	86	+ * @return array
	87	+ * @since 20.0.0
	88	+ */
	89	+ public function getShares(): array {
	90	+ return $this->shares;
	91	+ }
92	92
93		- /**
94		- * @return array
95		- * @since 20.0.0
96		- */
97		- public function getCardData(): array {
98		- return $this->cardData;
99		- }
	93	+ /**
	94	+ * @return array
	95	+ * @since 20.0.0
	96	+ */
	97	+ public function getCardData(): array {
	98	+ return $this->cardData;
	99	+ }
100	100	}

		@@ -34,81 +34,81 @@
		block discarded – undo
34	34	*/
35	35	class AddressBookShareUpdatedEvent extends Event {
36	36
37		- /** @var int */
38		- private $addressBookId;
	37	+ /** @var int */
	38	+ private $addressBookId;
39	39
40		- /** @var array */
41		- private $addressBookData;
	40	+ /** @var array */
	41	+ private $addressBookData;
42	42
43		- /** @var array */
44		- private $oldShares;
	43	+ /** @var array */
	44	+ private $oldShares;
45	45
46		- /** @var array */
47		- private $added;
	46	+ /** @var array */
	47	+ private $added;
48	48
49		- /** @var array */
50		- private $removed;
	49	+ /** @var array */
	50	+ private $removed;
51	51
52		- /**
53		- * AddressBookShareUpdatedEvent constructor.
54		- *
55		- * @param int $addressBookId
56		- * @param array $addressBookData
57		- * @param array $oldShares
58		- * @param array $added
59		- * @param array $removed
60		- * @since 20.0.0
61		- */
62		- public function __construct(int $addressBookId,
63		- array $addressBookData,
64		- array $oldShares,
65		- array $added,
66		- array $removed) {
67		- parent::__construct();
68		- $this->addressBookId = $addressBookId;
69		- $this->addressBookData = $addressBookData;
70		- $this->oldShares = $oldShares;
71		- $this->added = $added;
72		- $this->removed = $removed;
73		- }
	52	+ /**
	53	+ * AddressBookShareUpdatedEvent constructor.
	54	+ *
	55	+ * @param int $addressBookId
	56	+ * @param array $addressBookData
	57	+ * @param array $oldShares
	58	+ * @param array $added
	59	+ * @param array $removed
	60	+ * @since 20.0.0
	61	+ */
	62	+ public function __construct(int $addressBookId,
	63	+ array $addressBookData,
	64	+ array $oldShares,
	65	+ array $added,
	66	+ array $removed) {
	67	+ parent::__construct();
	68	+ $this->addressBookId = $addressBookId;
	69	+ $this->addressBookData = $addressBookData;
	70	+ $this->oldShares = $oldShares;
	71	+ $this->added = $added;
	72	+ $this->removed = $removed;
	73	+ }
74	74
75		- /**
76		- * @return int
77		- * @since 20.0.0
78		- */
79		- public function getAddressBookId(): int {
80		- return $this->addressBookId;
81		- }
	75	+ /**
	76	+ * @return int
	77	+ * @since 20.0.0
	78	+ */
	79	+ public function getAddressBookId(): int {
	80	+ return $this->addressBookId;
	81	+ }
82	82
83		- /**
84		- * @return array
85		- * @since 20.0.0
86		- */
87		- public function getAddressBookData(): array {
88		- return $this->addressBookData;
89		- }
	83	+ /**
	84	+ * @return array
	85	+ * @since 20.0.0
	86	+ */
	87	+ public function getAddressBookData(): array {
	88	+ return $this->addressBookData;
	89	+ }
90	90
91		- /**
92		- * @return array
93		- * @since 20.0.0
94		- */
95		- public function getOldShares(): array {
96		- return $this->oldShares;
97		- }
	91	+ /**
	92	+ * @return array
	93	+ * @since 20.0.0
	94	+ */
	95	+ public function getOldShares(): array {
	96	+ return $this->oldShares;
	97	+ }
98	98
99		- /**
100		- * @return array
101		- * @since 20.0.0
102		- */
103		- public function getAdded(): array {
104		- return $this->added;
105		- }
	99	+ /**
	100	+ * @return array
	101	+ * @since 20.0.0
	102	+ */
	103	+ public function getAdded(): array {
	104	+ return $this->added;
	105	+ }
106	106
107		- /**
108		- * @return array
109		- * @since 20.0.0
110		- */
111		- public function getRemoved(): array {
112		- return $this->removed;
113		- }
	107	+ /**
	108	+ * @return array
	109	+ * @since 20.0.0
	110	+ */
	111	+ public function getRemoved(): array {
	112	+ return $this->removed;
	113	+ }
114	114	}

		@@ -34,39 +34,39 @@
		block discarded – undo
34	34	*/
35	35	class AddressBookCreatedEvent extends Event {
36	36
37		- /** @var int */
38		- private $addressBookId;
	37	+ /** @var int */
	38	+ private $addressBookId;
39	39
40		- /** @var array */
41		- private $addressBookData;
	40	+ /** @var array */
	41	+ private $addressBookData;
42	42
43		- /**
44		- * AddressBookCreatedEvent constructor.
45		- *
46		- * @param int $addressBookId
47		- * @param array $addressBookData
48		- * @since 20.0.0
49		- */
50		- public function __construct(int $addressBookId,
51		- array $addressBookData) {
52		- parent::__construct();
53		- $this->addressBookId = $addressBookId;
54		- $this->addressBookData = $addressBookData;
55		- }
	43	+ /**
	44	+ * AddressBookCreatedEvent constructor.
	45	+ *
	46	+ * @param int $addressBookId
	47	+ * @param array $addressBookData
	48	+ * @since 20.0.0
	49	+ */
	50	+ public function __construct(int $addressBookId,
	51	+ array $addressBookData) {
	52	+ parent::__construct();
	53	+ $this->addressBookId = $addressBookId;
	54	+ $this->addressBookData = $addressBookData;
	55	+ }
56	56
57		- /**
58		- * @return int
59		- * @since 20.0.0
60		- */
61		- public function getAddressBookId(): int {
62		- return $this->addressBookId;
63		- }
	57	+ /**
	58	+ * @return int
	59	+ * @since 20.0.0
	60	+ */
	61	+ public function getAddressBookId(): int {
	62	+ return $this->addressBookId;
	63	+ }
64	64
65		- /**
66		- * @return array
67		- * @since 20.0.0
68		- */
69		- public function getAddressBookData(): array {
70		- return $this->addressBookData;
71		- }
	65	+ /**
	66	+ * @return array
	67	+ * @since 20.0.0
	68	+ */
	69	+ public function getAddressBookData(): array {
	70	+ return $this->addressBookData;
	71	+ }
72	72	}

		@@ -34,53 +34,53 @@
		block discarded – undo
34	34	*/
35	35	class CalendarDeletedEvent extends Event {
36	36
37		- /** @var int */
38		- private $calendarId;
	37	+ /** @var int */
	38	+ private $calendarId;
39	39
40		- /** @var array */
41		- private $calendarData;
	40	+ /** @var array */
	41	+ private $calendarData;
42	42
43		- /** @var array */
44		- private $shares;
	43	+ /** @var array */
	44	+ private $shares;
45	45
46		- /**
47		- * CalendarDeletedEvent constructor.
48		- *
49		- * @param int $calendarId
50		- * @param array $calendarData
51		- * @param array $shares
52		- * @since 20.0.0
53		- */
54		- public function __construct(int $calendarId,
55		- array $calendarData,
56		- array $shares) {
57		- parent::__construct();
58		- $this->calendarId = $calendarId;
59		- $this->calendarData = $calendarData;
60		- $this->shares = $shares;
61		- }
	46	+ /**
	47	+ * CalendarDeletedEvent constructor.
	48	+ *
	49	+ * @param int $calendarId
	50	+ * @param array $calendarData
	51	+ * @param array $shares
	52	+ * @since 20.0.0
	53	+ */
	54	+ public function __construct(int $calendarId,
	55	+ array $calendarData,
	56	+ array $shares) {
	57	+ parent::__construct();
	58	+ $this->calendarId = $calendarId;
	59	+ $this->calendarData = $calendarData;
	60	+ $this->shares = $shares;
	61	+ }
62	62
63		- /**
64		- * @return int
65		- * @since 20.0.0
66		- */
67		- public function getCalendarId(): int {
68		- return $this->calendarId;
69		- }
	63	+ /**
	64	+ * @return int
	65	+ * @since 20.0.0
	66	+ */
	67	+ public function getCalendarId(): int {
	68	+ return $this->calendarId;
	69	+ }
70	70
71		- /**
72		- * @return array
73		- * @since 20.0.0
74		- */
75		- public function getCalendarData(): array {
76		- return $this->calendarData;
77		- }
	71	+ /**
	72	+ * @return array
	73	+ * @since 20.0.0
	74	+ */
	75	+ public function getCalendarData(): array {
	76	+ return $this->calendarData;
	77	+ }
78	78
79		- /**
80		- * @return array
81		- * @since 20.0.0
82		- */
83		- public function getShares(): array {
84		- return $this->shares;
85		- }
	79	+ /**
	80	+ * @return array
	81	+ * @since 20.0.0
	82	+ */
	83	+ public function getShares(): array {
	84	+ return $this->shares;
	85	+ }
86	86	}

		@@ -32,32 +32,32 @@
		block discarded – undo
32	32	use OCP\IURLGenerator;
33	33
34	34	class LegacySSEKeyFormat {
35		- /** @var IL10N */
36		- private $l10n;
37		- /** @var IConfig */
38		- private $config;
39		- /** @var IURLGenerator */
40		- private $urlGenerator;
41		-
42		- public function __construct(IL10N $l10n, IConfig $config, IURLGenerator $urlGenerator) {
43		- $this->l10n = $l10n;
44		- $this->config = $config;
45		- $this->urlGenerator = $urlGenerator;
46		- }
47		-
48		- public function description(): string {
49		- return $this->l10n->t('The old server-side-encryption format is enabled. We recommend disabling this.');
50		- }
51		-
52		- public function severity(): string {
53		- return 'warning';
54		- }
55		-
56		- public function run(): bool {
57		- return $this->config->getSystemValueBool('encryption.legacy_format_support', false) === false;
58		- }
59		-
60		- public function linkToDocumentation(): string {
61		- return $this->urlGenerator->linkToDocs('admin-sse-legacy-format');
62		- }
	35	+ /** @var IL10N */
	36	+ private $l10n;
	37	+ /** @var IConfig */
	38	+ private $config;
	39	+ /** @var IURLGenerator */
	40	+ private $urlGenerator;
	41	+
	42	+ public function __construct(IL10N $l10n, IConfig $config, IURLGenerator $urlGenerator) {
	43	+ $this->l10n = $l10n;
	44	+ $this->config = $config;
	45	+ $this->urlGenerator = $urlGenerator;
	46	+ }
	47	+
	48	+ public function description(): string {
	49	+ return $this->l10n->t('The old server-side-encryption format is enabled. We recommend disabling this.');
	50	+ }
	51	+
	52	+ public function severity(): string {
	53	+ return 'warning';
	54	+ }
	55	+
	56	+ public function run(): bool {
	57	+ return $this->config->getSystemValueBool('encryption.legacy_format_support', false) === false;
	58	+ }
	59	+
	60	+ public function linkToDocumentation(): string {
	61	+ return $this->urlGenerator->linkToDocs('admin-sse-legacy-format');
	62	+ }
63	63	}

		@@ -33,31 +33,31 @@
		block discarded – undo
33	33
34	34	class LayoutApiController extends OCSController {
35	35
36		- /** @var IConfig */
37		- private $config;
38		- /** @var string */
39		- private $userId;
40		-
41		- public function __construct(
42		- string $appName,
43		- IRequest $request,
44		- IConfig $config,
45		- $userId
46		- ) {
47		- parent::__construct($appName, $request);
48		-
49		- $this->config = $config;
50		- $this->userId = $userId;
51		- }
52		-
53		- /**
54		- * @NoAdminRequired
55		- *
56		- * @param string $layout
57		- * @return JSONResponse
58		- */
59		- public function create(string $layout): JSONResponse {
60		- $this->config->setUserValue($this->userId, 'dashboard', 'layout', $layout);
61		- return new JSONResponse(['layout' => $layout]);
62		- }
	36	+ /** @var IConfig */
	37	+ private $config;
	38	+ /** @var string */
	39	+ private $userId;
	40	+
	41	+ public function __construct(
	42	+ string $appName,
	43	+ IRequest $request,
	44	+ IConfig $config,
	45	+ $userId
	46	+ ) {
	47	+ parent::__construct($appName, $request);
	48	+
	49	+ $this->config = $config;
	50	+ $this->userId = $userId;
	51	+ }
	52	+
	53	+ /**
	54	+ * @NoAdminRequired
	55	+ *
	56	+ * @param string $layout
	57	+ * @return JSONResponse
	58	+ */
	59	+ public function create(string $layout): JSONResponse {
	60	+ $this->config->setUserValue($this->userId, 'dashboard', 'layout', $layout);
	61	+ return new JSONResponse(['layout' => $layout]);
	62	+ }
63	63	}

		@@ -42,31 +42,31 @@
		block discarded – undo
42	42	*/
43	43	class Application extends App implements IBootstrap {
44	44
45		- /** @var string */
46		- public const APP_ID = 'weather_status';
	45	+ /** @var string */
	46	+ public const APP_ID = 'weather_status';
47	47
48		- /**
49		- * Application constructor.
50		- *
51		- * @param array $urlParams
52		- */
53		- public function __construct(array $urlParams = []) {
54		- parent::__construct(self::APP_ID, $urlParams);
	48	+ /**
	49	+ * Application constructor.
	50	+ *
	51	+ * @param array $urlParams
	52	+ */
	53	+ public function __construct(array $urlParams = []) {
	54	+ parent::__construct(self::APP_ID, $urlParams);
55	55
56		- $dispatcher = $this->getContainer()->query(IEventDispatcher::class);
57		- $dispatcher->addListener(RegisterWidgetEvent::class, function (Event $e) {
58		- Util::addScript(self::APP_ID, 'weather-status');
59		- });
60		- }
	56	+ $dispatcher = $this->getContainer()->query(IEventDispatcher::class);
	57	+ $dispatcher->addListener(RegisterWidgetEvent::class, function (Event $e) {
	58	+ Util::addScript(self::APP_ID, 'weather-status');
	59	+ });
	60	+ }
61	61
62		- /**
63		- * @inheritDoc
64		- */
65		- public function register(IRegistrationContext $context): void {
66		- // Register OCS Capabilities
67		- $context->registerCapability(Capabilities::class);
68		- }
	62	+ /**
	63	+ * @inheritDoc
	64	+ */
	65	+ public function register(IRegistrationContext $context): void {
	66	+ // Register OCS Capabilities
	67	+ $context->registerCapability(Capabilities::class);
	68	+ }
69	69
70		- public function boot(IBootContext $context): void {
71		- }
	70	+ public function boot(IBootContext $context): void {
	71	+ }
72	72	}

		@@ -35,21 +35,21 @@
		block discarded – undo
35	35	*/
36	36	class Capabilities implements ICapability {
37	37
38		- /**
39		- * Capabilities constructor.
40		- *
41		- */
42		- public function __construct() {
43		- }
	38	+ /**
	39	+ * Capabilities constructor.
	40	+ *
	41	+ */
	42	+ public function __construct() {
	43	+ }
44	44
45		- /**
46		- * @inheritDoc
47		- */
48		- public function getCapabilities() {
49		- return [
50		- Application::APP_ID => [
51		- 'enabled' => true,
52		- ],
53		- ];
54		- }
	45	+ /**
	46	+ * @inheritDoc
	47	+ */
	48	+ public function getCapabilities() {
	49	+ return [
	50	+ Application::APP_ID => [
	51	+ 'enabled' => true,
	52	+ ],
	53	+ ];
	54	+ }
55	55	}

		@@ -34,91 +34,91 @@
		block discarded – undo
34	34
35	35	class BuildCalendarSearchIndexBackgroundJob extends QueuedJob {
36	36
37		- /** @var IDBConnection */
38		- private $db;
39		-
40		- /** @var CalDavBackend */
41		- private $calDavBackend;
42		-
43		- /** @var ILogger */
44		- private $logger;
45		-
46		- /** @var IJobList */
47		- private $jobList;
48		-
49		- /** @var ITimeFactory */
50		- private $timeFactory;
51		-
52		- /**
53		- * @param IDBConnection $db
54		- * @param CalDavBackend $calDavBackend
55		- * @param ILogger $logger
56		- * @param IJobList $jobList
57		- * @param ITimeFactory $timeFactory
58		- */
59		- public function __construct(IDBConnection $db,
60		- CalDavBackend $calDavBackend,
61		- ILogger $logger,
62		- IJobList $jobList,
63		- ITimeFactory $timeFactory) {
64		- $this->db = $db;
65		- $this->calDavBackend = $calDavBackend;
66		- $this->logger = $logger;
67		- $this->jobList = $jobList;
68		- $this->timeFactory = $timeFactory;
69		- }
70		-
71		- public function run($arguments) {
72		- $offset = (int) $arguments['offset'];
73		- $stopAt = (int) $arguments['stopAt'];
74		-
75		- $this->logger->info('Building calendar index (' . $offset .'/' . $stopAt . ')');
76		-
77		- $startTime = $this->timeFactory->getTime();
78		- while (($this->timeFactory->getTime() - $startTime) < 15) {
79		- $offset = $this->buildIndex($offset, $stopAt);
80		- if ($offset >= $stopAt) {
81		- break;
82		- }
83		- }
84		-
85		- if ($offset >= $stopAt) {
86		- $this->logger->info('Building calendar index done');
87		- } else {
88		- $this->jobList->add(self::class, [
89		- 'offset' => $offset,
90		- 'stopAt' => $stopAt
91		- ]);
92		- $this->logger->info('New building calendar index job scheduled with offset ' . $offset);
93		- }
94		- }
95		-
96		- /**
97		- * @param int $offset
98		- * @param int $stopAt
99		- * @return int
100		- */
101		- private function buildIndex(int $offset, int $stopAt): int {
102		- $query = $this->db->getQueryBuilder();
103		- $query->select(['id', 'calendarid', 'uri', 'calendardata'])
104		- ->from('calendarobjects')
105		- ->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
106		- ->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
107		- ->orderBy('id', 'ASC')
108		- ->setMaxResults(500);
109		-
110		- $result = $query->execute();
111		- while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
112		- $offset = $row['id'];
113		-
114		- $calendarData = $row['calendardata'];
115		- if (is_resource($calendarData)) {
116		- $calendarData = stream_get_contents($calendarData);
117		- }
118		-
119		- $this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
120		- }
121		-
122		- return $offset;
123		- }
	37	+ /** @var IDBConnection */
	38	+ private $db;
	39	+
	40	+ /** @var CalDavBackend */
	41	+ private $calDavBackend;
	42	+
	43	+ /** @var ILogger */
	44	+ private $logger;
	45	+
	46	+ /** @var IJobList */
	47	+ private $jobList;
	48	+
	49	+ /** @var ITimeFactory */
	50	+ private $timeFactory;
	51	+
	52	+ /**
	53	+ * @param IDBConnection $db
	54	+ * @param CalDavBackend $calDavBackend
	55	+ * @param ILogger $logger
	56	+ * @param IJobList $jobList
	57	+ * @param ITimeFactory $timeFactory
	58	+ */
	59	+ public function __construct(IDBConnection $db,
	60	+ CalDavBackend $calDavBackend,
	61	+ ILogger $logger,
	62	+ IJobList $jobList,
	63	+ ITimeFactory $timeFactory) {
	64	+ $this->db = $db;
	65	+ $this->calDavBackend = $calDavBackend;
	66	+ $this->logger = $logger;
	67	+ $this->jobList = $jobList;
	68	+ $this->timeFactory = $timeFactory;
	69	+ }
	70	+
	71	+ public function run($arguments) {
	72	+ $offset = (int) $arguments['offset'];
	73	+ $stopAt = (int) $arguments['stopAt'];
	74	+
	75	+ $this->logger->info('Building calendar index (' . $offset .'/' . $stopAt . ')');
	76	+
	77	+ $startTime = $this->timeFactory->getTime();
	78	+ while (($this->timeFactory->getTime() - $startTime) < 15) {
	79	+ $offset = $this->buildIndex($offset, $stopAt);
	80	+ if ($offset >= $stopAt) {
	81	+ break;
	82	+ }
	83	+ }
	84	+
	85	+ if ($offset >= $stopAt) {
	86	+ $this->logger->info('Building calendar index done');
	87	+ } else {
	88	+ $this->jobList->add(self::class, [
	89	+ 'offset' => $offset,
	90	+ 'stopAt' => $stopAt
	91	+ ]);
	92	+ $this->logger->info('New building calendar index job scheduled with offset ' . $offset);
	93	+ }
	94	+ }
	95	+
	96	+ /**
	97	+ * @param int $offset
	98	+ * @param int $stopAt
	99	+ * @return int
	100	+ */
	101	+ private function buildIndex(int $offset, int $stopAt): int {
	102	+ $query = $this->db->getQueryBuilder();
	103	+ $query->select(['id', 'calendarid', 'uri', 'calendardata'])
	104	+ ->from('calendarobjects')
	105	+ ->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
	106	+ ->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
	107	+ ->orderBy('id', 'ASC')
	108	+ ->setMaxResults(500);
	109	+
	110	+ $result = $query->execute();
	111	+ while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
	112	+ $offset = $row['id'];
	113	+
	114	+ $calendarData = $row['calendardata'];
	115	+ if (is_resource($calendarData)) {
	116	+ $calendarData = stream_get_contents($calendarData);
	117	+ }
	118	+
	119	+ $this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
	120	+ }
	121	+
	122	+ return $offset;
	123	+ }
124	124	}

nextcloud / server

Push — master ( 078203...c81798 )

Status

Category

Indentation +55 added lines, -55 removed lines patch added patch discarded remove patch

Indentation +67 added lines, -67 removed lines patch added patch discarded remove patch

Indentation +31 added lines, -31 removed lines patch added patch discarded remove patch

Indentation +43 added lines, -43 removed lines patch added patch discarded remove patch

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

Indentation +87 added lines, -87 removed lines patch added patch discarded remove patch