Completed
Pull Request — master (#10075)
by
unknown
66:02 queued 36:49
created
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.
lib/public/Activity/ISetting.php 1 patch
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -29,48 +29,48 @@
 block discarded – undo
29 29
  */
30 30
 interface ISetting {
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 bool True when the option can be changed for the stream
54
-	 * @since 11.0.0
55
-	 */
56
-	public function canChangeStream();
52
+    /**
53
+     * @return bool True when the option can be changed for the stream
54
+     * @since 11.0.0
55
+     */
56
+    public function canChangeStream();
57 57
 
58
-	/**
59
-	 * @return bool True when the option can be changed for the stream
60
-	 * @since 11.0.0
61
-	 */
62
-	public function isDefaultEnabledStream();
58
+    /**
59
+     * @return bool True when the option can be changed for the stream
60
+     * @since 11.0.0
61
+     */
62
+    public function isDefaultEnabledStream();
63 63
 
64
-	/**
65
-	 * @return bool True when the option can be changed for the mail
66
-	 * @since 11.0.0
67
-	 */
68
-	public function canChangeMail();
64
+    /**
65
+     * @return bool True when the option can be changed for the mail
66
+     * @since 11.0.0
67
+     */
68
+    public function canChangeMail();
69 69
 
70
-	/**
71
-	 * @return bool True when the option can be changed for the stream
72
-	 * @since 11.0.0
73
-	 */
74
-	public function isDefaultEnabledMail();
70
+    /**
71
+     * @return bool True when the option can be changed for the stream
72
+     * @since 11.0.0
73
+     */
74
+    public function isDefaultEnabledMail();
75 75
 }
76 76
 
Please login to merge, or discard this patch.
lib/public/Activity/IProvider.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -28,15 +28,15 @@
 block discarded – undo
28 28
  * @since 11.0.0
29 29
  */
30 30
 interface IProvider {
31
-	/**
32
-	 * @param string $language The language which should be used for translating, e.g. "en"
33
-	 * @param IEvent $event The current event which should be parsed
34
-	 * @param IEvent|null $previousEvent A potential previous event which you can combine with the current one.
35
-	 *                                   To do so, simply use setChildEvent($previousEvent) after setting the
36
-	 *                                   combined subject on the current event.
37
-	 * @return IEvent
38
-	 * @throws \InvalidArgumentException Should be thrown if your provider does not know this event
39
-	 * @since 11.0.0
40
-	 */
41
-	public function parse($language, IEvent $event, IEvent $previousEvent = null);
31
+    /**
32
+     * @param string $language The language which should be used for translating, e.g. "en"
33
+     * @param IEvent $event The current event which should be parsed
34
+     * @param IEvent|null $previousEvent A potential previous event which you can combine with the current one.
35
+     *                                   To do so, simply use setChildEvent($previousEvent) after setting the
36
+     *                                   combined subject on the current event.
37
+     * @return IEvent
38
+     * @throws \InvalidArgumentException Should be thrown if your provider does not know this event
39
+     * @since 11.0.0
40
+     */
41
+    public function parse($language, IEvent $event, IEvent $previousEvent = null);
42 42
 }
Please login to merge, or discard this patch.
lib/public/Activity/IConsumer.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -38,12 +38,12 @@
 block discarded – undo
38 38
  * @since 6.0.0
39 39
  */
40 40
 interface IConsumer {
41
-	/**
42
-	 * @param IEvent $event
43
-	 * @return null
44
-	 * @since 6.0.0
45
-	 * @since 8.2.0 Replaced the parameters with an IEvent object
46
-	 */
47
-	public function receive(IEvent $event);
41
+    /**
42
+     * @param IEvent $event
43
+     * @return null
44
+     * @since 6.0.0
45
+     * @since 8.2.0 Replaced the parameters with an IEvent object
46
+     */
47
+    public function receive(IEvent $event);
48 48
 }
49 49
 
Please login to merge, or discard this patch.
lib/public/IMemcacheTTL.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,12 +29,12 @@
 block discarded – undo
29 29
  * @since 8.2.2
30 30
  */
31 31
 interface IMemcacheTTL extends IMemcache {
32
-	/**
33
-	 * Set the ttl for an existing value
34
-	 *
35
-	 * @param string $key
36
-	 * @param int $ttl time to live in seconds
37
-	 * @since 8.2.2
38
-	 */
39
-	public function setTTL($key, $ttl);
32
+    /**
33
+     * Set the ttl for an existing value
34
+     *
35
+     * @param string $key
36
+     * @param int $ttl time to live in seconds
37
+     * @since 8.2.2
38
+     */
39
+    public function setTTL($key, $ttl);
40 40
 }
Please login to merge, or discard this patch.
lib/public/IUserSession.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -40,44 +40,44 @@
 block discarded – undo
40 40
  * @since 6.0.0
41 41
  */
42 42
 interface IUserSession {
43
-	/**
44
-	 * Do a user login
45
-	 * @param string $user the username
46
-	 * @param string $password the password
47
-	 * @return bool true if successful
48
-	 * @since 6.0.0
49
-	 */
50
-	public function login($user, $password);
43
+    /**
44
+     * Do a user login
45
+     * @param string $user the username
46
+     * @param string $password the password
47
+     * @return bool true if successful
48
+     * @since 6.0.0
49
+     */
50
+    public function login($user, $password);
51 51
 
52
-	/**
53
-	 * Logs the user out including all the session data
54
-	 * Logout, destroys session
55
-	 * @return void
56
-	 * @since 6.0.0
57
-	 */
58
-	public function logout();
52
+    /**
53
+     * Logs the user out including all the session data
54
+     * Logout, destroys session
55
+     * @return void
56
+     * @since 6.0.0
57
+     */
58
+    public function logout();
59 59
 
60
-	/**
61
-	 * set the currently active user
62
-	 *
63
-	 * @param \OCP\IUser|null $user
64
-	 * @since 8.0.0
65
-	 */
66
-	public function setUser($user);
60
+    /**
61
+     * set the currently active user
62
+     *
63
+     * @param \OCP\IUser|null $user
64
+     * @since 8.0.0
65
+     */
66
+    public function setUser($user);
67 67
 
68
-	/**
69
-	 * get the current active user
70
-	 *
71
-	 * @return \OCP\IUser|null Current user, otherwise null
72
-	 * @since 8.0.0
73
-	 */
74
-	public function getUser();
68
+    /**
69
+     * get the current active user
70
+     *
71
+     * @return \OCP\IUser|null Current user, otherwise null
72
+     * @since 8.0.0
73
+     */
74
+    public function getUser();
75 75
 
76
-	/**
77
-	 * Checks whether the user is logged in
78
-	 *
79
-	 * @return bool if logged in
80
-	 * @since 8.0.0
81
-	 */
82
-	public function isLoggedIn();
76
+    /**
77
+     * Checks whether the user is logged in
78
+     *
79
+     * @return bool if logged in
80
+     * @since 8.0.0
81
+     */
82
+    public function isLoggedIn();
83 83
 }
Please login to merge, or discard this patch.
lib/public/IDateTimeZone.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,10 +30,10 @@
 block discarded – undo
30 30
  * @since 8.0.0
31 31
  */
32 32
 interface IDateTimeZone {
33
-	/**
34
-	 * @param bool|int $timestamp
35
-	 * @return \DateTimeZone
36
-	 * @since 8.0.0 - parameter $timestamp was added in 8.1.0
37
-	 */
38
-	public function getTimeZone($timestamp = false);
33
+    /**
34
+     * @param bool|int $timestamp
35
+     * @return \DateTimeZone
36
+     * @since 8.0.0 - parameter $timestamp was added in 8.1.0
37
+     */
38
+    public function getTimeZone($timestamp = false);
39 39
 }
Please login to merge, or discard this patch.
lib/public/Security/ICredentialsManager.php 1 patch
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -30,43 +30,43 @@
 block discarded – undo
30 30
  */
31 31
 interface ICredentialsManager {
32 32
 
33
-	/**
34
-	 * Store a set of credentials
35
-	 *
36
-	 * @param string|null $userId Null for system-wide credentials
37
-	 * @param string $identifier
38
-	 * @param mixed $credentials
39
-	 * @since 8.2.0
40
-	 */
41
-	public function store($userId, $identifier, $credentials);
33
+    /**
34
+     * Store a set of credentials
35
+     *
36
+     * @param string|null $userId Null for system-wide credentials
37
+     * @param string $identifier
38
+     * @param mixed $credentials
39
+     * @since 8.2.0
40
+     */
41
+    public function store($userId, $identifier, $credentials);
42 42
 
43
-	/**
44
-	 * Retrieve a set of credentials
45
-	 *
46
-	 * @param string|null $userId Null for system-wide credentials
47
-	 * @param string $identifier
48
-	 * @return mixed
49
-	 * @since 8.2.0
50
-	 */
51
-	public function retrieve($userId, $identifier);
43
+    /**
44
+     * Retrieve a set of credentials
45
+     *
46
+     * @param string|null $userId Null for system-wide credentials
47
+     * @param string $identifier
48
+     * @return mixed
49
+     * @since 8.2.0
50
+     */
51
+    public function retrieve($userId, $identifier);
52 52
 
53
-	/**
54
-	 * Delete a set of credentials
55
-	 *
56
-	 * @param string|null $userId Null for system-wide credentials
57
-	 * @param string $identifier
58
-	 * @return int rows removed
59
-	 * @since 8.2.0
60
-	 */
61
-	public function delete($userId, $identifier);
53
+    /**
54
+     * Delete a set of credentials
55
+     *
56
+     * @param string|null $userId Null for system-wide credentials
57
+     * @param string $identifier
58
+     * @return int rows removed
59
+     * @since 8.2.0
60
+     */
61
+    public function delete($userId, $identifier);
62 62
 
63
-	/**
64
-	 * Erase all credentials stored for a user
65
-	 *
66
-	 * @param string $userId
67
-	 * @return int rows removed
68
-	 * @since 8.2.0
69
-	 */
70
-	public function erase($userId);
63
+    /**
64
+     * Erase all credentials stored for a user
65
+     *
66
+     * @param string $userId
67
+     * @return int rows removed
68
+     * @since 8.2.0
69
+     */
70
+    public function erase($userId);
71 71
 
72 72
 }
Please login to merge, or discard this patch.
lib/public/Security/IContentSecurityPolicyManager.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -30,22 +30,22 @@
 block discarded – undo
30 30
  * @since 9.0.0
31 31
  */
32 32
 interface IContentSecurityPolicyManager {
33
-	/**
34
-	 * Allows to inject something into the default content policy. This is for
35
-	 * example useful when you're injecting Javascript code into a view belonging
36
-	 * to another controller and cannot modify its Content-Security-Policy itself.
37
-	 * Note that the adjustment is only applied to applications that use AppFramework
38
-	 * controllers.
39
-	 *
40
-	 * To use this from your `app.php` use `\OC::$server->getContentSecurityPolicyManager()->addDefaultPolicy($policy)`,
41
-	 * $policy has to be of type `\OCP\AppFramework\Http\ContentSecurityPolicy`.
42
-	 *
43
-	 * WARNING: Using this API incorrectly may make the instance more insecure.
44
-	 * Do think twice before adding whitelisting resources. Please do also note
45
-	 * that it is not possible to use the `disallowXYZ` functions.
46
-	 *
47
-	 * @param EmptyContentSecurityPolicy $policy
48
-	 * @since 9.0.0
49
-	 */
50
-	public function addDefaultPolicy(EmptyContentSecurityPolicy $policy);
33
+    /**
34
+     * Allows to inject something into the default content policy. This is for
35
+     * example useful when you're injecting Javascript code into a view belonging
36
+     * to another controller and cannot modify its Content-Security-Policy itself.
37
+     * Note that the adjustment is only applied to applications that use AppFramework
38
+     * controllers.
39
+     *
40
+     * To use this from your `app.php` use `\OC::$server->getContentSecurityPolicyManager()->addDefaultPolicy($policy)`,
41
+     * $policy has to be of type `\OCP\AppFramework\Http\ContentSecurityPolicy`.
42
+     *
43
+     * WARNING: Using this API incorrectly may make the instance more insecure.
44
+     * Do think twice before adding whitelisting resources. Please do also note
45
+     * that it is not possible to use the `disallowXYZ` functions.
46
+     *
47
+     * @param EmptyContentSecurityPolicy $policy
48
+     * @since 9.0.0
49
+     */
50
+    public function addDefaultPolicy(EmptyContentSecurityPolicy $policy);
51 51
 }
Please login to merge, or discard this patch.