Passed
Push — master ( 35aa34...c9fcf5 )
by Roeland
49:09 queued 29:27
created
lib/private/Files/Storage/StorageFactory.php 1 patch
Indentation   +70 added lines, -70 removed lines patch added patch discarded remove patch
@@ -29,80 +29,80 @@
 block discarded – undo
29 29
 use OCP\Files\Storage\IStorageFactory;
30 30
 
31 31
 class StorageFactory implements IStorageFactory {
32
-	/**
33
-	 * @var array[] [$name=>['priority'=>$priority, 'wrapper'=>$callable] $storageWrappers
34
-	 */
35
-	private $storageWrappers = [];
32
+    /**
33
+     * @var array[] [$name=>['priority'=>$priority, 'wrapper'=>$callable] $storageWrappers
34
+     */
35
+    private $storageWrappers = [];
36 36
 
37
-	/**
38
-	 * allow modifier storage behaviour by adding wrappers around storages
39
-	 *
40
-	 * $callback should be a function of type (string $mountPoint, Storage $storage) => Storage
41
-	 *
42
-	 * @param string $wrapperName name of the wrapper
43
-	 * @param callable $callback callback
44
-	 * @param int $priority wrappers with the lower priority are applied last (meaning they get called first)
45
-	 * @param \OCP\Files\Mount\IMountPoint[] $existingMounts existing mount points to apply the wrapper to
46
-	 * @return bool true if the wrapper was added, false if there was already a wrapper with this
47
-	 * name registered
48
-	 */
49
-	public function addStorageWrapper($wrapperName, $callback, $priority = 50, $existingMounts = []) {
50
-		if (isset($this->storageWrappers[$wrapperName])) {
51
-			return false;
52
-		}
37
+    /**
38
+     * allow modifier storage behaviour by adding wrappers around storages
39
+     *
40
+     * $callback should be a function of type (string $mountPoint, Storage $storage) => Storage
41
+     *
42
+     * @param string $wrapperName name of the wrapper
43
+     * @param callable $callback callback
44
+     * @param int $priority wrappers with the lower priority are applied last (meaning they get called first)
45
+     * @param \OCP\Files\Mount\IMountPoint[] $existingMounts existing mount points to apply the wrapper to
46
+     * @return bool true if the wrapper was added, false if there was already a wrapper with this
47
+     * name registered
48
+     */
49
+    public function addStorageWrapper($wrapperName, $callback, $priority = 50, $existingMounts = []) {
50
+        if (isset($this->storageWrappers[$wrapperName])) {
51
+            return false;
52
+        }
53 53
 
54
-		// apply to existing mounts before registering it to prevent applying it double in MountPoint::createStorage
55
-		foreach ($existingMounts as $mount) {
56
-			$mount->wrapStorage($callback);
57
-		}
54
+        // apply to existing mounts before registering it to prevent applying it double in MountPoint::createStorage
55
+        foreach ($existingMounts as $mount) {
56
+            $mount->wrapStorage($callback);
57
+        }
58 58
 
59
-		$this->storageWrappers[$wrapperName] = ['wrapper' => $callback, 'priority' => $priority];
60
-		return true;
61
-	}
59
+        $this->storageWrappers[$wrapperName] = ['wrapper' => $callback, 'priority' => $priority];
60
+        return true;
61
+    }
62 62
 
63
-	/**
64
-	 * Remove a storage wrapper by name.
65
-	 * Note: internal method only to be used for cleanup
66
-	 *
67
-	 * @param string $wrapperName name of the wrapper
68
-	 * @internal
69
-	 */
70
-	public function removeStorageWrapper($wrapperName) {
71
-		unset($this->storageWrappers[$wrapperName]);
72
-	}
63
+    /**
64
+     * Remove a storage wrapper by name.
65
+     * Note: internal method only to be used for cleanup
66
+     *
67
+     * @param string $wrapperName name of the wrapper
68
+     * @internal
69
+     */
70
+    public function removeStorageWrapper($wrapperName) {
71
+        unset($this->storageWrappers[$wrapperName]);
72
+    }
73 73
 
74
-	/**
75
-	 * Create an instance of a storage and apply the registered storage wrappers
76
-	 *
77
-	 * @param \OCP\Files\Mount\IMountPoint $mountPoint
78
-	 * @param string $class
79
-	 * @param array $arguments
80
-	 * @return \OCP\Files\Storage
81
-	 */
82
-	public function getInstance(IMountPoint $mountPoint, $class, $arguments) {
83
-		return $this->wrap($mountPoint, new $class($arguments));
84
-	}
74
+    /**
75
+     * Create an instance of a storage and apply the registered storage wrappers
76
+     *
77
+     * @param \OCP\Files\Mount\IMountPoint $mountPoint
78
+     * @param string $class
79
+     * @param array $arguments
80
+     * @return \OCP\Files\Storage
81
+     */
82
+    public function getInstance(IMountPoint $mountPoint, $class, $arguments) {
83
+        return $this->wrap($mountPoint, new $class($arguments));
84
+    }
85 85
 
86
-	/**
87
-	 * @param \OCP\Files\Mount\IMountPoint $mountPoint
88
-	 * @param \OCP\Files\Storage $storage
89
-	 * @return \OCP\Files\Storage
90
-	 */
91
-	public function wrap(IMountPoint $mountPoint, $storage) {
92
-		$wrappers = array_values($this->storageWrappers);
93
-		usort($wrappers, function ($a, $b) {
94
-			return $b['priority'] - $a['priority'];
95
-		});
96
-		/** @var callable[] $wrappers */
97
-		$wrappers = array_map(function ($wrapper) {
98
-			return $wrapper['wrapper'];
99
-		}, $wrappers);
100
-		foreach ($wrappers as $wrapper) {
101
-			$storage = $wrapper($mountPoint->getMountPoint(), $storage, $mountPoint);
102
-			if (!($storage instanceof \OCP\Files\Storage)) {
103
-				throw new \Exception('Invalid result from storage wrapper');
104
-			}
105
-		}
106
-		return $storage;
107
-	}
86
+    /**
87
+     * @param \OCP\Files\Mount\IMountPoint $mountPoint
88
+     * @param \OCP\Files\Storage $storage
89
+     * @return \OCP\Files\Storage
90
+     */
91
+    public function wrap(IMountPoint $mountPoint, $storage) {
92
+        $wrappers = array_values($this->storageWrappers);
93
+        usort($wrappers, function ($a, $b) {
94
+            return $b['priority'] - $a['priority'];
95
+        });
96
+        /** @var callable[] $wrappers */
97
+        $wrappers = array_map(function ($wrapper) {
98
+            return $wrapper['wrapper'];
99
+        }, $wrappers);
100
+        foreach ($wrappers as $wrapper) {
101
+            $storage = $wrapper($mountPoint->getMountPoint(), $storage, $mountPoint);
102
+            if (!($storage instanceof \OCP\Files\Storage)) {
103
+                throw new \Exception('Invalid result from storage wrapper');
104
+            }
105
+        }
106
+        return $storage;
107
+    }
108 108
 }
Please login to merge, or discard this patch.
lib/private/Files/Storage/PolyFill/CopyDirectory.php 1 patch
Indentation   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -25,81 +25,81 @@
 block discarded – undo
25 25
 namespace OC\Files\Storage\PolyFill;
26 26
 
27 27
 trait CopyDirectory {
28
-	/**
29
-	 * Check if a path is a directory
30
-	 *
31
-	 * @param string $path
32
-	 * @return bool
33
-	 */
34
-	abstract public function is_dir($path);
28
+    /**
29
+     * Check if a path is a directory
30
+     *
31
+     * @param string $path
32
+     * @return bool
33
+     */
34
+    abstract public function is_dir($path);
35 35
 
36
-	/**
37
-	 * Check if a file or folder exists
38
-	 *
39
-	 * @param string $path
40
-	 * @return bool
41
-	 */
42
-	abstract public function file_exists($path);
36
+    /**
37
+     * Check if a file or folder exists
38
+     *
39
+     * @param string $path
40
+     * @return bool
41
+     */
42
+    abstract public function file_exists($path);
43 43
 
44
-	/**
45
-	 * Delete a file or folder
46
-	 *
47
-	 * @param string $path
48
-	 * @return bool
49
-	 */
50
-	abstract public function unlink($path);
44
+    /**
45
+     * Delete a file or folder
46
+     *
47
+     * @param string $path
48
+     * @return bool
49
+     */
50
+    abstract public function unlink($path);
51 51
 
52
-	/**
53
-	 * Open a directory handle for a folder
54
-	 *
55
-	 * @param string $path
56
-	 * @return resource | bool
57
-	 */
58
-	abstract public function opendir($path);
52
+    /**
53
+     * Open a directory handle for a folder
54
+     *
55
+     * @param string $path
56
+     * @return resource | bool
57
+     */
58
+    abstract public function opendir($path);
59 59
 
60
-	/**
61
-	 * Create a new folder
62
-	 *
63
-	 * @param string $path
64
-	 * @return bool
65
-	 */
66
-	abstract public function mkdir($path);
60
+    /**
61
+     * Create a new folder
62
+     *
63
+     * @param string $path
64
+     * @return bool
65
+     */
66
+    abstract public function mkdir($path);
67 67
 
68
-	public function copy($source, $target) {
69
-		if ($this->is_dir($source)) {
70
-			if ($this->file_exists($target)) {
71
-				$this->unlink($target);
72
-			}
73
-			$this->mkdir($target);
74
-			return $this->copyRecursive($source, $target);
75
-		} else {
76
-			return parent::copy($source, $target);
77
-		}
78
-	}
68
+    public function copy($source, $target) {
69
+        if ($this->is_dir($source)) {
70
+            if ($this->file_exists($target)) {
71
+                $this->unlink($target);
72
+            }
73
+            $this->mkdir($target);
74
+            return $this->copyRecursive($source, $target);
75
+        } else {
76
+            return parent::copy($source, $target);
77
+        }
78
+    }
79 79
 
80
-	/**
81
-	 * For adapters that don't support copying folders natively
82
-	 *
83
-	 * @param $source
84
-	 * @param $target
85
-	 * @return bool
86
-	 */
87
-	protected function copyRecursive($source, $target) {
88
-		$dh = $this->opendir($source);
89
-		$result = true;
90
-		while ($file = readdir($dh)) {
91
-			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
92
-				if ($this->is_dir($source . '/' . $file)) {
93
-					$this->mkdir($target . '/' . $file);
94
-					$result = $this->copyRecursive($source . '/' . $file, $target . '/' . $file);
95
-				} else {
96
-					$result = parent::copy($source . '/' . $file, $target . '/' . $file);
97
-				}
98
-				if (!$result) {
99
-					break;
100
-				}
101
-			}
102
-		}
103
-		return $result;
104
-	}
80
+    /**
81
+     * For adapters that don't support copying folders natively
82
+     *
83
+     * @param $source
84
+     * @param $target
85
+     * @return bool
86
+     */
87
+    protected function copyRecursive($source, $target) {
88
+        $dh = $this->opendir($source);
89
+        $result = true;
90
+        while ($file = readdir($dh)) {
91
+            if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
92
+                if ($this->is_dir($source . '/' . $file)) {
93
+                    $this->mkdir($target . '/' . $file);
94
+                    $result = $this->copyRecursive($source . '/' . $file, $target . '/' . $file);
95
+                } else {
96
+                    $result = parent::copy($source . '/' . $file, $target . '/' . $file);
97
+                }
98
+                if (!$result) {
99
+                    break;
100
+                }
101
+            }
102
+        }
103
+        return $result;
104
+    }
105 105
 }
Please login to merge, or discard this patch.
lib/private/Repair/NC11/FixMountStorages.php 1 patch
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.
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/DB/QueryBuilder/QueryFunction.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -25,17 +25,17 @@
 block discarded – undo
25 25
 use OCP\DB\QueryBuilder\IQueryFunction;
26 26
 
27 27
 class QueryFunction implements IQueryFunction {
28
-	/** @var string */
29
-	protected $function;
28
+    /** @var string */
29
+    protected $function;
30 30
 
31
-	public function __construct($function) {
32
-		$this->function = $function;
33
-	}
31
+    public function __construct($function) {
32
+        $this->function = $function;
33
+    }
34 34
 
35
-	/**
36
-	 * @return string
37
-	 */
38
-	public function __toString() {
39
-		return (string) $this->function;
40
-	}
35
+    /**
36
+     * @return string
37
+     */
38
+    public function __toString() {
39
+        return (string) $this->function;
40
+    }
41 41
 }
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/Parameter.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -25,17 +25,17 @@
 block discarded – undo
25 25
 use OCP\DB\QueryBuilder\IParameter;
26 26
 
27 27
 class Parameter implements IParameter {
28
-	/** @var mixed */
29
-	protected $name;
28
+    /** @var mixed */
29
+    protected $name;
30 30
 
31
-	public function __construct($name) {
32
-		$this->name = $name;
33
-	}
31
+    public function __construct($name) {
32
+        $this->name = $name;
33
+    }
34 34
 
35
-	/**
36
-	 * @return string
37
-	 */
38
-	public function __toString() {
39
-		return (string) $this->name;
40
-	}
35
+    /**
36
+     * @return string
37
+     */
38
+    public function __toString() {
39
+        return (string) $this->name;
40
+    }
41 41
 }
Please login to merge, or discard this patch.
lib/private/DB/AdapterMySQL.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -27,31 +27,31 @@
 block discarded – undo
27 27
 
28 28
 class AdapterMySQL extends Adapter {
29 29
 
30
-	/** @var string */
31
-	protected $charset;
32
-
33
-	/**
34
-	 * @param string $tableName
35
-	 */
36
-	public function lockTable($tableName) {
37
-		$this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
38
-	}
39
-
40
-	public function unlockTable() {
41
-		$this->conn->executeUpdate('UNLOCK TABLES');
42
-	}
43
-
44
-	public function fixupStatement($statement) {
45
-		$statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
46
-		return $statement;
47
-	}
48
-
49
-	protected function getCharset() {
50
-		if (!$this->charset) {
51
-			$params = $this->conn->getParams();
52
-			$this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
53
-		}
54
-
55
-		return $this->charset;
56
-	}
30
+    /** @var string */
31
+    protected $charset;
32
+
33
+    /**
34
+     * @param string $tableName
35
+     */
36
+    public function lockTable($tableName) {
37
+        $this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
38
+    }
39
+
40
+    public function unlockTable() {
41
+        $this->conn->executeUpdate('UNLOCK TABLES');
42
+    }
43
+
44
+    public function fixupStatement($statement) {
45
+        $statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
46
+        return $statement;
47
+    }
48
+
49
+    protected function getCharset() {
50
+        if (!$this->charset) {
51
+            $params = $this->conn->getParams();
52
+            $this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
53
+        }
54
+
55
+        return $this->charset;
56
+    }
57 57
 }
Please login to merge, or discard this patch.
lib/private/App/AppStore/Version/Version.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -22,31 +22,31 @@
 block discarded – undo
22 22
 namespace OC\App\AppStore\Version;
23 23
 
24 24
 class Version {
25
-	/** @var string */
26
-	private $minVersion;
27
-	/** @var string */
28
-	private $maxVersion;
25
+    /** @var string */
26
+    private $minVersion;
27
+    /** @var string */
28
+    private $maxVersion;
29 29
 
30
-	/**
31
-	 * @param string $minVersion
32
-	 * @param string $maxVersion
33
-	 */
34
-	public function __construct($minVersion, $maxVersion) {
35
-		$this->minVersion = $minVersion;
36
-		$this->maxVersion = $maxVersion;
37
-	}
30
+    /**
31
+     * @param string $minVersion
32
+     * @param string $maxVersion
33
+     */
34
+    public function __construct($minVersion, $maxVersion) {
35
+        $this->minVersion = $minVersion;
36
+        $this->maxVersion = $maxVersion;
37
+    }
38 38
 
39
-	/**
40
-	 * @return string
41
-	 */
42
-	public function getMinimumVersion() {
43
-		return $this->minVersion;
44
-	}
39
+    /**
40
+     * @return string
41
+     */
42
+    public function getMinimumVersion() {
43
+        return $this->minVersion;
44
+    }
45 45
 
46
-	/**
47
-	 * @return string
48
-	 */
49
-	public function getMaximumVersion() {
50
-		return $this->maxVersion;
51
-	}
46
+    /**
47
+     * @return string
48
+     */
49
+    public function getMaximumVersion() {
50
+        return $this->maxVersion;
51
+    }
52 52
 }
Please login to merge, or discard this patch.
lib/private/App/CodeChecker/AbstractCheck.php 1 patch
Indentation   +114 added lines, -114 removed lines patch added patch discarded remove patch
@@ -23,118 +23,118 @@
 block discarded – undo
23 23
 namespace OC\App\CodeChecker;
24 24
 
25 25
 abstract class AbstractCheck implements ICheck {
26
-	/** @var ICheck */
27
-	protected $check;
28
-
29
-	/**
30
-	 * @param ICheck $check
31
-	 */
32
-	public function __construct(ICheck $check) {
33
-		$this->check = $check;
34
-	}
35
-
36
-	/**
37
-	 * @param int $errorCode
38
-	 * @param string $errorObject
39
-	 * @return string
40
-	 */
41
-	public function getDescription($errorCode, $errorObject) {
42
-		switch ($errorCode) {
43
-			case CodeChecker::STATIC_CALL_NOT_ALLOWED:
44
-				$functions = $this->getLocalFunctions();
45
-				$functions = array_change_key_case($functions, CASE_LOWER);
46
-				if (isset($functions[$errorObject])) {
47
-					return $this->getLocalDescription();
48
-				}
49
-			// no break;
50
-			case CodeChecker::CLASS_EXTENDS_NOT_ALLOWED:
51
-			case CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED:
52
-			case CodeChecker::CLASS_NEW_NOT_ALLOWED:
53
-			case CodeChecker::CLASS_USE_NOT_ALLOWED:
54
-				$classes = $this->getLocalClasses();
55
-				$classes = array_change_key_case($classes, CASE_LOWER);
56
-				if (isset($classes[$errorObject])) {
57
-					return $this->getLocalDescription();
58
-				}
59
-			break;
60
-
61
-			case CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED:
62
-				$constants = $this->getLocalConstants();
63
-				$constants = array_change_key_case($constants, CASE_LOWER);
64
-				if (isset($constants[$errorObject])) {
65
-					return $this->getLocalDescription();
66
-				}
67
-			break;
68
-
69
-			case CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED:
70
-				$methods = $this->getLocalMethods();
71
-				$methods = array_change_key_case($methods, CASE_LOWER);
72
-				if (isset($methods[$errorObject])) {
73
-					return $this->getLocalDescription();
74
-				}
75
-			break;
76
-		}
77
-
78
-		return $this->check->getDescription($errorCode, $errorObject);
79
-	}
80
-
81
-	/**
82
-	 * @return string
83
-	 */
84
-	abstract protected function getLocalDescription();
85
-
86
-	/**
87
-	 * @return array
88
-	 */
89
-	abstract protected function getLocalClasses();
90
-
91
-	/**
92
-	 * @return array
93
-	 */
94
-	abstract protected function getLocalConstants();
95
-
96
-	/**
97
-	 * @return array
98
-	 */
99
-	abstract protected function getLocalFunctions();
100
-
101
-	/**
102
-	 * @return array
103
-	 */
104
-	abstract protected function getLocalMethods();
105
-
106
-	/**
107
-	 * @return array E.g.: `'ClassName' => 'oc version',`
108
-	 */
109
-	public function getClasses() {
110
-		return array_merge($this->getLocalClasses(), $this->check->getClasses());
111
-	}
112
-
113
-	/**
114
-	 * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
115
-	 */
116
-	public function getConstants() {
117
-		return array_merge($this->getLocalConstants(), $this->check->getConstants());
118
-	}
119
-
120
-	/**
121
-	 * @return array E.g.: `'functionName' => 'oc version',`
122
-	 */
123
-	public function getFunctions() {
124
-		return array_merge($this->getLocalFunctions(), $this->check->getFunctions());
125
-	}
126
-
127
-	/**
128
-	 * @return array E.g.: `'ClassName::methodName' => 'oc version',`
129
-	 */
130
-	public function getMethods() {
131
-		return array_merge($this->getLocalMethods(), $this->check->getMethods());
132
-	}
133
-
134
-	/**
135
-	 * @return bool
136
-	 */
137
-	public function checkStrongComparisons() {
138
-		return $this->check->checkStrongComparisons();
139
-	}
26
+    /** @var ICheck */
27
+    protected $check;
28
+
29
+    /**
30
+     * @param ICheck $check
31
+     */
32
+    public function __construct(ICheck $check) {
33
+        $this->check = $check;
34
+    }
35
+
36
+    /**
37
+     * @param int $errorCode
38
+     * @param string $errorObject
39
+     * @return string
40
+     */
41
+    public function getDescription($errorCode, $errorObject) {
42
+        switch ($errorCode) {
43
+            case CodeChecker::STATIC_CALL_NOT_ALLOWED:
44
+                $functions = $this->getLocalFunctions();
45
+                $functions = array_change_key_case($functions, CASE_LOWER);
46
+                if (isset($functions[$errorObject])) {
47
+                    return $this->getLocalDescription();
48
+                }
49
+            // no break;
50
+            case CodeChecker::CLASS_EXTENDS_NOT_ALLOWED:
51
+            case CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED:
52
+            case CodeChecker::CLASS_NEW_NOT_ALLOWED:
53
+            case CodeChecker::CLASS_USE_NOT_ALLOWED:
54
+                $classes = $this->getLocalClasses();
55
+                $classes = array_change_key_case($classes, CASE_LOWER);
56
+                if (isset($classes[$errorObject])) {
57
+                    return $this->getLocalDescription();
58
+                }
59
+            break;
60
+
61
+            case CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED:
62
+                $constants = $this->getLocalConstants();
63
+                $constants = array_change_key_case($constants, CASE_LOWER);
64
+                if (isset($constants[$errorObject])) {
65
+                    return $this->getLocalDescription();
66
+                }
67
+            break;
68
+
69
+            case CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED:
70
+                $methods = $this->getLocalMethods();
71
+                $methods = array_change_key_case($methods, CASE_LOWER);
72
+                if (isset($methods[$errorObject])) {
73
+                    return $this->getLocalDescription();
74
+                }
75
+            break;
76
+        }
77
+
78
+        return $this->check->getDescription($errorCode, $errorObject);
79
+    }
80
+
81
+    /**
82
+     * @return string
83
+     */
84
+    abstract protected function getLocalDescription();
85
+
86
+    /**
87
+     * @return array
88
+     */
89
+    abstract protected function getLocalClasses();
90
+
91
+    /**
92
+     * @return array
93
+     */
94
+    abstract protected function getLocalConstants();
95
+
96
+    /**
97
+     * @return array
98
+     */
99
+    abstract protected function getLocalFunctions();
100
+
101
+    /**
102
+     * @return array
103
+     */
104
+    abstract protected function getLocalMethods();
105
+
106
+    /**
107
+     * @return array E.g.: `'ClassName' => 'oc version',`
108
+     */
109
+    public function getClasses() {
110
+        return array_merge($this->getLocalClasses(), $this->check->getClasses());
111
+    }
112
+
113
+    /**
114
+     * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
115
+     */
116
+    public function getConstants() {
117
+        return array_merge($this->getLocalConstants(), $this->check->getConstants());
118
+    }
119
+
120
+    /**
121
+     * @return array E.g.: `'functionName' => 'oc version',`
122
+     */
123
+    public function getFunctions() {
124
+        return array_merge($this->getLocalFunctions(), $this->check->getFunctions());
125
+    }
126
+
127
+    /**
128
+     * @return array E.g.: `'ClassName::methodName' => 'oc version',`
129
+     */
130
+    public function getMethods() {
131
+        return array_merge($this->getLocalMethods(), $this->check->getMethods());
132
+    }
133
+
134
+    /**
135
+     * @return bool
136
+     */
137
+    public function checkStrongComparisons() {
138
+        return $this->check->checkStrongComparisons();
139
+    }
140 140
 }
Please login to merge, or discard this patch.