Passed
Push — master ( 599964...a3ab0c )
by Robin
16:02 queued 14s
created
apps/files_trashbin/lib/Trash/ITrashManager.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -24,33 +24,33 @@
 block discarded – undo
24 24
 use OCP\IUser;
25 25
 
26 26
 interface ITrashManager extends ITrashBackend {
27
-	/**
28
-	 * Add a backend for the trashbin
29
-	 *
30
-	 * @param string $storageType
31
-	 * @param ITrashBackend $backend
32
-	 * @since 15.0.0
33
-	 */
34
-	public function registerBackend(string $storageType, ITrashBackend $backend);
27
+    /**
28
+     * Add a backend for the trashbin
29
+     *
30
+     * @param string $storageType
31
+     * @param ITrashBackend $backend
32
+     * @since 15.0.0
33
+     */
34
+    public function registerBackend(string $storageType, ITrashBackend $backend);
35 35
 
36
-	/**
37
-	 * List all trash items in the root of the trashbin
38
-	 *
39
-	 * @param IUser $user
40
-	 * @return ITrashItem[]
41
-	 * @since 15.0.0
42
-	 */
43
-	public function listTrashRoot(IUser $user): array;
36
+    /**
37
+     * List all trash items in the root of the trashbin
38
+     *
39
+     * @param IUser $user
40
+     * @return ITrashItem[]
41
+     * @since 15.0.0
42
+     */
43
+    public function listTrashRoot(IUser $user): array;
44 44
 
45
-	/**
46
-	 * Temporally prevent files from being moved to the trash
47
-	 *
48
-	 * @since 15.0.0
49
-	 */
50
-	public function pauseTrash();
45
+    /**
46
+     * Temporally prevent files from being moved to the trash
47
+     *
48
+     * @since 15.0.0
49
+     */
50
+    public function pauseTrash();
51 51
 
52
-	/**
53
-	 * @since 15.0.0
54
-	 */
55
-	public function resumeTrash();
52
+    /**
53
+     * @since 15.0.0
54
+     */
55
+    public function resumeTrash();
56 56
 }
Please login to merge, or discard this patch.
apps/files_trashbin/lib/Trash/ITrashBackend.php 1 patch
Indentation   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -31,54 +31,54 @@
 block discarded – undo
31 31
  * @since 15.0.0
32 32
  */
33 33
 interface ITrashBackend {
34
-	/**
35
-	 * List all trash items in the root of the trashbin
36
-	 *
37
-	 * @param IUser $user
38
-	 * @return ITrashItem[]
39
-	 * @since 15.0.0
40
-	 */
41
-	public function listTrashRoot(IUser $user): array;
34
+    /**
35
+     * List all trash items in the root of the trashbin
36
+     *
37
+     * @param IUser $user
38
+     * @return ITrashItem[]
39
+     * @since 15.0.0
40
+     */
41
+    public function listTrashRoot(IUser $user): array;
42 42
 
43
-	/**
44
-	 * List all trash items in a subfolder in the trashbin
45
-	 *
46
-	 * @param ITrashItem $folder
47
-	 * @return ITrashItem[]
48
-	 * @since 15.0.0
49
-	 */
50
-	public function listTrashFolder(ITrashItem $folder): array;
43
+    /**
44
+     * List all trash items in a subfolder in the trashbin
45
+     *
46
+     * @param ITrashItem $folder
47
+     * @return ITrashItem[]
48
+     * @since 15.0.0
49
+     */
50
+    public function listTrashFolder(ITrashItem $folder): array;
51 51
 
52
-	/**
53
-	 * Restore a trashbin item
54
-	 *
55
-	 * @param ITrashItem $item
56
-	 * @since 15.0.0
57
-	 */
58
-	public function restoreItem(ITrashItem $item);
52
+    /**
53
+     * Restore a trashbin item
54
+     *
55
+     * @param ITrashItem $item
56
+     * @since 15.0.0
57
+     */
58
+    public function restoreItem(ITrashItem $item);
59 59
 
60
-	/**
61
-	 * Permanently remove an item from trash
62
-	 *
63
-	 * @param ITrashItem $item
64
-	 * @since 15.0.0
65
-	 */
66
-	public function removeItem(ITrashItem $item);
60
+    /**
61
+     * Permanently remove an item from trash
62
+     *
63
+     * @param ITrashItem $item
64
+     * @since 15.0.0
65
+     */
66
+    public function removeItem(ITrashItem $item);
67 67
 
68
-	/**
69
-	 * Move a file or folder to trash
70
-	 *
71
-	 * @param IStorage $storage
72
-	 * @param string $internalPath
73
-	 * @return boolean whether or not the file was moved to trash, if false then the file should be deleted normally
74
-	 * @since 15.0.0
75
-	 */
76
-	public function moveToTrash(IStorage $storage, string $internalPath): bool;
68
+    /**
69
+     * Move a file or folder to trash
70
+     *
71
+     * @param IStorage $storage
72
+     * @param string $internalPath
73
+     * @return boolean whether or not the file was moved to trash, if false then the file should be deleted normally
74
+     * @since 15.0.0
75
+     */
76
+    public function moveToTrash(IStorage $storage, string $internalPath): bool;
77 77
 
78
-	/**
79
-	 * @param IUser $user
80
-	 * @param int $fileId
81
-	 * @return Node|null
82
-	 */
83
-	public function getTrashNodeById(IUser $user, int $fileId);
78
+    /**
79
+     * @param IUser $user
80
+     * @param int $fileId
81
+     * @return Node|null
82
+     */
83
+    public function getTrashNodeById(IUser $user, int $fileId);
84 84
 }
Please login to merge, or discard this patch.
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/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.
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.
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.