nextcloud / server

lib/private/DB/QueryBuilder/Parameter.php

Indentation +11 added lines, -11 removed lines

@@ -25,17 +25,17 @@
 use OCP\DB\QueryBuilder\IParameter;
 
 class Parameter implements IParameter {
-	/** @var mixed */
-	protected $name;
+    /** @var mixed */
+    protected $name;
 
-	public function __construct($name) {
-		$this->name = $name;
-	}
+    public function __construct($name) {
+        $this->name = $name;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function __toString() {
-		return (string) $this->name;
-	}
+    /**
+     * @return string
+     */
+    public function __toString() {
+        return (string) $this->name;
+    }
 }

lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	public function iLike($x, $y, $type = null) {
 		$x = $this->helper->quoteColumnName($x);
 		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
+		return $this->expressionBuilder->comparison($x, ' COLLATE '.$this->charset.'_general_ci LIKE', $y);
 	}
 
 }

Indentation +19 added lines, -19 removed lines

@@ -30,26 +30,26 @@
 
 class MySqlExpressionBuilder extends ExpressionBuilder {
 
-	/** @var string */
-	protected $charset;
+    /** @var string */
+    protected $charset;
 
-	/**
-	 * @param \OCP\IDBConnection|Connection $connection
-	 * @param IQueryBuilder $queryBuilder
-	 */
-	public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder) {
-		parent::__construct($connection, $queryBuilder);
+    /**
+     * @param \OCP\IDBConnection|Connection $connection
+     * @param IQueryBuilder $queryBuilder
+     */
+    public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder) {
+        parent::__construct($connection, $queryBuilder);
 
-		$params = $connection->getParams();
-		$this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
-	}
+        $params = $connection->getParams();
+        $this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function iLike($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
-	}
+    /**
+     * @inheritdoc
+     */
+    public function iLike($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
+    }
 }

lib/private/DB/PostgreSqlMigrator.php

Indentation +25 added lines, -25 removed lines

@@ -25,32 +25,32 @@
 use Doctrine\DBAL\Schema\Schema;
 
 class PostgreSqlMigrator extends Migrator {
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		$schemaDiff = parent::getDiff($targetSchema, $connection);
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        $schemaDiff = parent::getDiff($targetSchema, $connection);
 
-		foreach ($schemaDiff->changedTables as $tableDiff) {
-			// fix default value in brackets - pg 9.4 is returning a negative default value in ()
-			// see https://github.com/doctrine/dbal/issues/2427
-			foreach ($tableDiff->changedColumns as $column) {
-				$column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
-					if ($changedProperties !== 'default') {
-						return true;
-					}
-					$fromDefault = $column->fromColumn->getDefault();
-					$toDefault = $column->column->getDefault();
-					$fromDefault = trim($fromDefault, "()");
+        foreach ($schemaDiff->changedTables as $tableDiff) {
+            // fix default value in brackets - pg 9.4 is returning a negative default value in ()
+            // see https://github.com/doctrine/dbal/issues/2427
+            foreach ($tableDiff->changedColumns as $column) {
+                $column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
+                    if ($changedProperties !== 'default') {
+                        return true;
+                    }
+                    $fromDefault = $column->fromColumn->getDefault();
+                    $toDefault = $column->column->getDefault();
+                    $fromDefault = trim($fromDefault, "()");
 
-					// by intention usage of !=
-					return $fromDefault != $toDefault;
-				});
-			}
-		}
+                    // by intention usage of !=
+                    return $fromDefault != $toDefault;
+                });
+            }
+        }
 
-		return $schemaDiff;
-	}
+        return $schemaDiff;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 			// fix default value in brackets - pg 9.4 is returning a negative default value in ()
 			// see https://github.com/doctrine/dbal/issues/2427
 			foreach ($tableDiff->changedColumns as $column) {
-				$column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
+				$column->changedProperties = array_filter($column->changedProperties, function($changedProperties) use ($column) {
 					if ($changedProperties !== 'default') {
 						return true;
 					}

lib/private/DB/AdapterMySQL.php

Indentation +27 added lines, -27 removed lines

@@ -27,31 +27,31 @@
 
 class AdapterMySQL extends Adapter {
 
-	/** @var string */
-	protected $charset;
-
-	/**
-	 * @param string $tableName
-	 */
-	public function lockTable($tableName) {
-		$this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
-	}
-
-	public function unlockTable() {
-		$this->conn->executeUpdate('UNLOCK TABLES');
-	}
-
-	public function fixupStatement($statement) {
-		$statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
-		return $statement;
-	}
-
-	protected function getCharset() {
-		if (!$this->charset) {
-			$params = $this->conn->getParams();
-			$this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
-		}
-
-		return $this->charset;
-	}
+    /** @var string */
+    protected $charset;
+
+    /**
+     * @param string $tableName
+     */
+    public function lockTable($tableName) {
+        $this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
+    }
+
+    public function unlockTable() {
+        $this->conn->executeUpdate('UNLOCK TABLES');
+    }
+
+    public function fixupStatement($statement) {
+        $statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
+        return $statement;
+    }
+
+    protected function getCharset() {
+        if (!$this->charset) {
+            $params = $this->conn->getParams();
+            $this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
+        }
+
+        return $this->charset;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param string $tableName
 	 */
 	public function lockTable($tableName) {
-		$this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
+		$this->conn->executeUpdate('LOCK TABLES `'.$tableName.'` WRITE');
 	}
 
 	public function unlockTable() {
@@ -42,7 +42,7 @@ 
 	}
 
 	public function fixupStatement($statement) {
-		$statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
+		$statement = str_replace(' ILIKE ', ' COLLATE '.$this->getCharset().'_general_ci LIKE ', $statement);
 		return $statement;
 	}
 

lib/private/DB/SQLiteMigrator.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	 * @return string
 	 */
 	private function buildTempDatabase() {
-		$dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
+		$dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT.'/data');
 		$tmpFile = uniqid("oc_");
 		return "$dataDir/$tmpFile.db";
 	}

Indentation +53 added lines, -53 removed lines

@@ -32,62 +32,62 @@
 
 class SQLiteMigrator extends Migrator {
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $targetSchema
-	 * @throws \OC\DB\MigrationException
-	 *
-	 * For sqlite we simple make a copy of the entire database, and test the migration on that
-	 */
-	public function checkMigrate(\Doctrine\DBAL\Schema\Schema $targetSchema) {
-		$dbFile = $this->connection->getDatabase();
-		$tmpFile = $this->buildTempDatabase();
-		copy($dbFile, $tmpFile);
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $targetSchema
+     * @throws \OC\DB\MigrationException
+     *
+     * For sqlite we simple make a copy of the entire database, and test the migration on that
+     */
+    public function checkMigrate(\Doctrine\DBAL\Schema\Schema $targetSchema) {
+        $dbFile = $this->connection->getDatabase();
+        $tmpFile = $this->buildTempDatabase();
+        copy($dbFile, $tmpFile);
 
-		$connectionParams = [
-			'path' => $tmpFile,
-			'driver' => 'pdo_sqlite',
-		];
-		$conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
-		try {
-			$this->applySchema($targetSchema, $conn);
-			$conn->close();
-			unlink($tmpFile);
-		} catch (DBALException $e) {
-			$conn->close();
-			unlink($tmpFile);
-			throw new MigrationException('', $e->getMessage());
-		}
-	}
+        $connectionParams = [
+            'path' => $tmpFile,
+            'driver' => 'pdo_sqlite',
+        ];
+        $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
+        try {
+            $this->applySchema($targetSchema, $conn);
+            $conn->close();
+            unlink($tmpFile);
+        } catch (DBALException $e) {
+            $conn->close();
+            unlink($tmpFile);
+            throw new MigrationException('', $e->getMessage());
+        }
+    }
 
-	/**
-	 * @return string
-	 */
-	private function buildTempDatabase() {
-		$dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
-		$tmpFile = uniqid("oc_");
-		return "$dataDir/$tmpFile.db";
-	}
+    /**
+     * @return string
+     */
+    private function buildTempDatabase() {
+        $dataDir = $this->config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
+        $tmpFile = uniqid("oc_");
+        return "$dataDir/$tmpFile.db";
+    }
 
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		$platform = $connection->getDatabasePlatform();
-		$platform->registerDoctrineTypeMapping('tinyint unsigned', 'integer');
-		$platform->registerDoctrineTypeMapping('smallint unsigned', 'integer');
-		$platform->registerDoctrineTypeMapping('varchar ', 'string');
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        $platform = $connection->getDatabasePlatform();
+        $platform->registerDoctrineTypeMapping('tinyint unsigned', 'integer');
+        $platform->registerDoctrineTypeMapping('smallint unsigned', 'integer');
+        $platform->registerDoctrineTypeMapping('varchar ', 'string');
 
-		// with sqlite autoincrement columns is of type integer
-		foreach ($targetSchema->getTables() as $table) {
-			foreach ($table->getColumns() as $column) {
-				if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) {
-					$column->setType(Type::getType('integer'));
-				}
-			}
-		}
+        // with sqlite autoincrement columns is of type integer
+        foreach ($targetSchema->getTables() as $table) {
+            foreach ($table->getColumns() as $column) {
+                if ($column->getType() instanceof BigIntType && $column->getAutoincrement()) {
+                    $column->setType(Type::getType('integer'));
+                }
+            }
+        }
 
-		return parent::getDiff($targetSchema, $connection);
-	}
+        return parent::getDiff($targetSchema, $connection);
+    }
 }

lib/private/App/AppStore/Version/Version.php

Indentation +24 added lines, -24 removed lines

@@ -22,31 +22,31 @@
 namespace OC\App\AppStore\Version;
 
 class Version {
-	/** @var string */
-	private $minVersion;
-	/** @var string */
-	private $maxVersion;
+    /** @var string */
+    private $minVersion;
+    /** @var string */
+    private $maxVersion;
 
-	/**
-	 * @param string $minVersion
-	 * @param string $maxVersion
-	 */
-	public function __construct($minVersion, $maxVersion) {
-		$this->minVersion = $minVersion;
-		$this->maxVersion = $maxVersion;
-	}
+    /**
+     * @param string $minVersion
+     * @param string $maxVersion
+     */
+    public function __construct($minVersion, $maxVersion) {
+        $this->minVersion = $minVersion;
+        $this->maxVersion = $maxVersion;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getMinimumVersion() {
-		return $this->minVersion;
-	}
+    /**
+     * @return string
+     */
+    public function getMinimumVersion() {
+        return $this->minVersion;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getMaximumVersion() {
-		return $this->maxVersion;
-	}
+    /**
+     * @return string
+     */
+    public function getMaximumVersion() {
+        return $this->maxVersion;
+    }
 }

lib/private/App/CodeChecker/NodeVisitor.php

Spacing +13 added lines, -13 removed lines

@@ -102,7 +102,7 @@ 
 
 	public function enterNode(Node $node) {
 		if ($this->checkEqualOperatorUsage && $node instanceof Node\Expr\BinaryOp\Equal) {
-			$this->errors[]= [
+			$this->errors[] = [
 				'disallowedToken' => '==',
 				'errorCode' => CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED,
 				'line' => $node->getLine(),
@@ -110,7 +110,7 @@ 
 			];
 		}
 		if ($this->checkEqualOperatorUsage && $node instanceof Node\Expr\BinaryOp\NotEqual) {
-			$this->errors[]= [
+			$this->errors[] = [
 				'disallowedToken' => '!=',
 				'errorCode' => CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED,
 				'line' => $node->getLine(),
@@ -214,28 +214,28 @@ 
 		$alias = strtolower($alias);
 
 		foreach ($this->blackListedClassNames as $blackListedAlias => $blackListedClassName) {
-			if (strpos($blackListedClassName, $name . '\\') === 0) {
+			if (strpos($blackListedClassName, $name.'\\') === 0) {
 				$aliasedClassName = str_replace($name, $alias, $blackListedClassName);
 				$this->blackListedClassNames[$aliasedClassName] = $blackListedClassName;
 			}
 		}
 
 		foreach ($this->blackListedConstants as $blackListedAlias => $blackListedConstant) {
-			if (strpos($blackListedConstant, $name . '\\') === 0 || strpos($blackListedConstant, $name . '::') === 0) {
+			if (strpos($blackListedConstant, $name.'\\') === 0 || strpos($blackListedConstant, $name.'::') === 0) {
 				$aliasedConstantName = str_replace($name, $alias, $blackListedConstant);
 				$this->blackListedConstants[$aliasedConstantName] = $blackListedConstant;
 			}
 		}
 
 		foreach ($this->blackListedFunctions as $blackListedAlias => $blackListedFunction) {
-			if (strpos($blackListedFunction, $name . '\\') === 0 || strpos($blackListedFunction, $name . '::') === 0) {
+			if (strpos($blackListedFunction, $name.'\\') === 0 || strpos($blackListedFunction, $name.'::') === 0) {
 				$aliasedFunctionName = str_replace($name, $alias, $blackListedFunction);
 				$this->blackListedFunctions[$aliasedFunctionName] = $blackListedFunction;
 			}
 		}
 
 		foreach ($this->blackListedMethods as $blackListedAlias => $blackListedMethod) {
-			if (strpos($blackListedMethod, $name . '\\') === 0 || strpos($blackListedMethod, $name . '::') === 0) {
+			if (strpos($blackListedMethod, $name.'\\') === 0 || strpos($blackListedMethod, $name.'::') === 0) {
 				$aliasedMethodName = str_replace($name, $alias, $blackListedMethod);
 				$this->blackListedMethods[$aliasedMethodName] = $blackListedMethod;
 			}
@@ -246,7 +246,7 @@ 
 		$lowerName = strtolower($name);
 
 		if (isset($this->blackListedClassNames[$lowerName])) {
-			$this->errors[]= [
+			$this->errors[] = [
 				'disallowedToken' => $name,
 				'errorCode' => $errorCode,
 				'line' => $node->getLine(),
@@ -256,11 +256,11 @@ 
 	}
 
 	private function checkBlackListConstant($class, $constantName, Node $node) {
-		$name = $class . '::' . $constantName;
+		$name = $class.'::'.$constantName;
 		$lowerName = strtolower($name);
 
 		if (isset($this->blackListedConstants[$lowerName])) {
-			$this->errors[]= [
+			$this->errors[] = [
 				'disallowedToken' => $name,
 				'errorCode' => CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED,
 				'line' => $node->getLine(),
@@ -270,11 +270,11 @@ 
 	}
 
 	private function checkBlackListFunction($class, $functionName, Node $node) {
-		$name = $class . '::' . $functionName;
+		$name = $class.'::'.$functionName;
 		$lowerName = strtolower($name);
 
 		if (isset($this->blackListedFunctions[$lowerName])) {
-			$this->errors[]= [
+			$this->errors[] = [
 				'disallowedToken' => $name,
 				'errorCode' => CodeChecker::STATIC_CALL_NOT_ALLOWED,
 				'line' => $node->getLine(),
@@ -284,11 +284,11 @@ 
 	}
 
 	private function checkBlackListMethod($class, $functionName, Node $node) {
-		$name = $class . '::' . $functionName;
+		$name = $class.'::'.$functionName;
 		$lowerName = strtolower($name);
 
 		if (isset($this->blackListedMethods[$lowerName])) {
-			$this->errors[]= [
+			$this->errors[] = [
 				'disallowedToken' => $name,
 				'errorCode' => CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED,
 				'line' => $node->getLine(),

Indentation +276 added lines, -276 removed lines

@@ -29,280 +29,280 @@
 use PhpParser\NodeVisitorAbstract;
 
 class NodeVisitor extends NodeVisitorAbstract {
-	/** @var ICheck */
-	protected $list;
-
-	/** @var string */
-	protected $blackListDescription;
-	/** @var string[] */
-	protected $blackListedClassNames;
-	/** @var string[] */
-	protected $blackListedConstants;
-	/** @var string[] */
-	protected $blackListedFunctions;
-	/** @var string[] */
-	protected $blackListedMethods;
-	/** @var bool */
-	protected $checkEqualOperatorUsage;
-	/** @var string[] */
-	protected $errorMessages;
-
-	/**
-	 * @param ICheck $list
-	 */
-	public function __construct(ICheck $list) {
-		$this->list = $list;
-
-		$this->blackListedClassNames = [];
-		foreach ($list->getClasses() as $class => $blackListInfo) {
-			if (is_numeric($class) && is_string($blackListInfo)) {
-				$class = $blackListInfo;
-				$blackListInfo = null;
-			}
-
-			$class = strtolower($class);
-			$this->blackListedClassNames[$class] = $class;
-		}
-
-		$this->blackListedConstants = [];
-		foreach ($list->getConstants() as $constantName => $blackListInfo) {
-			$constantName = strtolower($constantName);
-			$this->blackListedConstants[$constantName] = $constantName;
-		}
-
-		$this->blackListedFunctions = [];
-		foreach ($list->getFunctions() as $functionName => $blackListInfo) {
-			$functionName = strtolower($functionName);
-			$this->blackListedFunctions[$functionName] = $functionName;
-		}
-
-		$this->blackListedMethods = [];
-		foreach ($list->getMethods() as $functionName => $blackListInfo) {
-			$functionName = strtolower($functionName);
-			$this->blackListedMethods[$functionName] = $functionName;
-		}
-
-		$this->checkEqualOperatorUsage = $list->checkStrongComparisons();
-
-		$this->errorMessages = [
-			CodeChecker::CLASS_EXTENDS_NOT_ALLOWED => "%s class must not be extended",
-			CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED => "%s interface must not be implemented",
-			CodeChecker::STATIC_CALL_NOT_ALLOWED => "Static method of %s class must not be called",
-			CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED => "Constant of %s class must not not be fetched",
-			CodeChecker::CLASS_NEW_NOT_ALLOWED => "%s class must not be instantiated",
-			CodeChecker::CLASS_USE_NOT_ALLOWED => "%s class must not be imported with a use statement",
-			CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED => "Method of %s class must not be called",
-
-			CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED => "is discouraged",
-		];
-	}
-
-	/** @var array */
-	public $errors = [];
-
-	public function enterNode(Node $node) {
-		if ($this->checkEqualOperatorUsage && $node instanceof Node\Expr\BinaryOp\Equal) {
-			$this->errors[]= [
-				'disallowedToken' => '==',
-				'errorCode' => CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED,
-				'line' => $node->getLine(),
-				'reason' => $this->buildReason('==', CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED)
-			];
-		}
-		if ($this->checkEqualOperatorUsage && $node instanceof Node\Expr\BinaryOp\NotEqual) {
-			$this->errors[]= [
-				'disallowedToken' => '!=',
-				'errorCode' => CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED,
-				'line' => $node->getLine(),
-				'reason' => $this->buildReason('!=', CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED)
-			];
-		}
-		if ($node instanceof Node\Stmt\Class_) {
-			if (!is_null($node->extends)) {
-				$this->checkBlackList($node->extends->toString(), CodeChecker::CLASS_EXTENDS_NOT_ALLOWED, $node);
-			}
-			foreach ($node->implements as $implements) {
-				$this->checkBlackList($implements->toString(), CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED, $node);
-			}
-		}
-		if ($node instanceof Node\Expr\StaticCall) {
-			if (!is_null($node->class)) {
-				if ($node->class instanceof Name) {
-					$this->checkBlackList($node->class->toString(), CodeChecker::STATIC_CALL_NOT_ALLOWED, $node);
-
-					$this->checkBlackListFunction($node->class->toString(), $node->name, $node);
-					$this->checkBlackListMethod($node->class->toString(), $node->name, $node);
-				}
-
-				if ($node->class instanceof Node\Expr\Variable) {
-					/**
-					 * TODO: find a way to detect something like this:
-					 *       $c = "OC_API";
-					 *       $n = $c::call();
-					 */
-					// $this->checkBlackListMethod($node->class->..., $node->name, $node);
-				}
-			}
-		}
-		if ($node instanceof Node\Expr\MethodCall) {
-			if (!is_null($node->var)) {
-				if ($node->var instanceof Node\Expr\Variable) {
-					/**
-					 * TODO: find a way to detect something like this:
-					 *       $c = new OC_API();
-					 *       $n = $c::call();
-					 *       $n = $c->call();
-					 */
-					// $this->checkBlackListMethod($node->var->..., $node->name, $node);
-				}
-			}
-		}
-		if ($node instanceof Node\Expr\ClassConstFetch) {
-			if (!is_null($node->class)) {
-				if ($node->class instanceof Name) {
-					$this->checkBlackList($node->class->toString(), CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED, $node);
-				}
-				if ($node->class instanceof Node\Expr\Variable || $node->class instanceof Node\Expr\PropertyFetch) {
-					/**
-					 * TODO: find a way to detect something like this:
-					 *       $c = "OC_API";
-					 *       $n = $i::ADMIN_AUTH;
-					 */
-				} else {
-					$this->checkBlackListConstant($node->class->toString(), $node->name, $node);
-				}
-			}
-		}
-		if ($node instanceof Node\Expr\New_) {
-			if (!is_null($node->class)) {
-				if ($node->class instanceof Name) {
-					$this->checkBlackList($node->class->toString(), CodeChecker::CLASS_NEW_NOT_ALLOWED, $node);
-				}
-				if ($node->class instanceof Node\Expr\Variable) {
-					/**
-					 * TODO: find a way to detect something like this:
-					 *       $c = "OC_API";
-					 *       $n = new $i;
-					 */
-				}
-			}
-		}
-		if ($node instanceof Node\Stmt\UseUse) {
-			$this->checkBlackList($node->name->toString(), CodeChecker::CLASS_USE_NOT_ALLOWED, $node);
-			if ($node->alias) {
-				$this->addUseNameToBlackList($node->name->toString(), $node->alias);
-			} else {
-				$this->addUseNameToBlackList($node->name->toString(), $node->name->getLast());
-			}
-		}
-	}
-
-	/**
-	 * Check whether an alias was introduced for a namespace of a blacklisted class
-	 *
-	 * Example:
-	 * - Blacklist entry:      OCP\AppFramework\IApi
-	 * - Name:                 OCP\AppFramework
-	 * - Alias:                OAF
-	 * =>  new blacklist entry:  OAF\IApi
-	 *
-	 * @param string $name
-	 * @param string $alias
-	 */
-	private function addUseNameToBlackList($name, $alias) {
-		$name = strtolower($name);
-		$alias = strtolower($alias);
-
-		foreach ($this->blackListedClassNames as $blackListedAlias => $blackListedClassName) {
-			if (strpos($blackListedClassName, $name . '\\') === 0) {
-				$aliasedClassName = str_replace($name, $alias, $blackListedClassName);
-				$this->blackListedClassNames[$aliasedClassName] = $blackListedClassName;
-			}
-		}
-
-		foreach ($this->blackListedConstants as $blackListedAlias => $blackListedConstant) {
-			if (strpos($blackListedConstant, $name . '\\') === 0 || strpos($blackListedConstant, $name . '::') === 0) {
-				$aliasedConstantName = str_replace($name, $alias, $blackListedConstant);
-				$this->blackListedConstants[$aliasedConstantName] = $blackListedConstant;
-			}
-		}
-
-		foreach ($this->blackListedFunctions as $blackListedAlias => $blackListedFunction) {
-			if (strpos($blackListedFunction, $name . '\\') === 0 || strpos($blackListedFunction, $name . '::') === 0) {
-				$aliasedFunctionName = str_replace($name, $alias, $blackListedFunction);
-				$this->blackListedFunctions[$aliasedFunctionName] = $blackListedFunction;
-			}
-		}
-
-		foreach ($this->blackListedMethods as $blackListedAlias => $blackListedMethod) {
-			if (strpos($blackListedMethod, $name . '\\') === 0 || strpos($blackListedMethod, $name . '::') === 0) {
-				$aliasedMethodName = str_replace($name, $alias, $blackListedMethod);
-				$this->blackListedMethods[$aliasedMethodName] = $blackListedMethod;
-			}
-		}
-	}
-
-	private function checkBlackList($name, $errorCode, Node $node) {
-		$lowerName = strtolower($name);
-
-		if (isset($this->blackListedClassNames[$lowerName])) {
-			$this->errors[]= [
-				'disallowedToken' => $name,
-				'errorCode' => $errorCode,
-				'line' => $node->getLine(),
-				'reason' => $this->buildReason($this->blackListedClassNames[$lowerName], $errorCode)
-			];
-		}
-	}
-
-	private function checkBlackListConstant($class, $constantName, Node $node) {
-		$name = $class . '::' . $constantName;
-		$lowerName = strtolower($name);
-
-		if (isset($this->blackListedConstants[$lowerName])) {
-			$this->errors[]= [
-				'disallowedToken' => $name,
-				'errorCode' => CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED,
-				'line' => $node->getLine(),
-				'reason' => $this->buildReason($this->blackListedConstants[$lowerName], CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED)
-			];
-		}
-	}
-
-	private function checkBlackListFunction($class, $functionName, Node $node) {
-		$name = $class . '::' . $functionName;
-		$lowerName = strtolower($name);
-
-		if (isset($this->blackListedFunctions[$lowerName])) {
-			$this->errors[]= [
-				'disallowedToken' => $name,
-				'errorCode' => CodeChecker::STATIC_CALL_NOT_ALLOWED,
-				'line' => $node->getLine(),
-				'reason' => $this->buildReason($this->blackListedFunctions[$lowerName], CodeChecker::STATIC_CALL_NOT_ALLOWED)
-			];
-		}
-	}
-
-	private function checkBlackListMethod($class, $functionName, Node $node) {
-		$name = $class . '::' . $functionName;
-		$lowerName = strtolower($name);
-
-		if (isset($this->blackListedMethods[$lowerName])) {
-			$this->errors[]= [
-				'disallowedToken' => $name,
-				'errorCode' => CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED,
-				'line' => $node->getLine(),
-				'reason' => $this->buildReason($this->blackListedMethods[$lowerName], CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED)
-			];
-		}
-	}
-
-	private function buildReason($name, $errorCode) {
-		if (isset($this->errorMessages[$errorCode])) {
-			$desc = $this->list->getDescription($errorCode, $name);
-			return sprintf($this->errorMessages[$errorCode], $desc);
-		}
-
-		return "$name usage not allowed - error: $errorCode";
-	}
+    /** @var ICheck */
+    protected $list;
+
+    /** @var string */
+    protected $blackListDescription;
+    /** @var string[] */
+    protected $blackListedClassNames;
+    /** @var string[] */
+    protected $blackListedConstants;
+    /** @var string[] */
+    protected $blackListedFunctions;
+    /** @var string[] */
+    protected $blackListedMethods;
+    /** @var bool */
+    protected $checkEqualOperatorUsage;
+    /** @var string[] */
+    protected $errorMessages;
+
+    /**
+     * @param ICheck $list
+     */
+    public function __construct(ICheck $list) {
+        $this->list = $list;
+
+        $this->blackListedClassNames = [];
+        foreach ($list->getClasses() as $class => $blackListInfo) {
+            if (is_numeric($class) && is_string($blackListInfo)) {
+                $class = $blackListInfo;
+                $blackListInfo = null;
+            }
+
+            $class = strtolower($class);
+            $this->blackListedClassNames[$class] = $class;
+        }
+
+        $this->blackListedConstants = [];
+        foreach ($list->getConstants() as $constantName => $blackListInfo) {
+            $constantName = strtolower($constantName);
+            $this->blackListedConstants[$constantName] = $constantName;
+        }
+
+        $this->blackListedFunctions = [];
+        foreach ($list->getFunctions() as $functionName => $blackListInfo) {
+            $functionName = strtolower($functionName);
+            $this->blackListedFunctions[$functionName] = $functionName;
+        }
+
+        $this->blackListedMethods = [];
+        foreach ($list->getMethods() as $functionName => $blackListInfo) {
+            $functionName = strtolower($functionName);
+            $this->blackListedMethods[$functionName] = $functionName;
+        }
+
+        $this->checkEqualOperatorUsage = $list->checkStrongComparisons();
+
+        $this->errorMessages = [
+            CodeChecker::CLASS_EXTENDS_NOT_ALLOWED => "%s class must not be extended",
+            CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED => "%s interface must not be implemented",
+            CodeChecker::STATIC_CALL_NOT_ALLOWED => "Static method of %s class must not be called",
+            CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED => "Constant of %s class must not not be fetched",
+            CodeChecker::CLASS_NEW_NOT_ALLOWED => "%s class must not be instantiated",
+            CodeChecker::CLASS_USE_NOT_ALLOWED => "%s class must not be imported with a use statement",
+            CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED => "Method of %s class must not be called",
+
+            CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED => "is discouraged",
+        ];
+    }
+
+    /** @var array */
+    public $errors = [];
+
+    public function enterNode(Node $node) {
+        if ($this->checkEqualOperatorUsage && $node instanceof Node\Expr\BinaryOp\Equal) {
+            $this->errors[]= [
+                'disallowedToken' => '==',
+                'errorCode' => CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED,
+                'line' => $node->getLine(),
+                'reason' => $this->buildReason('==', CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED)
+            ];
+        }
+        if ($this->checkEqualOperatorUsage && $node instanceof Node\Expr\BinaryOp\NotEqual) {
+            $this->errors[]= [
+                'disallowedToken' => '!=',
+                'errorCode' => CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED,
+                'line' => $node->getLine(),
+                'reason' => $this->buildReason('!=', CodeChecker::OP_OPERATOR_USAGE_DISCOURAGED)
+            ];
+        }
+        if ($node instanceof Node\Stmt\Class_) {
+            if (!is_null($node->extends)) {
+                $this->checkBlackList($node->extends->toString(), CodeChecker::CLASS_EXTENDS_NOT_ALLOWED, $node);
+            }
+            foreach ($node->implements as $implements) {
+                $this->checkBlackList($implements->toString(), CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED, $node);
+            }
+        }
+        if ($node instanceof Node\Expr\StaticCall) {
+            if (!is_null($node->class)) {
+                if ($node->class instanceof Name) {
+                    $this->checkBlackList($node->class->toString(), CodeChecker::STATIC_CALL_NOT_ALLOWED, $node);
+
+                    $this->checkBlackListFunction($node->class->toString(), $node->name, $node);
+                    $this->checkBlackListMethod($node->class->toString(), $node->name, $node);
+                }
+
+                if ($node->class instanceof Node\Expr\Variable) {
+                    /**
+                     * TODO: find a way to detect something like this:
+                     *       $c = "OC_API";
+                     *       $n = $c::call();
+                     */
+                    // $this->checkBlackListMethod($node->class->..., $node->name, $node);
+                }
+            }
+        }
+        if ($node instanceof Node\Expr\MethodCall) {
+            if (!is_null($node->var)) {
+                if ($node->var instanceof Node\Expr\Variable) {
+                    /**
+                     * TODO: find a way to detect something like this:
+                     *       $c = new OC_API();
+                     *       $n = $c::call();
+                     *       $n = $c->call();
+                     */
+                    // $this->checkBlackListMethod($node->var->..., $node->name, $node);
+                }
+            }
+        }
+        if ($node instanceof Node\Expr\ClassConstFetch) {
+            if (!is_null($node->class)) {
+                if ($node->class instanceof Name) {
+                    $this->checkBlackList($node->class->toString(), CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED, $node);
+                }
+                if ($node->class instanceof Node\Expr\Variable || $node->class instanceof Node\Expr\PropertyFetch) {
+                    /**
+                     * TODO: find a way to detect something like this:
+                     *       $c = "OC_API";
+                     *       $n = $i::ADMIN_AUTH;
+                     */
+                } else {
+                    $this->checkBlackListConstant($node->class->toString(), $node->name, $node);
+                }
+            }
+        }
+        if ($node instanceof Node\Expr\New_) {
+            if (!is_null($node->class)) {
+                if ($node->class instanceof Name) {
+                    $this->checkBlackList($node->class->toString(), CodeChecker::CLASS_NEW_NOT_ALLOWED, $node);
+                }
+                if ($node->class instanceof Node\Expr\Variable) {
+                    /**
+                     * TODO: find a way to detect something like this:
+                     *       $c = "OC_API";
+                     *       $n = new $i;
+                     */
+                }
+            }
+        }
+        if ($node instanceof Node\Stmt\UseUse) {
+            $this->checkBlackList($node->name->toString(), CodeChecker::CLASS_USE_NOT_ALLOWED, $node);
+            if ($node->alias) {
+                $this->addUseNameToBlackList($node->name->toString(), $node->alias);
+            } else {
+                $this->addUseNameToBlackList($node->name->toString(), $node->name->getLast());
+            }
+        }
+    }
+
+    /**
+     * Check whether an alias was introduced for a namespace of a blacklisted class
+     *
+     * Example:
+     * - Blacklist entry:      OCP\AppFramework\IApi
+     * - Name:                 OCP\AppFramework
+     * - Alias:                OAF
+     * =>  new blacklist entry:  OAF\IApi
+     *
+     * @param string $name
+     * @param string $alias
+     */
+    private function addUseNameToBlackList($name, $alias) {
+        $name = strtolower($name);
+        $alias = strtolower($alias);
+
+        foreach ($this->blackListedClassNames as $blackListedAlias => $blackListedClassName) {
+            if (strpos($blackListedClassName, $name . '\\') === 0) {
+                $aliasedClassName = str_replace($name, $alias, $blackListedClassName);
+                $this->blackListedClassNames[$aliasedClassName] = $blackListedClassName;
+            }
+        }
+
+        foreach ($this->blackListedConstants as $blackListedAlias => $blackListedConstant) {
+            if (strpos($blackListedConstant, $name . '\\') === 0 || strpos($blackListedConstant, $name . '::') === 0) {
+                $aliasedConstantName = str_replace($name, $alias, $blackListedConstant);
+                $this->blackListedConstants[$aliasedConstantName] = $blackListedConstant;
+            }
+        }
+
+        foreach ($this->blackListedFunctions as $blackListedAlias => $blackListedFunction) {
+            if (strpos($blackListedFunction, $name . '\\') === 0 || strpos($blackListedFunction, $name . '::') === 0) {
+                $aliasedFunctionName = str_replace($name, $alias, $blackListedFunction);
+                $this->blackListedFunctions[$aliasedFunctionName] = $blackListedFunction;
+            }
+        }
+
+        foreach ($this->blackListedMethods as $blackListedAlias => $blackListedMethod) {
+            if (strpos($blackListedMethod, $name . '\\') === 0 || strpos($blackListedMethod, $name . '::') === 0) {
+                $aliasedMethodName = str_replace($name, $alias, $blackListedMethod);
+                $this->blackListedMethods[$aliasedMethodName] = $blackListedMethod;
+            }
+        }
+    }
+
+    private function checkBlackList($name, $errorCode, Node $node) {
+        $lowerName = strtolower($name);
+
+        if (isset($this->blackListedClassNames[$lowerName])) {
+            $this->errors[]= [
+                'disallowedToken' => $name,
+                'errorCode' => $errorCode,
+                'line' => $node->getLine(),
+                'reason' => $this->buildReason($this->blackListedClassNames[$lowerName], $errorCode)
+            ];
+        }
+    }
+
+    private function checkBlackListConstant($class, $constantName, Node $node) {
+        $name = $class . '::' . $constantName;
+        $lowerName = strtolower($name);
+
+        if (isset($this->blackListedConstants[$lowerName])) {
+            $this->errors[]= [
+                'disallowedToken' => $name,
+                'errorCode' => CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED,
+                'line' => $node->getLine(),
+                'reason' => $this->buildReason($this->blackListedConstants[$lowerName], CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED)
+            ];
+        }
+    }
+
+    private function checkBlackListFunction($class, $functionName, Node $node) {
+        $name = $class . '::' . $functionName;
+        $lowerName = strtolower($name);
+
+        if (isset($this->blackListedFunctions[$lowerName])) {
+            $this->errors[]= [
+                'disallowedToken' => $name,
+                'errorCode' => CodeChecker::STATIC_CALL_NOT_ALLOWED,
+                'line' => $node->getLine(),
+                'reason' => $this->buildReason($this->blackListedFunctions[$lowerName], CodeChecker::STATIC_CALL_NOT_ALLOWED)
+            ];
+        }
+    }
+
+    private function checkBlackListMethod($class, $functionName, Node $node) {
+        $name = $class . '::' . $functionName;
+        $lowerName = strtolower($name);
+
+        if (isset($this->blackListedMethods[$lowerName])) {
+            $this->errors[]= [
+                'disallowedToken' => $name,
+                'errorCode' => CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED,
+                'line' => $node->getLine(),
+                'reason' => $this->buildReason($this->blackListedMethods[$lowerName], CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED)
+            ];
+        }
+    }
+
+    private function buildReason($name, $errorCode) {
+        if (isset($this->errorMessages[$errorCode])) {
+            $desc = $this->list->getDescription($errorCode, $name);
+            return sprintf($this->errorMessages[$errorCode], $desc);
+        }
+
+        return "$name usage not allowed - error: $errorCode";
+    }
 }

lib/private/App/CodeChecker/AbstractCheck.php

Indentation +114 added lines, -114 removed lines

@@ -23,118 +23,118 @@
 namespace OC\App\CodeChecker;
 
 abstract class AbstractCheck implements ICheck {
-	/** @var ICheck */
-	protected $check;
-
-	/**
-	 * @param ICheck $check
-	 */
-	public function __construct(ICheck $check) {
-		$this->check = $check;
-	}
-
-	/**
-	 * @param int $errorCode
-	 * @param string $errorObject
-	 * @return string
-	 */
-	public function getDescription($errorCode, $errorObject) {
-		switch ($errorCode) {
-			case CodeChecker::STATIC_CALL_NOT_ALLOWED:
-				$functions = $this->getLocalFunctions();
-				$functions = array_change_key_case($functions, CASE_LOWER);
-				if (isset($functions[$errorObject])) {
-					return $this->getLocalDescription();
-				}
-			// no break;
-			case CodeChecker::CLASS_EXTENDS_NOT_ALLOWED:
-			case CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED:
-			case CodeChecker::CLASS_NEW_NOT_ALLOWED:
-			case CodeChecker::CLASS_USE_NOT_ALLOWED:
-				$classes = $this->getLocalClasses();
-				$classes = array_change_key_case($classes, CASE_LOWER);
-				if (isset($classes[$errorObject])) {
-					return $this->getLocalDescription();
-				}
-			break;
-
-			case CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED:
-				$constants = $this->getLocalConstants();
-				$constants = array_change_key_case($constants, CASE_LOWER);
-				if (isset($constants[$errorObject])) {
-					return $this->getLocalDescription();
-				}
-			break;
-
-			case CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED:
-				$methods = $this->getLocalMethods();
-				$methods = array_change_key_case($methods, CASE_LOWER);
-				if (isset($methods[$errorObject])) {
-					return $this->getLocalDescription();
-				}
-			break;
-		}
-
-		return $this->check->getDescription($errorCode, $errorObject);
-	}
-
-	/**
-	 * @return string
-	 */
-	abstract protected function getLocalDescription();
-
-	/**
-	 * @return array
-	 */
-	abstract protected function getLocalClasses();
-
-	/**
-	 * @return array
-	 */
-	abstract protected function getLocalConstants();
-
-	/**
-	 * @return array
-	 */
-	abstract protected function getLocalFunctions();
-
-	/**
-	 * @return array
-	 */
-	abstract protected function getLocalMethods();
-
-	/**
-	 * @return array E.g.: `'ClassName' => 'oc version',`
-	 */
-	public function getClasses() {
-		return array_merge($this->getLocalClasses(), $this->check->getClasses());
-	}
-
-	/**
-	 * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
-	 */
-	public function getConstants() {
-		return array_merge($this->getLocalConstants(), $this->check->getConstants());
-	}
-
-	/**
-	 * @return array E.g.: `'functionName' => 'oc version',`
-	 */
-	public function getFunctions() {
-		return array_merge($this->getLocalFunctions(), $this->check->getFunctions());
-	}
-
-	/**
-	 * @return array E.g.: `'ClassName::methodName' => 'oc version',`
-	 */
-	public function getMethods() {
-		return array_merge($this->getLocalMethods(), $this->check->getMethods());
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function checkStrongComparisons() {
-		return $this->check->checkStrongComparisons();
-	}
+    /** @var ICheck */
+    protected $check;
+
+    /**
+     * @param ICheck $check
+     */
+    public function __construct(ICheck $check) {
+        $this->check = $check;
+    }
+
+    /**
+     * @param int $errorCode
+     * @param string $errorObject
+     * @return string
+     */
+    public function getDescription($errorCode, $errorObject) {
+        switch ($errorCode) {
+            case CodeChecker::STATIC_CALL_NOT_ALLOWED:
+                $functions = $this->getLocalFunctions();
+                $functions = array_change_key_case($functions, CASE_LOWER);
+                if (isset($functions[$errorObject])) {
+                    return $this->getLocalDescription();
+                }
+            // no break;
+            case CodeChecker::CLASS_EXTENDS_NOT_ALLOWED:
+            case CodeChecker::CLASS_IMPLEMENTS_NOT_ALLOWED:
+            case CodeChecker::CLASS_NEW_NOT_ALLOWED:
+            case CodeChecker::CLASS_USE_NOT_ALLOWED:
+                $classes = $this->getLocalClasses();
+                $classes = array_change_key_case($classes, CASE_LOWER);
+                if (isset($classes[$errorObject])) {
+                    return $this->getLocalDescription();
+                }
+            break;
+
+            case CodeChecker::CLASS_CONST_FETCH_NOT_ALLOWED:
+                $constants = $this->getLocalConstants();
+                $constants = array_change_key_case($constants, CASE_LOWER);
+                if (isset($constants[$errorObject])) {
+                    return $this->getLocalDescription();
+                }
+            break;
+
+            case CodeChecker::CLASS_METHOD_CALL_NOT_ALLOWED:
+                $methods = $this->getLocalMethods();
+                $methods = array_change_key_case($methods, CASE_LOWER);
+                if (isset($methods[$errorObject])) {
+                    return $this->getLocalDescription();
+                }
+            break;
+        }
+
+        return $this->check->getDescription($errorCode, $errorObject);
+    }
+
+    /**
+     * @return string
+     */
+    abstract protected function getLocalDescription();
+
+    /**
+     * @return array
+     */
+    abstract protected function getLocalClasses();
+
+    /**
+     * @return array
+     */
+    abstract protected function getLocalConstants();
+
+    /**
+     * @return array
+     */
+    abstract protected function getLocalFunctions();
+
+    /**
+     * @return array
+     */
+    abstract protected function getLocalMethods();
+
+    /**
+     * @return array E.g.: `'ClassName' => 'oc version',`
+     */
+    public function getClasses() {
+        return array_merge($this->getLocalClasses(), $this->check->getClasses());
+    }
+
+    /**
+     * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
+     */
+    public function getConstants() {
+        return array_merge($this->getLocalConstants(), $this->check->getConstants());
+    }
+
+    /**
+     * @return array E.g.: `'functionName' => 'oc version',`
+     */
+    public function getFunctions() {
+        return array_merge($this->getLocalFunctions(), $this->check->getFunctions());
+    }
+
+    /**
+     * @return array E.g.: `'ClassName::methodName' => 'oc version',`
+     */
+    public function getMethods() {
+        return array_merge($this->getLocalMethods(), $this->check->getMethods());
+    }
+
+    /**
+     * @return bool
+     */
+    public function checkStrongComparisons() {
+        return $this->check->checkStrongComparisons();
+    }
 }

lib/private/App/CodeChecker/EmptyCheck.php

Indentation +38 added lines, -38 removed lines

@@ -22,47 +22,47 @@
 namespace OC\App\CodeChecker;
 
 class EmptyCheck implements ICheck {
-	/**
-	 * @param int $errorCode
-	 * @param string $errorObject
-	 * @return string
-	 */
-	public function getDescription($errorCode, $errorObject) {
-		return '';
-	}
+    /**
+     * @param int $errorCode
+     * @param string $errorObject
+     * @return string
+     */
+    public function getDescription($errorCode, $errorObject) {
+        return '';
+    }
 
-	/**
-	 * @return array E.g.: `'ClassName' => 'oc version',`
-	 */
-	public function getClasses() {
-		return [];
-	}
+    /**
+     * @return array E.g.: `'ClassName' => 'oc version',`
+     */
+    public function getClasses() {
+        return [];
+    }
 
-	/**
-	 * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
-	 */
-	public function getConstants() {
-		return [];
-	}
+    /**
+     * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
+     */
+    public function getConstants() {
+        return [];
+    }
 
-	/**
-	 * @return array E.g.: `'functionName' => 'oc version',`
-	 */
-	public function getFunctions() {
-		return [];
-	}
+    /**
+     * @return array E.g.: `'functionName' => 'oc version',`
+     */
+    public function getFunctions() {
+        return [];
+    }
 
-	/**
-	 * @return array E.g.: `'ClassName::methodName' => 'oc version',`
-	 */
-	public function getMethods() {
-		return [];
-	}
+    /**
+     * @return array E.g.: `'ClassName::methodName' => 'oc version',`
+     */
+    public function getMethods() {
+        return [];
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function checkStrongComparisons() {
-		return false;
-	}
+    /**
+     * @return bool
+     */
+    public function checkStrongComparisons() {
+        return false;
+    }
 }