nextcloud / server

lib/public/IContainer.php

Indentation +50 added lines, -50 removed lines

@@ -47,58 +47,58 @@
  */
 interface IContainer {
 
-	/**
-	 * If a parameter is not registered in the container try to instantiate it
-	 * by using reflection to find out how to build the class
-	 * @param string $name the class name to resolve
-	 * @return \stdClass
-	 * @since 8.2.0
-	 * @throws QueryException if the class could not be found or instantiated
-	 */
-	public function resolve($name);
+    /**
+     * If a parameter is not registered in the container try to instantiate it
+     * by using reflection to find out how to build the class
+     * @param string $name the class name to resolve
+     * @return \stdClass
+     * @since 8.2.0
+     * @throws QueryException if the class could not be found or instantiated
+     */
+    public function resolve($name);
 
-	/**
-	 * Look up a service for a given name in the container.
-	 *
-	 * @param string $name
-	 * @return mixed
-	 * @throws QueryException if the query could not be resolved
-	 * @since 6.0.0
-	 */
-	public function query($name);
+    /**
+     * Look up a service for a given name in the container.
+     *
+     * @param string $name
+     * @return mixed
+     * @throws QueryException if the query could not be resolved
+     * @since 6.0.0
+     */
+    public function query($name);
 
-	/**
-	 * A value is stored in the container with it's corresponding name
-	 *
-	 * @param string $name
-	 * @param mixed $value
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function registerParameter($name, $value);
+    /**
+     * A value is stored in the container with it's corresponding name
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return void
+     * @since 6.0.0
+     */
+    public function registerParameter($name, $value);
 
-	/**
-	 * A service is registered in the container where a closure is passed in which will actually
-	 * create the service on demand.
-	 * In case the parameter $shared is set to true (the default usage) the once created service will remain in
-	 * memory and be reused on subsequent calls.
-	 * In case the parameter is false the service will be recreated on every call.
-	 *
-	 * @param string $name
-	 * @param \Closure $closure
-	 * @param bool $shared
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function registerService($name, Closure $closure, $shared = true);
+    /**
+     * A service is registered in the container where a closure is passed in which will actually
+     * create the service on demand.
+     * In case the parameter $shared is set to true (the default usage) the once created service will remain in
+     * memory and be reused on subsequent calls.
+     * In case the parameter is false the service will be recreated on every call.
+     *
+     * @param string $name
+     * @param \Closure $closure
+     * @param bool $shared
+     * @return void
+     * @since 6.0.0
+     */
+    public function registerService($name, Closure $closure, $shared = true);
 
-	/**
-	 * Shortcut for returning a service from a service under a different key,
-	 * e.g. to tell the container to return a class when queried for an
-	 * interface
-	 * @param string $alias the alias that should be registered
-	 * @param string $target the target that should be resolved instead
-	 * @since 8.2.0
-	 */
-	public function registerAlias($alias, $target);
+    /**
+     * Shortcut for returning a service from a service under a different key,
+     * e.g. to tell the container to return a class when queried for an
+     * interface
+     * @param string $alias the alias that should be registered
+     * @param string $target the target that should be resolved instead
+     * @since 8.2.0
+     */
+    public function registerAlias($alias, $target);
 }

lib/private/RedisFactory.php

Indentation +72 added lines, -72 removed lines

@@ -23,86 +23,86 @@
 namespace OC;
 
 class RedisFactory {
-	/** @var  \Redis */
-	private $instance;
+    /** @var  \Redis */
+    private $instance;
 
-	/** @var  SystemConfig */
-	private $config;
+    /** @var  SystemConfig */
+    private $config;
 
-	/**
-	 * RedisFactory constructor.
-	 *
-	 * @param SystemConfig $config
-	 */
-	public function __construct(SystemConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * RedisFactory constructor.
+     *
+     * @param SystemConfig $config
+     */
+    public function __construct(SystemConfig $config) {
+        $this->config = $config;
+    }
 
-	private function create() {
-		if ($config = $this->config->getValue('redis.cluster', [])) {
-			if (!class_exists('RedisCluster')) {
-				throw new \Exception('Redis Cluster support is not available');
-			}
-			// cluster config
-			if (isset($config['timeout'])) {
-				$timeout = $config['timeout'];
-			} else {
-				$timeout = null;
-			}
-			if (isset($config['read_timeout'])) {
-				$readTimeout = $config['read_timeout'];
-			} else {
-				$readTimeout = null;
-			}
-			$this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout);
+    private function create() {
+        if ($config = $this->config->getValue('redis.cluster', [])) {
+            if (!class_exists('RedisCluster')) {
+                throw new \Exception('Redis Cluster support is not available');
+            }
+            // cluster config
+            if (isset($config['timeout'])) {
+                $timeout = $config['timeout'];
+            } else {
+                $timeout = null;
+            }
+            if (isset($config['read_timeout'])) {
+                $readTimeout = $config['read_timeout'];
+            } else {
+                $readTimeout = null;
+            }
+            $this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout);
 
-			if (isset($config['failover_mode'])) {
-				$this->instance->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, $config['failover_mode']);
-			}
-		} else {
+            if (isset($config['failover_mode'])) {
+                $this->instance->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, $config['failover_mode']);
+            }
+        } else {
 
-			$this->instance = new \Redis();
-			$config = $this->config->getValue('redis', []);
-			if (isset($config['host'])) {
-				$host = $config['host'];
-			} else {
-				$host = '127.0.0.1';
-			}
-			if (isset($config['port'])) {
-				$port = $config['port'];
-			} else {
-				$port = 6379;
-			}
-			if (isset($config['timeout'])) {
-				$timeout = $config['timeout'];
-			} else {
-				$timeout = 0.0; // unlimited
-			}
+            $this->instance = new \Redis();
+            $config = $this->config->getValue('redis', []);
+            if (isset($config['host'])) {
+                $host = $config['host'];
+            } else {
+                $host = '127.0.0.1';
+            }
+            if (isset($config['port'])) {
+                $port = $config['port'];
+            } else {
+                $port = 6379;
+            }
+            if (isset($config['timeout'])) {
+                $timeout = $config['timeout'];
+            } else {
+                $timeout = 0.0; // unlimited
+            }
 
-			$this->instance->connect($host, $port, $timeout);
-			if (isset($config['password']) && $config['password'] !== '') {
-				$this->instance->auth($config['password']);
-			}
+            $this->instance->connect($host, $port, $timeout);
+            if (isset($config['password']) && $config['password'] !== '') {
+                $this->instance->auth($config['password']);
+            }
 
-			if (isset($config['dbindex'])) {
-				$this->instance->select($config['dbindex']);
-			}
-		}
-	}
+            if (isset($config['dbindex'])) {
+                $this->instance->select($config['dbindex']);
+            }
+        }
+    }
 
-	public function getInstance() {
-		if (!$this->isAvailable()) {
-			throw new \Exception('Redis support is not available');
-		}
-		if (!$this->instance instanceof \Redis) {
-			$this->create();
-		}
+    public function getInstance() {
+        if (!$this->isAvailable()) {
+            throw new \Exception('Redis support is not available');
+        }
+        if (!$this->instance instanceof \Redis) {
+            $this->create();
+        }
 
-		return $this->instance;
-	}
+        return $this->instance;
+    }
 
-	public function isAvailable() {
-		return extension_loaded('redis')
-		&& version_compare(phpversion('redis'), '2.2.5', '>=');
-	}
+    public function isAvailable() {
+        return extension_loaded('redis')
+        && version_compare(phpversion('redis'), '2.2.5', '>=');
+    }
 }

apps/dav/lib/Avatars/RootCollection.php

Indentation +17 added lines, -17 removed lines

@@ -7,23 +7,23 @@
 
 class RootCollection extends AbstractPrincipalCollection {
 
-	/**
-	 * This method returns a node for a principal.
-	 *
-	 * The passed array contains principal information, and is guaranteed to
-	 * at least contain a uri item. Other properties may or may not be
-	 * supplied by the authentication backend.
-	 *
-	 * @param array $principalInfo
-	 * @return AvatarHome
-	 */
-	public function getChildForPrincipal(array $principalInfo) {
-		$avatarManager = \OC::$server->getAvatarManager();
-		return new AvatarHome($principalInfo, $avatarManager);
-	}
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principalInfo
+     * @return AvatarHome
+     */
+    public function getChildForPrincipal(array $principalInfo) {
+        $avatarManager = \OC::$server->getAvatarManager();
+        return new AvatarHome($principalInfo, $avatarManager);
+    }
 
-	public function getName() {
-		return 'avatars';
-	}
+    public function getName() {
+        return 'avatars';
+    }
 
 }

apps/dav/lib/Migration/CalDAVRemoveEmptyValue.php

Indentation +83 added lines, -83 removed lines

@@ -33,87 +33,87 @@
 
 class CalDAVRemoveEmptyValue implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param CalDavBackend $calDavBackend
-	 * @param ILogger $logger
-	 */
-	public function __construct(IDBConnection $db, CalDavBackend $calDavBackend, ILogger $logger) {
-		$this->db = $db;
-		$this->calDavBackend = $calDavBackend;
-		$this->logger = $logger;
-	}
-
-	public function getName() {
-		return 'Fix broken values of calendar objects';
-	}
-
-	public function run(IOutput $output) {
-		$pattern = ';VALUE=:';
-		$count = $warnings = 0;
-
-		$objects = $this->getInvalidObjects($pattern);
-
-		$output->startProgress(count($objects));
-		foreach ($objects as $row) {
-			$calObject = $this->calDavBackend->getCalendarObject((int)$row['calendarid'], $row['uri']);
-			$data = preg_replace('/' . $pattern . '/', ':', $calObject['calendardata']);
-
-			if ($data !== $calObject['calendardata']) {
-				$output->advance();
-
-				try {
-					$this->calDavBackend->getDenormalizedData($data);
-				} catch (InvalidDataException $e) {
-					$this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [
-						'app' => 'dav',
-						'cal' => (int)$row['calendarid'],
-						'uri' => $row['uri'],
-					]);
-					$warnings++;
-					continue;
-				}
-
-				$this->calDavBackend->updateCalendarObject((int)$row['calendarid'], $row['uri'], $data);
-				$count++;
-			}
-		}
-		$output->finishProgress();
-
-		if ($warnings > 0) {
-			$output->warning(sprintf('%d events could not be updated, see log file for more information', $warnings));
-		}
-		if ($count > 0) {
-			$output->info(sprintf('Updated %d events', $count));
-		}
-	}
-
-	protected function getInvalidObjects($pattern) {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['calendarid', 'uri'])
-			->from('calendarobjects')
-			->where($query->expr()->like(
-				'calendardata',
-				$query->createNamedParameter(
-					'%' . $this->db->escapeLikeParameter($pattern) . '%',
-					IQueryBuilder::PARAM_STR
-				),
-				IQueryBuilder::PARAM_STR
-			));
-
-		$result = $query->execute();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return $rows;
-	}
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * @param IDBConnection $db
+     * @param CalDavBackend $calDavBackend
+     * @param ILogger $logger
+     */
+    public function __construct(IDBConnection $db, CalDavBackend $calDavBackend, ILogger $logger) {
+        $this->db = $db;
+        $this->calDavBackend = $calDavBackend;
+        $this->logger = $logger;
+    }
+
+    public function getName() {
+        return 'Fix broken values of calendar objects';
+    }
+
+    public function run(IOutput $output) {
+        $pattern = ';VALUE=:';
+        $count = $warnings = 0;
+
+        $objects = $this->getInvalidObjects($pattern);
+
+        $output->startProgress(count($objects));
+        foreach ($objects as $row) {
+            $calObject = $this->calDavBackend->getCalendarObject((int)$row['calendarid'], $row['uri']);
+            $data = preg_replace('/' . $pattern . '/', ':', $calObject['calendardata']);
+
+            if ($data !== $calObject['calendardata']) {
+                $output->advance();
+
+                try {
+                    $this->calDavBackend->getDenormalizedData($data);
+                } catch (InvalidDataException $e) {
+                    $this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [
+                        'app' => 'dav',
+                        'cal' => (int)$row['calendarid'],
+                        'uri' => $row['uri'],
+                    ]);
+                    $warnings++;
+                    continue;
+                }
+
+                $this->calDavBackend->updateCalendarObject((int)$row['calendarid'], $row['uri'], $data);
+                $count++;
+            }
+        }
+        $output->finishProgress();
+
+        if ($warnings > 0) {
+            $output->warning(sprintf('%d events could not be updated, see log file for more information', $warnings));
+        }
+        if ($count > 0) {
+            $output->info(sprintf('Updated %d events', $count));
+        }
+    }
+
+    protected function getInvalidObjects($pattern) {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['calendarid', 'uri'])
+            ->from('calendarobjects')
+            ->where($query->expr()->like(
+                'calendardata',
+                $query->createNamedParameter(
+                    '%' . $this->db->escapeLikeParameter($pattern) . '%',
+                    IQueryBuilder::PARAM_STR
+                ),
+                IQueryBuilder::PARAM_STR
+            ));
+
+        $result = $query->execute();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return $rows;
+    }
 }

apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php

Indentation +14 added lines, -14 removed lines

@@ -27,21 +27,21 @@
 
 class CompFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return string
-	 */
-	static function xmlDeserialize(Reader $reader) {
-		$att = $reader->parseAttributes();
-		$componentName = $att['name'];
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return string
+     */
+    static function xmlDeserialize(Reader $reader) {
+        $att = $reader->parseAttributes();
+        $componentName = $att['name'];
 
-		$reader->parseInnerTree();
+        $reader->parseInnerTree();
 
-		if (!is_string($componentName)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}comp-filter requires a valid name attribute');
-		}
+        if (!is_string($componentName)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}comp-filter requires a valid name attribute');
+        }
 
-		return $componentName;
-	}
+        return $componentName;
+    }
 }

apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php

Indentation +12 added lines, -12 removed lines

@@ -27,17 +27,17 @@
 
 class SearchTermFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return string
-	 */
-	static function xmlDeserialize(Reader $reader) {
-		$value = $reader->parseInnerTree();
-		if (!is_string($value)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
-		}
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return string
+     */
+    static function xmlDeserialize(Reader $reader) {
+        $value = $reader->parseInnerTree();
+        if (!is_string($value)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 }
\ No newline at end of file

apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php

Indentation +14 added lines, -14 removed lines

@@ -27,21 +27,21 @@
 
 class PropFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return string
-	 */
-	static function xmlDeserialize(Reader $reader) {
-		$att = $reader->parseAttributes();
-		$componentName = $att['name'];
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return string
+     */
+    static function xmlDeserialize(Reader $reader) {
+        $att = $reader->parseAttributes();
+        $componentName = $att['name'];
 
-		$reader->parseInnerTree();
+        $reader->parseInnerTree();
 
-		if (!is_string($componentName)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}prop-filter requires a valid name attribute');
-		}
+        if (!is_string($componentName)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}prop-filter requires a valid name attribute');
+        }
 
-		return $componentName;
-	}
+        return $componentName;
+    }
 }

apps/dav/lib/CalDAV/Search/Xml/Filter/ParamFilter.php

Indentation +21 added lines, -21 removed lines

@@ -27,29 +27,29 @@
 
 class ParamFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return string
-	 */
-	static function xmlDeserialize(Reader $reader) {
-		$att = $reader->parseAttributes();
-		$property = $att['property'];
-		$parameter = $att['name'];
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return string
+     */
+    static function xmlDeserialize(Reader $reader) {
+        $att = $reader->parseAttributes();
+        $property = $att['property'];
+        $parameter = $att['name'];
 
-		$reader->parseInnerTree();
+        $reader->parseInnerTree();
 
-		if (!is_string($property)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid property attribute');
+        if (!is_string($property)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid property attribute');
 
-		}
-		if (!is_string($parameter)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid parameter attribute');
-		}
+        }
+        if (!is_string($parameter)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}param-filter requires a valid parameter attribute');
+        }
 
-		return [
-			'property' => $property,
-			'parameter' => $parameter,
-		];
-	}
+        return [
+            'property' => $property,
+            'parameter' => $parameter,
+        ];
+    }
 }

lib/private/Activity/EventMerger.php

Indentation +201 added lines, -201 removed lines

@@ -27,230 +27,230 @@
 
 class EventMerger implements IEventMerger {
 
-	/** @var IL10N */
-	protected $l10n;
+    /** @var IL10N */
+    protected $l10n;
 
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $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;
-		}
+    /**
+     * 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;
-		}
+        // 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;
-		}
+        // 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 subject => can not combine
+        if ($event->getSubject() !== $previousEvent->getSubject()) {
+            return $event;
+        }
 
-		// Different object type => can not combine
-		if ($event->getObjectType() !== $previousEvent->getObjectType()) {
-			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;
-		}
+        // 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 {
-			list($combined, $parameters) = $this->combineParameters($mergeParameter, $event, $previousEvent);
-		} catch (\UnexpectedValueException $e) {
-			return $event;
-		}
+        // Other parameters are not the same => can not combine
+        try {
+            list($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);
+        try {
+            $newSubject = $this->getExtendedSubject($event->getRichSubject(), $mergeParameter, $combined);
+            $parsedSubject = $this->generateParsedSubject($newSubject, $parameters);
 
-			$event->setRichSubject($newSubject, $parameters)
-				->setParsedSubject($parsedSubject)
-				->setChildEvent($previousEvent);
-		} catch (\UnexpectedValueException $e) {
-			return $event;
-		}
+            $event->setRichSubject($newSubject, $parameters)
+                ->setParsedSubject($parsedSubject)
+                ->setChildEvent($previousEvent);
+        } catch (\UnexpectedValueException $e) {
+            return $event;
+        }
 
-		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 = [];
+    /**
+     * @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;
+        $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;
-			}
+        // 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();
-			}
+            if (!isset($params2[$key]) || $params2[$key] !== $parameter) {
+                // Parameter missing on $previousEvent or different => can not combine
+                throw new \UnexpectedValueException();
+            }
 
-			$params[$key] = $parameter;
-		}
+            $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;
-			}
+        // 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();
-			}
+            if (!isset($params1[$key]) || $params1[$key] !== $parameter) {
+                // Parameter missing on $event or different => can not combine
+                throw new \UnexpectedValueException();
+            }
 
-			$params[$key] = $parameter;
-		}
+            $params[$key] = $parameter;
+        }
 
-		return [$combined, $params];
-	}
+        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 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();
-		}
+    /**
+     * @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
-		);
-	}
+        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'], '/');
-			} else if (isset($parameter['name'])) {
-				$replacements[] = $parameter['name'];
-			} else {
-				$replacements[] = $parameter['id'];
-			}
-		}
+    /**
+     * @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'], '/');
+            } else if (isset($parameter['name'])) {
+                $replacements[] = $parameter['name'];
+            } else {
+                $replacements[] = $parameter['id'];
+            }
+        }
 
-		return str_replace($placeholders, $replacements, $subject);
-	}
+        return str_replace($placeholders, $replacements, $subject);
+    }
 }