Fix coding style with phpcs PSR-12 standard

Signed-off-by: davidarendsen <davidarendsen@hey.com>

tests/Expression/KeyValueTest.php

@@ -1,11 +1,14 @@
 <?php
+
 declare(strict_types=1);
 
+namespace Tests\Expression;
+
 use Arendsen\FluxQueryBuilder\Expression\KeyValue;
 use PHPUnit\Framework\TestCase;
 
-final class KeyValueExpressionTest extends TestCase {
-
+final class KeyValueExpressionTest extends TestCase
+{
     public function testSimpleKeyvalue()
     {
         $keyvalue = KeyValue::setEqualTo('_measurement', 'test_measurement')
@@ -14,7 +17,7 @@ final class KeyValueExpressionTest extends TestCase {
             ->and('user', KeyValue::EQUAL_TO, 'my_username')
             ->orNotEqualTo('test', 'world');
 
-        $query = 'r._measurement == "test_measurement" and r._field == "user" or ' . 
+        $query = 'r._measurement == "test_measurement" and r._field == "user" or ' .
             'r.count >= "1" and r.user == "my_username" or r.test != "world"';
 
         $this->assertEquals($keyvalue->__toString(), $query);
@@ -29,5 +32,4 @@ final class KeyValueExpressionTest extends TestCase {
             ->or('_field', '==', 'field2')
             ->andEqualTo('user', 'my_username');
     }
-
-}
+}

tests/Functions/FilterFunctionTest.php

@@ -1,24 +1,25 @@
 <?php
+
 declare(strict_types=1);
 
+namespace Tests\Functions;
+
 use Arendsen\FluxQueryBuilder\Expression\KeyValue;
 use Arendsen\FluxQueryBuilder\Functions\Filter;
 use PHPUnit\Framework\TestCase;
 
-final class FilterFunctionTest extends TestCase {
-
+final class FilterFunctionTest extends TestCase
+{
     public function testSimpleFilter()
     {
         $expression = new Filter(KeyValue::setEqualTo('_measurement', 'test_measurement')
             ->andEqualTo('_field', 'user')
             ->orEqualTo('_field', 'field2')
-            ->andEqualTo('user', 'my_username')
-        );
+            ->andEqualTo('user', 'my_username'));
 
-        $query = '|> filter(fn: (r) => r._measurement == "test_measurement" and r._field == "user" or ' . 
+        $query = '|> filter(fn: (r) => r._measurement == "test_measurement" and r._field == "user" or ' .
             'r._field == "field2" and r.user == "my_username") ';
 
         $this->assertEquals($expression->__toString(), $query);
     }
-
-}
+}

tests/Functions/FromFunctionTest.php

@@ -1,11 +1,14 @@
 <?php
+
 declare(strict_types=1);
 
+namespace Tests\Functions;
+
 use Arendsen\FluxQueryBuilder\Functions\From;
 use PHPUnit\Framework\TestCase;
 
-final class FromFunctionTest extends TestCase {
-
+final class FromFunctionTest extends TestCase
+{
     /**
      * @dataProvider somethingProvider
      */
@@ -34,5 +37,4 @@ final class FromFunctionTest extends TestCase {
             ],
         ];
     }
-
-}
+}

tests/Functions/GroupFunctionTest.php

@@ -1,11 +1,14 @@
 <?php
+
 declare(strict_types=1);
 
+namespace Tests\Functions;
+
 use Arendsen\FluxQueryBuilder\Functions\Group;
 use PHPUnit\Framework\TestCase;
 
-final class GroupFunctionTest extends TestCase {
-
+final class GroupFunctionTest extends TestCase
+{
     public function testSimpleGroup()
     {
         $expression = new Group(['foo', 'bar'], 'by');
@@ -14,5 +17,4 @@ final class GroupFunctionTest extends TestCase {
 
         $this->assertEquals($query, $expression->__toString());
     }
-
-}
+}

tests/Functions/LimitFunctionTest.php

@@ -1,11 +1,14 @@
 <?php
+
 declare(strict_types=1);
 
+namespace Tests\Functions;
+
 use Arendsen\FluxQueryBuilder\Functions\Limit;
 use PHPUnit\Framework\TestCase;
 
-final class LimitFunctionTest extends TestCase {
-
+final class LimitFunctionTest extends TestCase
+{
     public function testSimpleLimit()
     {
         $expression = new Limit(1);
@@ -14,5 +17,4 @@ final class LimitFunctionTest extends TestCase {
 
         $this->assertEquals($query, $expression->__toString());
     }
-
-}
+}

tests/Functions/MapFunctionTest.php

@@ -1,11 +1,14 @@
 <?php
+
 declare(strict_types=1);
 
+namespace Tests\Functions;
+
 use Arendsen\FluxQueryBuilder\Functions\Map;
 use PHPUnit\Framework\TestCase;
 
-final class MapFunctionTest extends TestCase {
-
+final class MapFunctionTest extends TestCase
+{
     public function testSimpleMap()
     {
         $expression = new Map('r with name: r.user');
@@ -14,5 +17,4 @@ final class MapFunctionTest extends TestCase {
 
         $this->assertEquals($query, $expression->__toString());
     }
-
-}
+}

tests/Functions/RangeFunctionTest.php

@@ -1,13 +1,15 @@
 <?php
+
 declare(strict_types=1);
 
-use Arendsen\FluxQueryBuilder\Exception\FunctionRequiredSettingMissingException;
-use Arendsen\FluxQueryBuilder\Formatters;
+namespace Tests\Functions;
+
+use DateTime;
 use Arendsen\FluxQueryBuilder\Functions\Range;
 use PHPUnit\Framework\TestCase;
 
-final class RangeFunctionTest extends TestCase {
-
+final class RangeFunctionTest extends TestCase
+{
     public function testOnlyStartOption()
     {
         $expression = new Range(
@@ -42,5 +44,4 @@ final class RangeFunctionTest extends TestCase {
 
         $this->assertEquals($expected, $expression->__toString());
     }
-
-}
+}

tests/Functions/ReduceFunctionTest.php

@@ -1,11 +1,14 @@
 <?php
+
 declare(strict_types=1);
 
+namespace Tests\Functions;
+
 use Arendsen\FluxQueryBuilder\Functions\Reduce;
 use PHPUnit\Framework\TestCase;
 
-final class ReduceFunctionTest extends TestCase {
-
+final class ReduceFunctionTest extends TestCase
+{
     public function testSimpleReduce()
     {
         $expression = new Reduce(['sum' => 'r._value + accumulator.sum'], ['sum' => 0]);
@@ -14,5 +17,4 @@ final class ReduceFunctionTest extends TestCase {
 
         $this->assertEquals($query, $expression->__toString());
     }
-
-}
+}

tests/Functions/SortFunctionTest.php

@@ -1,11 +1,14 @@
 <?php
+
 declare(strict_types=1);
 
+namespace Tests\Functions;
+
 use Arendsen\FluxQueryBuilder\Functions\Sort;
 use PHPUnit\Framework\TestCase;
 
-final class SortFunctionTest extends TestCase {
-
+final class SortFunctionTest extends TestCase
+{
     public function testSimpleSort()
     {
         $expression = new Sort(['foo', 'bar'], true);
@@ -14,5 +17,4 @@ final class SortFunctionTest extends TestCase {
 
         $this->assertEquals($query, $expression->__toString());
     }
-
-}
+}

tests/Generic/FormattersTest.php

@@ -1,11 +1,15 @@
 <?php
+
 declare(strict_types=1);
 
+namespace Tests\Generic;
+
+use DateTime;
 use Arendsen\FluxQueryBuilder\Formatters;
 use PHPUnit\Framework\TestCase;
 
-final class FormattersTest extends TestCase {
-
+final class FormattersTest extends TestCase
+{
     public function testAssociativeArrayNested()
     {
         $array = [
@@ -26,5 +30,4 @@ final class FormattersTest extends TestCase {
 
         $this->assertEquals($expected, Formatters::dateTimeToString($dateTime));
     }
-
-}
+}

tests/Generic/QueryBuilderTest.php

@@ -1,12 +1,15 @@
 <?php
+
 declare(strict_types=1);
 
+namespace Tests\Generic;
+
 use Arendsen\FluxQueryBuilder\Expression\KeyValue;
 use PHPUnit\Framework\TestCase;
 use Arendsen\FluxQueryBuilder\QueryBuilder;
 
-final class QueryBuilderTest extends TestCase {
-
+final class QueryBuilderTest extends TestCase
+{
     /**
      * @dataProvider simpleQueryProvider
      */
@@ -15,10 +18,9 @@ final class QueryBuilderTest extends TestCase {
         $queryBuilder = new QueryBuilder();
         $queryBuilder->from($bucket)
             ->fromMeasurement($measurement)
-		    ->addRangeStart($range);
+            ->addRangeStart($range);
 
-        if($keyValue)
-        {
+        if ($keyValue) {
             $queryBuilder->addFilter($keyValue);
         }
 
@@ -35,7 +37,7 @@ final class QueryBuilderTest extends TestCase {
                 'test_measurement',
                 new DateTime('2022-08-12 23:05:00'),
                 null,
-                'from(bucket: "example_bucket") |> range(start: time(v: 2022-08-12T23:05:00Z)) ' . 
+                'from(bucket: "example_bucket") |> range(start: time(v: 2022-08-12T23:05:00Z)) ' .
                     '|> filter(fn: (r) => r._measurement == "test_measurement") '
             ],
             'query with filter' => [
@@ -45,8 +47,8 @@ final class QueryBuilderTest extends TestCase {
                 'test_measurement',
                 new DateTime('2022-08-12 20:05:00'),
                 KeyValue::setEqualTo('user', 'username'),
-                'from(bucket: "example_bucket") |> range(start: time(v: 2022-08-12T20:05:00Z)) ' . 
-                    '|> filter(fn: (r) => r._measurement == "test_measurement") ' . 
+                'from(bucket: "example_bucket") |> range(start: time(v: 2022-08-12T20:05:00Z)) ' .
+                    '|> filter(fn: (r) => r._measurement == "test_measurement") ' .
                     '|> filter(fn: (r) => r.user == "username") '
             ],
         ];
@@ -61,13 +63,13 @@ final class QueryBuilderTest extends TestCase {
 
         $queryBuilder = new QueryBuilder();
 
-        if($from) {
+        if ($from) {
             $queryBuilder->from($from);
         }
-        if($measurement) {
+        if ($measurement) {
             $queryBuilder->fromMeasurement($measurement);
         }
-        if($range) {
+        if ($range) {
             $queryBuilder->addRangeStart($range['start']);
         }
 
@@ -101,13 +103,12 @@ final class QueryBuilderTest extends TestCase {
             ->addReduce(['count' => 'accumulator.count + 1'], ['count' => 0])
             ->addFilter(KeyValue::setGreaterOrEqualTo('count', 1)->andGreaterOrEqualTo('count2', 2));
 
-        $expectedQuery = 'from(bucket: "test_bucket") |> range(start: time(v: 2022-08-12T17:31:00Z)) ' . 
-            '|> reduce(fn: (r, accumulator) => ({count: accumulator.count + 1}), identity: {count: 0}) ' . 
-            '|> filter(fn: (r) => r._measurement == "test_measurement") |> filter(fn: (r) => r._field == "username") ' . 
-            '|> filter(fn: (r) => r.count >= 1 and r.count2 >= 2) |> map(fn: (r) => ({ r with name: r.user })) ' . 
+        $expectedQuery = 'from(bucket: "test_bucket") |> range(start: time(v: 2022-08-12T17:31:00Z)) ' .
+            '|> reduce(fn: (r, accumulator) => ({count: accumulator.count + 1}), identity: {count: 0}) ' .
+            '|> filter(fn: (r) => r._measurement == "test_measurement") |> filter(fn: (r) => r._field == "username") ' .
+            '|> filter(fn: (r) => r.count >= 1 and r.count2 >= 2) |> map(fn: (r) => ({ r with name: r.user })) ' .
             '|> group(columns: ["_field", "ip"], mode: "by") ';
 
         $this->assertEquals($expectedQuery, $queryBuilder->build());
     }
-
-}
+}