Make tests pass

marijnvanwezel · marijnvanwezel · commit 543d69bb7d90 · 2022-12-02T23:58:30.000+01:00
diff --git a/src/Expressions/Parameter.php b/src/Expressions/Parameter.php
@@ -72,7 +72,6 @@ final class Parameter implements
     use ErrorTrait;
     use EscapeTrait;
     use NameGenerationTrait;
-
     private string $parameter;
 
     /**
diff --git a/tests/unit/Expressions/LabelTest.php b/tests/unit/Expressions/LabelTest.php
@@ -16,7 +16,7 @@
 /**
  * @covers \WikibaseSolutions\CypherDSL\Expressions\Label
  */
-class LabelTest extends TestCase
+final class LabelTest extends TestCase
 {
     public function testSingle(): void
     {
diff --git a/tests/unit/Expressions/Literals/IntegerTest.php b/tests/unit/Expressions/Literals/IntegerTest.php
@@ -68,7 +68,6 @@ public function testInvalidInput($input): void
         new Integer($input);
     }
 
-
     public function provideToQueryData(): array
     {
         return [
@@ -82,6 +81,7 @@ public function provideToQueryData(): array
             ["-1238109438204130457284308235720483205", "-1238109438204130457284308235720483205"],
         ];
     }
+
     public function provideInvalidInputData(): array
     {
         return [
diff --git a/tests/unit/Expressions/Operators/LessThanTest.php b/tests/unit/Expressions/Operators/LessThanTest.php
@@ -9,10 +9,10 @@
  */
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
-use PHPStan\Type\BooleanType;
 use PHPUnit\Framework\TestCase;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Integer;
 use WikibaseSolutions\CypherDSL\Expressions\Operators\LessThan;
+use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
 /**
  * @covers \WikibaseSolutions\CypherDSL\Expressions\Operators\LessThan
diff --git a/tests/unit/Expressions/Operators/ModuloDivisionTest.php b/tests/unit/Expressions/Operators/ModuloDivisionTest.php
@@ -10,11 +10,9 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
-use TypeError;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Float_;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Integer;
 use WikibaseSolutions\CypherDSL\Expressions\Operators\ModuloDivision;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\FloatType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\IntegerType;
 
diff --git a/tests/unit/Expressions/Operators/MultiplicationTest.php b/tests/unit/Expressions/Operators/MultiplicationTest.php
@@ -10,11 +10,9 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
-use TypeError;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Float_;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Integer;
 use WikibaseSolutions\CypherDSL\Expressions\Operators\Multiplication;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\FloatType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\IntegerType;
 
diff --git a/tests/unit/Expressions/Operators/NegationTest.php b/tests/unit/Expressions/Operators/NegationTest.php
@@ -10,10 +10,8 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
-use TypeError;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Boolean;
 use WikibaseSolutions\CypherDSL\Expressions\Operators\Negation;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
 /**
diff --git a/tests/unit/Expressions/Operators/RegexTest.php b/tests/unit/Expressions/Operators/RegexTest.php
@@ -10,11 +10,9 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
-use TypeError;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\String_;
 use WikibaseSolutions\CypherDSL\Expressions\Operators\Regex;
 use WikibaseSolutions\CypherDSL\Expressions\Variable;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
 /**
@@ -40,6 +38,6 @@ public function testInstanceOfBooleanType(): void
     {
         $regex = new Regex(new Variable("a"), new String_("b"));
 
-        $this->assertSame(BooleanType::class, $regex);
+        $this->assertInstanceOf(BooleanType::class, $regex);
     }
 }
diff --git a/tests/unit/Expressions/Operators/StartsWithTest.php b/tests/unit/Expressions/Operators/StartsWithTest.php
@@ -10,11 +10,9 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
-use TypeError;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\String_;
 use WikibaseSolutions\CypherDSL\Expressions\Operators\StartsWith;
 use WikibaseSolutions\CypherDSL\Expressions\Variable;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
 /**
diff --git a/tests/unit/Expressions/Operators/SubtractionTest.php b/tests/unit/Expressions/Operators/SubtractionTest.php
@@ -10,10 +10,8 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
-use TypeError;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Integer;
 use WikibaseSolutions\CypherDSL\Expressions\Operators\Subtraction;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\FloatType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\IntegerType;
 
diff --git a/tests/unit/Expressions/Operators/UnaryMinusTest.php b/tests/unit/Expressions/Operators/UnaryMinusTest.php
@@ -10,10 +10,8 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;
 
 use PHPUnit\Framework\TestCase;
-use TypeError;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Integer;
 use WikibaseSolutions\CypherDSL\Expressions\Operators\UnaryMinus;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\FloatType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\IntegerType;
 
@@ -34,14 +32,14 @@ public function testToQuery(): void
 
         $minus = new UnaryMinus(new Integer(10));
 
-        $this->assertSame("(-10)", $minus->toQuery());
+        $this->assertSame("(- 10)", $minus->toQuery());
     }
 
     public function testToQueryNoParentheses(): void
     {
         $minus = new UnaryMinus(new Integer(10), false);
 
-        $this->assertSame("-10", $minus->toQuery());
+        $this->assertSame("- 10", $minus->toQuery());
     }
 
     public function testInstanceOfFloatType(): void
diff --git a/tests/unit/Expressions/ParameterTest.php b/tests/unit/Expressions/ParameterTest.php
@@ -16,7 +16,7 @@
 /**
  * @covers \WikibaseSolutions\CypherDSL\Expressions\Parameter
  */
-class ParameterTest extends TestCase
+final class ParameterTest extends TestCase
 {
     /**
      * @dataProvider provideToQueryData
diff --git a/tests/unit/Expressions/Procedures/AnyTest.php b/tests/unit/Expressions/Procedures/AnyTest.php
@@ -10,13 +10,8 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Procedures;
 
 use PHPUnit\Framework\TestCase;
-use TypeError;
-use WikibaseSolutions\CypherDSL\Expressions\Literals\List_;
-use WikibaseSolutions\CypherDSL\Expressions\Literals\String_;
 use WikibaseSolutions\CypherDSL\Expressions\Procedures\Any;
-use WikibaseSolutions\CypherDSL\Expressions\Variable;
 use WikibaseSolutions\CypherDSL\Query;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
 /**
diff --git a/tests/unit/Expressions/Procedures/DateTest.php b/tests/unit/Expressions/Procedures/DateTest.php
@@ -13,7 +13,6 @@
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Map;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\String_;
 use WikibaseSolutions\CypherDSL\Expressions\Procedures\Date;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\DateType;
 
 /**
diff --git a/tests/unit/Expressions/Procedures/DateTimeTest.php b/tests/unit/Expressions/Procedures/DateTimeTest.php
@@ -13,7 +13,6 @@
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Map;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\String_;
 use WikibaseSolutions\CypherDSL\Expressions\Procedures\DateTime;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\DateTimeType;
 
 /**
diff --git a/tests/unit/Expressions/Procedures/ExistsTest.php b/tests/unit/Expressions/Procedures/ExistsTest.php
@@ -12,7 +12,6 @@
 use PHPUnit\Framework\TestCase;
 use WikibaseSolutions\CypherDSL\Expressions\Procedures\Exists;
 use WikibaseSolutions\CypherDSL\Query;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
 /**
diff --git a/tests/unit/Expressions/Procedures/IsEmptyTest.php b/tests/unit/Expressions/Procedures/IsEmptyTest.php
@@ -10,13 +10,8 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Procedures;
 
 use PHPUnit\Framework\TestCase;
-use TypeError;
-use WikibaseSolutions\CypherDSL\Expressions\Literals\List_;
-use WikibaseSolutions\CypherDSL\Expressions\Literals\Map;
-use WikibaseSolutions\CypherDSL\Expressions\Literals\String_;
 use WikibaseSolutions\CypherDSL\Expressions\Procedures\IsEmpty;
 use WikibaseSolutions\CypherDSL\Query;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
 /**
diff --git a/tests/unit/Expressions/Procedures/LocalDateTimeTest.php b/tests/unit/Expressions/Procedures/LocalDateTimeTest.php
@@ -10,11 +10,8 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Procedures;
 
 use PHPUnit\Framework\TestCase;
-use WikibaseSolutions\CypherDSL\Expressions\Literals\Map;
-use WikibaseSolutions\CypherDSL\Expressions\Literals\String_;
 use WikibaseSolutions\CypherDSL\Expressions\Procedures\LocalDateTime;
 use WikibaseSolutions\CypherDSL\Query;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\LocalDateTimeType;
 
 /**
diff --git a/tests/unit/Expressions/Procedures/LocalTimeTest.php b/tests/unit/Expressions/Procedures/LocalTimeTest.php
@@ -10,11 +10,8 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Procedures;
 
 use PHPUnit\Framework\TestCase;
-use WikibaseSolutions\CypherDSL\Expressions\Literals\Map;
-use WikibaseSolutions\CypherDSL\Expressions\Literals\String_;
 use WikibaseSolutions\CypherDSL\Expressions\Procedures\LocalTime;
 use WikibaseSolutions\CypherDSL\Query;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\LocalTimeType;
 
 /**
diff --git a/tests/unit/Expressions/Procedures/NoneTest.php b/tests/unit/Expressions/Procedures/NoneTest.php
@@ -10,13 +10,8 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Procedures;
 
 use PHPUnit\Framework\TestCase;
-use TypeError;
-use WikibaseSolutions\CypherDSL\Expressions\Literals\List_;
-use WikibaseSolutions\CypherDSL\Expressions\Literals\String_;
 use WikibaseSolutions\CypherDSL\Expressions\Procedures\None;
-use WikibaseSolutions\CypherDSL\Expressions\Variable;
 use WikibaseSolutions\CypherDSL\Query;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
 /**
@@ -32,7 +27,7 @@ public function testToQuery(): void
 
         $none = new None($variable, $list, $predicate);
 
-        $this->assertSame("none(variable IN ['foo', 'bar'] WHERE predicate)", $none->toQuery());
+        $this->assertSame("none(variable IN ['foo', 'bar'] WHERE true)", $none->toQuery());
     }
 
     public function testInstanceOfBooleanType(): void
diff --git a/tests/unit/Expressions/Procedures/PointTest.php b/tests/unit/Expressions/Procedures/PointTest.php
@@ -10,12 +10,8 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Procedures;
 
 use PHPUnit\Framework\TestCase;
-use TypeError;
-use WikibaseSolutions\CypherDSL\Expressions\Literals\Float_;
-use WikibaseSolutions\CypherDSL\Expressions\Literals\Map;
 use WikibaseSolutions\CypherDSL\Expressions\Procedures\Point;
 use WikibaseSolutions\CypherDSL\Query;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
 use WikibaseSolutions\CypherDSL\Types\PropertyTypes\PointType;
 
 /**
diff --git a/tests/unit/Expressions/Procedures/RawTest.php b/tests/unit/Expressions/Procedures/RawTest.php
@@ -10,7 +10,6 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Procedures;
 
 use PHPUnit\Framework\TestCase;
-use TypeError;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Literal;
 use WikibaseSolutions\CypherDSL\Expressions\Procedures\Raw;
 use WikibaseSolutions\CypherDSL\Expressions\Variable;
diff --git a/tests/unit/Expressions/Procedures/SingleTest.php b/tests/unit/Expressions/Procedures/SingleTest.php
@@ -10,17 +10,17 @@
 namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Procedures;
 
 use PHPUnit\Framework\TestCase;
-use TypeError;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\List_;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\String_;
 use WikibaseSolutions\CypherDSL\Expressions\Procedures\Single;
 use WikibaseSolutions\CypherDSL\Expressions\Variable;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
+use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;
 
 /**
  * @covers \WikibaseSolutions\CypherDSL\Expressions\Procedures\Single
  */
-class SingleTest extends TestCase
+final class SingleTest extends TestCase
 {
     public function testToQuery(): void
     {
@@ -29,34 +29,20 @@ public function testToQuery(): void
         $predicate = $this->createMock(AnyType::class);
         $predicate->method('toQuery')->willReturn('predicate');
 
-        $all = new Single($variable, $list, $predicate);
+        $single = new Single($variable, $list, $predicate);
 
-        $this->assertSame("single(variable IN ['a', 'b'] WHERE predicate)", $all->toQuery());
+        $this->assertSame("single(variable IN ['a', 'b'] WHERE predicate)", $single->toQuery());
     }
 
-    public function testDoesNotAcceptAnyTypeAsVariable(): void
-    {
-        $variable = $this->createMock(AnyType::class);
-        $list = new List_;
-        $predicate = $this->createMock(AnyType::class);
-
-        $this->expectException(TypeError::class);
-
-        $all = new Single($variable, $list, $predicate);
-
-        $all->toQuery();
-    }
-
-    public function testDoesNotAcceptAnyTypeAsList(): void
+    public function testInstanceOfBooleanType(): void
     {
         $variable = new Variable("variable");
-        $list = $this->createMock(AnyType::class);
+        $list = new List_([new String_('a'), new String_('b')]);
         $predicate = $this->createMock(AnyType::class);
+        $predicate->method('toQuery')->willReturn('predicate');
 
-        $this->expectException(TypeError::class);
-
-        $all = new Single($variable, $list, $predicate);
+        $single = new Single($variable, $list, $predicate);
 
-        $all->toQuery();
+        $this->assertInstanceOf(BooleanType::class, $single);
     }
 }
diff --git a/tests/unit/Expressions/Procedures/TimeTest.php b/tests/unit/Expressions/Procedures/TimeTest.php
@@ -13,12 +13,12 @@
 use WikibaseSolutions\CypherDSL\Expressions\Literals\Map;
 use WikibaseSolutions\CypherDSL\Expressions\Literals\String_;
 use WikibaseSolutions\CypherDSL\Expressions\Procedures\Time;
-use WikibaseSolutions\CypherDSL\Types\AnyType;
+use WikibaseSolutions\CypherDSL\Types\PropertyTypes\TimeType;
 
 /**
  * @covers \WikibaseSolutions\CypherDSL\Expressions\Procedures\Time
  */
-class TimeTest extends TestCase
+final class TimeTest extends TestCase
 {
     public function testToQuery(): void
     {
@@ -36,15 +36,10 @@ public function testEmpty(): void
         $this->assertSame("time()", $time->toQuery());
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
-    public function testAcceptsAnyType(): void
+    public function testInstanceOfTimeType(): void
     {
-        $map = $this->createMock(AnyType::class);
-
-        $time = new Time($map);
+        $time = new Time();
 
-        $time->toQuery();
+        $this->assertInstanceOf(TimeType::class, $time);
     }
 }
diff --git a/tests/unit/Expressions/PropertyTest.php b/tests/unit/Expressions/PropertyTest.php
diff --git a/tests/unit/Expressions/RawExpressionTest.php b/tests/unit/Expressions/RawExpressionTest.php
diff --git a/tests/unit/Expressions/VariableTest.php b/tests/unit/Expressions/VariableTest.php
diff --git a/tests/unit/Traits/TypeTraits/AnyTypeTraitTest.php b/tests/unit/Traits/TypeTraits/AnyTypeTraitTest.php

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`/**`
`17`	`17`	`* @covers \WikibaseSolutions\CypherDSL\Expressions\Label`
`18`	`18`	`*/`
`19`		`-class LabelTest extends TestCase`
	`19`	`+final class LabelTest extends TestCase`
`20`	`20`	`{`
`21`	`21`	`public function testSingle(): void`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ public function testInvalidInput($input): void`
`68`	`68`	`new Integer($input);`
`69`	`69`	`}`
`70`	`70`
`71`		`-`
`72`	`71`	`public function provideToQueryData(): array`
`73`	`72`	`{`
`74`	`73`	`return [`
`@@ -82,6 +81,7 @@ public function provideToQueryData(): array`
`82`	`81`	`["-1238109438204130457284308235720483205", "-1238109438204130457284308235720483205"],`
`83`	`82`	`];`
`84`	`83`	`}`
	`84`	`+`
`85`	`85`	`public function provideInvalidInputData(): array`
`86`	`86`	`{`
`87`	`87`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,9 @@`
`10`	`10`	`namespace WikibaseSolutions\CypherDSL\Tests\Unit\Expressions\Operators;`
`11`	`11`
`12`	`12`	`use PHPUnit\Framework\TestCase;`
`13`		`-use TypeError;`
`14`	`13`	`use WikibaseSolutions\CypherDSL\Expressions\Literals\String_;`
`15`	`14`	`use WikibaseSolutions\CypherDSL\Expressions\Operators\Regex;`
`16`	`15`	`use WikibaseSolutions\CypherDSL\Expressions\Variable;`
`17`		`-use WikibaseSolutions\CypherDSL\Types\AnyType;`
`18`	`16`	`use WikibaseSolutions\CypherDSL\Types\PropertyTypes\BooleanType;`
`19`	`17`
`20`	`18`	`/**`
`@@ -40,6 +38,6 @@ public function testInstanceOfBooleanType(): void`
`40`	`38`	`{`
`41`	`39`	`$regex = new Regex(new Variable("a"), new String_("b"));`
`42`	`40`
`43`		`- $this->assertSame(BooleanType::class, $regex);`
	`41`	`+ $this->assertInstanceOf(BooleanType::class, $regex);`
`44`	`42`	`}`
`45`	`43`	`}`