Passed
Push — master ( d0668c...20ee35 )
by Joas
14:49 queued 14s
created
lib/public/FullTextSearch/Model/IIndexOptions.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -46,41 +46,41 @@
 block discarded – undo
46 46
 interface IIndexOptions {
47 47
 
48 48
 
49
-	/**
50
-	 * Get the value (as a string) for an option.
51
-	 *
52
-	 * @since 15.0.0
53
-	 *
54
-	 * @param string $option
55
-	 * @param string $default
56
-	 *
57
-	 * @return string
58
-	 */
59
-	public function getOption(string $option, string $default = ''): string;
49
+    /**
50
+     * Get the value (as a string) for an option.
51
+     *
52
+     * @since 15.0.0
53
+     *
54
+     * @param string $option
55
+     * @param string $default
56
+     *
57
+     * @return string
58
+     */
59
+    public function getOption(string $option, string $default = ''): string;
60 60
 
61
-	/**
62
-	 * Get the value (as an array) for an option.
63
-	 *
64
-	 * @since 15.0.0
65
-	 *
66
-	 * @param string $option
67
-	 * @param array $default
68
-	 *
69
-	 * @return array
70
-	 */
71
-	public function getOptionArray(string $option, array $default = []): array;
61
+    /**
62
+     * Get the value (as an array) for an option.
63
+     *
64
+     * @since 15.0.0
65
+     *
66
+     * @param string $option
67
+     * @param array $default
68
+     *
69
+     * @return array
70
+     */
71
+    public function getOptionArray(string $option, array $default = []): array;
72 72
 
73
-	/**
74
-	 * Get the value (as an boolean) for an option.
75
-	 *
76
-	 * @since 15.0.0
77
-	 *
78
-	 * @param string $option
79
-	 * @param bool $default
80
-	 *
81
-	 * @return bool
82
-	 */
83
-	public function getOptionBool(string $option, bool $default): bool;
73
+    /**
74
+     * Get the value (as an boolean) for an option.
75
+     *
76
+     * @since 15.0.0
77
+     *
78
+     * @param string $option
79
+     * @param bool $default
80
+     *
81
+     * @return bool
82
+     */
83
+    public function getOptionBool(string $option, bool $default): bool;
84 84
 
85 85
 }
86 86
 
Please login to merge, or discard this patch.
lib/private/Authentication/Exceptions/ExpiredTokenException.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -26,16 +26,16 @@
 block discarded – undo
26 26
 use OC\Authentication\Token\IToken;
27 27
 
28 28
 class ExpiredTokenException extends InvalidTokenException {
29
-	/** @var IToken */
30
-	private $token;
29
+    /** @var IToken */
30
+    private $token;
31 31
 
32
-	public function __construct(IToken $token) {
33
-		parent::__construct();
32
+    public function __construct(IToken $token) {
33
+        parent::__construct();
34 34
 
35
-		$this->token = $token;
36
-	}
35
+        $this->token = $token;
36
+    }
37 37
 
38
-	public function getToken(): IToken {
39
-		return $this->token;
40
-	}
38
+    public function getToken(): IToken {
39
+        return $this->token;
40
+    }
41 41
 }
Please login to merge, or discard this patch.
apps/files_versions/lib/Versions/IVersionManager.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -25,12 +25,12 @@
 block discarded – undo
25 25
  * @since 15.0.0
26 26
  */
27 27
 interface IVersionManager extends IVersionBackend {
28
-	/**
29
-	 * Register a new backend
30
-	 *
31
-	 * @param string $storageType
32
-	 * @param IVersionBackend $backend
33
-	 * @since 15.0.0
34
-	 */
35
-	public function registerBackend(string $storageType, IVersionBackend $backend);
28
+    /**
29
+     * Register a new backend
30
+     *
31
+     * @param string $storageType
32
+     * @param IVersionBackend $backend
33
+     * @since 15.0.0
34
+     */
35
+    public function registerBackend(string $storageType, IVersionBackend $backend);
36 36
 }
Please login to merge, or discard this patch.
core/Migrations/Version15000Date20181029084625.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -31,23 +31,23 @@
 block discarded – undo
31 31
 
32 32
 class Version15000Date20181029084625 extends SimpleMigrationStep {
33 33
 
34
-	/**
35
-	 * @param IOutput $output
36
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
37
-	 * @param array $options
38
-	 * @return null|ISchemaWrapper
39
-	 */
40
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
41
-		/** @var ISchemaWrapper $schema */
42
-		$schema = $schemaClosure();
34
+    /**
35
+     * @param IOutput $output
36
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
37
+     * @param array $options
38
+     * @return null|ISchemaWrapper
39
+     */
40
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
41
+        /** @var ISchemaWrapper $schema */
42
+        $schema = $schemaClosure();
43 43
 
44
-		$table = $schema->getTable('share');
45
-		$table->addColumn('label', 'string', [
46
-			'notnull' => false,
47
-			'length' => 255,
48
-		]);
44
+        $table = $schema->getTable('share');
45
+        $table->addColumn('label', 'string', [
46
+            'notnull' => false,
47
+            'length' => 255,
48
+        ]);
49 49
 
50
-		return $schema;
51
-	}
50
+        return $schema;
51
+    }
52 52
 
53 53
 }
Please login to merge, or discard this patch.
private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php 1 patch
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -32,60 +32,60 @@
 block discarded – undo
32 32
 use OCP\User\Backend\IPasswordConfirmationBackend;
33 33
 
34 34
 class PasswordConfirmationMiddleware extends Middleware {
35
-	/** @var ControllerMethodReflector */
36
-	private $reflector;
37
-	/** @var ISession */
38
-	private $session;
39
-	/** @var IUserSession */
40
-	private $userSession;
41
-	/** @var ITimeFactory */
42
-	private $timeFactory;
43
-	/** @var array */
44
-	private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
35
+    /** @var ControllerMethodReflector */
36
+    private $reflector;
37
+    /** @var ISession */
38
+    private $session;
39
+    /** @var IUserSession */
40
+    private $userSession;
41
+    /** @var ITimeFactory */
42
+    private $timeFactory;
43
+    /** @var array */
44
+    private $excludedUserBackEnds = ['user_saml' => true, 'user_globalsiteselector' => true];
45 45
 
46
-	/**
47
-	 * PasswordConfirmationMiddleware constructor.
48
-	 *
49
-	 * @param ControllerMethodReflector $reflector
50
-	 * @param ISession $session
51
-	 * @param IUserSession $userSession
52
-	 * @param ITimeFactory $timeFactory
53
-	 */
54
-	public function __construct(ControllerMethodReflector $reflector,
55
-								ISession $session,
56
-								IUserSession $userSession,
57
-								ITimeFactory $timeFactory) {
58
-		$this->reflector = $reflector;
59
-		$this->session = $session;
60
-		$this->userSession = $userSession;
61
-		$this->timeFactory = $timeFactory;
62
-	}
46
+    /**
47
+     * PasswordConfirmationMiddleware constructor.
48
+     *
49
+     * @param ControllerMethodReflector $reflector
50
+     * @param ISession $session
51
+     * @param IUserSession $userSession
52
+     * @param ITimeFactory $timeFactory
53
+     */
54
+    public function __construct(ControllerMethodReflector $reflector,
55
+                                ISession $session,
56
+                                IUserSession $userSession,
57
+                                ITimeFactory $timeFactory) {
58
+        $this->reflector = $reflector;
59
+        $this->session = $session;
60
+        $this->userSession = $userSession;
61
+        $this->timeFactory = $timeFactory;
62
+    }
63 63
 
64
-	/**
65
-	 * @param Controller $controller
66
-	 * @param string $methodName
67
-	 * @throws NotConfirmedException
68
-	 */
69
-	public function beforeController($controller, $methodName) {
70
-		if ($this->reflector->hasAnnotation('PasswordConfirmationRequired')) {
71
-			$user = $this->userSession->getUser();
72
-			$backendClassName = '';
73
-			if ($user !== null) {
74
-				$backend = $user->getBackend();
75
-				if ($backend instanceof IPasswordConfirmationBackend) {
76
-					if (!$backend->canConfirmPassword($user->getUID())) {
77
-						return;
78
-					}
79
-				}
64
+    /**
65
+     * @param Controller $controller
66
+     * @param string $methodName
67
+     * @throws NotConfirmedException
68
+     */
69
+    public function beforeController($controller, $methodName) {
70
+        if ($this->reflector->hasAnnotation('PasswordConfirmationRequired')) {
71
+            $user = $this->userSession->getUser();
72
+            $backendClassName = '';
73
+            if ($user !== null) {
74
+                $backend = $user->getBackend();
75
+                if ($backend instanceof IPasswordConfirmationBackend) {
76
+                    if (!$backend->canConfirmPassword($user->getUID())) {
77
+                        return;
78
+                    }
79
+                }
80 80
 
81
-				$backendClassName = $user->getBackendClassName();
82
-			}
81
+                $backendClassName = $user->getBackendClassName();
82
+            }
83 83
 
84
-			$lastConfirm = (int) $this->session->get('last-password-confirm');
85
-			// we can't check the password against a SAML backend, so skip password confirmation in this case
86
-			if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay
87
-				throw new NotConfirmedException();
88
-			}
89
-		}
90
-	}
84
+            $lastConfirm = (int) $this->session->get('last-password-confirm');
85
+            // we can't check the password against a SAML backend, so skip password confirmation in this case
86
+            if (!isset($this->excludedUserBackEnds[$backendClassName]) && $lastConfirm < ($this->timeFactory->getTime() - (30 * 60 + 15))) { // allow 15 seconds delay
87
+                throw new NotConfirmedException();
88
+            }
89
+        }
90
+    }
91 91
 }
Please login to merge, or discard this patch.
lib/public/User/Backend/IPasswordConfirmationBackend.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@
 block discarded – undo
29 29
  */
30 30
 interface IPasswordConfirmationBackend {
31 31
 
32
-	/**
33
-	 * @since 15.0.0
34
-	 */
35
-	public function canConfirmPassword(string $uid): bool;
32
+    /**
33
+     * @since 15.0.0
34
+     */
35
+    public function canConfirmPassword(string $uid): bool;
36 36
 }
Please login to merge, or discard this patch.
apps/dav/lib/Migration/Version1008Date20181105112049.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -32,18 +32,18 @@
 block discarded – undo
32 32
 
33 33
 class Version1008Date20181105112049 extends SimpleMigrationStep {
34 34
 
35
-	/**
36
-	 * @param IOutput $output
37
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
38
-	 * @param array $options
39
-	 * @return null|ISchemaWrapper
40
-	 */
41
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
42
-		/** @var ISchemaWrapper $schema */
43
-		$schema = $schemaClosure();
44
-		$table = $schema->getTable('calendarsubscriptions');
45
-		$table->dropColumn('source_copy');
35
+    /**
36
+     * @param IOutput $output
37
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
38
+     * @param array $options
39
+     * @return null|ISchemaWrapper
40
+     */
41
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
42
+        /** @var ISchemaWrapper $schema */
43
+        $schema = $schemaClosure();
44
+        $table = $schema->getTable('calendarsubscriptions');
45
+        $table->dropColumn('source_copy');
46 46
 
47
-		return $schema;
48
-	}
47
+        return $schema;
48
+    }
49 49
 }
Please login to merge, or discard this patch.
apps/dav/lib/Migration/Version1008Date20181105104833.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -32,18 +32,18 @@
 block discarded – undo
32 32
 
33 33
 class Version1008Date20181105104833 extends SimpleMigrationStep {
34 34
 
35
-	/**
36
-	 * @param IOutput $output
37
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
38
-	 * @param array $options
39
-	 * @return null|ISchemaWrapper
40
-	 */
41
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
42
-		/** @var ISchemaWrapper $schema */
43
-		$schema = $schemaClosure();
44
-		$table = $schema->getTable('calendarsubscriptions');
45
-		$table->dropColumn('source');
35
+    /**
36
+     * @param IOutput $output
37
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
38
+     * @param array $options
39
+     * @return null|ISchemaWrapper
40
+     */
41
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
42
+        /** @var ISchemaWrapper $schema */
43
+        $schema = $schemaClosure();
44
+        $table = $schema->getTable('calendarsubscriptions');
45
+        $table->dropColumn('source');
46 46
 
47
-		return $schema;
48
-	}
47
+        return $schema;
48
+    }
49 49
 }
Please login to merge, or discard this patch.
lib/public/Security/ICrypto.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -37,31 +37,31 @@
 block discarded – undo
37 37
  */
38 38
 interface ICrypto {
39 39
 
40
-	/**
41
-	 * @param string $message The message to authenticate
42
-	 * @param string $password Password to use (defaults to `secret` in config.php)
43
-	 * @return string Calculated HMAC
44
-	 * @since 8.0.0
45
-	 */
46
-	public function calculateHMAC(string $message, string $password = ''): string;
40
+    /**
41
+     * @param string $message The message to authenticate
42
+     * @param string $password Password to use (defaults to `secret` in config.php)
43
+     * @return string Calculated HMAC
44
+     * @since 8.0.0
45
+     */
46
+    public function calculateHMAC(string $message, string $password = ''): string;
47 47
 
48
-	/**
49
-	 * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
50
-	 * @param string $plaintext
51
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
52
-	 * @return string Authenticated ciphertext
53
-	 * @since 8.0.0
54
-	 */
55
-	public function encrypt(string $plaintext, string $password = ''): string;
48
+    /**
49
+     * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
50
+     * @param string $plaintext
51
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
52
+     * @return string Authenticated ciphertext
53
+     * @since 8.0.0
54
+     */
55
+    public function encrypt(string $plaintext, string $password = ''): string;
56 56
 
57
-	/**
58
-	 * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
59
-	 * @param string $authenticatedCiphertext
60
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
61
-	 * @return string plaintext
62
-	 * @throws \Exception If the HMAC does not match
63
-	 * @throws \Exception If the decryption failed
64
-	 * @since 8.0.0
65
-	 */
66
-	public function decrypt(string $authenticatedCiphertext, string $password = ''): string;
57
+    /**
58
+     * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
59
+     * @param string $authenticatedCiphertext
60
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
61
+     * @return string plaintext
62
+     * @throws \Exception If the HMAC does not match
63
+     * @throws \Exception If the decryption failed
64
+     * @since 8.0.0
65
+     */
66
+    public function decrypt(string $authenticatedCiphertext, string $password = ''): string;
67 67
 }
Please login to merge, or discard this patch.