[Coding Style] Enable rule Squiz.Functions.MultiLineFunctionDeclaration.ContentAfterBrace (matomo-org#21716)

michalkleiner · web-flow · commit 4bf4190287d5 · 2023-12-19T12:32:09.000+01:00
* Enable rule Squiz.Functions.MultiLineFunctionDeclaration.ContentAfterBrace

* Apply CS
diff --git a/core/Segment/SegmentExpression.php b/core/Segment/SegmentExpression.php
@@ -371,7 +371,8 @@ public static function parseColumnsFromSqlExpr($field)
     {
         preg_match_all('/[^@a-zA-Z0-9_]?`?([@a-zA-Z_][@a-zA-Z0-9_]*`?\.`?[a-zA-Z0-9_`]+)`?\b/', $field, $matches);
         $result = isset($matches[1]) ? $matches[1] : [];
-        $result = array_filter($result, function ($value) { // remove uses of session vars
+        // remove uses of session vars
+        $result = array_filter($result, function ($value) {
             return strpos($value, '@') === false;
         });
         $result = array_map(function ($item) {
diff --git a/phpcs.xml b/phpcs.xml
@@ -78,7 +78,6 @@
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.BraceIndent" />
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.BraceOnSameLine" />
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.CloseBracketLine" />
-        <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.ContentAfterBrace" />
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.FirstParamSpacing" />
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.Indent" />
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.NewlineBeforeOpenBrace" />
diff --git a/tests/PHPUnit/Unit/DataTableTest.php b/tests/PHPUnit/Unit/DataTableTest.php
@@ -1237,7 +1237,8 @@ public function test_sumRowWithLabel_sumsWithExistingRowIfTableDoesHaveRowWithSa
         ];
 
         $actualRows = $dataTable->getRows();
-        $actualRows = array_map(function (Row $r) { return $r->getColumns();
+        $actualRows = array_map(function (Row $r) {
+            return $r->getColumns();
         }, $actualRows);
 
         $this->assertEquals($expectedRows, $actualRows);
