nextcloud / server

lib/private/Dashboard/DashboardManager.php

Indentation +97 added lines, -97 removed lines

@@ -46,103 +46,103 @@
 class DashboardManager implements IDashboardManager {
 
 
-	/** @var IWidgetsService */
-	private $widgetsService;
-
-	/** @var IEventsService */
-	private $eventsService;
-
-
-	/**
-	 * @param IEventsService $eventsService
-	 */
-	public function registerEventsService(IEventsService $eventsService) {
-		$this->eventsService = $eventsService;
-	}
-
-
-	/**
-	 * @param IWidgetsService $widgetsService
-	 */
-	public function registerWidgetsService(IWidgetsService $widgetsService) {
-		$this->widgetsService = $widgetsService;
-	}
-
-
-	/**
-	 * @param string $widgetId
-	 * @param string $userId
-	 *
-	 * @return IWidgetConfig
-	 * @throws DashboardAppNotAvailableException
-	 */
-	public function getWidgetConfig(string $widgetId, string $userId): IWidgetConfig {
-		return $this->getWidgetsService()->getWidgetConfig($widgetId, $userId);
-	}
-
-
-	/**
-	 * @param string $widgetId
-	 * @param array $users
-	 * @param array $payload
-	 * @param string $uniqueId
-	 *
-	 * @throws DashboardAppNotAvailableException
-	 */
-	public function createUsersEvent(string $widgetId, array $users, array $payload, string $uniqueId = '') {
-		$this->getEventsService()->createUsersEvent($widgetId, $users, $payload, $uniqueId);
-	}
-
-
-	/**
-	 * @param string $widgetId
-	 * @param array $groups
-	 * @param array $payload
-	 * @param string $uniqueId
-	 *
-	 * @throws DashboardAppNotAvailableException
-	 */
-	public function createGroupsEvent(string $widgetId, array $groups, array $payload, string $uniqueId = '') {
-		$this->getEventsService()->createGroupsEvent($widgetId, $groups, $payload, $uniqueId);
-	}
-
-
-	/**
-	 * @param string $widgetId
-	 * @param array $payload
-	 * @param string $uniqueId
-	 *
-	 * @throws DashboardAppNotAvailableException
-	 */
-	public function createGlobalEvent(string $widgetId, array $payload, string $uniqueId = '') {
-		$this->getEventsService()->createGlobalEvent($widgetId, $payload, $uniqueId);
-	}
-
-
-	/**
-	 * @return IWidgetsService
-	 * @throws DashboardAppNotAvailableException
-	 */
-	private function getWidgetsService() {
-		if ($this->widgetsService === null) {
-			throw new DashboardAppNotAvailableException('No IWidgetsService registered');
-		}
-
-		return $this->widgetsService;
-	}
-
-
-	/**
-	 * @return IEventsService
-	 * @throws DashboardAppNotAvailableException
-	 */
-	private function getEventsService() {
-		if ($this->eventsService === null) {
-			throw new DashboardAppNotAvailableException('No IEventsService registered');
-		}
-
-		return $this->eventsService;
-	}
+    /** @var IWidgetsService */
+    private $widgetsService;
+
+    /** @var IEventsService */
+    private $eventsService;
+
+
+    /**
+     * @param IEventsService $eventsService
+     */
+    public function registerEventsService(IEventsService $eventsService) {
+        $this->eventsService = $eventsService;
+    }
+
+
+    /**
+     * @param IWidgetsService $widgetsService
+     */
+    public function registerWidgetsService(IWidgetsService $widgetsService) {
+        $this->widgetsService = $widgetsService;
+    }
+
+
+    /**
+     * @param string $widgetId
+     * @param string $userId
+     *
+     * @return IWidgetConfig
+     * @throws DashboardAppNotAvailableException
+     */
+    public function getWidgetConfig(string $widgetId, string $userId): IWidgetConfig {
+        return $this->getWidgetsService()->getWidgetConfig($widgetId, $userId);
+    }
+
+
+    /**
+     * @param string $widgetId
+     * @param array $users
+     * @param array $payload
+     * @param string $uniqueId
+     *
+     * @throws DashboardAppNotAvailableException
+     */
+    public function createUsersEvent(string $widgetId, array $users, array $payload, string $uniqueId = '') {
+        $this->getEventsService()->createUsersEvent($widgetId, $users, $payload, $uniqueId);
+    }
+
+
+    /**
+     * @param string $widgetId
+     * @param array $groups
+     * @param array $payload
+     * @param string $uniqueId
+     *
+     * @throws DashboardAppNotAvailableException
+     */
+    public function createGroupsEvent(string $widgetId, array $groups, array $payload, string $uniqueId = '') {
+        $this->getEventsService()->createGroupsEvent($widgetId, $groups, $payload, $uniqueId);
+    }
+
+
+    /**
+     * @param string $widgetId
+     * @param array $payload
+     * @param string $uniqueId
+     *
+     * @throws DashboardAppNotAvailableException
+     */
+    public function createGlobalEvent(string $widgetId, array $payload, string $uniqueId = '') {
+        $this->getEventsService()->createGlobalEvent($widgetId, $payload, $uniqueId);
+    }
+
+
+    /**
+     * @return IWidgetsService
+     * @throws DashboardAppNotAvailableException
+     */
+    private function getWidgetsService() {
+        if ($this->widgetsService === null) {
+            throw new DashboardAppNotAvailableException('No IWidgetsService registered');
+        }
+
+        return $this->widgetsService;
+    }
+
+
+    /**
+     * @return IEventsService
+     * @throws DashboardAppNotAvailableException
+     */
+    private function getEventsService() {
+        if ($this->eventsService === null) {
+            throw new DashboardAppNotAvailableException('No IEventsService registered');
+        }
+
+        return $this->eventsService;
+    }
 
 }
 

lib/public/Accounts/IAccountProperty.php

Indentation +59 added lines, -59 removed lines

@@ -34,71 +34,71 @@
  */
 interface IAccountProperty extends \JsonSerializable {
 
-	/**
-	 * Set the value of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $value
-	 * @return IAccountProperty
-	 */
-	public function setValue(string $value): IAccountProperty;
+    /**
+     * Set the value of a property
+     *
+     * @since 15.0.0
+     *
+     * @param string $value
+     * @return IAccountProperty
+     */
+    public function setValue(string $value): IAccountProperty;
 
-	/**
-	 * Set the scope of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $scope
-	 * @return IAccountProperty
-	 */
-	public function setScope(string $scope): IAccountProperty;
+    /**
+     * Set the scope of a property
+     *
+     * @since 15.0.0
+     *
+     * @param string $scope
+     * @return IAccountProperty
+     */
+    public function setScope(string $scope): IAccountProperty;
 
-	/**
-	 * Set the verification status of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $verified
-	 * @return IAccountProperty
-	 */
-	public function setVerified(string $verified): IAccountProperty;
+    /**
+     * Set the verification status of a property
+     *
+     * @since 15.0.0
+     *
+     * @param string $verified
+     * @return IAccountProperty
+     */
+    public function setVerified(string $verified): IAccountProperty;
 
-	/**
-	 * Get the name of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getName(): string;
+    /**
+     * Get the name of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getName(): string;
 
-	/**
-	 * Get the value of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getValue(): string;
+    /**
+     * Get the value of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getValue(): string;
 
-	/**
-	 * Get the scope of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getScope(): string;
+    /**
+     * Get the scope of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getScope(): string;
 
-	/**
-	 * Get the verification status of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getVerified(): string;
+    /**
+     * Get the verification status of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getVerified(): string;
 
 }
 

lib/private/Accounts/AccountProperty.php

Indentation +98 added lines, -98 removed lines

@@ -30,111 +30,111 @@
 
 class AccountProperty implements IAccountProperty {
 
-	/** @var string */
-	private $name;
-	/** @var string */
-	private $value;
-	/** @var string */
-	private $scope;
-	/** @var string */
-	private $verified;
+    /** @var string */
+    private $name;
+    /** @var string */
+    private $value;
+    /** @var string */
+    private $scope;
+    /** @var string */
+    private $verified;
 
-	public function __construct(string $name, string $value, string $scope, string $verified) {
-		$this->name = $name;
-		$this->value = $value;
-		$this->scope = $scope;
-		$this->verified = $verified;
-	}
+    public function __construct(string $name, string $value, string $scope, string $verified) {
+        $this->name = $name;
+        $this->value = $value;
+        $this->scope = $scope;
+        $this->verified = $verified;
+    }
 
-	public function jsonSerialize() {
-		return [
-			'name' => $this->getName(),
-			'value' => $this->getValue(),
-			'scope' => $this->getScope(),
-			'verified' => $this->getVerified()
-		];
-	}
+    public function jsonSerialize() {
+        return [
+            'name' => $this->getName(),
+            'value' => $this->getValue(),
+            'scope' => $this->getScope(),
+            'verified' => $this->getVerified()
+        ];
+    }
 
-	/**
-	 * Set the value of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $value
-	 * @return IAccountProperty
-	 */
-	public function setValue(string $value): IAccountProperty {
-		$this->value = $value;
-		return $this;
-	}
+    /**
+     * Set the value of a property
+     *
+     * @since 15.0.0
+     *
+     * @param string $value
+     * @return IAccountProperty
+     */
+    public function setValue(string $value): IAccountProperty {
+        $this->value = $value;
+        return $this;
+    }
 
-	/**
-	 * Set the scope of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $scope
-	 * @return IAccountProperty
-	 */
-	public function setScope(string $scope): IAccountProperty {
-		$this->scope = $scope;
-		return $this;
-	}
+    /**
+     * Set the scope of a property
+     *
+     * @since 15.0.0
+     *
+     * @param string $scope
+     * @return IAccountProperty
+     */
+    public function setScope(string $scope): IAccountProperty {
+        $this->scope = $scope;
+        return $this;
+    }
 
-	/**
-	 * Set the verification status of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @param string $verified
-	 * @return IAccountProperty
-	 */
-	public function setVerified(string $verified): IAccountProperty {
-		$this->verified = $verified;
-		return $this;
-	}
+    /**
+     * Set the verification status of a property
+     *
+     * @since 15.0.0
+     *
+     * @param string $verified
+     * @return IAccountProperty
+     */
+    public function setVerified(string $verified): IAccountProperty {
+        $this->verified = $verified;
+        return $this;
+    }
 
-	/**
-	 * Get the name of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getName(): string {
-		return $this->name;
-	}
+    /**
+     * Get the name of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getName(): string {
+        return $this->name;
+    }
 
-	/**
-	 * Get the value of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getValue(): string {
-		return $this->value;
-	}
+    /**
+     * Get the value of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getValue(): string {
+        return $this->value;
+    }
 
-	/**
-	 * Get the scope of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getScope(): string {
-		return $this->scope;
-	}
+    /**
+     * Get the scope of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getScope(): string {
+        return $this->scope;
+    }
 
-	/**
-	 * Get the verification status of a property
-	 *
-	 * @since 15.0.0
-	 *
-	 * @return string
-	 */
-	public function getVerified(): string {
-		return $this->verified;
-	}
+    /**
+     * Get the verification status of a property
+     *
+     * @since 15.0.0
+     *
+     * @return string
+     */
+    public function getVerified(): string {
+        return $this->verified;
+    }
 }

apps/dav/lib/CalDAV/Outbox.php

Spacing +11 added lines, -11 removed lines

@@ -74,12 +74,12 @@ 
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
 				'protected' => true,
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 		];
@@ -94,23 +94,23 @@ 
 		if ($this->disableFreeBusy) {
 			return array_merge($commonAcl, [
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-invite',
 					'principal' => $this->getOwner(),
 					'protected' => true,
 				],
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-invite',
+					'principal' => $this->getOwner().'/calendar-proxy-write',
 					'protected' => true,
 				],
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-reply',
 					'principal' => $this->getOwner(),
 					'protected' => true,
 				],
 				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
+					'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send-reply',
+					'principal' => $this->getOwner().'/calendar-proxy-write',
 					'protected' => true,
 				],
 			]);
@@ -118,13 +118,13 @@ 
 
 		return array_merge($commonAcl, [
 			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
+				'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send',
 				'principal' => $this->getOwner(),
 				'protected' => true,
 			],
 			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'privilege' => '{'.CalDAVPlugin::NS_CALDAV.'}schedule-send',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 		]);

Indentation +91 added lines, -91 removed lines

@@ -34,102 +34,102 @@
  */
 class Outbox extends \Sabre\CalDAV\Schedule\Outbox {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var null|bool */
-	private $disableFreeBusy = null;
+    /** @var null|bool */
+    private $disableFreeBusy = null;
 
-	/**
-	 * Outbox constructor.
-	 *
-	 * @param IConfig $config
-	 * @param string $principalUri
-	 */
-	public function __construct(IConfig $config, string $principalUri) {
-		parent::__construct($principalUri);
-		$this->config = $config;
-	}
+    /**
+     * Outbox constructor.
+     *
+     * @param IConfig $config
+     * @param string $principalUri
+     */
+    public function __construct(IConfig $config, string $principalUri) {
+        parent::__construct($principalUri);
+        $this->config = $config;
+    }
 
-	/**
-	 * Returns a list of ACE's for this node.
-	 *
-	 * Each ACE has the following properties:
-	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-	 *     currently the only supported privileges
-	 *   * 'principal', a url to the principal who owns the node
-	 *   * 'protected' (optional), indicating that this ACE is not allowed to
-	 *      be updated.
-	 *
-	 * @return array
-	 */
-	public function getACL() {
-		// getACL is called so frequently that we cache the config result
-		if ($this->disableFreeBusy === null) {
-			$this->disableFreeBusy = ($this->config->getAppValue('dav', 'disableFreeBusy', 'no') === 'yes');
-		}
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    public function getACL() {
+        // getACL is called so frequently that we cache the config result
+        if ($this->disableFreeBusy === null) {
+            $this->disableFreeBusy = ($this->config->getAppValue('dav', 'disableFreeBusy', 'no') === 'yes');
+        }
 
-		$commonAcl = [
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
-				'protected' => true,
-			],
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			],
-		];
+        $commonAcl = [
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-read',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ],
+        ];
 
-		// schedule-send is an aggregate privilege for:
-		// - schedule-send-invite
-		// - schedule-send-reply
-		// - schedule-send-freebusy
-		//
-		// If FreeBusy is disabled, we have to remove the latter privilege
+        // schedule-send is an aggregate privilege for:
+        // - schedule-send-invite
+        // - schedule-send-reply
+        // - schedule-send-freebusy
+        //
+        // If FreeBusy is disabled, we have to remove the latter privilege
 
-		if ($this->disableFreeBusy) {
-			return array_merge($commonAcl, [
-				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
-					'principal' => $this->getOwner(),
-					'protected' => true,
-				],
-				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
-					'protected' => true,
-				],
-				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
-					'principal' => $this->getOwner(),
-					'protected' => true,
-				],
-				[
-					'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
-					'principal' => $this->getOwner() . '/calendar-proxy-write',
-					'protected' => true,
-				],
-			]);
-		}
+        if ($this->disableFreeBusy) {
+            return array_merge($commonAcl, [
+                [
+                    'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
+                    'principal' => $this->getOwner(),
+                    'protected' => true,
+                ],
+                [
+                    'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-invite',
+                    'principal' => $this->getOwner() . '/calendar-proxy-write',
+                    'protected' => true,
+                ],
+                [
+                    'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
+                    'principal' => $this->getOwner(),
+                    'protected' => true,
+                ],
+                [
+                    'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send-reply',
+                    'principal' => $this->getOwner() . '/calendar-proxy-write',
+                    'protected' => true,
+                ],
+            ]);
+        }
 
-		return array_merge($commonAcl, [
-			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
-				'principal' => $this->getOwner(),
-				'protected' => true,
-			],
-			[
-				'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
-				'protected' => true,
-			],
-		]);
-	}
+        return array_merge($commonAcl, [
+            [
+                'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
+                'principal' => $this->getOwner(),
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{' . CalDAVPlugin::NS_CALDAV . '}schedule-send',
+                'principal' => $this->getOwner() . '/calendar-proxy-write',
+                'protected' => true,
+            ],
+        ]);
+    }
 }

lib/public/BackgroundJob/Job.php

Spacing +3 added lines, -3 removed lines

@@ -73,17 +73,17 @@
 
 		try {
 			$jobStartTime = $this->time->getTime();
-			$logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
+			$logger->debug('Run '.get_class($this).' job with ID '.$this->getId(), ['app' => 'cron']);
 			$this->run($this->argument);
 			$timeTaken = $this->time->getTime() - $jobStartTime;
 
-			$logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
+			$logger->debug('Finished '.get_class($this).' job with ID '.$this->getId().' in '.$timeTaken.' seconds', ['app' => 'cron']);
 			$jobList->setExecutionTime($this, $timeTaken);
 		} catch (\Exception $e) {
 			if ($logger) {
 				$logger->logException($e, [
 					'app' => 'core',
-					'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
+					'message' => 'Error while running background job (class: '.get_class($this).', arguments: '.print_r($this->argument, true).')'
 				]);
 			}
 		}

Indentation +102 added lines, -102 removed lines

@@ -40,106 +40,106 @@
  */
 abstract class Job implements IJob {
 
-	/** @var int $id */
-	protected $id;
-
-	/** @var int $lastRun */
-	protected $lastRun;
-
-	/** @var mixed $argument */
-	protected $argument;
-
-	/** @var ITimeFactory */
-	protected $time;
-
-	/**
-	 * @since 15.0.0
-	 */
-	public function __construct(ITimeFactory $time) {
-		$this->time = $time;
-	}
-
-	/**
-	 * The function to prepare the execution of the job.
-	 *
-	 *
-	 * @param IJobList $jobList
-	 * @param ILogger|null $logger
-	 *
-	 * @since 15.0.0
-	 */
-	public function execute(IJobList $jobList, ILogger $logger = null) {
-		$jobList->setLastRun($this);
-		if ($logger === null) {
-			$logger = \OC::$server->getLogger();
-		}
-
-		try {
-			$jobStartTime = $this->time->getTime();
-			$logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
-			$this->run($this->argument);
-			$timeTaken = $this->time->getTime() - $jobStartTime;
-
-			$logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
-			$jobList->setExecutionTime($this, $timeTaken);
-		} catch (\Exception $e) {
-			if ($logger) {
-				$logger->logException($e, [
-					'app' => 'core',
-					'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	final public function setId(int $id) {
-		$this->id = $id;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	final public function setLastRun(int $lastRun) {
-		$this->lastRun = $lastRun;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	public function setArgument($argument) {
-		$this->argument = $argument;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	final public function getId(): int {
-		return $this->id;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	final public function getLastRun(): int {
-		return $this->lastRun;
-	}
-
-	/**
-	 * @since 15.0.0
-	 */
-	public function getArgument() {
-		return $this->argument;
-	}
-
-	/**
-	 * The actual function that is called to run the job
-	 *
-	 * @param $argument
-	 *
-	 * @since 15.0.0
-	 */
-	abstract protected function run($argument);
+    /** @var int $id */
+    protected $id;
+
+    /** @var int $lastRun */
+    protected $lastRun;
+
+    /** @var mixed $argument */
+    protected $argument;
+
+    /** @var ITimeFactory */
+    protected $time;
+
+    /**
+     * @since 15.0.0
+     */
+    public function __construct(ITimeFactory $time) {
+        $this->time = $time;
+    }
+
+    /**
+     * The function to prepare the execution of the job.
+     *
+     *
+     * @param IJobList $jobList
+     * @param ILogger|null $logger
+     *
+     * @since 15.0.0
+     */
+    public function execute(IJobList $jobList, ILogger $logger = null) {
+        $jobList->setLastRun($this);
+        if ($logger === null) {
+            $logger = \OC::$server->getLogger();
+        }
+
+        try {
+            $jobStartTime = $this->time->getTime();
+            $logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
+            $this->run($this->argument);
+            $timeTaken = $this->time->getTime() - $jobStartTime;
+
+            $logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
+            $jobList->setExecutionTime($this, $timeTaken);
+        } catch (\Exception $e) {
+            if ($logger) {
+                $logger->logException($e, [
+                    'app' => 'core',
+                    'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    final public function setId(int $id) {
+        $this->id = $id;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    final public function setLastRun(int $lastRun) {
+        $this->lastRun = $lastRun;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    public function setArgument($argument) {
+        $this->argument = $argument;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    final public function getId(): int {
+        return $this->id;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    final public function getLastRun(): int {
+        return $this->lastRun;
+    }
+
+    /**
+     * @since 15.0.0
+     */
+    public function getArgument() {
+        return $this->argument;
+    }
+
+    /**
+     * The actual function that is called to run the job
+     *
+     * @param $argument
+     *
+     * @since 15.0.0
+     */
+    abstract protected function run($argument);
 }

lib/public/BackgroundJob/QueuedJob.php

Indentation +12 added lines, -12 removed lines

@@ -33,16 +33,16 @@
  */
 abstract class QueuedJob extends Job {
 
-	/**
-	 * run the job, then remove it from the joblist
-	 *
-	 * @param IJobList $jobList
-	 * @param ILogger|null $logger
-	 *
-	 * @since 15.0.0
-	 */
-	final public function execute($jobList, ILogger $logger = null) {
-		$jobList->remove($this, $this->argument);
-		parent::execute($jobList, $logger);
-	}
+    /**
+     * run the job, then remove it from the joblist
+     *
+     * @param IJobList $jobList
+     * @param ILogger|null $logger
+     *
+     * @since 15.0.0
+     */
+    final public function execute($jobList, ILogger $logger = null) {
+        $jobList->remove($this, $this->argument);
+        parent::execute($jobList, $logger);
+    }
 }

lib/public/BackgroundJob/TimedJob.php

Indentation +23 added lines, -23 removed lines

@@ -34,29 +34,29 @@
  * @since 15.0.0
  */
 abstract class TimedJob extends Job {
-	/** @var int */
-	protected $interval = 0;
+    /** @var int */
+    protected $interval = 0;
 
-	/**
-	 * set the interval for the job
-	 *
-	 * @since 15.0.0
-	 */
-	public function setInterval(int $interval) {
-		$this->interval = $interval;
-	}
+    /**
+     * set the interval for the job
+     *
+     * @since 15.0.0
+     */
+    public function setInterval(int $interval) {
+        $this->interval = $interval;
+    }
 
-	/**
-	 * run the job if the last run is is more than the interval ago
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 *
-	 * @since 15.0.0
-	 */
-	final public function execute($jobList, ILogger $logger = null) {
-		if (($this->time->getTime() - $this->lastRun) > $this->interval) {
-			parent::execute($jobList, $logger);
-		}
-	}
+    /**
+     * run the job if the last run is is more than the interval ago
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     *
+     * @since 15.0.0
+     */
+    final public function execute($jobList, ILogger $logger = null) {
+        if (($this->time->getTime() - $this->lastRun) > $this->interval) {
+            parent::execute($jobList, $logger);
+        }
+    }
 }

apps/files_trashbin/lib/Trash/ITrashManager.php

Indentation +26 added lines, -26 removed lines

@@ -24,33 +24,33 @@
 use OCP\IUser;
 
 interface ITrashManager extends ITrashBackend {
-	/**
-	 * Add a backend for the trashbin
-	 *
-	 * @param string $storageType
-	 * @param ITrashBackend $backend
-	 * @since 15.0.0
-	 */
-	public function registerBackend(string $storageType, ITrashBackend $backend);
+    /**
+     * Add a backend for the trashbin
+     *
+     * @param string $storageType
+     * @param ITrashBackend $backend
+     * @since 15.0.0
+     */
+    public function registerBackend(string $storageType, ITrashBackend $backend);
 
-	/**
-	 * List all trash items in the root of the trashbin
-	 *
-	 * @param IUser $user
-	 * @return ITrashItem[]
-	 * @since 15.0.0
-	 */
-	public function listTrashRoot(IUser $user): array;
+    /**
+     * List all trash items in the root of the trashbin
+     *
+     * @param IUser $user
+     * @return ITrashItem[]
+     * @since 15.0.0
+     */
+    public function listTrashRoot(IUser $user): array;
 
-	/**
-	 * Temporally prevent files from being moved to the trash
-	 *
-	 * @since 15.0.0
-	 */
-	public function pauseTrash();
+    /**
+     * Temporally prevent files from being moved to the trash
+     *
+     * @since 15.0.0
+     */
+    public function pauseTrash();
 
-	/**
-	 * @since 15.0.0
-	 */
-	public function resumeTrash();
+    /**
+     * @since 15.0.0
+     */
+    public function resumeTrash();
 }

apps/files_trashbin/lib/Trash/ITrashBackend.php

Indentation +45 added lines, -45 removed lines

@@ -31,54 +31,54 @@
  * @since 15.0.0
  */
 interface ITrashBackend {
-	/**
-	 * List all trash items in the root of the trashbin
-	 *
-	 * @param IUser $user
-	 * @return ITrashItem[]
-	 * @since 15.0.0
-	 */
-	public function listTrashRoot(IUser $user): array;
+    /**
+     * List all trash items in the root of the trashbin
+     *
+     * @param IUser $user
+     * @return ITrashItem[]
+     * @since 15.0.0
+     */
+    public function listTrashRoot(IUser $user): array;
 
-	/**
-	 * List all trash items in a subfolder in the trashbin
-	 *
-	 * @param ITrashItem $folder
-	 * @return ITrashItem[]
-	 * @since 15.0.0
-	 */
-	public function listTrashFolder(ITrashItem $folder): array;
+    /**
+     * List all trash items in a subfolder in the trashbin
+     *
+     * @param ITrashItem $folder
+     * @return ITrashItem[]
+     * @since 15.0.0
+     */
+    public function listTrashFolder(ITrashItem $folder): array;
 
-	/**
-	 * Restore a trashbin item
-	 *
-	 * @param ITrashItem $item
-	 * @since 15.0.0
-	 */
-	public function restoreItem(ITrashItem $item);
+    /**
+     * Restore a trashbin item
+     *
+     * @param ITrashItem $item
+     * @since 15.0.0
+     */
+    public function restoreItem(ITrashItem $item);
 
-	/**
-	 * Permanently remove an item from trash
-	 *
-	 * @param ITrashItem $item
-	 * @since 15.0.0
-	 */
-	public function removeItem(ITrashItem $item);
+    /**
+     * Permanently remove an item from trash
+     *
+     * @param ITrashItem $item
+     * @since 15.0.0
+     */
+    public function removeItem(ITrashItem $item);
 
-	/**
-	 * Move a file or folder to trash
-	 *
-	 * @param IStorage $storage
-	 * @param string $internalPath
-	 * @return boolean whether or not the file was moved to trash, if false then the file should be deleted normally
-	 * @since 15.0.0
-	 */
-	public function moveToTrash(IStorage $storage, string $internalPath): bool;
+    /**
+     * Move a file or folder to trash
+     *
+     * @param IStorage $storage
+     * @param string $internalPath
+     * @return boolean whether or not the file was moved to trash, if false then the file should be deleted normally
+     * @since 15.0.0
+     */
+    public function moveToTrash(IStorage $storage, string $internalPath): bool;
 
-	/**
-	 * @param IUser $user
-	 * @param int $fileId
-	 * @return Node|null
-	 */
-	public function getTrashNodeById(IUser $user, int $fileId);
+    /**
+     * @param IUser $user
+     * @param int $fileId
+     * @return Node|null
+     */
+    public function getTrashNodeById(IUser $user, int $fileId);
 }