Do not let Relationship extend Pattern and other improvements

Author: marijnvanwezel

src/Expressions/Alias.php renamed to src/Alias.php

@@ -19,8 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace WikibaseSolutions\CypherDSL\Expressions;
+namespace WikibaseSolutions\CypherDSL;
 
+use WikibaseSolutions\CypherDSL\Expressions\Variable;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use function sprintf;
 
@@ -30,7 +31,7 @@
  * @see https://neo4j.com/docs/cypher-manual/current/clauses/return/#return-column-alias
  * @see https://neo4j.com/docs/cypher-manual/current/clauses/with/#with-introduce-variables
  */
-class Alias implements AnyType
+final class Alias
 {
     /**
      * @var AnyType The original item to be aliased

src/Expressions/Functions/All.php

@@ -21,7 +21,7 @@
 
 namespace WikibaseSolutions\CypherDSL\Expressions\Functions;
 
-use WikibaseSolutions\CypherDSL\Expressions\ExpressionList;
+use WikibaseSolutions\CypherDSL\Expressions\Literals\ExpressionList;
 use WikibaseSolutions\CypherDSL\Expressions\Variable;
 use WikibaseSolutions\CypherDSL\Traits\TypeTraits\PropertyTypeTraits\BooleanTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
@@ -33,7 +33,7 @@
  *
  * @see https://neo4j.com/docs/cypher-manual/current/functions/predicate/#functions-all
  */
-class All extends FunctionCall implements BooleanType
+class All extends Func implements BooleanType
 {
     use BooleanTypeTrait;
 

src/Expressions/Functions/Any.php

@@ -32,7 +32,7 @@
  *
  * @see https://neo4j.com/docs/cypher-manual/current/functions/predicate/#functions-any
  */
-class Any extends FunctionCall implements BooleanType
+class Any extends Func implements BooleanType
 {
     use BooleanTypeTrait;
 

src/Expressions/Functions/Date.php

@@ -33,7 +33,7 @@
  *
  * @see https://neo4j.com/docs/cypher-manual/current/functions/temporal/#functions-date
  */
-class Date extends FunctionCall implements DateType
+class Date extends Func implements DateType
 {
     use DateTypeTrait;
 

src/Expressions/Functions/DateTime.php

@@ -33,7 +33,7 @@
  *
  * @see https://neo4j.com/docs/cypher-manual/current/functions/temporal/#functions-datetime
  */
-class DateTime extends FunctionCall implements DateTimeType
+class DateTime extends Func implements DateTimeType
 {
     use DateTimeTypeTrait;
 

src/Expressions/Functions/Exists.php

@@ -30,7 +30,7 @@
  *
  * @see https://neo4j.com/docs/cypher-manual/current/functions/predicate/#functions-exists
  */
-class Exists extends FunctionCall implements BooleanType
+class Exists extends Func implements BooleanType
 {
     use BooleanTypeTrait;
 

src/Expressions/Functions/FunctionCall.php renamed to src/Expressions/Functions/Func.php

@@ -23,21 +23,18 @@
 
 use WikibaseSolutions\CypherDSL\Expressions\Variable;
 use WikibaseSolutions\CypherDSL\QueryConvertible;
-use WikibaseSolutions\CypherDSL\Traits\TypeTraits\AliasablePropertyTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\CompositeTypes\ListType;
 use WikibaseSolutions\CypherDSL\Types\CompositeTypes\MapType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\StringType;
 
 /**
- * This class represents any function call.
+ * This class represents any function call. This class is named "Func", because "Function" is an invalid class name.
  *
  * @see https://neo4j.com/docs/cypher-manual/current/functions/
  */
-abstract class FunctionCall implements QueryConvertible
+abstract class Func implements QueryConvertible
 {
-    use AliasablePropertyTypeTrait;
-
     /**
      * Produces a raw function call. This enables the usage of unimplemented functions in your
      * Cypher queries. The parameters of this function are not type-checked.

src/Expressions/Functions/IsEmpty.php

@@ -34,7 +34,7 @@
  *
  * @see https://neo4j.com/docs/cypher-manual/current/functions/predicate/#functions-isempty
  */
-class IsEmpty extends FunctionCall implements BooleanType
+class IsEmpty extends Func implements BooleanType
 {
     use BooleanTypeTrait;
     use ErrorTrait;

src/Expressions/Functions/LocalDateTime.php

@@ -33,7 +33,7 @@
  *
  * @see https://neo4j.com/docs/cypher-manual/current/functions/temporal/#functions-localdatetime
  */
-class LocalDateTime extends FunctionCall implements LocalDateTimeType
+class LocalDateTime extends Func implements LocalDateTimeType
 {
     use LocalDateTimeTypeTrait;
 

src/Expressions/Functions/LocalTime.php

@@ -33,7 +33,7 @@
  *
  * @see https://neo4j.com/docs/cypher-manual/current/functions/temporal/#functions-localtime
  */
-class LocalTime extends FunctionCall implements LocalTimeType
+class LocalTime extends Func implements LocalTimeType
 {
     use LocalTimeTypeTrait;