From caff1023ea72bb2ea94130e18a2a6e2ccf819e5f Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Fri, 10 Apr 2020 14:19:56 +0200 Subject: Format control structures, classes, methods and function To continue this formatting madness, here's a tiny patch that adds unified formatting for control structures like if and loops as well as classes, their methods and anonymous functions. This basically forces the constructs to start on the same line. This is not exactly what PSR2 wants, but I think we can have a few exceptions with "our" style. The starting of braces on the same line is pracrically standard for our code. This also removes and empty lines from method/function bodies at the beginning and end. Signed-off-by: Christoph Wurst --- lib/private/App/CodeChecker/CodeChecker.php | 3 +-- lib/private/App/CodeChecker/MigrationSchemaChecker.php | 15 ++++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'lib/private/App/CodeChecker') diff --git a/lib/private/App/CodeChecker/CodeChecker.php b/lib/private/App/CodeChecker/CodeChecker.php index 60276d5bfcc..aa8f43e6af2 100644 --- a/lib/private/App/CodeChecker/CodeChecker.php +++ b/lib/private/App/CodeChecker/CodeChecker.php @@ -37,7 +37,6 @@ use RegexIterator; use SplFileInfo; class CodeChecker extends BasicEmitter { - const CLASS_EXTENDS_NOT_ALLOWED = 1000; const CLASS_IMPLEMENTS_NOT_ALLOWED = 1001; const STATIC_CALL_NOT_ALLOWED = 1002; @@ -96,7 +95,7 @@ class CodeChecker extends BasicEmitter { $iterator = new RecursiveDirectoryIterator($folder, RecursiveDirectoryIterator::SKIP_DOTS); $iterator = new RecursiveCallbackFilterIterator($iterator, function ($item) use ($excludes) { /** @var SplFileInfo $item */ - foreach($excludes as $exclude) { + foreach ($excludes as $exclude) { if (substr($item->getPath(), 0, strlen($exclude)) === $exclude) { return false; } diff --git a/lib/private/App/CodeChecker/MigrationSchemaChecker.php b/lib/private/App/CodeChecker/MigrationSchemaChecker.php index 63e35e0647c..778bbfc2f31 100644 --- a/lib/private/App/CodeChecker/MigrationSchemaChecker.php +++ b/lib/private/App/CodeChecker/MigrationSchemaChecker.php @@ -53,7 +53,6 @@ class MigrationSchemaChecker extends NodeVisitorAbstract { $node->expr instanceof Node\Expr\MethodCall && $node->expr->var instanceof Node\Expr\Variable && $node->expr->var->name === $this->schemaVariableName) { - if ($node->expr->name === 'createTable') { if (isset($node->expr->args[0]) && $node->expr->args[0]->value instanceof Node\Scalar\String_) { if (!$this->checkNameLength($node->expr->args[0]->value->value)) { @@ -75,7 +74,6 @@ class MigrationSchemaChecker extends NodeVisitorAbstract { $node instanceof Node\Expr\MethodCall && $node->var instanceof Node\Expr\Variable && $node->var->name === $this->schemaVariableName) { - if ($node->name === 'renameTable') { $this->errors[] = [ 'line' => $node->getLine(), @@ -87,14 +85,13 @@ class MigrationSchemaChecker extends NodeVisitorAbstract { ]; } - /** - * Check columns and Indexes - */ + /** + * Check columns and Indexes + */ } elseif (!empty($this->tableVariableNames) && $node instanceof Node\Expr\MethodCall && $node->var instanceof Node\Expr\Variable && isset($this->tableVariableNames[$node->var->name])) { - if ($node->name === 'addColumn' || $node->name === 'changeColumn') { if (isset($node->args[0]) && $node->args[0]->value instanceof Node\Scalar\String_) { if (!$this->checkNameLength($node->args[0]->value->value)) { @@ -163,9 +160,9 @@ class MigrationSchemaChecker extends NodeVisitorAbstract { ]; } - /** - * Find the schema - */ + /** + * Find the schema + */ } elseif ($node instanceof Node\Expr\Assign && $node->expr instanceof Node\Expr\FuncCall && $node->var instanceof Node\Expr\Variable && -- cgit v1.2.3