Passed
Push — master ( eb9faa...c3969d )
by Morris
11:38 queued 11s
created
lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
 	public function iLike($x, $y, $type = null) {
49 49
 		$x = $this->helper->quoteColumnName($x);
50 50
 		$y = $this->helper->quoteColumnName($y);
51
-		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
51
+		return $this->expressionBuilder->comparison($x, ' COLLATE '.$this->charset.'_general_ci LIKE', $y);
52 52
 	}
53 53
 
54 54
 }
Please login to merge, or discard this patch.
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -30,26 +30,26 @@
 block discarded – undo
30 30
 
31 31
 class MySqlExpressionBuilder extends ExpressionBuilder {
32 32
 
33
-	/** @var string */
34
-	protected $charset;
33
+    /** @var string */
34
+    protected $charset;
35 35
 
36
-	/**
37
-	 * @param \OCP\IDBConnection|Connection $connection
38
-	 * @param IQueryBuilder $queryBuilder
39
-	 */
40
-	public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder) {
41
-		parent::__construct($connection, $queryBuilder);
36
+    /**
37
+     * @param \OCP\IDBConnection|Connection $connection
38
+     * @param IQueryBuilder $queryBuilder
39
+     */
40
+    public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder) {
41
+        parent::__construct($connection, $queryBuilder);
42 42
 
43
-		$params = $connection->getParams();
44
-		$this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
45
-	}
43
+        $params = $connection->getParams();
44
+        $this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
45
+    }
46 46
 
47
-	/**
48
-	 * @inheritdoc
49
-	 */
50
-	public function iLike($x, $y, $type = null) {
51
-		$x = $this->helper->quoteColumnName($x);
52
-		$y = $this->helper->quoteColumnName($y);
53
-		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
54
-	}
47
+    /**
48
+     * @inheritdoc
49
+     */
50
+    public function iLike($x, $y, $type = null) {
51
+        $x = $this->helper->quoteColumnName($x);
52
+        $y = $this->helper->quoteColumnName($y);
53
+        return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
54
+    }
55 55
 }
Please login to merge, or discard this patch.
lib/private/DB/PostgreSqlMigrator.php 2 patches
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -25,32 +25,32 @@
 block discarded – undo
25 25
 use Doctrine\DBAL\Schema\Schema;
26 26
 
27 27
 class PostgreSqlMigrator extends Migrator {
28
-	/**
29
-	 * @param Schema $targetSchema
30
-	 * @param \Doctrine\DBAL\Connection $connection
31
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
32
-	 */
33
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
34
-		$schemaDiff = parent::getDiff($targetSchema, $connection);
28
+    /**
29
+     * @param Schema $targetSchema
30
+     * @param \Doctrine\DBAL\Connection $connection
31
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
32
+     */
33
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
34
+        $schemaDiff = parent::getDiff($targetSchema, $connection);
35 35
 
36
-		foreach ($schemaDiff->changedTables as $tableDiff) {
37
-			// fix default value in brackets - pg 9.4 is returning a negative default value in ()
38
-			// see https://github.com/doctrine/dbal/issues/2427
39
-			foreach ($tableDiff->changedColumns as $column) {
40
-				$column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
41
-					if ($changedProperties !== 'default') {
42
-						return true;
43
-					}
44
-					$fromDefault = $column->fromColumn->getDefault();
45
-					$toDefault = $column->column->getDefault();
46
-					$fromDefault = trim($fromDefault, "()");
36
+        foreach ($schemaDiff->changedTables as $tableDiff) {
37
+            // fix default value in brackets - pg 9.4 is returning a negative default value in ()
38
+            // see https://github.com/doctrine/dbal/issues/2427
39
+            foreach ($tableDiff->changedColumns as $column) {
40
+                $column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
41
+                    if ($changedProperties !== 'default') {
42
+                        return true;
43
+                    }
44
+                    $fromDefault = $column->fromColumn->getDefault();
45
+                    $toDefault = $column->column->getDefault();
46
+                    $fromDefault = trim($fromDefault, "()");
47 47
 
48
-					// by intention usage of !=
49
-					return $fromDefault != $toDefault;
50
-				});
51
-			}
52
-		}
48
+                    // by intention usage of !=
49
+                    return $fromDefault != $toDefault;
50
+                });
51
+            }
52
+        }
53 53
 
54
-		return $schemaDiff;
55
-	}
54
+        return $schemaDiff;
55
+    }
56 56
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 			// fix default value in brackets - pg 9.4 is returning a negative default value in ()
38 38
 			// see https://github.com/doctrine/dbal/issues/2427
39 39
 			foreach ($tableDiff->changedColumns as $column) {
40
-				$column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
40
+				$column->changedProperties = array_filter($column->changedProperties, function($changedProperties) use ($column) {
41 41
 					if ($changedProperties !== 'default') {
42 42
 						return true;
43 43
 					}
Please login to merge, or discard this patch.
lib/private/DB/AdapterMySQL.php 2 patches
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.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 * @param string $tableName
35 35
 	 */
36 36
 	public function lockTable($tableName) {
37
-		$this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
37
+		$this->conn->executeUpdate('LOCK TABLES `'.$tableName.'` WRITE');
38 38
 	}
39 39
 
40 40
 	public function unlockTable() {
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 	}
43 43
 
44 44
 	public function fixupStatement($statement) {
45
-		$statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
45
+		$statement = str_replace(' ILIKE ', ' COLLATE '.$this->getCharset().'_general_ci LIKE ', $statement);
46 46
 		return $statement;
47 47
 	}
48 48
 
Please login to merge, or discard this patch.
lib/private/DB/SQLiteMigrator.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
 	 * @return string
64 64
 	 */
65 65
 	private function buildTempDatabase() {
66
-		$dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
66
+		$dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT.'/data');
67 67
 		$tmpFile = uniqid("oc_");
68 68
 		return "$dataDir/$tmpFile.db";
69 69
 	}
Please login to merge, or discard this patch.
Indentation   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -32,62 +32,62 @@
 block discarded – undo
32 32
 
33 33
 class SQLiteMigrator extends Migrator {
34 34
 
35
-	/**
36
-	 * @param \Doctrine\DBAL\Schema\Schema $targetSchema
37
-	 * @throws \OC\DB\MigrationException
38
-	 *
39
-	 * For sqlite we simple make a copy of the entire database, and test the migration on that
40
-	 */
41
-	public function checkMigrate(\Doctrine\DBAL\Schema\Schema $targetSchema) {
42
-		$dbFile = $this->connection->getDatabase();
43
-		$tmpFile = $this->buildTempDatabase();
44
-		copy($dbFile, $tmpFile);
35
+    /**
36
+     * @param \Doctrine\DBAL\Schema\Schema $targetSchema
37
+     * @throws \OC\DB\MigrationException
38
+     *
39
+     * For sqlite we simple make a copy of the entire database, and test the migration on that
40
+     */
41
+    public function checkMigrate(\Doctrine\DBAL\Schema\Schema $targetSchema) {
42
+        $dbFile = $this->connection->getDatabase();
43
+        $tmpFile = $this->buildTempDatabase();
44
+        copy($dbFile, $tmpFile);
45 45
 
46
-		$connectionParams = [
47
-			'path' => $tmpFile,
48
-			'driver' => 'pdo_sqlite',
49
-		];
50
-		$conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
51
-		try {
52
-			$this->applySchema($targetSchema, $conn);
53
-			$conn->close();
54
-			unlink($tmpFile);
55
-		} catch (DBALException $e) {
56
-			$conn->close();
57
-			unlink($tmpFile);
58
-			throw new MigrationException('', $e->getMessage());
59
-		}
60
-	}
46
+        $connectionParams = [
47
+            'path' => $tmpFile,
48
+            'driver' => 'pdo_sqlite',
49
+        ];
50
+        $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
51
+        try {
52
+            $this->applySchema($targetSchema, $conn);
53
+            $conn->close();
54
+            unlink($tmpFile);
55
+        } catch (DBALException $e) {
56
+            $conn->close();
57
+            unlink($tmpFile);
58
+            throw new MigrationException('', $e->getMessage());
59
+        }
60
+    }
61 61
 
62
-	/**
63
-	 * @return string
64
-	 */
65
-	private function buildTempDatabase() {
66
-		$dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
67
-		$tmpFile = uniqid("oc_");
68
-		return "$dataDir/$tmpFile.db";
69
-	}
62
+    /**
63
+     * @return string
64
+     */
65
+    private function buildTempDatabase() {
66
+        $dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
67
+        $tmpFile = uniqid("oc_");
68
+        return "$dataDir/$tmpFile.db";
69
+    }
70 70
 
71
-	/**
72
-	 * @param Schema $targetSchema
73
-	 * @param \Doctrine\DBAL\Connection $connection
74
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
75
-	 */
76
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
77
-		$platform = $connection->getDatabasePlatform();
78
-		$platform->registerDoctrineTypeMapping('tinyint unsigned', 'integer');
79
-		$platform->registerDoctrineTypeMapping('smallint unsigned', 'integer');
80
-		$platform->registerDoctrineTypeMapping('varchar ', 'string');
71
+    /**
72
+     * @param Schema $targetSchema
73
+     * @param \Doctrine\DBAL\Connection $connection
74
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
75
+     */
76
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
77
+        $platform = $connection->getDatabasePlatform();
78
+        $platform->registerDoctrineTypeMapping('tinyint unsigned', 'integer');
79
+        $platform->registerDoctrineTypeMapping('smallint unsigned', 'integer');
80
+        $platform->registerDoctrineTypeMapping('varchar ', 'string');
81 81
 
82
-		// with sqlite autoincrement columns is of type integer
83
-		foreach ($targetSchema->getTables() as $table) {
84
-			foreach ($table->getColumns() as $column) {
85
-				if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) {
86
-					$column->setType(Type::getType('integer'));
87
-				}
88
-			}
89
-		}
82
+        // with sqlite autoincrement columns is of type integer
83
+        foreach ($targetSchema->getTables() as $table) {
84
+            foreach ($table->getColumns() as $column) {
85
+                if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) {
86
+                    $column->setType(Type::getType('integer'));
87
+                }
88
+            }
89
+        }
90 90
 
91
-		return parent::getDiff($targetSchema, $connection);
92
-	}
91
+        return parent::getDiff($targetSchema, $connection);
92
+    }
93 93
 }
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.
lib/private/App/CodeChecker/EmptyCheck.php 1 patch
Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -22,47 +22,47 @@
 block discarded – undo
22 22
 namespace OC\App\CodeChecker;
23 23
 
24 24
 class EmptyCheck implements ICheck {
25
-	/**
26
-	 * @param int $errorCode
27
-	 * @param string $errorObject
28
-	 * @return string
29
-	 */
30
-	public function getDescription($errorCode, $errorObject) {
31
-		return '';
32
-	}
25
+    /**
26
+     * @param int $errorCode
27
+     * @param string $errorObject
28
+     * @return string
29
+     */
30
+    public function getDescription($errorCode, $errorObject) {
31
+        return '';
32
+    }
33 33
 
34
-	/**
35
-	 * @return array E.g.: `'ClassName' => 'oc version',`
36
-	 */
37
-	public function getClasses() {
38
-		return [];
39
-	}
34
+    /**
35
+     * @return array E.g.: `'ClassName' => 'oc version',`
36
+     */
37
+    public function getClasses() {
38
+        return [];
39
+    }
40 40
 
41
-	/**
42
-	 * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
43
-	 */
44
-	public function getConstants() {
45
-		return [];
46
-	}
41
+    /**
42
+     * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
43
+     */
44
+    public function getConstants() {
45
+        return [];
46
+    }
47 47
 
48
-	/**
49
-	 * @return array E.g.: `'functionName' => 'oc version',`
50
-	 */
51
-	public function getFunctions() {
52
-		return [];
53
-	}
48
+    /**
49
+     * @return array E.g.: `'functionName' => 'oc version',`
50
+     */
51
+    public function getFunctions() {
52
+        return [];
53
+    }
54 54
 
55
-	/**
56
-	 * @return array E.g.: `'ClassName::methodName' => 'oc version',`
57
-	 */
58
-	public function getMethods() {
59
-		return [];
60
-	}
55
+    /**
56
+     * @return array E.g.: `'ClassName::methodName' => 'oc version',`
57
+     */
58
+    public function getMethods() {
59
+        return [];
60
+    }
61 61
 
62
-	/**
63
-	 * @return bool
64
-	 */
65
-	public function checkStrongComparisons() {
66
-		return false;
67
-	}
62
+    /**
63
+     * @return bool
64
+     */
65
+    public function checkStrongComparisons() {
66
+        return false;
67
+    }
68 68
 }
Please login to merge, or discard this patch.
lib/private/App/CodeChecker/StrongComparisonCheck.php 1 patch
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -23,57 +23,57 @@
 block discarded – undo
23 23
 namespace OC\App\CodeChecker;
24 24
 
25 25
 class StrongComparisonCheck implements ICheck {
26
-	/** @var ICheck */
27
-	protected $check;
26
+    /** @var ICheck */
27
+    protected $check;
28 28
 
29
-	/**
30
-	 * @param ICheck $check
31
-	 */
32
-	public function __construct(ICheck $check) {
33
-		$this->check = $check;
34
-	}
29
+    /**
30
+     * @param ICheck $check
31
+     */
32
+    public function __construct(ICheck $check) {
33
+        $this->check = $check;
34
+    }
35 35
 
36
-	/**
37
-	 * @param int $errorCode
38
-	 * @param string $errorObject
39
-	 * @return string
40
-	 */
41
-	public function getDescription($errorCode, $errorObject) {
42
-		return $this->check->getDescription($errorCode, $errorObject);
43
-	}
36
+    /**
37
+     * @param int $errorCode
38
+     * @param string $errorObject
39
+     * @return string
40
+     */
41
+    public function getDescription($errorCode, $errorObject) {
42
+        return $this->check->getDescription($errorCode, $errorObject);
43
+    }
44 44
 
45
-	/**
46
-	 * @return array
47
-	 */
48
-	public function getClasses() {
49
-		return $this->check->getClasses();
50
-	}
45
+    /**
46
+     * @return array
47
+     */
48
+    public function getClasses() {
49
+        return $this->check->getClasses();
50
+    }
51 51
 
52
-	/**
53
-	 * @return array
54
-	 */
55
-	public function getConstants() {
56
-		return $this->check->getConstants();
57
-	}
52
+    /**
53
+     * @return array
54
+     */
55
+    public function getConstants() {
56
+        return $this->check->getConstants();
57
+    }
58 58
 
59
-	/**
60
-	 * @return array
61
-	 */
62
-	public function getFunctions() {
63
-		return $this->check->getFunctions();
64
-	}
59
+    /**
60
+     * @return array
61
+     */
62
+    public function getFunctions() {
63
+        return $this->check->getFunctions();
64
+    }
65 65
 
66
-	/**
67
-	 * @return array
68
-	 */
69
-	public function getMethods() {
70
-		return $this->check->getMethods();
71
-	}
66
+    /**
67
+     * @return array
68
+     */
69
+    public function getMethods() {
70
+        return $this->check->getMethods();
71
+    }
72 72
 
73
-	/**
74
-	 * @return bool
75
-	 */
76
-	public function checkStrongComparisons() {
77
-		return true;
78
-	}
73
+    /**
74
+     * @return bool
75
+     */
76
+    public function checkStrongComparisons() {
77
+        return true;
78
+    }
79 79
 }
Please login to merge, or discard this patch.
lib/private/App/CodeChecker/ICheck.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -22,35 +22,35 @@
 block discarded – undo
22 22
 namespace OC\App\CodeChecker;
23 23
 
24 24
 interface ICheck {
25
-	/**
26
-	 * @param int $errorCode
27
-	 * @param string $errorObject
28
-	 * @return string
29
-	 */
30
-	public function getDescription($errorCode, $errorObject);
25
+    /**
26
+     * @param int $errorCode
27
+     * @param string $errorObject
28
+     * @return string
29
+     */
30
+    public function getDescription($errorCode, $errorObject);
31 31
 
32
-	/**
33
-	 * @return array E.g.: `'ClassName' => 'oc version',`
34
-	 */
35
-	public function getClasses();
32
+    /**
33
+     * @return array E.g.: `'ClassName' => 'oc version',`
34
+     */
35
+    public function getClasses();
36 36
 
37
-	/**
38
-	 * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
39
-	 */
40
-	public function getConstants();
37
+    /**
38
+     * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
39
+     */
40
+    public function getConstants();
41 41
 
42
-	/**
43
-	 * @return array E.g.: `'functionName' => 'oc version',`
44
-	 */
45
-	public function getFunctions();
42
+    /**
43
+     * @return array E.g.: `'functionName' => 'oc version',`
44
+     */
45
+    public function getFunctions();
46 46
 
47
-	/**
48
-	 * @return array E.g.: `'ClassName::methodName' => 'oc version',`
49
-	 */
50
-	public function getMethods();
47
+    /**
48
+     * @return array E.g.: `'ClassName::methodName' => 'oc version',`
49
+     */
50
+    public function getMethods();
51 51
 
52
-	/**
53
-	 * @return bool
54
-	 */
55
-	public function checkStrongComparisons();
52
+    /**
53
+     * @return bool
54
+     */
55
+    public function checkStrongComparisons();
56 56
 }
Please login to merge, or discard this patch.