Split NumeralType into FloatType and IntegerType, other fixes

Author: marijnvanwezel

src/Clauses/MatchClause.php

@@ -21,6 +21,7 @@
 
 namespace WikibaseSolutions\CypherDSL\Clauses;
 
+use WikibaseSolutions\CypherDSL\Patterns\MatchablePattern;
 use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\NodeType;
 use WikibaseSolutions\CypherDSL\Types\StructuralTypes\PathType;
@@ -42,30 +43,26 @@ class MatchClause extends Clause
     /**
      * Sets the pattern of the MATCH clause. This overwrites any previously added patterns.
      *
-     * @param PathType[]|NodeType[] $patterns
+     * @param MatchablePattern[] $patterns
      * @return $this
      */
     public function setPatterns(array $patterns): self
     {
-        foreach ($patterns as $pattern) {
-            $this->assertClass('pattern', [PathType::class, NodeType::class], $pattern);
-        }
-
+        self::assertClassArray('patterns', MatchablePattern::class, $patterns);
         $this->patterns = $patterns;
 
         return $this;
     }
 
     /**
-     * Add a pattern to the MATCH clause.
+     * Add one or more patterns to the MATCH clause.
      *
-     * @param PathType|NodeType $pattern
+     * @param MatchablePattern ...$pattern
      * @return MatchClause
      */
-    public function addPattern($pattern): self
+    public function addPattern(MatchablePattern ...$pattern): self
     {
-        $this->assertClass('pattern', [PathType::class, NodeType::class], $pattern);
-        $this->patterns[] = $pattern;
+        $this->patterns = array_merge($this->patterns, $pattern);
 
         return $this;
     }

src/Expressions/Exists.php

@@ -1,30 +1,21 @@
-<?php
-
+<?php declare(strict_types=1);
 /*
- * Cypher DSL
- * Copyright (C) 2021  Wikibase Solutions
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of php-cypher-dsl.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Copyright (C) 2021  Wikibase Solutions
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
-
 namespace WikibaseSolutions\CypherDSL\Expressions;
 
 use WikibaseSolutions\CypherDSL\Clauses\MatchClause;
 use WikibaseSolutions\CypherDSL\Clauses\WhereClause;
+use WikibaseSolutions\CypherDSL\Patterns\MatchablePattern;
+use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
 use WikibaseSolutions\CypherDSL\Traits\TypeTraits\PropertyTypeTraits\BooleanTypeTrait;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
+use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
 
 /**
  * Represents the EXISTS expression.
@@ -33,6 +24,7 @@
  */
 final class Exists implements BooleanType
 {
+    use ErrorTrait;
     use BooleanTypeTrait;
 
     /**
@@ -51,13 +43,12 @@ final class Exists implements BooleanType
     private bool $insertParentheses;
 
     /**
-     * Exists constructor.
-     *
      * @param MatchClause $match The MATCH part of the EXISTS expression
      * @param WhereClause|null $where The optional WHERE part of the EXISTS expression
      * @param bool $insertParentheses Whether to insert parentheses around the expression
+     * @internal This function is not covered by the backwards compatibility guarantee of php-cypher-dsl
      */
-    public function __construct(MatchClause $match, ?WhereClause $where = null, bool $insertParentheses = false)
+    public function __construct(MatchClause $match, WhereClause $where = null, bool $insertParentheses = false)
     {
         $this->match = $match;
         $this->where = $where;

src/Expressions/Label.php

@@ -1,24 +1,12 @@
-<?php
-
+<?php declare(strict_types=1);
 /*
- * Cypher DSL
- * Copyright (C) 2021  Wikibase Solutions
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of php-cypher-dsl.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Copyright (C) 2021  Wikibase Solutions
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
-
 namespace WikibaseSolutions\CypherDSL\Expressions;
 
 use WikibaseSolutions\CypherDSL\Traits\EscapeTrait;
@@ -55,6 +43,7 @@ final class Label implements BooleanType
      *
      * @param Variable $variable The variable to attach the labels to
      * @param string ...$labels The labels to attach to the variable
+     * @internal This function is not covered by the backwards compatibility guarantee of php-cypher-dsl
      */
     public function __construct(Variable $variable, string ...$labels)
     {

src/Expressions/Literals/Float_.php

@@ -0,0 +1,53 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of php-cypher-dsl.
+ *
+ * Copyright (C) 2021  Wikibase Solutions
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace WikibaseSolutions\CypherDSL\Expressions\Literals;
+
+use WikibaseSolutions\CypherDSL\Traits\TypeTraits\PropertyTypeTraits\FloatTypeTrait;
+use WikibaseSolutions\CypherDSL\Types\PropertyTypes\FloatType;
+
+/**
+ * Represents a float literal.
+ */
+final class Float_ implements FloatType
+{
+    use FloatTypeTrait;
+
+    /**
+     * @var float The value
+     */
+    private float $value;
+
+    /**
+     * @param float $value The value
+     * @internal This function is not covered by the backwards compatibility guarantee of php-cypher-dsl
+     */
+    public function __construct(float $value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * Returns the integer value.
+     *
+     * @return float
+     */
+    public function getValue(): float
+    {
+        return $this->value;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function toQuery(): string
+    {
+        return (string)$this->value;
+    }
+}

src/Expressions/Literals/Decimal.php renamed to src/Expressions/Literals/Integer.php

@@ -9,40 +9,36 @@
  */
 namespace WikibaseSolutions\CypherDSL\Expressions\Literals;
 
-use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
-use WikibaseSolutions\CypherDSL\Traits\TypeTraits\PropertyTypeTraits\NumeralTypeTrait;
-use WikibaseSolutions\CypherDSL\Types\PropertyTypes\NumeralType;
+use WikibaseSolutions\CypherDSL\Traits\TypeTraits\PropertyTypeTraits\IntegerTypeTrait;
+use WikibaseSolutions\CypherDSL\Types\PropertyTypes\IntegerType;
 
 /**
- * Represents a decimal (integer or float) literal.
+ * Represents an integer literal.
  */
-final class Decimal implements NumeralType
+final class Integer implements IntegerType
 {
-    use NumeralTypeTrait;
-
-    use ErrorTrait;
+    use IntegerTypeTrait;
 
     /**
-     * @var int|float The value
+     * @var int The value
      */
-    private $value;
+    private int $value;
 
     /**
-     * @param int|float $value The value
+     * @param int $value The value
      * @internal This function is not covered by the backwards compatibility guarantee of php-cypher-dsl
      */
-    public function __construct($value)
+    public function __construct(int $value)
     {
-        $this->assertClass('value', ['int', 'float'], $value);
         $this->value = $value;
     }
 
     /**
-     * Returns the numeric value.
+     * Returns the integer value.
      *
-     * @return int|float
+     * @return int
      */
-    public function getValue()
+    public function getValue(): int
     {
         return $this->value;
     }