Passed
Push — master ( 1fd674...707cb6 )
by Jan-Christoph
15:26 queued 10s
created
apps/files_versions/lib/Capabilities.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -29,16 +29,16 @@
 block discarded – undo
29 29
 
30 30
 class Capabilities implements ICapability {
31 31
 	
32
-	/**
33
-	 * Return this classes capabilities
34
-	 *
35
-	 * @return array
36
-	 */
37
-	public function getCapabilities() {
38
-		return [
39
-			'files' => [
40
-				'versioning' => true
41
-			]
42
-		];
43
-	}
32
+    /**
33
+     * Return this classes capabilities
34
+     *
35
+     * @return array
36
+     */
37
+    public function getCapabilities() {
38
+        return [
39
+            'files' => [
40
+                'versioning' => true
41
+            ]
42
+        ];
43
+    }
44 44
 }
Please login to merge, or discard this patch.
apps/files_versions/lib/BackgroundJob/ExpireVersions.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
 		\OC_Util::setupFS($user);
87 87
 
88 88
 		// Check if this user has a versions directory
89
-		$view = new \OC\Files\View('/' . $user);
89
+		$view = new \OC\Files\View('/'.$user);
90 90
 		if (!$view->is_dir('/files_versions')) {
91 91
 			return false;
92 92
 		}
Please login to merge, or discard this patch.
Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -32,56 +32,56 @@
 block discarded – undo
32 32
 
33 33
 class ExpireVersions extends \OC\BackgroundJob\TimedJob {
34 34
 
35
-	const ITEMS_PER_SESSION = 1000;
35
+    const ITEMS_PER_SESSION = 1000;
36 36
 
37
-	/**
38
-	 * @var Expiration
39
-	 */
40
-	private $expiration;
37
+    /**
38
+     * @var Expiration
39
+     */
40
+    private $expiration;
41 41
 	
42
-	/**
43
-	 * @var IUserManager
44
-	 */
45
-	private $userManager;
42
+    /**
43
+     * @var IUserManager
44
+     */
45
+    private $userManager;
46 46
 
47
-	public function __construct(IUserManager $userManager, Expiration $expiration) {
48
-		// Run once per 30 minutes
49
-		$this->setInterval(60 * 30);
47
+    public function __construct(IUserManager $userManager, Expiration $expiration) {
48
+        // Run once per 30 minutes
49
+        $this->setInterval(60 * 30);
50 50
 
51
-		$this->expiration = $expiration;
52
-		$this->userManager = $userManager;
53
-	}
51
+        $this->expiration = $expiration;
52
+        $this->userManager = $userManager;
53
+    }
54 54
 
55
-	protected function run($argument) {
56
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
57
-		if (!$maxAge) {
58
-			return;
59
-		}
55
+    protected function run($argument) {
56
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
57
+        if (!$maxAge) {
58
+            return;
59
+        }
60 60
 
61
-		$this->userManager->callForSeenUsers(function(IUser $user) {
62
-			$uid = $user->getUID();
63
-			if (!$this->setupFS($uid)) {
64
-				return;
65
-			}
66
-			Storage::expireOlderThanMaxForUser($uid);
67
-		});
68
-	}
61
+        $this->userManager->callForSeenUsers(function(IUser $user) {
62
+            $uid = $user->getUID();
63
+            if (!$this->setupFS($uid)) {
64
+                return;
65
+            }
66
+            Storage::expireOlderThanMaxForUser($uid);
67
+        });
68
+    }
69 69
 
70
-	/**
71
-	 * Act on behalf on trash item owner
72
-	 * @param string $user
73
-	 * @return boolean
74
-	 */
75
-	protected function setupFS($user) {
76
-		\OC_Util::tearDownFS();
77
-		\OC_Util::setupFS($user);
70
+    /**
71
+     * Act on behalf on trash item owner
72
+     * @param string $user
73
+     * @return boolean
74
+     */
75
+    protected function setupFS($user) {
76
+        \OC_Util::tearDownFS();
77
+        \OC_Util::setupFS($user);
78 78
 
79
-		// Check if this user has a versions directory
80
-		$view = new \OC\Files\View('/' . $user);
81
-		if (!$view->is_dir('/files_versions')) {
82
-			return false;
83
-		}
79
+        // Check if this user has a versions directory
80
+        $view = new \OC\Files\View('/' . $user);
81
+        if (!$view->is_dir('/files_versions')) {
82
+            return false;
83
+        }
84 84
 
85
-		return true;
86
-	}
85
+        return true;
86
+    }
87 87
 }
Please login to merge, or discard this patch.
apps/files_versions/appinfo/routes.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -31,20 +31,20 @@
 block discarded – undo
31 31
 
32 32
 $application = new Application();
33 33
 $application->registerRoutes($this, [
34
-	'routes' => [
35
-		[
36
-			'name' => 'Preview#getPreview',
37
-			'url' => '/preview',
38
-			'verb' => 'GET',
39
-		],
40
-	],
34
+    'routes' => [
35
+        [
36
+            'name' => 'Preview#getPreview',
37
+            'url' => '/preview',
38
+            'verb' => 'GET',
39
+        ],
40
+    ],
41 41
 ]);
42 42
 
43 43
 /** @var $this \OCP\Route\IRouter */
44 44
 $this->create('files_versions_download', 'download.php')
45
-	->actionInclude('files_versions/download.php');
45
+    ->actionInclude('files_versions/download.php');
46 46
 $this->create('files_versions_ajax_getVersions', 'ajax/getVersions.php')
47
-	->actionInclude('files_versions/ajax/getVersions.php');
47
+    ->actionInclude('files_versions/ajax/getVersions.php');
48 48
 $this->create('files_versions_ajax_rollbackVersion', 'ajax/rollbackVersion.php')
49
-	->actionInclude('files_versions/ajax/rollbackVersion.php');
49
+    ->actionInclude('files_versions/ajax/rollbackVersion.php');
50 50
 
Please login to merge, or discard this patch.
lib/public/Authentication/LoginCredentials/IStore.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,14 +31,14 @@
 block discarded – undo
31 31
  */
32 32
 interface IStore {
33 33
 	
34
-	/**
35
-	 * Get login credentials of the currently logged in user
36
-	 *
37
-	 * @since 12
38
-	 *
39
-	 * @throws CredentialsUnavailableException
40
-	 * @return ICredentials the login credentials of the current user
41
-	 */
42
-	public function getLoginCredentials();
34
+    /**
35
+     * Get login credentials of the currently logged in user
36
+     *
37
+     * @since 12
38
+     *
39
+     * @throws CredentialsUnavailableException
40
+     * @return ICredentials the login credentials of the current user
41
+     */
42
+    public function getLoginCredentials();
43 43
 	
44 44
 }
Please login to merge, or discard this patch.
lib/public/ITagManager.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -46,17 +46,17 @@
 block discarded – undo
46 46
  */
47 47
 interface ITagManager {
48 48
 
49
-	/**
50
-	 * Create a new \OCP\ITags instance and load tags from db for the current user.
51
-	 *
52
-	 * @see \OCP\ITags
53
-	 * @param string $type The type identifier e.g. 'contact' or 'event'.
54
-	 * @param array $defaultTags An array of default tags to be used if none are stored.
55
-	 * @param boolean $includeShared Whether to include tags for items shared with this user by others.
56
-	 * @param string $userId user for which to retrieve the tags, defaults to the currently
57
-	 * logged in user
58
-	 * @return \OCP\ITags
59
-	 * @since 6.0.0 - parameter $includeShared and $userId were added in 8.0.0
60
-	*/
61
-	public function load($type, $defaultTags = array(), $includeShared = false, $userId = null);
49
+    /**
50
+     * Create a new \OCP\ITags instance and load tags from db for the current user.
51
+     *
52
+     * @see \OCP\ITags
53
+     * @param string $type The type identifier e.g. 'contact' or 'event'.
54
+     * @param array $defaultTags An array of default tags to be used if none are stored.
55
+     * @param boolean $includeShared Whether to include tags for items shared with this user by others.
56
+     * @param string $userId user for which to retrieve the tags, defaults to the currently
57
+     * logged in user
58
+     * @return \OCP\ITags
59
+     * @since 6.0.0 - parameter $includeShared and $userId were added in 8.0.0
60
+     */
61
+    public function load($type, $defaultTags = array(), $includeShared = false, $userId = null);
62 62
 }
Please login to merge, or discard this patch.
lib/public/Console/ConsoleEvent.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -32,39 +32,39 @@
 block discarded – undo
32 32
  */
33 33
 class ConsoleEvent extends Event {
34 34
 
35
-	const EVENT_RUN = 'OC\Console\Application::run';
35
+    const EVENT_RUN = 'OC\Console\Application::run';
36 36
 
37
-	/** @var string */
38
-	protected $event;
37
+    /** @var string */
38
+    protected $event;
39 39
 
40
-	/** @var string[] */
41
-	protected $arguments;
40
+    /** @var string[] */
41
+    protected $arguments;
42 42
 
43
-	/**
44
-	 * DispatcherEvent constructor.
45
-	 *
46
-	 * @param string $event
47
-	 * @param string[] $arguments
48
-	 * @since 9.0.0
49
-	 */
50
-	public function __construct($event, array $arguments) {
51
-		$this->event = $event;
52
-		$this->arguments = $arguments;
53
-	}
43
+    /**
44
+     * DispatcherEvent constructor.
45
+     *
46
+     * @param string $event
47
+     * @param string[] $arguments
48
+     * @since 9.0.0
49
+     */
50
+    public function __construct($event, array $arguments) {
51
+        $this->event = $event;
52
+        $this->arguments = $arguments;
53
+    }
54 54
 
55
-	/**
56
-	 * @return string
57
-	 * @since 9.0.0
58
-	 */
59
-	public function getEvent() {
60
-		return $this->event;
61
-	}
55
+    /**
56
+     * @return string
57
+     * @since 9.0.0
58
+     */
59
+    public function getEvent() {
60
+        return $this->event;
61
+    }
62 62
 
63
-	/**
64
-	 * @return string[]
65
-	 * @since 9.0.0
66
-	 */
67
-	public function getArguments() {
68
-		return $this->arguments;
69
-	}
63
+    /**
64
+     * @return string[]
65
+     * @since 9.0.0
66
+     */
67
+    public function getArguments() {
68
+        return $this->arguments;
69
+    }
70 70
 }
Please login to merge, or discard this patch.
lib/public/Activity/IExtension.php 2 patches
Indentation   +117 added lines, -117 removed lines patch added patch discarded remove patch
@@ -39,132 +39,132 @@
 block discarded – undo
39 39
  * @since 8.0.0
40 40
  */
41 41
 interface IExtension {
42
-	const METHOD_STREAM = 'stream';
43
-	const METHOD_MAIL = 'email';
42
+    const METHOD_STREAM = 'stream';
43
+    const METHOD_MAIL = 'email';
44 44
 
45
-	const PRIORITY_VERYLOW 	= 10;
46
-	const PRIORITY_LOW	= 20;
47
-	const PRIORITY_MEDIUM	= 30;
48
-	const PRIORITY_HIGH	= 40;
49
-	const PRIORITY_VERYHIGH	= 50;
45
+    const PRIORITY_VERYLOW 	= 10;
46
+    const PRIORITY_LOW	= 20;
47
+    const PRIORITY_MEDIUM	= 30;
48
+    const PRIORITY_HIGH	= 40;
49
+    const PRIORITY_VERYHIGH	= 50;
50 50
 
51
-	/**
52
-	 * The extension can return an array of additional notification types.
53
-	 * If no additional types are to be added false is to be returned
54
-	 *
55
-	 * @param string $languageCode
56
-	 * @return array|false Array "stringID of the type" => "translated string description for the setting"
57
-	 * 				or Array "stringID of the type" => [
58
-	 * 					'desc' => "translated string description for the setting"
59
-	 * 					'methods' => [self::METHOD_*],
60
-	 * 				]
61
-	 * @since 8.0.0 - 8.2.0: Added support to allow limiting notifications to certain methods
62
-	 */
63
-	public function getNotificationTypes($languageCode);
51
+    /**
52
+     * The extension can return an array of additional notification types.
53
+     * If no additional types are to be added false is to be returned
54
+     *
55
+     * @param string $languageCode
56
+     * @return array|false Array "stringID of the type" => "translated string description for the setting"
57
+     * 				or Array "stringID of the type" => [
58
+     * 					'desc' => "translated string description for the setting"
59
+     * 					'methods' => [self::METHOD_*],
60
+     * 				]
61
+     * @since 8.0.0 - 8.2.0: Added support to allow limiting notifications to certain methods
62
+     */
63
+    public function getNotificationTypes($languageCode);
64 64
 
65
-	/**
66
-	 * For a given method additional types to be displayed in the settings can be returned.
67
-	 * In case no additional types are to be added false is to be returned.
68
-	 *
69
-	 * @param string $method
70
-	 * @return array|false
71
-	 * @since 8.0.0
72
-	 */
73
-	public function getDefaultTypes($method);
65
+    /**
66
+     * For a given method additional types to be displayed in the settings can be returned.
67
+     * In case no additional types are to be added false is to be returned.
68
+     *
69
+     * @param string $method
70
+     * @return array|false
71
+     * @since 8.0.0
72
+     */
73
+    public function getDefaultTypes($method);
74 74
 
75
-	/**
76
-	 * A string naming the css class for the icon to be used can be returned.
77
-	 * If no icon is known for the given type false is to be returned.
78
-	 *
79
-	 * @param string $type
80
-	 * @return string|false
81
-	 * @since 8.0.0
82
-	 */
83
-	public function getTypeIcon($type);
75
+    /**
76
+     * A string naming the css class for the icon to be used can be returned.
77
+     * If no icon is known for the given type false is to be returned.
78
+     *
79
+     * @param string $type
80
+     * @return string|false
81
+     * @since 8.0.0
82
+     */
83
+    public function getTypeIcon($type);
84 84
 
85
-	/**
86
-	 * The extension can translate a given message to the requested languages.
87
-	 * If no translation is available false is to be returned.
88
-	 *
89
-	 * @param string $app
90
-	 * @param string $text
91
-	 * @param array $params
92
-	 * @param boolean $stripPath
93
-	 * @param boolean $highlightParams
94
-	 * @param string $languageCode
95
-	 * @return string|false
96
-	 * @since 8.0.0
97
-	 */
98
-	public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode);
85
+    /**
86
+     * The extension can translate a given message to the requested languages.
87
+     * If no translation is available false is to be returned.
88
+     *
89
+     * @param string $app
90
+     * @param string $text
91
+     * @param array $params
92
+     * @param boolean $stripPath
93
+     * @param boolean $highlightParams
94
+     * @param string $languageCode
95
+     * @return string|false
96
+     * @since 8.0.0
97
+     */
98
+    public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode);
99 99
 
100
-	/**
101
-	 * The extension can define the type of parameters for translation
102
-	 *
103
-	 * Currently known types are:
104
-	 * * file		=> will strip away the path of the file and add a tooltip with it
105
-	 * * username	=> will add the avatar of the user
106
-	 * * email 	    => will add a mailto link
107
-	 *
108
-	 * @param string $app
109
-	 * @param string $text
110
-	 * @return array|false
111
-	 * @since 8.0.0
112
-	 */
113
-	public function getSpecialParameterList($app, $text);
100
+    /**
101
+     * The extension can define the type of parameters for translation
102
+     *
103
+     * Currently known types are:
104
+     * * file		=> will strip away the path of the file and add a tooltip with it
105
+     * * username	=> will add the avatar of the user
106
+     * * email 	    => will add a mailto link
107
+     *
108
+     * @param string $app
109
+     * @param string $text
110
+     * @return array|false
111
+     * @since 8.0.0
112
+     */
113
+    public function getSpecialParameterList($app, $text);
114 114
 
115
-	/**
116
-	 * The extension can define the parameter grouping by returning the index as integer.
117
-	 * In case no grouping is required false is to be returned.
118
-	 *
119
-	 * @param array $activity
120
-	 * @return integer|false
121
-	 * @since 8.0.0
122
-	 */
123
-	public function getGroupParameter($activity);
115
+    /**
116
+     * The extension can define the parameter grouping by returning the index as integer.
117
+     * In case no grouping is required false is to be returned.
118
+     *
119
+     * @param array $activity
120
+     * @return integer|false
121
+     * @since 8.0.0
122
+     */
123
+    public function getGroupParameter($activity);
124 124
 
125
-	/**
126
-	 * The extension can define additional navigation entries. The array returned has to contain two keys 'top'
127
-	 * and 'apps' which hold arrays with the relevant entries.
128
-	 * If no further entries are to be added false is no be returned.
129
-	 *
130
-	 * @return array|false
131
-	 * @since 8.0.0
132
-	 * @deprecated 11.0.0 - Register an IFilter instead
133
-	 */
134
-	public function getNavigation();
125
+    /**
126
+     * The extension can define additional navigation entries. The array returned has to contain two keys 'top'
127
+     * and 'apps' which hold arrays with the relevant entries.
128
+     * If no further entries are to be added false is no be returned.
129
+     *
130
+     * @return array|false
131
+     * @since 8.0.0
132
+     * @deprecated 11.0.0 - Register an IFilter instead
133
+     */
134
+    public function getNavigation();
135 135
 
136
-	/**
137
-	 * The extension can check if a customer filter (given by a query string like filter=abc) is valid or not.
138
-	 *
139
-	 * @param string $filterValue
140
-	 * @return boolean
141
-	 * @since 8.0.0
142
-	 * @deprecated 11.0.0 - Register an IFilter instead
143
-	 */
144
-	public function isFilterValid($filterValue);
136
+    /**
137
+     * The extension can check if a customer filter (given by a query string like filter=abc) is valid or not.
138
+     *
139
+     * @param string $filterValue
140
+     * @return boolean
141
+     * @since 8.0.0
142
+     * @deprecated 11.0.0 - Register an IFilter instead
143
+     */
144
+    public function isFilterValid($filterValue);
145 145
 
146
-	/**
147
-	 * The extension can filter the types based on the filter if required.
148
-	 * In case no filter is to be applied false is to be returned unchanged.
149
-	 *
150
-	 * @param array $types
151
-	 * @param string $filter
152
-	 * @return array|false
153
-	 * @since 8.0.0
154
-	 * @deprecated 11.0.0 - Register an IFilter instead
155
-	 */
156
-	public function filterNotificationTypes($types, $filter);
146
+    /**
147
+     * The extension can filter the types based on the filter if required.
148
+     * In case no filter is to be applied false is to be returned unchanged.
149
+     *
150
+     * @param array $types
151
+     * @param string $filter
152
+     * @return array|false
153
+     * @since 8.0.0
154
+     * @deprecated 11.0.0 - Register an IFilter instead
155
+     */
156
+    public function filterNotificationTypes($types, $filter);
157 157
 
158
-	/**
159
-	 * For a given filter the extension can specify the sql query conditions including parameters for that query.
160
-	 * In case the extension does not know the filter false is to be returned.
161
-	 * The query condition and the parameters are to be returned as array with two elements.
162
-	 * E.g. return array('`app` = ? and `message` like ?', array('mail', 'ownCloud%'));
163
-	 *
164
-	 * @param string $filter
165
-	 * @return array|false
166
-	 * @since 8.0.0
167
-	 * @deprecated 11.0.0 - Register an IFilter instead
168
-	 */
169
-	public function getQueryForFilter($filter);
158
+    /**
159
+     * For a given filter the extension can specify the sql query conditions including parameters for that query.
160
+     * In case the extension does not know the filter false is to be returned.
161
+     * The query condition and the parameters are to be returned as array with two elements.
162
+     * E.g. return array('`app` = ? and `message` like ?', array('mail', 'ownCloud%'));
163
+     *
164
+     * @param string $filter
165
+     * @return array|false
166
+     * @since 8.0.0
167
+     * @deprecated 11.0.0 - Register an IFilter instead
168
+     */
169
+    public function getQueryForFilter($filter);
170 170
 }
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -42,11 +42,11 @@
 block discarded – undo
42 42
 	const METHOD_STREAM = 'stream';
43 43
 	const METHOD_MAIL = 'email';
44 44
 
45
-	const PRIORITY_VERYLOW 	= 10;
46
-	const PRIORITY_LOW	= 20;
47
-	const PRIORITY_MEDIUM	= 30;
48
-	const PRIORITY_HIGH	= 40;
49
-	const PRIORITY_VERYHIGH	= 50;
45
+	const PRIORITY_VERYLOW = 10;
46
+	const PRIORITY_LOW = 20;
47
+	const PRIORITY_MEDIUM = 30;
48
+	const PRIORITY_HIGH = 40;
49
+	const PRIORITY_VERYHIGH = 50;
50 50
 
51 51
 	/**
52 52
 	 * The extension can return an array of additional notification types.
Please login to merge, or discard this patch.
lib/public/Activity/IFilter.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -29,43 +29,43 @@
 block discarded – undo
29 29
  */
30 30
 interface IFilter {
31 31
 
32
-	/**
33
-	 * @return string Lowercase a-z and underscore only identifier
34
-	 * @since 11.0.0
35
-	 */
36
-	public function getIdentifier();
32
+    /**
33
+     * @return string Lowercase a-z and underscore only identifier
34
+     * @since 11.0.0
35
+     */
36
+    public function getIdentifier();
37 37
 
38
-	/**
39
-	 * @return string A translated string
40
-	 * @since 11.0.0
41
-	 */
42
-	public function getName();
38
+    /**
39
+     * @return string A translated string
40
+     * @since 11.0.0
41
+     */
42
+    public function getName();
43 43
 
44
-	/**
45
-	 * @return int whether the filter should be rather on the top or bottom of
46
-	 * the admin section. The filters are arranged in ascending order of the
47
-	 * priority values. It is required to return a value between 0 and 100.
48
-	 * @since 11.0.0
49
-	 */
50
-	public function getPriority();
44
+    /**
45
+     * @return int whether the filter should be rather on the top or bottom of
46
+     * the admin section. The filters are arranged in ascending order of the
47
+     * priority values. It is required to return a value between 0 and 100.
48
+     * @since 11.0.0
49
+     */
50
+    public function getPriority();
51 51
 
52
-	/**
53
-	 * @return string Full URL to an icon, empty string when none is given
54
-	 * @since 11.0.0
55
-	 */
56
-	public function getIcon();
52
+    /**
53
+     * @return string Full URL to an icon, empty string when none is given
54
+     * @since 11.0.0
55
+     */
56
+    public function getIcon();
57 57
 
58
-	/**
59
-	 * @param string[] $types
60
-	 * @return string[] An array of allowed apps from which activities should be displayed
61
-	 * @since 11.0.0
62
-	 */
63
-	public function filterTypes(array $types);
58
+    /**
59
+     * @param string[] $types
60
+     * @return string[] An array of allowed apps from which activities should be displayed
61
+     * @since 11.0.0
62
+     */
63
+    public function filterTypes(array $types);
64 64
 
65
-	/**
66
-	 * @return string[] An array of allowed apps from which activities should be displayed
67
-	 * @since 11.0.0
68
-	 */
69
-	public function allowedApps();
65
+    /**
66
+     * @return string[] An array of allowed apps from which activities should be displayed
67
+     * @since 11.0.0
68
+     */
69
+    public function allowedApps();
70 70
 }
71 71
 
Please login to merge, or discard this patch.
lib/public/Activity/IEventMerger.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -30,35 +30,35 @@
 block discarded – undo
30 30
  */
31 31
 interface IEventMerger {
32 32
 
33
-	/**
34
-	 * Combines two events when possible to have grouping:
35
-	 *
36
-	 * Example1: Two events with subject '{user} created {file}' and
37
-	 * $mergeParameter file with different file and same user will be merged
38
-	 * to '{user} created {file1} and {file2}' and the childEvent on the return
39
-	 * will be set, if the events have been merged.
40
-	 *
41
-	 * Example2: Two events with subject '{user} created {file}' and
42
-	 * $mergeParameter file with same file and same user will be merged to
43
-	 * '{user} created {file1}' and the childEvent on the return will be set, if
44
-	 * the events have been merged.
45
-	 *
46
-	 * The following requirements have to be met, in order to be merged:
47
-	 * - Both events need to have the same `getApp()`
48
-	 * - Both events must not have a message `getMessage()`
49
-	 * - Both events need to have the same subject `getSubject()`
50
-	 * - Both events need to have the same object type `getObjectType()`
51
-	 * - The time difference between both events must not be bigger then 3 hours
52
-	 * - Only up to 5 events can be merged.
53
-	 * - All parameters apart from such starting with $mergeParameter must be
54
-	 *   the same for both events.
55
-	 *
56
-	 * @param string $mergeParameter
57
-	 * @param IEvent $event
58
-	 * @param IEvent|null $previousEvent
59
-	 * @return IEvent
60
-	 * @since 11.0
61
-	 */
62
-	public function mergeEvents($mergeParameter, IEvent $event, IEvent $previousEvent = null);
33
+    /**
34
+     * Combines two events when possible to have grouping:
35
+     *
36
+     * Example1: Two events with subject '{user} created {file}' and
37
+     * $mergeParameter file with different file and same user will be merged
38
+     * to '{user} created {file1} and {file2}' and the childEvent on the return
39
+     * will be set, if the events have been merged.
40
+     *
41
+     * Example2: Two events with subject '{user} created {file}' and
42
+     * $mergeParameter file with same file and same user will be merged to
43
+     * '{user} created {file1}' and the childEvent on the return will be set, if
44
+     * the events have been merged.
45
+     *
46
+     * The following requirements have to be met, in order to be merged:
47
+     * - Both events need to have the same `getApp()`
48
+     * - Both events must not have a message `getMessage()`
49
+     * - Both events need to have the same subject `getSubject()`
50
+     * - Both events need to have the same object type `getObjectType()`
51
+     * - The time difference between both events must not be bigger then 3 hours
52
+     * - Only up to 5 events can be merged.
53
+     * - All parameters apart from such starting with $mergeParameter must be
54
+     *   the same for both events.
55
+     *
56
+     * @param string $mergeParameter
57
+     * @param IEvent $event
58
+     * @param IEvent|null $previousEvent
59
+     * @return IEvent
60
+     * @since 11.0
61
+     */
62
+    public function mergeEvents($mergeParameter, IEvent $event, IEvent $previousEvent = null);
63 63
 
64 64
 }
Please login to merge, or discard this patch.