Passed
Push — master ( 27fb46...dad31c )
by rakekniven
15:02 queued 12s
created
lib/private/Files/Notify/RenameChange.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -26,27 +26,27 @@
 block discarded – undo
26 26
 use OCP\Files\Notify\IRenameChange;
27 27
 
28 28
 class RenameChange extends Change implements IRenameChange {
29
-	/** @var string */
30
-	private $targetPath;
29
+    /** @var string */
30
+    private $targetPath;
31 31
 
32
-	/**
33
-	 * Change constructor.
34
-	 *
35
-	 * @param int $type
36
-	 * @param string $path
37
-	 * @param string $targetPath
38
-	 */
39
-	public function __construct($type, $path, $targetPath) {
40
-		parent::__construct($type, $path);
41
-		$this->targetPath = $targetPath;
42
-	}
32
+    /**
33
+     * Change constructor.
34
+     *
35
+     * @param int $type
36
+     * @param string $path
37
+     * @param string $targetPath
38
+     */
39
+    public function __construct($type, $path, $targetPath) {
40
+        parent::__construct($type, $path);
41
+        $this->targetPath = $targetPath;
42
+    }
43 43
 
44
-	/**
45
-	 * Get the new path of the renamed file relative to the storage root
46
-	 *
47
-	 * @return string
48
-	 */
49
-	public function getTargetPath() {
50
-		return $this->targetPath;
51
-	}
44
+    /**
45
+     * Get the new path of the renamed file relative to the storage root
46
+     *
47
+     * @return string
48
+     */
49
+    public function getTargetPath() {
50
+        return $this->targetPath;
51
+    }
52 52
 }
Please login to merge, or discard this patch.
lib/private/Files/Notify/Change.php 1 patch
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -26,40 +26,40 @@
 block discarded – undo
26 26
 use OCP\Files\Notify\IChange;
27 27
 
28 28
 class Change implements IChange {
29
-	/** @var int */
30
-	private $type;
29
+    /** @var int */
30
+    private $type;
31 31
 
32
-	/** @var string */
33
-	private $path;
32
+    /** @var string */
33
+    private $path;
34 34
 
35
-	/**
36
-	 * Change constructor.
37
-	 *
38
-	 * @param int $type
39
-	 * @param string $path
40
-	 */
41
-	public function __construct($type, $path) {
42
-		$this->type = $type;
43
-		$this->path = $path;
44
-	}
35
+    /**
36
+     * Change constructor.
37
+     *
38
+     * @param int $type
39
+     * @param string $path
40
+     */
41
+    public function __construct($type, $path) {
42
+        $this->type = $type;
43
+        $this->path = $path;
44
+    }
45 45
 
46
-	/**
47
-	 * Get the type of the change
48
-	 *
49
-	 * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED
50
-	 */
51
-	public function getType() {
52
-		return $this->type;
53
-	}
46
+    /**
47
+     * Get the type of the change
48
+     *
49
+     * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED
50
+     */
51
+    public function getType() {
52
+        return $this->type;
53
+    }
54 54
 
55
-	/**
56
-	 * Get the path of the file that was changed relative to the root of the storage
57
-	 *
58
-	 * Note, for rename changes this path is the old path for the file
59
-	 *
60
-	 * @return mixed
61
-	 */
62
-	public function getPath() {
63
-		return $this->path;
64
-	}
55
+    /**
56
+     * Get the path of the file that was changed relative to the root of the storage
57
+     *
58
+     * Note, for rename changes this path is the old path for the file
59
+     *
60
+     * @return mixed
61
+     */
62
+    public function getPath() {
63
+        return $this->path;
64
+    }
65 65
 }
Please login to merge, or discard this patch.
AppFramework/Middleware/Security/Exceptions/NotConfirmedException.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
  * @package OC\AppFramework\Middleware\Security\Exceptions
32 32
  */
33 33
 class NotConfirmedException extends SecurityException {
34
-	public function __construct() {
35
-		parent::__construct('Password confirmation is required', Http::STATUS_FORBIDDEN);
36
-	}
34
+    public function __construct() {
35
+        parent::__construct('Password confirmation is required', Http::STATUS_FORBIDDEN);
36
+    }
37 37
 }
Please login to merge, or discard this patch.
Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
  * @package OC\AppFramework\Middleware\Security\Exceptions
35 35
  */
36 36
 class CrossSiteRequestForgeryException extends SecurityException {
37
-	public function __construct() {
38
-		parent::__construct('CSRF check failed', Http::STATUS_PRECONDITION_FAILED);
39
-	}
37
+    public function __construct() {
38
+        parent::__construct('CSRF check failed', Http::STATUS_PRECONDITION_FAILED);
39
+    }
40 40
 }
Please login to merge, or discard this patch.
AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
  * @package OC\AppFramework\Middleware\Security\Exceptions
35 35
  */
36 36
 class AppNotEnabledException extends SecurityException {
37
-	public function __construct() {
38
-		parent::__construct('App is not enabled', Http::STATUS_PRECONDITION_FAILED);
39
-	}
37
+    public function __construct() {
38
+        parent::__construct('App is not enabled', Http::STATUS_PRECONDITION_FAILED);
39
+    }
40 40
 }
Please login to merge, or discard this patch.
AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
  * @package OC\AppFramework\Middleware\Security\Exceptions
35 35
  */
36 36
 class NotLoggedInException extends SecurityException {
37
-	public function __construct() {
38
-		parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
39
-	}
37
+    public function __construct() {
38
+        parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
39
+    }
40 40
 }
Please login to merge, or discard this patch.
lib/private/Repair/NC11/FixMountStorages.php 2 patches
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -29,50 +29,50 @@
 block discarded – undo
29 29
 
30 30
 class FixMountStorages implements IRepairStep {
31 31
 
32
-	/** @var IDBConnection */
33
-	private $db;
32
+    /** @var IDBConnection */
33
+    private $db;
34 34
 
35
-	/**
36
-	 * @param IDBConnection $db
37
-	 */
38
-	public function __construct(IDBConnection $db) {
39
-		$this->db = $db;
40
-	}
35
+    /**
36
+     * @param IDBConnection $db
37
+     */
38
+    public function __construct(IDBConnection $db) {
39
+        $this->db = $db;
40
+    }
41 41
 
42
-	/**
43
-	 * @return string
44
-	 */
45
-	public function getName() {
46
-		return 'Fix potential broken mount points';
47
-	}
42
+    /**
43
+     * @return string
44
+     */
45
+    public function getName() {
46
+        return 'Fix potential broken mount points';
47
+    }
48 48
 
49
-	public function run(IOutput $output) {
50
-		$query = $this->db->getQueryBuilder();
51
-		$query->select('m.id', 'f.storage')
52
-			->from('mounts', 'm')
53
-			->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid'))
54
-			->where($query->expr()->neq('m.storage_id', 'f.storage'));
49
+    public function run(IOutput $output) {
50
+        $query = $this->db->getQueryBuilder();
51
+        $query->select('m.id', 'f.storage')
52
+            ->from('mounts', 'm')
53
+            ->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid'))
54
+            ->where($query->expr()->neq('m.storage_id', 'f.storage'));
55 55
 
56
-		$update = $this->db->getQueryBuilder();
57
-		$update->update('mounts')
58
-			->set('storage_id', $update->createParameter('storage'))
59
-			->where($query->expr()->eq('id', $update->createParameter('mount')));
56
+        $update = $this->db->getQueryBuilder();
57
+        $update->update('mounts')
58
+            ->set('storage_id', $update->createParameter('storage'))
59
+            ->where($query->expr()->eq('id', $update->createParameter('mount')));
60 60
 
61
-		$result = $query->execute();
62
-		$entriesUpdated = 0;
63
-		while ($row = $result->fetch()) {
64
-			$update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT)
65
-				->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT);
66
-			$update->execute();
67
-			$entriesUpdated++;
68
-		}
69
-		$result->closeCursor();
61
+        $result = $query->execute();
62
+        $entriesUpdated = 0;
63
+        while ($row = $result->fetch()) {
64
+            $update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT)
65
+                ->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT);
66
+            $update->execute();
67
+            $entriesUpdated++;
68
+        }
69
+        $result->closeCursor();
70 70
 
71
-		if ($entriesUpdated > 0) {
72
-			$output->info($entriesUpdated . ' mounts updated');
73
-			return;
74
-		}
71
+        if ($entriesUpdated > 0) {
72
+            $output->info($entriesUpdated . ' mounts updated');
73
+            return;
74
+        }
75 75
 
76
-		$output->info('No mounts updated');
77
-	}
76
+        $output->info('No mounts updated');
77
+    }
78 78
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
 		$result->closeCursor();
70 70
 
71 71
 		if ($entriesUpdated > 0) {
72
-			$output->info($entriesUpdated . ' mounts updated');
72
+			$output->info($entriesUpdated.' mounts updated');
73 73
 			return;
74 74
 		}
75 75
 
Please login to merge, or discard this patch.
lib/private/Repair/SqliteAutoincrement.php 1 patch
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -36,66 +36,66 @@
 block discarded – undo
36 36
  * altered in order to retrigger SQL schema generation through OCSqlitePlatform.
37 37
  */
38 38
 class SqliteAutoincrement implements IRepairStep {
39
-	/**
40
-	 * @var \OC\DB\Connection
41
-	 */
42
-	protected $connection;
39
+    /**
40
+     * @var \OC\DB\Connection
41
+     */
42
+    protected $connection;
43 43
 
44
-	/**
45
-	 * @param \OC\DB\Connection $connection
46
-	 */
47
-	public function __construct($connection) {
48
-		$this->connection = $connection;
49
-	}
44
+    /**
45
+     * @param \OC\DB\Connection $connection
46
+     */
47
+    public function __construct($connection) {
48
+        $this->connection = $connection;
49
+    }
50 50
 
51
-	public function getName() {
52
-		return 'Repair SQLite autoincrement';
53
-	}
51
+    public function getName() {
52
+        return 'Repair SQLite autoincrement';
53
+    }
54 54
 
55
-	/**
56
-	 * Fix mime types
57
-	 */
58
-	public function run(IOutput $out) {
59
-		if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
60
-			return;
61
-		}
55
+    /**
56
+     * Fix mime types
57
+     */
58
+    public function run(IOutput $out) {
59
+        if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
60
+            return;
61
+        }
62 62
 
63
-		$sourceSchema = $this->connection->getSchemaManager()->createSchema();
63
+        $sourceSchema = $this->connection->getSchemaManager()->createSchema();
64 64
 
65
-		$schemaDiff = new SchemaDiff();
65
+        $schemaDiff = new SchemaDiff();
66 66
 
67
-		foreach ($sourceSchema->getTables() as $tableSchema) {
68
-			$primaryKey = $tableSchema->getPrimaryKey();
69
-			if (!$primaryKey) {
70
-				continue;
71
-			}
67
+        foreach ($sourceSchema->getTables() as $tableSchema) {
68
+            $primaryKey = $tableSchema->getPrimaryKey();
69
+            if (!$primaryKey) {
70
+                continue;
71
+            }
72 72
 
73
-			$columnNames = $primaryKey->getColumns();
73
+            $columnNames = $primaryKey->getColumns();
74 74
 
75
-			// add a column diff for every primary key column,
76
-			// but do not actually change anything, this will
77
-			// force the generation of SQL statements to alter
78
-			// those tables, which will then trigger the
79
-			// specific SQL code from OCSqlitePlatform
80
-			try {
81
-				$tableDiff = new TableDiff($tableSchema->getName());
82
-				$tableDiff->fromTable = $tableSchema;
83
-				foreach ($columnNames as $columnName) {
84
-					$columnSchema = $tableSchema->getColumn($columnName);
85
-					$columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema);
86
-					$tableDiff->changedColumns[] = $columnDiff;
87
-					$schemaDiff->changedTables[] = $tableDiff;
88
-				}
89
-			} catch (SchemaException $e) {
90
-				// ignore
91
-			}
92
-		}
75
+            // add a column diff for every primary key column,
76
+            // but do not actually change anything, this will
77
+            // force the generation of SQL statements to alter
78
+            // those tables, which will then trigger the
79
+            // specific SQL code from OCSqlitePlatform
80
+            try {
81
+                $tableDiff = new TableDiff($tableSchema->getName());
82
+                $tableDiff->fromTable = $tableSchema;
83
+                foreach ($columnNames as $columnName) {
84
+                    $columnSchema = $tableSchema->getColumn($columnName);
85
+                    $columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema);
86
+                    $tableDiff->changedColumns[] = $columnDiff;
87
+                    $schemaDiff->changedTables[] = $tableDiff;
88
+                }
89
+            } catch (SchemaException $e) {
90
+                // ignore
91
+            }
92
+        }
93 93
 
94
-		$this->connection->beginTransaction();
95
-		foreach ($schemaDiff->toSql($this->connection->getDatabasePlatform()) as $sql) {
96
-			$this->connection->query($sql);
97
-		}
98
-		$this->connection->commit();
99
-	}
94
+        $this->connection->beginTransaction();
95
+        foreach ($schemaDiff->toSql($this->connection->getDatabasePlatform()) as $sql) {
96
+            $this->connection->query($sql);
97
+        }
98
+        $this->connection->commit();
99
+    }
100 100
 }
101 101
 
Please login to merge, or discard this patch.
lib/private/Repair/OldGroupMembershipShares.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
 		$result->closeCursor();
94 94
 
95 95
 		if ($deletedEntries) {
96
-			$output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
96
+			$output->info('Removed '.$deletedEntries.' shares where user is not a member of the group anymore');
97 97
 		}
98 98
 	}
99 99
 
Please login to merge, or discard this patch.
Indentation   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -30,88 +30,88 @@
 block discarded – undo
30 30
 
31 31
 class OldGroupMembershipShares implements IRepairStep {
32 32
 
33
-	/** @var \OCP\IDBConnection */
34
-	protected $connection;
33
+    /** @var \OCP\IDBConnection */
34
+    protected $connection;
35 35
 
36
-	/** @var \OCP\IGroupManager */
37
-	protected $groupManager;
36
+    /** @var \OCP\IGroupManager */
37
+    protected $groupManager;
38 38
 
39
-	/**
40
-	 * @var array [gid => [uid => (bool)]]
41
-	 */
42
-	protected $memberships;
39
+    /**
40
+     * @var array [gid => [uid => (bool)]]
41
+     */
42
+    protected $memberships;
43 43
 
44
-	/**
45
-	 * @param IDBConnection $connection
46
-	 * @param IGroupManager $groupManager
47
-	 */
48
-	public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
49
-		$this->connection = $connection;
50
-		$this->groupManager = $groupManager;
51
-	}
44
+    /**
45
+     * @param IDBConnection $connection
46
+     * @param IGroupManager $groupManager
47
+     */
48
+    public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
49
+        $this->connection = $connection;
50
+        $this->groupManager = $groupManager;
51
+    }
52 52
 
53
-	/**
54
-	 * Returns the step's name
55
-	 *
56
-	 * @return string
57
-	 */
58
-	public function getName() {
59
-		return 'Remove shares of old group memberships';
60
-	}
53
+    /**
54
+     * Returns the step's name
55
+     *
56
+     * @return string
57
+     */
58
+    public function getName() {
59
+        return 'Remove shares of old group memberships';
60
+    }
61 61
 
62
-	/**
63
-	 * Run repair step.
64
-	 * Must throw exception on error.
65
-	 *
66
-	 * @throws \Exception in case of failure
67
-	 */
68
-	public function run(IOutput $output) {
69
-		$deletedEntries = 0;
62
+    /**
63
+     * Run repair step.
64
+     * Must throw exception on error.
65
+     *
66
+     * @throws \Exception in case of failure
67
+     */
68
+    public function run(IOutput $output) {
69
+        $deletedEntries = 0;
70 70
 
71
-		$query = $this->connection->getQueryBuilder();
72
-		$query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
73
-			->from('share', 's1')
74
-			->where($query->expr()->isNotNull('s1.parent'))
75
-				// \OC\Share\Constant::$shareTypeGroupUserUnique === 2
76
-				->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
77
-				->andWhere($query->expr()->isNotNull('s2.id'))
78
-				->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(IShare::TYPE_GROUP)))
79
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
71
+        $query = $this->connection->getQueryBuilder();
72
+        $query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
73
+            ->from('share', 's1')
74
+            ->where($query->expr()->isNotNull('s1.parent'))
75
+                // \OC\Share\Constant::$shareTypeGroupUserUnique === 2
76
+                ->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
77
+                ->andWhere($query->expr()->isNotNull('s2.id'))
78
+                ->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(IShare::TYPE_GROUP)))
79
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
80 80
 
81
-		$deleteQuery = $this->connection->getQueryBuilder();
82
-		$deleteQuery->delete('share')
83
-			->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
81
+        $deleteQuery = $this->connection->getQueryBuilder();
82
+        $deleteQuery->delete('share')
83
+            ->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
84 84
 
85
-		$result = $query->execute();
86
-		while ($row = $result->fetch()) {
87
-			if (!$this->isMember($row['group'], $row['user'])) {
88
-				$deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
89
-					->execute();
90
-			}
91
-		}
92
-		$result->closeCursor();
85
+        $result = $query->execute();
86
+        while ($row = $result->fetch()) {
87
+            if (!$this->isMember($row['group'], $row['user'])) {
88
+                $deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
89
+                    ->execute();
90
+            }
91
+        }
92
+        $result->closeCursor();
93 93
 
94
-		if ($deletedEntries) {
95
-			$output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
96
-		}
97
-	}
94
+        if ($deletedEntries) {
95
+            $output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
96
+        }
97
+    }
98 98
 
99
-	/**
100
-	 * @param string $gid
101
-	 * @param string $uid
102
-	 * @return bool
103
-	 */
104
-	protected function isMember($gid, $uid) {
105
-		if (isset($this->memberships[$gid][$uid])) {
106
-			return $this->memberships[$gid][$uid];
107
-		}
99
+    /**
100
+     * @param string $gid
101
+     * @param string $uid
102
+     * @return bool
103
+     */
104
+    protected function isMember($gid, $uid) {
105
+        if (isset($this->memberships[$gid][$uid])) {
106
+            return $this->memberships[$gid][$uid];
107
+        }
108 108
 
109
-		$isMember = $this->groupManager->isInGroup($uid, $gid);
110
-		if (!isset($this->memberships[$gid])) {
111
-			$this->memberships[$gid] = [];
112
-		}
113
-		$this->memberships[$gid][$uid] = $isMember;
109
+        $isMember = $this->groupManager->isInGroup($uid, $gid);
110
+        if (!isset($this->memberships[$gid])) {
111
+            $this->memberships[$gid] = [];
112
+        }
113
+        $this->memberships[$gid][$uid] = $isMember;
114 114
 
115
-		return $isMember;
116
-	}
115
+        return $isMember;
116
+    }
117 117
 }
Please login to merge, or discard this patch.