Passed
Push — master ( f61779...efbe97 )
by John
31:43 queued 16:46
created
apps/files_trashbin/lib/Sabre/AbstractTrashFolder.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -29,49 +29,49 @@
 block discarded – undo
29 29
 use Sabre\DAV\ICollection;
30 30
 
31 31
 abstract class AbstractTrashFolder extends AbstractTrash implements ICollection, ITrash {
32
-	public function getChildren(): array {
33
-		$entries = $this->trashManager->listTrashFolder($this->data);
32
+    public function getChildren(): array {
33
+        $entries = $this->trashManager->listTrashFolder($this->data);
34 34
 
35
-		$children = array_map(function (ITrashItem $entry) {
36
-			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
37
-				return new TrashFolderFolder($this->trashManager, $entry);
38
-			}
39
-			return new TrashFolderFile($this->trashManager, $entry);
40
-		}, $entries);
35
+        $children = array_map(function (ITrashItem $entry) {
36
+            if ($entry->getType() === FileInfo::TYPE_FOLDER) {
37
+                return new TrashFolderFolder($this->trashManager, $entry);
38
+            }
39
+            return new TrashFolderFile($this->trashManager, $entry);
40
+        }, $entries);
41 41
 
42
-		return $children;
43
-	}
42
+        return $children;
43
+    }
44 44
 
45
-	public function getChild($name): ITrash {
46
-		$entries = $this->getChildren();
45
+    public function getChild($name): ITrash {
46
+        $entries = $this->getChildren();
47 47
 
48
-		foreach ($entries as $entry) {
49
-			if ($entry->getName() === $name) {
50
-				return $entry;
51
-			}
52
-		}
48
+        foreach ($entries as $entry) {
49
+            if ($entry->getName() === $name) {
50
+                return $entry;
51
+            }
52
+        }
53 53
 
54
-		throw new NotFound();
55
-	}
54
+        throw new NotFound();
55
+    }
56 56
 
57
-	public function childExists($name): bool {
58
-		try {
59
-			$this->getChild($name);
60
-			return true;
61
-		} catch (NotFound $e) {
62
-			return false;
63
-		}
64
-	}
57
+    public function childExists($name): bool {
58
+        try {
59
+            $this->getChild($name);
60
+            return true;
61
+        } catch (NotFound $e) {
62
+            return false;
63
+        }
64
+    }
65 65
 
66
-	public function setName($name) {
67
-		throw new Forbidden();
68
-	}
66
+    public function setName($name) {
67
+        throw new Forbidden();
68
+    }
69 69
 
70
-	public function createFile($name, $data = null) {
71
-		throw new Forbidden();
72
-	}
70
+    public function createFile($name, $data = null) {
71
+        throw new Forbidden();
72
+    }
73 73
 
74
-	public function createDirectory($name) {
75
-		throw new Forbidden();
76
-	}
74
+    public function createDirectory($name) {
75
+        throw new Forbidden();
76
+    }
77 77
 }
Please login to merge, or discard this patch.
apps/files_trashbin/lib/Sabre/TrashFile.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -25,11 +25,11 @@
 block discarded – undo
25 25
 namespace OCA\Files_Trashbin\Sabre;
26 26
 
27 27
 class TrashFile extends AbstractTrashFile {
28
-	public function get() {
29
-		return $this->data->getStorage()->fopen($this->data->getInternalPath() . '.d' . $this->getLastModified(), 'rb');
30
-	}
28
+    public function get() {
29
+        return $this->data->getStorage()->fopen($this->data->getInternalPath() . '.d' . $this->getLastModified(), 'rb');
30
+    }
31 31
 
32
-	public function getName(): string {
33
-		return $this->data->getName() . '.d' . $this->getLastModified();
34
-	}
32
+    public function getName(): string {
33
+        return $this->data->getName() . '.d' . $this->getLastModified();
34
+    }
35 35
 }
Please login to merge, or discard this patch.
lib/public/FullTextSearch/Service/ISearchService.php 1 patch
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -45,45 +45,45 @@
 block discarded – undo
45 45
 interface ISearchService {
46 46
 
47 47
 
48
-	/**
49
-	 * generate a search request, based on an array:
50
-	 *
51
-	 * $request =
52
-	 *   [
53
-	 *        'providers' =>    (string/array) 'all'
54
-	 *        'author' =>       (string) owner of the document.
55
-	 *        'search' =>       (string) search string,
56
-	 *        'size' =>         (int) number of items to be return
57
-	 *        'page' =>         (int) page
58
-	 *        'parts' =>        (array) parts of document to search within,
59
-	 *        'options' =       (array) search options,
60
-	 *        'tags'     =>     (array) tags,
61
-	 *        'metatags' =>     (array) metatags,
62
-	 *        'subtags'  =>     (array) subtags
63
-	 *   ]
64
-	 *
65
-	 * 'providers' can be an array of providerIds
66
-	 *
67
-	 * @since 15.0.0
68
-	 *
69
-	 * @param array $request
70
-	 *
71
-	 * @return ISearchRequest
72
-	 */
73
-	public function generateSearchRequest(array $request): ISearchRequest;
48
+    /**
49
+     * generate a search request, based on an array:
50
+     *
51
+     * $request =
52
+     *   [
53
+     *        'providers' =>    (string/array) 'all'
54
+     *        'author' =>       (string) owner of the document.
55
+     *        'search' =>       (string) search string,
56
+     *        'size' =>         (int) number of items to be return
57
+     *        'page' =>         (int) page
58
+     *        'parts' =>        (array) parts of document to search within,
59
+     *        'options' =       (array) search options,
60
+     *        'tags'     =>     (array) tags,
61
+     *        'metatags' =>     (array) metatags,
62
+     *        'subtags'  =>     (array) subtags
63
+     *   ]
64
+     *
65
+     * 'providers' can be an array of providerIds
66
+     *
67
+     * @since 15.0.0
68
+     *
69
+     * @param array $request
70
+     *
71
+     * @return ISearchRequest
72
+     */
73
+    public function generateSearchRequest(array $request): ISearchRequest;
74 74
 
75 75
 
76
-	/**
77
-	 * Search documents
78
-	 *
79
-	 * @since 15.0.0
80
-	 *
81
-	 * @param string $userId
82
-	 * @param ISearchRequest $searchRequest
83
-	 *
84
-	 * @return ISearchResult[]
85
-	 */
86
-	public function search(string $userId, ISearchRequest $searchRequest): array;
76
+    /**
77
+     * Search documents
78
+     *
79
+     * @since 15.0.0
80
+     *
81
+     * @param string $userId
82
+     * @param ISearchRequest $searchRequest
83
+     *
84
+     * @return ISearchResult[]
85
+     */
86
+    public function search(string $userId, ISearchRequest $searchRequest): array;
87 87
 
88 88
 }
89 89
 
Please login to merge, or discard this patch.
lib/public/FullTextSearch/Service/IProviderService.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -41,24 +41,24 @@
 block discarded – undo
41 41
 interface IProviderService {
42 42
 
43 43
 
44
-	/**
45
-	 * Check if the provider $providerId is already indexed.
46
-	 *
47
-	 * @since 15.0.0
48
-	 *
49
-	 * @param string $providerId
50
-	 *
51
-	 * @return bool
52
-	 */
53
-	public function isProviderIndexed(string $providerId);
44
+    /**
45
+     * Check if the provider $providerId is already indexed.
46
+     *
47
+     * @since 15.0.0
48
+     *
49
+     * @param string $providerId
50
+     *
51
+     * @return bool
52
+     */
53
+    public function isProviderIndexed(string $providerId);
54 54
 
55 55
 
56
-	/**
57
-	 * Add the Javascript API in the navigation page of an app.
58
-	 *
59
-	 * @since 15.0.0
60
-	 */
61
-	public function addJavascriptAPI();
56
+    /**
57
+     * Add the Javascript API in the navigation page of an app.
58
+     *
59
+     * @since 15.0.0
60
+     */
61
+    public function addJavascriptAPI();
62 62
 
63 63
 
64 64
 }
Please login to merge, or discard this patch.
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.