Minor improvements in codestyle & (unused) imports

Wout Gevaert · Wout Gevaert · commit 9b8ab6b06232 · 2022-04-25T11:30:32.000+02:00
diff --git a/src/Alias.php b/src/Alias.php
@@ -2,8 +2,8 @@
 
 namespace WikibaseSolutions\CypherDSL;
 
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use function sprintf;
+use WikibaseSolutions\CypherDSL\Types\AnyType;
 
 /**
  * Represents aliasing an expression or variable.
diff --git a/src/Clauses/CallProcedureClause.php b/src/Clauses/CallProcedureClause.php
@@ -174,8 +174,8 @@ protected function getSubject(): string
             );
 
             return sprintf("%s(%s) YIELD %s", $this->procedure, $arguments, $yieldParameters);
-        } else {
-            return sprintf("%s(%s)", $this->procedure, $arguments);
         }
+
+        return sprintf("%s(%s)", $this->procedure, $arguments);
     }
 }
diff --git a/src/Clauses/RemoveClause.php b/src/Clauses/RemoveClause.php
@@ -21,10 +21,10 @@
 
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
-use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Label;
 use WikibaseSolutions\CypherDSL\Property;
 use WikibaseSolutions\CypherDSL\QueryConvertable;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 
 /**
  * This class represents a REMOVE clause.
diff --git a/src/Clauses/SetClause.php b/src/Clauses/SetClause.php
@@ -22,9 +22,9 @@
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
 use WikibaseSolutions\CypherDSL\Assignment;
-use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Label;
 use WikibaseSolutions\CypherDSL\QueryConvertable;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 
 /**
  * This class represents a SET clause.
diff --git a/src/Exists.php b/src/Exists.php
@@ -84,8 +84,8 @@ public function toQuery(): string
     {
         if (isset($this->where)) {
             return sprintf("EXISTS { %s %s }", $this->match->toQuery(), $this->where->toQuery());
-        } else {
-            return sprintf("EXISTS { %s }", $this->match->toQuery());
         }
+
+        return sprintf("EXISTS { %s }", $this->match->toQuery());
     }
 }
diff --git a/src/ExpressionList.php b/src/ExpressionList.php
@@ -21,8 +21,8 @@
 
 namespace WikibaseSolutions\CypherDSL;
 
-use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
 use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
+use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
 use WikibaseSolutions\CypherDSL\Traits\ListTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\CompositeTypes\ListType;
diff --git a/src/Functions/IsEmpty.php b/src/Functions/IsEmpty.php
@@ -21,8 +21,8 @@
 
 namespace WikibaseSolutions\CypherDSL\Functions;
 
-use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Traits\BooleanTypeTrait;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\CompositeTypes\ListType;
 use WikibaseSolutions\CypherDSL\Types\CompositeTypes\MapType;
diff --git a/src/Functions/RawFunction.php b/src/Functions/RawFunction.php
@@ -22,8 +22,8 @@
 namespace WikibaseSolutions\CypherDSL\Functions;
 
 use InvalidArgumentException;
-use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Traits\BooleanTypeTrait;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Traits\ListTypeTrait;
 use WikibaseSolutions\CypherDSL\Traits\MapTypeTrait;
 use WikibaseSolutions\CypherDSL\Traits\NumeralTypeTrait;
@@ -34,8 +34,6 @@
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\NumeralType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\StringType;
-use WikibaseSolutions\CypherDSL\Types\StructuralTypes\NodeType;
-use WikibaseSolutions\CypherDSL\Types\StructuralTypes\PathType;
 
 /**
  * This class represents any function call.
diff --git a/src/Literals/Boolean.php b/src/Literals/Boolean.php
@@ -21,7 +21,6 @@
 
 namespace WikibaseSolutions\CypherDSL\Literals;
 
-use WikibaseSolutions\CypherDSL\Traits\AliasableTrait;
 use WikibaseSolutions\CypherDSL\Traits\BooleanTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
diff --git a/src/Literals/Decimal.php b/src/Literals/Decimal.php
@@ -21,7 +21,6 @@
 
 namespace WikibaseSolutions\CypherDSL\Literals;
 
-use WikibaseSolutions\CypherDSL\Traits\AliasableTrait;
 use WikibaseSolutions\CypherDSL\Traits\NumeralTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\NumeralType;
 
diff --git a/src/Literals/Literal.php b/src/Literals/Literal.php
@@ -23,8 +23,8 @@
 
 use InvalidArgumentException;
 use WikibaseSolutions\CypherDSL\Functions\FunctionCall;
-use WikibaseSolutions\CypherDSL\Query;
 use WikibaseSolutions\CypherDSL\PropertyMap;
+use WikibaseSolutions\CypherDSL\Query;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\DateTimeType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\DateType;
@@ -240,7 +240,7 @@ public static function dateTimeYMD(
             "millisecond" => $millisecond,
             "microsecond" => $microsecond,
             "nanosecond" => $nanosecond,
-            "timezone" => $timezone
+            "timezone" => $timezone,
         ]));
     }
 
@@ -381,6 +381,7 @@ public static function datetimeString($dateString): DateTimeType
         if (!($dateString instanceof StringType)) {
             $dateString = self::string($dateString);
         }
+
         return FunctionCall::datetime($dateString);
     }
 
@@ -401,6 +402,7 @@ public static function localDatetime($timezone = null): LocalDateTimeType
         if (!($timezone instanceof StringType)) {
             $timezone = self::string($timezone);
         }
+
         return FunctionCall::localdatetime(Query::map(["timezone" => $timezone]));
     }
 
@@ -440,7 +442,7 @@ public static function localDatetimeYMD(
             "second" => $second,
             "millisecond" => $millisecond,
             "microsecond" => $microsecond,
-            "nanosecond" => $nanosecond
+            "nanosecond" => $nanosecond,
         ]));
     }
 
@@ -481,7 +483,7 @@ public static function localDatetimeYWD(
             "second" => $second,
             "millisecond" => $millisecond,
             "microsecond" => $microsecond,
-            "nanosecond" => $nanosecond
+            "nanosecond" => $nanosecond,
         ]));
     }
 
@@ -521,7 +523,7 @@ public static function localDatetimeYQD(
             "second" => $second,
             "millisecond" => $millisecond,
             "microsecond" => $microsecond,
-            "nanosecond" => $nanosecond
+            "nanosecond" => $nanosecond,
         ]));
     }
 
@@ -558,7 +560,7 @@ public static function localDatetimeYD(
             "second" => $second,
             "millisecond" => $millisecond,
             "microsecond" => $microsecond,
-            "nanosecond" => $nanosecond
+            "nanosecond" => $nanosecond,
         ]));
     }
 
@@ -596,6 +598,7 @@ public static function localTimeCurrent($timezone = null): LocalTimeType
         if (!($timezone instanceof StringType)) {
             $timezone = self::string($timezone);
         }
+
         return FunctionCall::localtime(Query::map(["timezone" => $timezone]));
     }
 
@@ -626,7 +629,7 @@ public static function localTime(
             "second" => $second,
             "millisecond" => $millisecond,
             "microsecond" => $microsecond,
-            "nanosecond" => $nanosecond
+            "nanosecond" => $nanosecond,
         ]));
     }
 
@@ -696,7 +699,7 @@ public static function timeHMS(
             "millisecond" => $millisecond,
             "microsecond" => $microsecond,
             "nanosecond" => $nanosecond,
-            "timezone" => $timezone
+            "timezone" => $timezone,
         ]));
     }
 
@@ -738,7 +741,7 @@ public static function point2d($x, $y): PointType
 
         $map = [
             "x" => $x,
-            "y" => $y
+            "y" => $y,
         ];
 
         $map["crs"] = self::string("cartesian");
@@ -773,7 +776,7 @@ public static function point3d($x, $y, $z): PointType
         $map = [
             "x" => $x,
             "y" => $y,
-            "z" => $z
+            "z" => $z,
         ];
 
         $map["crs"] = self::string("cartesian-3D");
@@ -802,7 +805,7 @@ public static function point2dWGS84($longitude, $latitude): PointType
 
         $map = [
             "longitude" => $longitude,
-            "latitude" => $latitude
+            "latitude" => $latitude,
         ];
 
         $map["crs"] = self::string("WGS-84");
@@ -837,7 +840,7 @@ public static function point3dWGS84($longitude, $latitude, $height): PointType
         $map = [
             "longitude" => $longitude,
             "latitude" => $latitude,
-            "height" => $height
+            "height" => $height,
         ];
 
         $map["crs"] = self::string("WGS-84-3D");
@@ -867,6 +870,7 @@ private static function makeTemporalMap(array $variables): PropertyMap
         foreach ($variables as $key => $variable) {
             if ($variable === null) {
                 $nullEncountered = true;
+
                 continue;
             }
 
@@ -896,6 +900,7 @@ private static function convertToNumeral($var): NumeralType
         if ($var instanceof NumeralType) {
             return $var;
         }
+
         return self::decimal($var);
     }
 
@@ -904,6 +909,7 @@ private static function convertToString($var): StringLiteral
         if ($var instanceof StringLiteral) {
             return $var;
         }
+
         return self::string($var);
     }
 }
diff --git a/src/Literals/StringLiteral.php b/src/Literals/StringLiteral.php
@@ -21,7 +21,6 @@
 
 namespace WikibaseSolutions\CypherDSL\Literals;
 
-use WikibaseSolutions\CypherDSL\Traits\AliasableTrait;
 use WikibaseSolutions\CypherDSL\Traits\StringTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\StringType;
 
@@ -95,8 +94,8 @@ public function toQuery(): string
 
         if ($this->useDoubleQuotes) {
             return sprintf('"%s"', str_replace('"', '\"', $value));
-        } else {
-            return sprintf("'%s'", str_replace("'", "\'", $value));
         }
+
+        return sprintf("'%s'", str_replace("'", "\'", $value));
     }
 }
diff --git a/src/Patterns/Node.php b/src/Patterns/Node.php
@@ -22,12 +22,9 @@
 namespace WikibaseSolutions\CypherDSL\Patterns;
 
 use WikibaseSolutions\CypherDSL\Property;
-use WikibaseSolutions\CypherDSL\PropertyMap;
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
 use WikibaseSolutions\CypherDSL\Traits\NodeTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\NodeType;
-use WikibaseSolutions\CypherDSL\Types\StructuralTypes\RelationshipType;
-use WikibaseSolutions\CypherDSL\Variable;
 
 /**
  * This class represents a node.
diff --git a/src/Patterns/Path.php b/src/Patterns/Path.php
@@ -2,17 +2,16 @@
 
 namespace WikibaseSolutions\CypherDSL\Patterns;
 
+use function array_key_exists;
+use function is_array;
 use WikibaseSolutions\CypherDSL\PropertyMap;
 use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Traits\PathTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
-use WikibaseSolutions\CypherDSL\Types\StructuralTypes\NodeType;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\PathType;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\RelationshipType;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
 use WikibaseSolutions\CypherDSL\Variable;
-use function array_key_exists;
-use function is_array;
 
 class Path implements PathType
 {
@@ -68,6 +67,7 @@ public function toQuery(): string
             // and is thus very unlikely.
             if (!array_key_exists($i + 1, $this->nodes)) {
                 --$i;
+
                 break;
             }
             $cql .= $this->nodes[$i]->toQuery();
diff --git a/src/Query.php b/src/Query.php
@@ -37,14 +37,14 @@
 use WikibaseSolutions\CypherDSL\Clauses\SkipClause;
 use WikibaseSolutions\CypherDSL\Clauses\WhereClause;
 use WikibaseSolutions\CypherDSL\Clauses\WithClause;
-use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Functions\FunctionCall;
 use WikibaseSolutions\CypherDSL\Literals\Boolean;
 use WikibaseSolutions\CypherDSL\Literals\Decimal;
 use WikibaseSolutions\CypherDSL\Literals\Literal;
 use WikibaseSolutions\CypherDSL\Literals\StringLiteral;
 use WikibaseSolutions\CypherDSL\Patterns\Node;
 use WikibaseSolutions\CypherDSL\Patterns\Relationship;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\CompositeTypes\ListType;
diff --git a/src/RawExpression.php b/src/RawExpression.php
@@ -31,8 +31,8 @@
 use WikibaseSolutions\CypherDSL\Traits\MapTypeTrait;
 use WikibaseSolutions\CypherDSL\Traits\NodeTypeTrait;
 use WikibaseSolutions\CypherDSL\Traits\NumeralTypeTrait;
-use WikibaseSolutions\CypherDSL\Traits\RelationshipTypeTrait;
 use WikibaseSolutions\CypherDSL\Traits\PointTrait;
+use WikibaseSolutions\CypherDSL\Traits\RelationshipTypeTrait;
 use WikibaseSolutions\CypherDSL\Traits\StringTypeTrait;
 use WikibaseSolutions\CypherDSL\Traits\TimeTrait;
 use WikibaseSolutions\CypherDSL\Types\CompositeTypes\ListType;
diff --git a/src/Traits/AliasableTrait.php b/src/Traits/AliasableTrait.php
@@ -2,9 +2,9 @@
 
 namespace WikibaseSolutions\CypherDSL\Traits;
 
+use function is_string;
 use WikibaseSolutions\CypherDSL\Alias;
 use WikibaseSolutions\CypherDSL\Variable;
-use function is_string;
 
 trait AliasableTrait
 {
diff --git a/src/Traits/ErrorTrait.php b/src/Traits/ErrorTrait.php
@@ -22,13 +22,11 @@
 namespace WikibaseSolutions\CypherDSL\Traits;
 
 use __PHP_Incomplete_Class;
-use InvalidArgumentException;
-use TypeError;
-use UnexpectedValueException;
 use function class_implements;
 use function get_class;
 use function get_parent_class;
 use function get_resource_type;
+use InvalidArgumentException;
 use function is_array;
 use function is_bool;
 use function is_float;
@@ -39,6 +37,7 @@
 use function key;
 use function preg_match;
 use function strpos;
+use TypeError;
 
 /**
  * Convenience trait including simple assertions and error reporting functions
diff --git a/src/Traits/HasNameTrait.php b/src/Traits/HasNameTrait.php
diff --git a/src/Traits/HasPropertiesTrait.php b/src/Traits/HasPropertiesTrait.php
diff --git a/src/Traits/HasVariableTrait.php b/src/Traits/HasVariableTrait.php
diff --git a/src/Traits/NodeTypeTrait.php b/src/Traits/NodeTypeTrait.php
diff --git a/src/Types/StructuralTypes/HasPropertiesType.php b/src/Types/StructuralTypes/HasPropertiesType.php
diff --git a/src/Types/StructuralTypes/HasRelationshipsType.php b/src/Types/StructuralTypes/HasRelationshipsType.php
diff --git a/src/Types/StructuralTypes/RelationshipType.php b/src/Types/StructuralTypes/RelationshipType.php
diff --git a/src/Types/StructuralTypes/StructuralType.php b/src/Types/StructuralTypes/StructuralType.php
diff --git a/src/Variable.php b/src/Variable.php

Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,8 @@ protected function getSubject(): string`
`174`	`174`	`);`
`175`	`175`
`176`	`176`	`return sprintf("%s(%s) YIELD %s", $this->procedure, $arguments, $yieldParameters);`
`177`		`- } else {`
`178`		`- return sprintf("%s(%s)", $this->procedure, $arguments);`
`179`	`177`	`}`
	`178`	`+`
	`179`	`+ return sprintf("%s(%s)", $this->procedure, $arguments);`
`180`	`180`	`}`
`181`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ public function toQuery(): string`
`84`	`84`	`{`
`85`	`85`	`if (isset($this->where)) {`
`86`	`86`	`return sprintf("EXISTS { %s %s }", $this->match->toQuery(), $this->where->toQuery());`
`87`		`- } else {`
`88`		`- return sprintf("EXISTS { %s }", $this->match->toQuery());`
`89`	`87`	`}`
	`88`	`+`
	`89`	`+ return sprintf("EXISTS { %s }", $this->match->toQuery());`
`90`	`90`	`}`
`91`	`91`	`}`