nextcloud / server

apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php

Spacing +11 added lines, -11 removed lines

@@ -107,32 +107,32 @@ 
 				case '{DAV:}prop':
 					$newProps['properties'] = array_keys($elem['value']);
 					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}filter':
+				case '{'.SearchPlugin::NS_Nextcloud.'}filter':
 					foreach ($elem['value'] as $subElem) {
-						if ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}comp-filter') {
+						if ($subElem['name'] === '{'.SearchPlugin::NS_Nextcloud.'}comp-filter') {
 							if (!isset($newProps['filters']['comps']) || !is_array($newProps['filters']['comps'])) {
 								$newProps['filters']['comps'] = [];
 							}
 							$newProps['filters']['comps'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}prop-filter') {
+						} elseif ($subElem['name'] === '{'.SearchPlugin::NS_Nextcloud.'}prop-filter') {
 							if (!isset($newProps['filters']['props']) || !is_array($newProps['filters']['props'])) {
 								$newProps['filters']['props'] = [];
 							}
 							$newProps['filters']['props'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}param-filter') {
+						} elseif ($subElem['name'] === '{'.SearchPlugin::NS_Nextcloud.'}param-filter') {
 							if (!isset($newProps['filters']['params']) || !is_array($newProps['filters']['params'])) {
 								$newProps['filters']['params'] = [];
 							}
 							$newProps['filters']['params'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}search-term') {
+						} elseif ($subElem['name'] === '{'.SearchPlugin::NS_Nextcloud.'}search-term') {
 							$newProps['filters']['search-term'] = $subElem['value'];
 						}
 					}
 					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}limit':
+				case '{'.SearchPlugin::NS_Nextcloud.'}limit':
 					$newProps['limit'] = $elem['value'];
 					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}offset':
+				case '{'.SearchPlugin::NS_Nextcloud.'}offset':
 					$newProps['offset'] = $elem['value'];
 					break;
 
@@ -140,21 +140,21 @@ 
 		}
 
 		if (empty($newProps['filters'])) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}filter element is required for this request');
+			throw new BadRequest('The {'.SearchPlugin::NS_Nextcloud.'}filter element is required for this request');
 		}
 
 		$propsOrParamsDefined = (!empty($newProps['filters']['props']) || !empty($newProps['filters']['params']));
 		$noCompsDefined = empty($newProps['filters']['comps']);
 		if ($propsOrParamsDefined && $noCompsDefined) {
-			throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter given without any {' . SearchPlugin::NS_Nextcloud . '}comp-filter');
+			throw new BadRequest('{'.SearchPlugin::NS_Nextcloud.'}prop-filter or {'.SearchPlugin::NS_Nextcloud.'}param-filter given without any {'.SearchPlugin::NS_Nextcloud.'}comp-filter');
 		}
 
 		if (!isset($newProps['filters']['search-term'])) {
-			throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}search-term is required for this request');
+			throw new BadRequest('{'.SearchPlugin::NS_Nextcloud.'}search-term is required for this request');
 		}
 
 		if (empty($newProps['filters']['props']) && empty($newProps['filters']['params'])) {
-			throw new BadRequest('At least one{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter is required for this request');
+			throw new BadRequest('At least one{'.SearchPlugin::NS_Nextcloud.'}prop-filter or {'.SearchPlugin::NS_Nextcloud.'}param-filter is required for this request');
 		}
 
 

Indentation +129 added lines, -129 removed lines

@@ -35,133 +35,133 @@
  */
 class CalendarSearchReport implements XmlDeserializable {
 
-	/**
-	 * An array with requested properties.
-	 *
-	 * @var array
-	 */
-	public $properties;
-
-	/**
-	 * List of property/component filters.
-	 *
-	 * @var array
-	 */
-	public $filters;
-
-	/**
-	 * @var int
-	 */
-	public $limit;
-
-	/**
-	 * @var int
-	 */
-	public $offset;
-
-	/**
-	 * The deserialize method is called during xml parsing.
-	 *
-	 * This method is called statically, this is because in theory this method
-	 * may be used as a type of constructor, or factory method.
-	 *
-	 * Often you want to return an instance of the current class, but you are
-	 * free to return other data as well.
-	 *
-	 * You are responsible for advancing the reader to the next element. Not
-	 * doing anything will result in a never-ending loop.
-	 *
-	 * If you just want to skip parsing for this element altogether, you can
-	 * just call $reader->next();
-	 *
-	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-	 * the next element.
-	 *
-	 * @param Reader $reader
-	 * @return mixed
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$elems = $reader->parseInnerTree([
-			'{http://nextcloud.com/ns}comp-filter' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\CompFilter',
-			'{http://nextcloud.com/ns}prop-filter' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter',
-			'{http://nextcloud.com/ns}param-filter' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\ParamFilter',
-			'{http://nextcloud.com/ns}search-term' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter',
-			'{http://nextcloud.com/ns}limit' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\LimitFilter',
-			'{http://nextcloud.com/ns}offset' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\OffsetFilter',
-			'{DAV:}prop' => 'Sabre\\Xml\\Element\\KeyValue',
-		]);
-
-		$newProps = [
-			'filters' => [],
-			'properties' => [],
-			'limit' => null,
-			'offset' => null
-		];
-
-		if (!is_array($elems)) {
-			$elems = [];
-		}
-
-		foreach ($elems as $elem) {
-			switch ($elem['name']) {
-				case '{DAV:}prop':
-					$newProps['properties'] = array_keys($elem['value']);
-					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}filter':
-					foreach ($elem['value'] as $subElem) {
-						if ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}comp-filter') {
-							if (!isset($newProps['filters']['comps']) || !is_array($newProps['filters']['comps'])) {
-								$newProps['filters']['comps'] = [];
-							}
-							$newProps['filters']['comps'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}prop-filter') {
-							if (!isset($newProps['filters']['props']) || !is_array($newProps['filters']['props'])) {
-								$newProps['filters']['props'] = [];
-							}
-							$newProps['filters']['props'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}param-filter') {
-							if (!isset($newProps['filters']['params']) || !is_array($newProps['filters']['params'])) {
-								$newProps['filters']['params'] = [];
-							}
-							$newProps['filters']['params'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}search-term') {
-							$newProps['filters']['search-term'] = $subElem['value'];
-						}
-					}
-					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}limit':
-					$newProps['limit'] = $elem['value'];
-					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}offset':
-					$newProps['offset'] = $elem['value'];
-					break;
-
-			}
-		}
-
-		if (empty($newProps['filters'])) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}filter element is required for this request');
-		}
-
-		$propsOrParamsDefined = (!empty($newProps['filters']['props']) || !empty($newProps['filters']['params']));
-		$noCompsDefined = empty($newProps['filters']['comps']);
-		if ($propsOrParamsDefined && $noCompsDefined) {
-			throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter given without any {' . SearchPlugin::NS_Nextcloud . '}comp-filter');
-		}
-
-		if (!isset($newProps['filters']['search-term'])) {
-			throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}search-term is required for this request');
-		}
-
-		if (empty($newProps['filters']['props']) && empty($newProps['filters']['params'])) {
-			throw new BadRequest('At least one{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter is required for this request');
-		}
-
-
-		$obj = new self();
-		foreach ($newProps as $key => $value) {
-			$obj->$key = $value;
-		}
-		return $obj;
-	}
+    /**
+     * An array with requested properties.
+     *
+     * @var array
+     */
+    public $properties;
+
+    /**
+     * List of property/component filters.
+     *
+     * @var array
+     */
+    public $filters;
+
+    /**
+     * @var int
+     */
+    public $limit;
+
+    /**
+     * @var int
+     */
+    public $offset;
+
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * This method is called statically, this is because in theory this method
+     * may be used as a type of constructor, or factory method.
+     *
+     * Often you want to return an instance of the current class, but you are
+     * free to return other data as well.
+     *
+     * You are responsible for advancing the reader to the next element. Not
+     * doing anything will result in a never-ending loop.
+     *
+     * If you just want to skip parsing for this element altogether, you can
+     * just call $reader->next();
+     *
+     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+     * the next element.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $elems = $reader->parseInnerTree([
+            '{http://nextcloud.com/ns}comp-filter' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\CompFilter',
+            '{http://nextcloud.com/ns}prop-filter' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter',
+            '{http://nextcloud.com/ns}param-filter' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\ParamFilter',
+            '{http://nextcloud.com/ns}search-term' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter',
+            '{http://nextcloud.com/ns}limit' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\LimitFilter',
+            '{http://nextcloud.com/ns}offset' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\OffsetFilter',
+            '{DAV:}prop' => 'Sabre\\Xml\\Element\\KeyValue',
+        ]);
+
+        $newProps = [
+            'filters' => [],
+            'properties' => [],
+            'limit' => null,
+            'offset' => null
+        ];
+
+        if (!is_array($elems)) {
+            $elems = [];
+        }
+
+        foreach ($elems as $elem) {
+            switch ($elem['name']) {
+                case '{DAV:}prop':
+                    $newProps['properties'] = array_keys($elem['value']);
+                    break;
+                case '{' . SearchPlugin::NS_Nextcloud . '}filter':
+                    foreach ($elem['value'] as $subElem) {
+                        if ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}comp-filter') {
+                            if (!isset($newProps['filters']['comps']) || !is_array($newProps['filters']['comps'])) {
+                                $newProps['filters']['comps'] = [];
+                            }
+                            $newProps['filters']['comps'][] = $subElem['value'];
+                        } elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}prop-filter') {
+                            if (!isset($newProps['filters']['props']) || !is_array($newProps['filters']['props'])) {
+                                $newProps['filters']['props'] = [];
+                            }
+                            $newProps['filters']['props'][] = $subElem['value'];
+                        } elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}param-filter') {
+                            if (!isset($newProps['filters']['params']) || !is_array($newProps['filters']['params'])) {
+                                $newProps['filters']['params'] = [];
+                            }
+                            $newProps['filters']['params'][] = $subElem['value'];
+                        } elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}search-term') {
+                            $newProps['filters']['search-term'] = $subElem['value'];
+                        }
+                    }
+                    break;
+                case '{' . SearchPlugin::NS_Nextcloud . '}limit':
+                    $newProps['limit'] = $elem['value'];
+                    break;
+                case '{' . SearchPlugin::NS_Nextcloud . '}offset':
+                    $newProps['offset'] = $elem['value'];
+                    break;
+
+            }
+        }
+
+        if (empty($newProps['filters'])) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}filter element is required for this request');
+        }
+
+        $propsOrParamsDefined = (!empty($newProps['filters']['props']) || !empty($newProps['filters']['params']));
+        $noCompsDefined = empty($newProps['filters']['comps']);
+        if ($propsOrParamsDefined && $noCompsDefined) {
+            throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter given without any {' . SearchPlugin::NS_Nextcloud . '}comp-filter');
+        }
+
+        if (!isset($newProps['filters']['search-term'])) {
+            throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}search-term is required for this request');
+        }
+
+        if (empty($newProps['filters']['props']) && empty($newProps['filters']['params'])) {
+            throw new BadRequest('At least one{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter is required for this request');
+        }
+
+
+        $obj = new self();
+        foreach ($newProps as $key => $value) {
+            $obj->$key = $value;
+        }
+        return $obj;
+    }
 }

lib/public/Diagnostics/IEventLogger.php

Indentation +47 added lines, -47 removed lines

@@ -35,55 +35,55 @@
  * @since 8.0.0
  */
 interface IEventLogger {
-	/**
-	 * Mark the start of an event setting its ID $id and providing event description $description.
-	 *
-	 * @param string $id
-	 * @param string $description
-	 * @since 8.0.0
-	 */
-	public function start($id, $description);
+    /**
+     * Mark the start of an event setting its ID $id and providing event description $description.
+     *
+     * @param string $id
+     * @param string $description
+     * @since 8.0.0
+     */
+    public function start($id, $description);
 
-	/**
-	 * Mark the end of an event with specific ID $id, marked by start() method.
-	 * Ending event should store \OCP\Diagnostics\IEvent to
-	 * be returned with getEvents() method.
-	 *
-	 * @param string $id
-	 * @since 8.0.0
-	 */
-	public function end($id);
+    /**
+     * Mark the end of an event with specific ID $id, marked by start() method.
+     * Ending event should store \OCP\Diagnostics\IEvent to
+     * be returned with getEvents() method.
+     *
+     * @param string $id
+     * @since 8.0.0
+     */
+    public function end($id);
 
-	/**
-	 * Mark the start and the end of an event with specific ID $id and description $description,
-	 * explicitly marking start and end of the event, represented by $start and $end timestamps.
-	 * Logging event should store \OCP\Diagnostics\IEvent to
-	 * be returned with getEvents() method.
-	 *
-	 * @param string $id
-	 * @param string $description
-	 * @param float $start
-	 * @param float $end
-	 * @since 8.0.0
-	 */
-	public function log($id, $description, $start, $end);
+    /**
+     * Mark the start and the end of an event with specific ID $id and description $description,
+     * explicitly marking start and end of the event, represented by $start and $end timestamps.
+     * Logging event should store \OCP\Diagnostics\IEvent to
+     * be returned with getEvents() method.
+     *
+     * @param string $id
+     * @param string $description
+     * @param float $start
+     * @param float $end
+     * @since 8.0.0
+     */
+    public function log($id, $description, $start, $end);
 
-	/**
-	 * This method should return all \OCP\Diagnostics\IEvent objects stored using
-	 * start()/end() or log() methods
-	 *
-	 * @return \OCP\Diagnostics\IEvent[]
-	 * @since 8.0.0
-	 */
-	public function getEvents();
+    /**
+     * This method should return all \OCP\Diagnostics\IEvent objects stored using
+     * start()/end() or log() methods
+     *
+     * @return \OCP\Diagnostics\IEvent[]
+     * @since 8.0.0
+     */
+    public function getEvents();
 
-	/**
-	 * Activate the module for the duration of the request. Deactivated module
-	 * does not create and store \OCP\Diagnostics\IEvent objects.
-	 * Only activated module should create and store objects to be
-	 * returned with getEvents() call.
-	 *
-	 * @since 12.0.0
-	 */
-	public function activate();
+    /**
+     * Activate the module for the duration of the request. Deactivated module
+     * does not create and store \OCP\Diagnostics\IEvent objects.
+     * Only activated module should create and store objects to be
+     * returned with getEvents() call.
+     *
+     * @since 12.0.0
+     */
+    public function activate();
 }

lib/public/Diagnostics/IQuery.php

Indentation +30 added lines, -30 removed lines

@@ -30,38 +30,38 @@
  * @since 8.0.0
  */
 interface IQuery {
-	/**
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getSql();
+    /**
+     * @return string
+     * @since 8.0.0
+     */
+    public function getSql();
 
-	/**
-	 * @return array
-	 * @since 8.0.0
-	 */
-	public function getParams();
+    /**
+     * @return array
+     * @since 8.0.0
+     */
+    public function getParams();
 
-	/**
-	 * @return float
-	 * @since 8.0.0
-	 */
-	public function getDuration();
+    /**
+     * @return float
+     * @since 8.0.0
+     */
+    public function getDuration();
 
-	/**
-	 * @return float
-	 * @since 11.0.0
-	 */
-	public function getStartTime();
+    /**
+     * @return float
+     * @since 11.0.0
+     */
+    public function getStartTime();
 
-	/**
-	 * @return array
-	 * @since 11.0.0
-	 */
-	public function getStacktrace();
-	/**
-	 * @return array
-	 * @since 12.0.0
-	 */
-	public function getStart();
+    /**
+     * @return array
+     * @since 11.0.0
+     */
+    public function getStacktrace();
+    /**
+     * @return array
+     * @since 12.0.0
+     */
+    public function getStart();
 }

lib/private/Diagnostics/Query.php

Indentation +49 added lines, -49 removed lines

@@ -26,65 +26,65 @@
 use OCP\Diagnostics\IQuery;
 
 class Query implements IQuery {
-	private $sql;
+    private $sql;
 
-	private $params;
+    private $params;
 
-	private $start;
+    private $start;
 
-	private $end;
+    private $end;
 
-	private $stack;
+    private $stack;
 
-	/**
-	 * @param string $sql
-	 * @param array $params
-	 * @param int $start
-	 */
-	public function __construct($sql, $params, $start, array $stack) {
-		$this->sql = $sql;
-		$this->params = $params;
-		$this->start = $start;
-		$this->stack = $stack;
-	}
+    /**
+     * @param string $sql
+     * @param array $params
+     * @param int $start
+     */
+    public function __construct($sql, $params, $start, array $stack) {
+        $this->sql = $sql;
+        $this->params = $params;
+        $this->start = $start;
+        $this->stack = $stack;
+    }
 
-	public function end($time) {
-		$this->end = $time;
-	}
+    public function end($time) {
+        $this->end = $time;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getParams() {
-		return $this->params;
-	}
+    /**
+     * @return array
+     */
+    public function getParams() {
+        return $this->params;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getSql() {
-		return $this->sql;
-	}
+    /**
+     * @return string
+     */
+    public function getSql() {
+        return $this->sql;
+    }
 
-	/**
-	 * @return float
-	 */
-	public function getStart() {
-		return $this->start;
-	}
+    /**
+     * @return float
+     */
+    public function getStart() {
+        return $this->start;
+    }
 	
-	/**
-	 * @return float
-	 */
-	public function getDuration() {
-		return $this->end - $this->start;
-	}
+    /**
+     * @return float
+     */
+    public function getDuration() {
+        return $this->end - $this->start;
+    }
 
-	public function getStartTime() {
-		return $this->start;
-	}
+    public function getStartTime() {
+        return $this->start;
+    }
 
-	public function getStacktrace() {
-		return $this->stack;
-	}
+    public function getStacktrace() {
+        return $this->stack;
+    }
 }

lib/private/App/AppStore/Version/VersionParser.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	 * @return bool
 	 */
 	private function isValidVersionString($versionString) {
-		return (bool)preg_match('/^[0-9.]+$/', $versionString);
+		return (bool) preg_match('/^[0-9.]+$/', $versionString);
 	}
 
 	/**

Indentation +48 added lines, -48 removed lines

@@ -11,56 +11,56 @@
  * @package OC\App\AppStore
  */
 class VersionParser {
-	/**
-	 * @param string $versionString
-	 * @return bool
-	 */
-	private function isValidVersionString($versionString) {
-		return (bool)preg_match('/^[0-9.]+$/', $versionString);
-	}
+    /**
+     * @param string $versionString
+     * @return bool
+     */
+    private function isValidVersionString($versionString) {
+        return (bool)preg_match('/^[0-9.]+$/', $versionString);
+    }
 
-	/**
-	 * Returns the version for a version string
-	 *
-	 * @param string $versionSpec
-	 * @return Version
-	 * @throws \Exception If the version cannot be parsed
-	 */
-	public function getVersion($versionSpec) {
-		// * indicates that the version is compatible with all versions
-		if ($versionSpec === '*') {
-			return new Version('', '');
-		}
+    /**
+     * Returns the version for a version string
+     *
+     * @param string $versionSpec
+     * @return Version
+     * @throws \Exception If the version cannot be parsed
+     */
+    public function getVersion($versionSpec) {
+        // * indicates that the version is compatible with all versions
+        if ($versionSpec === '*') {
+            return new Version('', '');
+        }
 
-		// Count the amount of =, if it is one then it's either maximum or minimum
-		// version. If it is two then it is maximum and minimum.
-		$versionElements = explode(' ', $versionSpec);
-		$firstVersion = $versionElements[0] ?? '';
-		$firstVersionNumber = substr($firstVersion, 2);
-		$secondVersion = $versionElements[1] ?? '';
-		$secondVersionNumber = substr($secondVersion, 2);
+        // Count the amount of =, if it is one then it's either maximum or minimum
+        // version. If it is two then it is maximum and minimum.
+        $versionElements = explode(' ', $versionSpec);
+        $firstVersion = $versionElements[0] ?? '';
+        $firstVersionNumber = substr($firstVersion, 2);
+        $secondVersion = $versionElements[1] ?? '';
+        $secondVersionNumber = substr($secondVersion, 2);
 
-		switch (count($versionElements)) {
-			case 1:
-				if (!$this->isValidVersionString($firstVersionNumber)) {
-					break;
-				}
-				if (str_starts_with($firstVersion, '>')) {
-					return new Version($firstVersionNumber, '');
-				}
-				return new Version('', $firstVersionNumber);
-			case 2:
-				if (!$this->isValidVersionString($firstVersionNumber) || !$this->isValidVersionString($secondVersionNumber)) {
-					break;
-				}
-				return new Version($firstVersionNumber, $secondVersionNumber);
-		}
+        switch (count($versionElements)) {
+            case 1:
+                if (!$this->isValidVersionString($firstVersionNumber)) {
+                    break;
+                }
+                if (str_starts_with($firstVersion, '>')) {
+                    return new Version($firstVersionNumber, '');
+                }
+                return new Version('', $firstVersionNumber);
+            case 2:
+                if (!$this->isValidVersionString($firstVersionNumber) || !$this->isValidVersionString($secondVersionNumber)) {
+                    break;
+                }
+                return new Version($firstVersionNumber, $secondVersionNumber);
+        }
 
-		throw new \Exception(
-			sprintf(
-				'Version cannot be parsed: %s',
-				$versionSpec
-			)
-		);
-	}
+        throw new \Exception(
+            sprintf(
+                'Version cannot be parsed: %s',
+                $versionSpec
+            )
+        );
+    }
 }

lib/private/DB/MigrationException.php

Indentation +11 added lines, -11 removed lines

@@ -24,17 +24,17 @@
 namespace OC\DB;
 
 class MigrationException extends \Exception {
-	private $table;
+    private $table;
 
-	public function __construct($table, $message) {
-		$this->table = $table;
-		parent::__construct($message);
-	}
+    public function __construct($table, $message) {
+        $this->table = $table;
+        parent::__construct($message);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getTable() {
-		return $this->table;
-	}
+    /**
+     * @return string
+     */
+    public function getTable() {
+        return $this->table;
+    }
 }

lib/private/Command/FileAccess.php

Indentation +7 added lines, -7 removed lines

@@ -25,12 +25,12 @@
 use OCP\IUser;
 
 trait FileAccess {
-	protected function setupFS(IUser $user) {
-		\OC_Util::setupFS($user->getUID());
-	}
+    protected function setupFS(IUser $user) {
+        \OC_Util::setupFS($user->getUID());
+    }
 
-	protected function getUserFolder(IUser $user) {
-		$this->setupFS($user);
-		return \OC::$server->getUserFolder($user->getUID());
-	}
+    protected function getUserFolder(IUser $user) {
+        $this->setupFS($user);
+        return \OC::$server->getUserFolder($user->getUID());
+    }
 }

lib/private/Group/Backend.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 	 * compared with \OC\Group\Backend::CREATE_GROUP etc.
 	 */
 	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
+		return (bool) ($this->getSupportedActions() & $actions);
 	}
 
 	/**

Indentation +93 added lines, -93 removed lines

@@ -11,107 +11,107 @@
  * Abstract base class for user management
  */
 abstract class Backend implements \OCP\GroupInterface {
-	/**
-	 * error code for functions not provided by the group backend
-	 */
-	public const NOT_IMPLEMENTED = -501;
+    /**
+     * error code for functions not provided by the group backend
+     */
+    public const NOT_IMPLEMENTED = -501;
 
-	protected $possibleActions = [
-		self::CREATE_GROUP => 'createGroup',
-		self::DELETE_GROUP => 'deleteGroup',
-		self::ADD_TO_GROUP => 'addToGroup',
-		self::REMOVE_FROM_GOUP => 'removeFromGroup',
-		self::COUNT_USERS => 'countUsersInGroup',
-		self::GROUP_DETAILS => 'getGroupDetails',
-		self::IS_ADMIN => 'isAdmin',
-	];
+    protected $possibleActions = [
+        self::CREATE_GROUP => 'createGroup',
+        self::DELETE_GROUP => 'deleteGroup',
+        self::ADD_TO_GROUP => 'addToGroup',
+        self::REMOVE_FROM_GOUP => 'removeFromGroup',
+        self::COUNT_USERS => 'countUsersInGroup',
+        self::GROUP_DETAILS => 'getGroupDetails',
+        self::IS_ADMIN => 'isAdmin',
+    ];
 
-	/**
-	 * Get all supported actions
-	 * @return int bitwise-or'ed actions
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with \OC\Group\Backend::CREATE_GROUP etc.
-	 */
-	public function getSupportedActions() {
-		$actions = 0;
-		foreach ($this->possibleActions as $action => $methodName) {
-			if (method_exists($this, $methodName)) {
-				$actions |= $action;
-			}
-		}
+    /**
+     * Get all supported actions
+     * @return int bitwise-or'ed actions
+     *
+     * Returns the supported actions as int to be
+     * compared with \OC\Group\Backend::CREATE_GROUP etc.
+     */
+    public function getSupportedActions() {
+        $actions = 0;
+        foreach ($this->possibleActions as $action => $methodName) {
+            if (method_exists($this, $methodName)) {
+                $actions |= $action;
+            }
+        }
 
-		return $actions;
-	}
+        return $actions;
+    }
 
-	/**
-	 * Check if backend implements actions
-	 * @param int $actions bitwise-or'ed actions
-	 * @return bool
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with \OC\Group\Backend::CREATE_GROUP etc.
-	 */
-	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
-	}
+    /**
+     * Check if backend implements actions
+     * @param int $actions bitwise-or'ed actions
+     * @return bool
+     *
+     * Returns the supported actions as int to be
+     * compared with \OC\Group\Backend::CREATE_GROUP etc.
+     */
+    public function implementsActions($actions) {
+        return (bool)($this->getSupportedActions() & $actions);
+    }
 
-	/**
-	 * is user in group?
-	 * @param string $uid uid of the user
-	 * @param string $gid gid of the group
-	 * @return bool
-	 *
-	 * Checks whether the user is member of a group or not.
-	 */
-	public function inGroup($uid, $gid) {
-		return in_array($gid, $this->getUserGroups($uid));
-	}
+    /**
+     * is user in group?
+     * @param string $uid uid of the user
+     * @param string $gid gid of the group
+     * @return bool
+     *
+     * Checks whether the user is member of a group or not.
+     */
+    public function inGroup($uid, $gid) {
+        return in_array($gid, $this->getUserGroups($uid));
+    }
 
-	/**
-	 * Get all groups a user belongs to
-	 * @param string $uid Name of the user
-	 * @return list<string> an array of group names
-	 *
-	 * This function fetches all groups a user belongs to. It does not check
-	 * if the user exists at all.
-	 */
-	public function getUserGroups($uid) {
-		return [];
-	}
+    /**
+     * Get all groups a user belongs to
+     * @param string $uid Name of the user
+     * @return list<string> an array of group names
+     *
+     * This function fetches all groups a user belongs to. It does not check
+     * if the user exists at all.
+     */
+    public function getUserGroups($uid) {
+        return [];
+    }
 
-	/**
-	 * get a list of all groups
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of group names
-	 *
-	 * Returns a list with all groups
-	 */
+    /**
+     * get a list of all groups
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of group names
+     *
+     * Returns a list with all groups
+     */
 
-	public function getGroups($search = '', $limit = -1, $offset = 0) {
-		return [];
-	}
+    public function getGroups($search = '', $limit = -1, $offset = 0) {
+        return [];
+    }
 
-	/**
-	 * check if a group exists
-	 * @param string $gid
-	 * @return bool
-	 */
-	public function groupExists($gid) {
-		return in_array($gid, $this->getGroups($gid, 1));
-	}
+    /**
+     * check if a group exists
+     * @param string $gid
+     * @return bool
+     */
+    public function groupExists($gid) {
+        return in_array($gid, $this->getGroups($gid, 1));
+    }
 
-	/**
-	 * get a list of all users in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array<int,string> an array of user ids
-	 */
-	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		return [];
-	}
+    /**
+     * get a list of all users in a group
+     * @param string $gid
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array<int,string> an array of user ids
+     */
+    public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+        return [];
+    }
 }

lib/private/Activity/EventMerger.php

Spacing +12 added lines, -12 removed lines

@@ -133,10 +133,10 @@ 
 
 		// Check that all parameters from $event exist in $previousEvent
 		foreach ($params1 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+			if (preg_match('/^'.$mergeParameter.'(\d+)?$/', $key)) {
 				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
 					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
+					$params[$mergeParameter.$combined] = $parameter;
 				}
 				continue;
 			}
@@ -151,10 +151,10 @@ 
 
 		// Check that all parameters from $previousEvent exist in $event
 		foreach ($params2 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+			if (preg_match('/^'.$mergeParameter.'(\d+)?$/', $key)) {
 				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
 					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
+					$params[$mergeParameter.$combined] = $parameter;
 				}
 				continue;
 			}
@@ -178,7 +178,7 @@ 
 	 */
 	protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) {
 		foreach ($parameters as $key => $param) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+			if (preg_match('/^'.$mergeParameter.'(\d+)?$/', $key)) {
 				if ($param === $parameter) {
 					return true;
 				}
@@ -196,30 +196,30 @@ 
 	protected function getExtendedSubject($subject, $parameter, $counter) {
 		switch ($counter) {
 			case 1:
-				$replacement = '{' . $parameter . '1}';
+				$replacement = '{'.$parameter.'1}';
 				break;
 			case 2:
 				$replacement = $this->l10n->t(
 					'%1$s and %2$s',
-					['{' . $parameter . '2}', '{' . $parameter . '1}']
+					['{'.$parameter.'2}', '{'.$parameter.'1}']
 				);
 				break;
 			case 3:
 				$replacement = $this->l10n->t(
 					'%1$s, %2$s and %3$s',
-					['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+					['{'.$parameter.'3}', '{'.$parameter.'2}', '{'.$parameter.'1}']
 				);
 				break;
 			case 4:
 				$replacement = $this->l10n->t(
 					'%1$s, %2$s, %3$s and %4$s',
-					['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+					['{'.$parameter.'4}', '{'.$parameter.'3}', '{'.$parameter.'2}', '{'.$parameter.'1}']
 				);
 				break;
 			case 5:
 				$replacement = $this->l10n->t(
 					'%1$s, %2$s, %3$s, %4$s and %5$s',
-					['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+					['{'.$parameter.'5}', '{'.$parameter.'4}', '{'.$parameter.'3}', '{'.$parameter.'2}', '{'.$parameter.'1}']
 				);
 				break;
 			default:
@@ -227,7 +227,7 @@ 
 		}
 
 		return str_replace(
-			'{' . $parameter . '}',
+			'{'.$parameter.'}',
 			$replacement,
 			$subject
 		);
@@ -241,7 +241,7 @@ 
 	protected function generateParsedSubject($subject, $parameters) {
 		$placeholders = $replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
+			$placeholders[] = '{'.$placeholder.'}';
 			if ($parameter['type'] === 'file') {
 				$replacements[] = trim($parameter['path'], '/');
 			} elseif (isset($parameter['name'])) {

Indentation +227 added lines, -227 removed lines

@@ -10,231 +10,231 @@
 use OCP\IL10N;
 
 class EventMerger implements IEventMerger {
-	/** @var IL10N */
-	protected $l10n;
-
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
-
-	/**
-	 * Combines two events when possible to have grouping:
-	 *
-	 * Example1: Two events with subject '{user} created {file}' and
-	 * $mergeParameter file with different file and same user will be merged
-	 * to '{user} created {file1} and {file2}' and the childEvent on the return
-	 * will be set, if the events have been merged.
-	 *
-	 * Example2: Two events with subject '{user} created {file}' and
-	 * $mergeParameter file with same file and same user will be merged to
-	 * '{user} created {file1}' and the childEvent on the return will be set, if
-	 * the events have been merged.
-	 *
-	 * The following requirements have to be met, in order to be merged:
-	 * - Both events need to have the same `getApp()`
-	 * - Both events must not have a message `getMessage()`
-	 * - Both events need to have the same subject `getSubject()`
-	 * - Both events need to have the same object type `getObjectType()`
-	 * - The time difference between both events must not be bigger then 3 hours
-	 * - Only up to 5 events can be merged.
-	 * - All parameters apart from such starting with $mergeParameter must be
-	 *   the same for both events.
-	 *
-	 * @param string $mergeParameter
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 */
-	public function mergeEvents($mergeParameter, IEvent $event, ?IEvent $previousEvent = null) {
-		// No second event => can not combine
-		if (!$previousEvent instanceof IEvent) {
-			return $event;
-		}
-
-		// Different app => can not combine
-		if ($event->getApp() !== $previousEvent->getApp()) {
-			return $event;
-		}
-
-		// Message is set => can not combine
-		if ($event->getMessage() !== '' || $previousEvent->getMessage() !== '') {
-			return $event;
-		}
-
-		// Different subject => can not combine
-		if ($event->getSubject() !== $previousEvent->getSubject()) {
-			return $event;
-		}
-
-		// Different object type => can not combine
-		if ($event->getObjectType() !== $previousEvent->getObjectType()) {
-			return $event;
-		}
-
-		// More than 3 hours difference => can not combine
-		if (abs($event->getTimestamp() - $previousEvent->getTimestamp()) > 3 * 60 * 60) {
-			return $event;
-		}
-
-		// Other parameters are not the same => can not combine
-		try {
-			[$combined, $parameters] = $this->combineParameters($mergeParameter, $event, $previousEvent);
-		} catch (\UnexpectedValueException $e) {
-			return $event;
-		}
-
-		try {
-			$newSubject = $this->getExtendedSubject($event->getRichSubject(), $mergeParameter, $combined);
-			$parsedSubject = $this->generateParsedSubject($newSubject, $parameters);
-
-			$event->setRichSubject($newSubject, $parameters)
-				->setParsedSubject($parsedSubject)
-				->setChildEvent($previousEvent)
-				->setTimestamp(max($event->getTimestamp(), $previousEvent->getTimestamp()));
-		} catch (\UnexpectedValueException $e) {
-			return $event;
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param string $mergeParameter
-	 * @param IEvent $event
-	 * @param IEvent $previousEvent
-	 * @return array
-	 * @throws \UnexpectedValueException
-	 */
-	protected function combineParameters($mergeParameter, IEvent $event, IEvent $previousEvent) {
-		$params1 = $event->getRichSubjectParameters();
-		$params2 = $previousEvent->getRichSubjectParameters();
-		$params = [];
-
-		$combined = 0;
-
-		// Check that all parameters from $event exist in $previousEvent
-		foreach ($params1 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
-				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
-					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
-				}
-				continue;
-			}
-
-			if (!isset($params2[$key]) || $params2[$key] !== $parameter) {
-				// Parameter missing on $previousEvent or different => can not combine
-				throw new \UnexpectedValueException();
-			}
-
-			$params[$key] = $parameter;
-		}
-
-		// Check that all parameters from $previousEvent exist in $event
-		foreach ($params2 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
-				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
-					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
-				}
-				continue;
-			}
-
-			if (!isset($params1[$key]) || $params1[$key] !== $parameter) {
-				// Parameter missing on $event or different => can not combine
-				throw new \UnexpectedValueException();
-			}
-
-			$params[$key] = $parameter;
-		}
-
-		return [$combined, $params];
-	}
-
-	/**
-	 * @param array[] $parameters
-	 * @param string $mergeParameter
-	 * @param array $parameter
-	 * @return bool
-	 */
-	protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) {
-		foreach ($parameters as $key => $param) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
-				if ($param === $parameter) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $subject
-	 * @param string $parameter
-	 * @param int $counter
-	 * @return mixed
-	 */
-	protected function getExtendedSubject($subject, $parameter, $counter) {
-		switch ($counter) {
-			case 1:
-				$replacement = '{' . $parameter . '1}';
-				break;
-			case 2:
-				$replacement = $this->l10n->t(
-					'%1$s and %2$s',
-					['{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			case 3:
-				$replacement = $this->l10n->t(
-					'%1$s, %2$s and %3$s',
-					['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			case 4:
-				$replacement = $this->l10n->t(
-					'%1$s, %2$s, %3$s and %4$s',
-					['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			case 5:
-				$replacement = $this->l10n->t(
-					'%1$s, %2$s, %3$s, %4$s and %5$s',
-					['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			default:
-				throw new \UnexpectedValueException();
-		}
-
-		return str_replace(
-			'{' . $parameter . '}',
-			$replacement,
-			$subject
-		);
-	}
-
-	/**
-	 * @param string $subject
-	 * @param array[] $parameters
-	 * @return string
-	 */
-	protected function generateParsedSubject($subject, $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			if ($parameter['type'] === 'file') {
-				$replacements[] = trim($parameter['path'], '/');
-			} elseif (isset($parameter['name'])) {
-				$replacements[] = $parameter['name'];
-			} else {
-				$replacements[] = $parameter['id'];
-			}
-		}
-
-		return str_replace($placeholders, $replacements, $subject);
-	}
+    /** @var IL10N */
+    protected $l10n;
+
+    /**
+     * @param IL10N $l10n
+     */
+    public function __construct(IL10N $l10n) {
+        $this->l10n = $l10n;
+    }
+
+    /**
+     * Combines two events when possible to have grouping:
+     *
+     * Example1: Two events with subject '{user} created {file}' and
+     * $mergeParameter file with different file and same user will be merged
+     * to '{user} created {file1} and {file2}' and the childEvent on the return
+     * will be set, if the events have been merged.
+     *
+     * Example2: Two events with subject '{user} created {file}' and
+     * $mergeParameter file with same file and same user will be merged to
+     * '{user} created {file1}' and the childEvent on the return will be set, if
+     * the events have been merged.
+     *
+     * The following requirements have to be met, in order to be merged:
+     * - Both events need to have the same `getApp()`
+     * - Both events must not have a message `getMessage()`
+     * - Both events need to have the same subject `getSubject()`
+     * - Both events need to have the same object type `getObjectType()`
+     * - The time difference between both events must not be bigger then 3 hours
+     * - Only up to 5 events can be merged.
+     * - All parameters apart from such starting with $mergeParameter must be
+     *   the same for both events.
+     *
+     * @param string $mergeParameter
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     */
+    public function mergeEvents($mergeParameter, IEvent $event, ?IEvent $previousEvent = null) {
+        // No second event => can not combine
+        if (!$previousEvent instanceof IEvent) {
+            return $event;
+        }
+
+        // Different app => can not combine
+        if ($event->getApp() !== $previousEvent->getApp()) {
+            return $event;
+        }
+
+        // Message is set => can not combine
+        if ($event->getMessage() !== '' || $previousEvent->getMessage() !== '') {
+            return $event;
+        }
+
+        // Different subject => can not combine
+        if ($event->getSubject() !== $previousEvent->getSubject()) {
+            return $event;
+        }
+
+        // Different object type => can not combine
+        if ($event->getObjectType() !== $previousEvent->getObjectType()) {
+            return $event;
+        }
+
+        // More than 3 hours difference => can not combine
+        if (abs($event->getTimestamp() - $previousEvent->getTimestamp()) > 3 * 60 * 60) {
+            return $event;
+        }
+
+        // Other parameters are not the same => can not combine
+        try {
+            [$combined, $parameters] = $this->combineParameters($mergeParameter, $event, $previousEvent);
+        } catch (\UnexpectedValueException $e) {
+            return $event;
+        }
+
+        try {
+            $newSubject = $this->getExtendedSubject($event->getRichSubject(), $mergeParameter, $combined);
+            $parsedSubject = $this->generateParsedSubject($newSubject, $parameters);
+
+            $event->setRichSubject($newSubject, $parameters)
+                ->setParsedSubject($parsedSubject)
+                ->setChildEvent($previousEvent)
+                ->setTimestamp(max($event->getTimestamp(), $previousEvent->getTimestamp()));
+        } catch (\UnexpectedValueException $e) {
+            return $event;
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param string $mergeParameter
+     * @param IEvent $event
+     * @param IEvent $previousEvent
+     * @return array
+     * @throws \UnexpectedValueException
+     */
+    protected function combineParameters($mergeParameter, IEvent $event, IEvent $previousEvent) {
+        $params1 = $event->getRichSubjectParameters();
+        $params2 = $previousEvent->getRichSubjectParameters();
+        $params = [];
+
+        $combined = 0;
+
+        // Check that all parameters from $event exist in $previousEvent
+        foreach ($params1 as $key => $parameter) {
+            if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+                if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
+                    $combined++;
+                    $params[$mergeParameter . $combined] = $parameter;
+                }
+                continue;
+            }
+
+            if (!isset($params2[$key]) || $params2[$key] !== $parameter) {
+                // Parameter missing on $previousEvent or different => can not combine
+                throw new \UnexpectedValueException();
+            }
+
+            $params[$key] = $parameter;
+        }
+
+        // Check that all parameters from $previousEvent exist in $event
+        foreach ($params2 as $key => $parameter) {
+            if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+                if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
+                    $combined++;
+                    $params[$mergeParameter . $combined] = $parameter;
+                }
+                continue;
+            }
+
+            if (!isset($params1[$key]) || $params1[$key] !== $parameter) {
+                // Parameter missing on $event or different => can not combine
+                throw new \UnexpectedValueException();
+            }
+
+            $params[$key] = $parameter;
+        }
+
+        return [$combined, $params];
+    }
+
+    /**
+     * @param array[] $parameters
+     * @param string $mergeParameter
+     * @param array $parameter
+     * @return bool
+     */
+    protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) {
+        foreach ($parameters as $key => $param) {
+            if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+                if ($param === $parameter) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param string $subject
+     * @param string $parameter
+     * @param int $counter
+     * @return mixed
+     */
+    protected function getExtendedSubject($subject, $parameter, $counter) {
+        switch ($counter) {
+            case 1:
+                $replacement = '{' . $parameter . '1}';
+                break;
+            case 2:
+                $replacement = $this->l10n->t(
+                    '%1$s and %2$s',
+                    ['{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            case 3:
+                $replacement = $this->l10n->t(
+                    '%1$s, %2$s and %3$s',
+                    ['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            case 4:
+                $replacement = $this->l10n->t(
+                    '%1$s, %2$s, %3$s and %4$s',
+                    ['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            case 5:
+                $replacement = $this->l10n->t(
+                    '%1$s, %2$s, %3$s, %4$s and %5$s',
+                    ['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            default:
+                throw new \UnexpectedValueException();
+        }
+
+        return str_replace(
+            '{' . $parameter . '}',
+            $replacement,
+            $subject
+        );
+    }
+
+    /**
+     * @param string $subject
+     * @param array[] $parameters
+     * @return string
+     */
+    protected function generateParsedSubject($subject, $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            if ($parameter['type'] === 'file') {
+                $replacements[] = trim($parameter['path'], '/');
+            } elseif (isset($parameter['name'])) {
+                $replacements[] = $parameter['name'];
+            } else {
+                $replacements[] = $parameter['id'];
+            }
+        }
+
+        return str_replace($placeholders, $replacements, $subject);
+    }
 }