nextcloud / server

lib/public/Calendar/IMetadataProvider.php

Indentation +27 added lines, -27 removed lines

@@ -33,33 +33,33 @@
  */
 interface IMetadataProvider {
 
-	/**
-	 * Get a list of all metadata keys available for this room
-	 *
-	 * Room backends are allowed to return custom keys, beyond the ones
-	 * defined in this class. If they do, they should make sure to use their
-	 * own namespace.
-	 *
-	 * @return String[] - A list of available keys
-	 * @since 17.0.0
-	 */
-	public function getAllAvailableMetadataKeys():array;
+    /**
+     * Get a list of all metadata keys available for this room
+     *
+     * Room backends are allowed to return custom keys, beyond the ones
+     * defined in this class. If they do, they should make sure to use their
+     * own namespace.
+     *
+     * @return String[] - A list of available keys
+     * @since 17.0.0
+     */
+    public function getAllAvailableMetadataKeys():array;
 
-	/**
-	 * Get whether or not a metadata key is set for this room
-	 *
-	 * @param string $key - The key to check for
-	 * @return bool - Whether or not key is available
-	 * @since 17.0.0
-	 */
-	public function hasMetadataForKey(string $key):bool;
+    /**
+     * Get whether or not a metadata key is set for this room
+     *
+     * @param string $key - The key to check for
+     * @return bool - Whether or not key is available
+     * @since 17.0.0
+     */
+    public function hasMetadataForKey(string $key):bool;
 
-	/**
-	 * Get the value for a metadata key
-	 *
-	 * @param string $key - The key to check for
-	 * @return string|null - The value stored for the key, null if no value stored
-	 * @since 17.0.0
-	 */
-	public function getMetadataForKey(string $key):?string;
+    /**
+     * Get the value for a metadata key
+     *
+     * @param string $key - The key to check for
+     * @return string|null - The value stored for the key, null if no value stored
+     * @since 17.0.0
+     */
+    public function getMetadataForKey(string $key):?string;
 }

Spacing +1 added lines, -1 removed lines

@@ -61,5 +61,5 @@
 	 * @return string|null - The value stored for the key, null if no value stored
 	 * @since 17.0.0
 	 */
-	public function getMetadataForKey(string $key):?string;
+	public function getMetadataForKey(string $key): ?string;
 }

lib/private/AppFramework/Middleware/Security/FeaturePolicyMiddleware.php

Indentation +24 added lines, -24 removed lines

@@ -38,33 +38,33 @@
 
 class FeaturePolicyMiddleware extends Middleware {
 
-	/** @var FeaturePolicyManager */
-	private $policyManager;
+    /** @var FeaturePolicyManager */
+    private $policyManager;
 
-	public function __construct(FeaturePolicyManager $policyManager) {
-		$this->policyManager = $policyManager;
-	}
+    public function __construct(FeaturePolicyManager $policyManager) {
+        $this->policyManager = $policyManager;
+    }
 
-	/**
-	 * Performs the default FeaturePolicy modifications that may be injected by other
-	 * applications
-	 *
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return Response
-	 */
-	public function afterController($controller, $methodName, Response $response): Response {
-		$policy = !is_null($response->getFeaturePolicy()) ? $response->getFeaturePolicy() : new FeaturePolicy();
+    /**
+     * Performs the default FeaturePolicy modifications that may be injected by other
+     * applications
+     *
+     * @param Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return Response
+     */
+    public function afterController($controller, $methodName, Response $response): Response {
+        $policy = !is_null($response->getFeaturePolicy()) ? $response->getFeaturePolicy() : new FeaturePolicy();
 
-		if (get_class($policy) === EmptyFeaturePolicy::class) {
-			return $response;
-		}
+        if (get_class($policy) === EmptyFeaturePolicy::class) {
+            return $response;
+        }
 
-		$defaultPolicy = $this->policyManager->getDefaultPolicy();
-		$defaultPolicy = $this->policyManager->mergePolicies($defaultPolicy, $policy);
-		$response->setFeaturePolicy($defaultPolicy);
+        $defaultPolicy = $this->policyManager->getDefaultPolicy();
+        $defaultPolicy = $this->policyManager->mergePolicies($defaultPolicy, $policy);
+        $response->setFeaturePolicy($defaultPolicy);
 
-		return $response;
-	}
+        return $response;
+    }
 }

lib/private/Security/FeaturePolicy/FeaturePolicyManager.php

Spacing +3 added lines, -3 removed lines

@@ -60,10 +60,10 @@
 	 */
 	public function mergePolicies(FeaturePolicy $defaultPolicy,
 								  EmptyFeaturePolicy $originalPolicy): FeaturePolicy {
-		foreach ((object)(array)$originalPolicy as $name => $value) {
-			$setter = 'set' . ucfirst($name);
+		foreach ((object) (array) $originalPolicy as $name => $value) {
+			$setter = 'set'.ucfirst($name);
 			if (\is_array($value)) {
-				$getter = 'get' . ucfirst($name);
+				$getter = 'get'.ucfirst($name);
 				$currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
 				$defaultPolicy->$setter(\array_values(\array_unique(\array_merge($currentValues, $value))));
 			} elseif (\is_bool($value)) {

Indentation +37 added lines, -37 removed lines

@@ -31,48 +31,48 @@
 use OCP\Security\FeaturePolicy\AddFeaturePolicyEvent;
 
 class FeaturePolicyManager {
-	/** @var EmptyFeaturePolicy[] */
-	private $policies = [];
+    /** @var EmptyFeaturePolicy[] */
+    private $policies = [];
 
-	/** @var IEventDispatcher */
-	private $dispatcher;
+    /** @var IEventDispatcher */
+    private $dispatcher;
 
-	public function __construct(IEventDispatcher $dispatcher) {
-		$this->dispatcher = $dispatcher;
-	}
+    public function __construct(IEventDispatcher $dispatcher) {
+        $this->dispatcher = $dispatcher;
+    }
 
-	public function addDefaultPolicy(EmptyFeaturePolicy $policy): void {
-		$this->policies[] = $policy;
-	}
+    public function addDefaultPolicy(EmptyFeaturePolicy $policy): void {
+        $this->policies[] = $policy;
+    }
 
-	public function getDefaultPolicy(): FeaturePolicy {
-		$event = new AddFeaturePolicyEvent($this);
-		$this->dispatcher->dispatchTyped($event);
+    public function getDefaultPolicy(): FeaturePolicy {
+        $event = new AddFeaturePolicyEvent($this);
+        $this->dispatcher->dispatchTyped($event);
 
-		$defaultPolicy = new FeaturePolicy();
-		foreach ($this->policies as $policy) {
-			$defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
-		}
-		return $defaultPolicy;
-	}
+        $defaultPolicy = new FeaturePolicy();
+        foreach ($this->policies as $policy) {
+            $defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
+        }
+        return $defaultPolicy;
+    }
 
-	/**
-	 * Merges the first given policy with the second one
-	 *
-	 */
-	public function mergePolicies(FeaturePolicy $defaultPolicy,
-								  EmptyFeaturePolicy $originalPolicy): FeaturePolicy {
-		foreach ((object)(array)$originalPolicy as $name => $value) {
-			$setter = 'set' . ucfirst($name);
-			if (\is_array($value)) {
-				$getter = 'get' . ucfirst($name);
-				$currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
-				$defaultPolicy->$setter(\array_values(\array_unique(\array_merge($currentValues, $value))));
-			} elseif (\is_bool($value)) {
-				$defaultPolicy->$setter($value);
-			}
-		}
+    /**
+     * Merges the first given policy with the second one
+     *
+     */
+    public function mergePolicies(FeaturePolicy $defaultPolicy,
+                                    EmptyFeaturePolicy $originalPolicy): FeaturePolicy {
+        foreach ((object)(array)$originalPolicy as $name => $value) {
+            $setter = 'set' . ucfirst($name);
+            if (\is_array($value)) {
+                $getter = 'get' . ucfirst($name);
+                $currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
+                $defaultPolicy->$setter(\array_values(\array_unique(\array_merge($currentValues, $value))));
+            } elseif (\is_bool($value)) {
+                $defaultPolicy->$setter($value);
+            }
+        }
 
-		return $defaultPolicy;
-	}
+        return $defaultPolicy;
+    }
 }

lib/public/AppFramework/Http/EmptyFeaturePolicy.php

Indentation +143 added lines, -143 removed lines

@@ -37,147 +37,147 @@
  */
 class EmptyFeaturePolicy {
 
-	/** @var string[] of allowed domains to autoplay media */
-	protected $autoplayDomains = null;
-
-	/** @var string[] of allowed domains that can access the camera */
-	protected $cameraDomains = null;
-
-	/** @var string[] of allowed domains that can use fullscreen */
-	protected $fullscreenDomains = null;
-
-	/** @var string[] of allowed domains that can use the geolocation of the device */
-	protected $geolocationDomains = null;
-
-	/** @var string[] of allowed domains that can use the microphone */
-	protected $microphoneDomains = null;
-
-	/** @var string[] of allowed domains that can use the payment API */
-	protected $paymentDomains = null;
-
-	/**
-	 * Allows to use autoplay from a specific domain. Use * to allow from all domains.
-	 *
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 17.0.0
-	 */
-	public function addAllowedAutoplayDomain(string $domain): self {
-		$this->autoplayDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Allows to use the camera on a specific domain. Use * to allow from all domains
-	 *
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 17.0.0
-	 */
-	public function addAllowedCameraDomain(string $domain): self {
-		$this->cameraDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Allows the full screen functionality to be used on a specific domain. Use * to allow from all domains
-	 *
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 17.0.0
-	 */
-	public function addAllowedFullScreenDomain(string $domain): self {
-		$this->fullscreenDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Allows to use the geolocation on a specific domain. Use * to allow from all domains
-	 *
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 17.0.0
-	 */
-	public function addAllowedGeoLocationDomain(string $domain): self {
-		$this->geolocationDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Allows to use the microphone on a specific domain. Use * to allow from all domains
-	 *
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 17.0.0
-	 */
-	public function addAllowedMicrophoneDomain(string $domain): self {
-		$this->microphoneDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Allows to use the payment API on a specific domain. Use * to allow from all domains
-	 *
-	 * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
-	 * @return $this
-	 * @since 17.0.0
-	 */
-	public function addAllowedPaymentDomain(string $domain): self {
-		$this->paymentDomains[] = $domain;
-		return $this;
-	}
-
-	/**
-	 * Get the generated Feature-Policy as a string
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function buildPolicy(): string {
-		$policy = '';
-
-		if (empty($this->autoplayDomains)) {
-			$policy .= "autoplay 'none';";
-		} else {
-			$policy .= 'autoplay ' . implode(' ', $this->autoplayDomains);
-			$policy .= ';';
-		}
-
-		if (empty($this->cameraDomains)) {
-			$policy .= "camera 'none';";
-		} else {
-			$policy .= 'camera ' . implode(' ', $this->cameraDomains);
-			$policy .= ';';
-		}
-
-		if (empty($this->fullscreenDomains)) {
-			$policy .= "fullscreen 'none';";
-		} else {
-			$policy .= 'fullscreen ' . implode(' ', $this->fullscreenDomains);
-			$policy .= ';';
-		}
-
-		if (empty($this->geolocationDomains)) {
-			$policy .= "geolocation 'none';";
-		} else {
-			$policy .= 'geolocation ' . implode(' ', $this->geolocationDomains);
-			$policy .= ';';
-		}
-
-		if (empty($this->microphoneDomains)) {
-			$policy .= "microphone 'none';";
-		} else {
-			$policy .= 'microphone ' . implode(' ', $this->microphoneDomains);
-			$policy .= ';';
-		}
-
-		if (empty($this->paymentDomains)) {
-			$policy .= "payment 'none';";
-		} else {
-			$policy .= 'payment ' . implode(' ', $this->paymentDomains);
-			$policy .= ';';
-		}
-
-		return rtrim($policy, ';');
-	}
+    /** @var string[] of allowed domains to autoplay media */
+    protected $autoplayDomains = null;
+
+    /** @var string[] of allowed domains that can access the camera */
+    protected $cameraDomains = null;
+
+    /** @var string[] of allowed domains that can use fullscreen */
+    protected $fullscreenDomains = null;
+
+    /** @var string[] of allowed domains that can use the geolocation of the device */
+    protected $geolocationDomains = null;
+
+    /** @var string[] of allowed domains that can use the microphone */
+    protected $microphoneDomains = null;
+
+    /** @var string[] of allowed domains that can use the payment API */
+    protected $paymentDomains = null;
+
+    /**
+     * Allows to use autoplay from a specific domain. Use * to allow from all domains.
+     *
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 17.0.0
+     */
+    public function addAllowedAutoplayDomain(string $domain): self {
+        $this->autoplayDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Allows to use the camera on a specific domain. Use * to allow from all domains
+     *
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 17.0.0
+     */
+    public function addAllowedCameraDomain(string $domain): self {
+        $this->cameraDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Allows the full screen functionality to be used on a specific domain. Use * to allow from all domains
+     *
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 17.0.0
+     */
+    public function addAllowedFullScreenDomain(string $domain): self {
+        $this->fullscreenDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Allows to use the geolocation on a specific domain. Use * to allow from all domains
+     *
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 17.0.0
+     */
+    public function addAllowedGeoLocationDomain(string $domain): self {
+        $this->geolocationDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Allows to use the microphone on a specific domain. Use * to allow from all domains
+     *
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 17.0.0
+     */
+    public function addAllowedMicrophoneDomain(string $domain): self {
+        $this->microphoneDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Allows to use the payment API on a specific domain. Use * to allow from all domains
+     *
+     * @param string $domain Domain to whitelist. Any passed value needs to be properly sanitized.
+     * @return $this
+     * @since 17.0.0
+     */
+    public function addAllowedPaymentDomain(string $domain): self {
+        $this->paymentDomains[] = $domain;
+        return $this;
+    }
+
+    /**
+     * Get the generated Feature-Policy as a string
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function buildPolicy(): string {
+        $policy = '';
+
+        if (empty($this->autoplayDomains)) {
+            $policy .= "autoplay 'none';";
+        } else {
+            $policy .= 'autoplay ' . implode(' ', $this->autoplayDomains);
+            $policy .= ';';
+        }
+
+        if (empty($this->cameraDomains)) {
+            $policy .= "camera 'none';";
+        } else {
+            $policy .= 'camera ' . implode(' ', $this->cameraDomains);
+            $policy .= ';';
+        }
+
+        if (empty($this->fullscreenDomains)) {
+            $policy .= "fullscreen 'none';";
+        } else {
+            $policy .= 'fullscreen ' . implode(' ', $this->fullscreenDomains);
+            $policy .= ';';
+        }
+
+        if (empty($this->geolocationDomains)) {
+            $policy .= "geolocation 'none';";
+        } else {
+            $policy .= 'geolocation ' . implode(' ', $this->geolocationDomains);
+            $policy .= ';';
+        }
+
+        if (empty($this->microphoneDomains)) {
+            $policy .= "microphone 'none';";
+        } else {
+            $policy .= 'microphone ' . implode(' ', $this->microphoneDomains);
+            $policy .= ';';
+        }
+
+        if (empty($this->paymentDomains)) {
+            $policy .= "payment 'none';";
+        } else {
+            $policy .= 'payment ' . implode(' ', $this->paymentDomains);
+            $policy .= ';';
+        }
+
+        return rtrim($policy, ';');
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -139,42 +139,42 @@
 		if (empty($this->autoplayDomains)) {
 			$policy .= "autoplay 'none';";
 		} else {
-			$policy .= 'autoplay ' . implode(' ', $this->autoplayDomains);
+			$policy .= 'autoplay '.implode(' ', $this->autoplayDomains);
 			$policy .= ';';
 		}
 
 		if (empty($this->cameraDomains)) {
 			$policy .= "camera 'none';";
 		} else {
-			$policy .= 'camera ' . implode(' ', $this->cameraDomains);
+			$policy .= 'camera '.implode(' ', $this->cameraDomains);
 			$policy .= ';';
 		}
 
 		if (empty($this->fullscreenDomains)) {
 			$policy .= "fullscreen 'none';";
 		} else {
-			$policy .= 'fullscreen ' . implode(' ', $this->fullscreenDomains);
+			$policy .= 'fullscreen '.implode(' ', $this->fullscreenDomains);
 			$policy .= ';';
 		}
 
 		if (empty($this->geolocationDomains)) {
 			$policy .= "geolocation 'none';";
 		} else {
-			$policy .= 'geolocation ' . implode(' ', $this->geolocationDomains);
+			$policy .= 'geolocation '.implode(' ', $this->geolocationDomains);
 			$policy .= ';';
 		}
 
 		if (empty($this->microphoneDomains)) {
 			$policy .= "microphone 'none';";
 		} else {
-			$policy .= 'microphone ' . implode(' ', $this->microphoneDomains);
+			$policy .= 'microphone '.implode(' ', $this->microphoneDomains);
 			$policy .= ';';
 		}
 
 		if (empty($this->paymentDomains)) {
 			$policy .= "payment 'none';";
 		} else {
-			$policy .= 'payment ' . implode(' ', $this->paymentDomains);
+			$policy .= 'payment '.implode(' ', $this->paymentDomains);
 			$policy .= ';';
 		}
 

lib/public/AppFramework/Http/FeaturePolicy.php

Indentation +14 added lines, -14 removed lines

@@ -37,23 +37,23 @@
  * @since 17.0.0
  */
 class FeaturePolicy extends EmptyFeaturePolicy {
-	protected $autoplayDomains = [
-		'\'self\'',
-	];
+    protected $autoplayDomains = [
+        '\'self\'',
+    ];
 
-	/** @var string[] of allowed domains that can access the camera */
-	protected $cameraDomains = [];
+    /** @var string[] of allowed domains that can access the camera */
+    protected $cameraDomains = [];
 
-	protected $fullscreenDomains = [
-		'\'self\'',
-	];
+    protected $fullscreenDomains = [
+        '\'self\'',
+    ];
 
-	/** @var string[] of allowed domains that can use the geolocation of the device */
-	protected $geolocationDomains = [];
+    /** @var string[] of allowed domains that can use the geolocation of the device */
+    protected $geolocationDomains = [];
 
-	/** @var string[] of allowed domains that can use the microphone */
-	protected $microphoneDomains = [];
+    /** @var string[] of allowed domains that can use the microphone */
+    protected $microphoneDomains = [];
 
-	/** @var string[] of allowed domains that can use the payment API */
-	protected $paymentDomains = [];
+    /** @var string[] of allowed domains that can use the payment API */
+    protected $paymentDomains = [];
 }

apps/dav/lib/CalDAV/Proxy/Proxy.php

Indentation +11 added lines, -11 removed lines

@@ -36,16 +36,16 @@
  */
 class Proxy extends Entity {
 
-	/** @var string */
-	protected $ownerId;
-	/** @var string */
-	protected $proxyId;
-	/** @var int */
-	protected $permissions;
+    /** @var string */
+    protected $ownerId;
+    /** @var string */
+    protected $proxyId;
+    /** @var int */
+    protected $permissions;
 
-	public function __construct() {
-		$this->addType('ownerId', 'string');
-		$this->addType('proxyId', 'string');
-		$this->addType('permissions', 'int');
-	}
+    public function __construct() {
+        $this->addType('ownerId', 'string');
+        $this->addType('proxyId', 'string');
+        $this->addType('permissions', 'int');
+    }
 }

apps/dav/lib/Migration/Version1012Date20190808122342.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 */
 	public function changeSchema(IOutput $output,
 								 \Closure $schemaClosure,
-								 array $options):?ISchemaWrapper {
+								 array $options): ?ISchemaWrapper {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
 

Indentation +77 added lines, -77 removed lines

@@ -38,86 +38,86 @@
  */
 class Version1012Date20190808122342 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 17.0.0
-	 */
-	public function changeSchema(IOutput $output,
-								 \Closure $schemaClosure,
-								 array $options):?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 17.0.0
+     */
+    public function changeSchema(IOutput $output,
+                                    \Closure $schemaClosure,
+                                    array $options):?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('calendar_reminders')) {
-			$table = $schema->createTable('calendar_reminders');
+        if (!$schema->hasTable('calendar_reminders')) {
+            $table = $schema->createTable('calendar_reminders');
 
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendar_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-			]);
-			$table->addColumn('object_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-			]);
-			$table->addColumn('is_recurring', Types::SMALLINT, [
-				'notnull' => false,
-				'length' => 1,
-			]);
-			$table->addColumn('uid', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('recurrence_id', Types::BIGINT, [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('is_recurrence_exception', Types::SMALLINT, [
-				'notnull' => true,
-				'length' => 1,
-			]);
-			$table->addColumn('event_hash', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('alarm_hash', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('type', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('is_relative', Types::SMALLINT, [
-				'notnull' => true,
-				'length' => 1,
-			]);
-			$table->addColumn('notification_date', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('is_repeat_based', Types::SMALLINT, [
-				'notnull' => true,
-				'length' => 1,
-			]);
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendar_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+            ]);
+            $table->addColumn('object_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+            ]);
+            $table->addColumn('is_recurring', Types::SMALLINT, [
+                'notnull' => false,
+                'length' => 1,
+            ]);
+            $table->addColumn('uid', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('recurrence_id', Types::BIGINT, [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('is_recurrence_exception', Types::SMALLINT, [
+                'notnull' => true,
+                'length' => 1,
+            ]);
+            $table->addColumn('event_hash', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('alarm_hash', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('type', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('is_relative', Types::SMALLINT, [
+                'notnull' => true,
+                'length' => 1,
+            ]);
+            $table->addColumn('notification_date', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('is_repeat_based', Types::SMALLINT, [
+                'notnull' => true,
+                'length' => 1,
+            ]);
 
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['object_id'], 'calendar_reminder_objid');
-			$table->addIndex(['uid', 'recurrence_id'], 'calendar_reminder_uidrec');
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['object_id'], 'calendar_reminder_objid');
+            $table->addIndex(['uid', 'recurrence_id'], 'calendar_reminder_uidrec');
 
-			return $schema;
-		}
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

apps/dav/lib/CalDAV/Reminder/NotificationProviderManager.php

Indentation +42 added lines, -42 removed lines

@@ -31,51 +31,51 @@
  */
 class NotificationProviderManager {
 
-	/** @var INotificationProvider[] */
-	private $providers = [];
+    /** @var INotificationProvider[] */
+    private $providers = [];
 
-	/**
-	 * Checks whether a provider for a given ACTION exists
-	 *
-	 * @param string $type
-	 * @return bool
-	 */
-	public function hasProvider(string $type):bool {
-		return (\in_array($type, ReminderService::REMINDER_TYPES, true)
-			&& isset($this->providers[$type]));
-	}
+    /**
+     * Checks whether a provider for a given ACTION exists
+     *
+     * @param string $type
+     * @return bool
+     */
+    public function hasProvider(string $type):bool {
+        return (\in_array($type, ReminderService::REMINDER_TYPES, true)
+            && isset($this->providers[$type]));
+    }
 
-	/**
-	 * Get provider for a given ACTION
-	 *
-	 * @param string $type
-	 * @return INotificationProvider
-	 * @throws NotificationProvider\ProviderNotAvailableException
-	 * @throws NotificationTypeDoesNotExistException
-	 */
-	public function getProvider(string $type):INotificationProvider {
-		if (in_array($type, ReminderService::REMINDER_TYPES, true)) {
-			if (isset($this->providers[$type])) {
-				return $this->providers[$type];
-			}
-			throw new NotificationProvider\ProviderNotAvailableException($type);
-		}
-		throw new NotificationTypeDoesNotExistException($type);
-	}
+    /**
+     * Get provider for a given ACTION
+     *
+     * @param string $type
+     * @return INotificationProvider
+     * @throws NotificationProvider\ProviderNotAvailableException
+     * @throws NotificationTypeDoesNotExistException
+     */
+    public function getProvider(string $type):INotificationProvider {
+        if (in_array($type, ReminderService::REMINDER_TYPES, true)) {
+            if (isset($this->providers[$type])) {
+                return $this->providers[$type];
+            }
+            throw new NotificationProvider\ProviderNotAvailableException($type);
+        }
+        throw new NotificationTypeDoesNotExistException($type);
+    }
 
-	/**
-	 * Registers a new provider
-	 *
-	 * @param string $providerClassName
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function registerProvider(string $providerClassName):void {
-		$provider = \OC::$server->query($providerClassName);
+    /**
+     * Registers a new provider
+     *
+     * @param string $providerClassName
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function registerProvider(string $providerClassName):void {
+        $provider = \OC::$server->query($providerClassName);
 
-		if (!$provider instanceof INotificationProvider) {
-			throw new \InvalidArgumentException('Invalid notification provider registered');
-		}
+        if (!$provider instanceof INotificationProvider) {
+            throw new \InvalidArgumentException('Invalid notification provider registered');
+        }
 
-		$this->providers[$provider::NOTIFICATION_TYPE] = $provider;
-	}
+        $this->providers[$provider::NOTIFICATION_TYPE] = $provider;
+    }
 }

apps/dav/lib/CalDAV/Reminder/NotificationTypeDoesNotExistException.php

Indentation +10 added lines, -10 removed lines

@@ -26,15 +26,15 @@
 
 class NotificationTypeDoesNotExistException extends \Exception {
 
-	/**
-	 * NotificationTypeDoesNotExistException constructor.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $type ReminderType
-	 */
-	public function __construct(string $type) {
-		parent::__construct("Type $type is not an accepted type of notification");
-	}
+    /**
+     * NotificationTypeDoesNotExistException constructor.
+     *
+     * @since 16.0.0
+     *
+     * @param string $type ReminderType
+     */
+    public function __construct(string $type) {
+        parent::__construct("Type $type is not an accepted type of notification");
+    }
 
 }