Merge pull request #54 from WikibaseSolutions/fix-typing

Minor fixes to typing, move AliasTest class

Author: marijnvanwezel

.gitignore

@@ -4,3 +4,4 @@ phpunit.xml
 vendor/
 *.idea
 .phpunit.result.cache
+.php-cs-fixer.cache

src/Query.php

@@ -313,7 +313,7 @@ public function create($patterns): self
     /**
      * Creates the DELETE clause.
      *
-     * @param Variable|Variable[] $nodes The nodes to delete
+     * @param Variable|Variable[] $variables The nodes to delete
      *
      * @return $this
      * @see https://neo4j.com/docs/cypher-manual/current/clauses/delete/
@@ -608,7 +608,7 @@ public function with($expressions): self
      * @param string $subject The subject/body of the clause
      * @return Query
      */
-    public function raw(string $clause, string $subject)
+    public function raw(string $clause, string $subject): self
     {
         $this->clauses[] = new RawClause($clause, $subject);
 

src/Traits/HasPropertiesTrait.php

@@ -24,7 +24,6 @@
 use function is_array;
 use WikibaseSolutions\CypherDSL\PropertyMap;
 use WikibaseSolutions\CypherDSL\Types\AnyType;
-use WikibaseSolutions\CypherDSL\Types\StructuralTypes\HasPropertiesType;
 
 trait HasPropertiesTrait
 {
@@ -38,9 +37,9 @@ trait HasPropertiesTrait
      * @param string $key The name of the property
      * @param AnyType $value The value of the property
      *
-     * @return HasPropertiesType
+     * @return static
      */
-    public function withProperty(string $key, AnyType $value): HasPropertiesType
+    public function withProperty(string $key, AnyType $value): self
     {
         $this->initialiseProperties();
 
@@ -54,9 +53,9 @@ public function withProperty(string $key, AnyType $value): HasPropertiesType
      *
      * @param PropertyMap|array $properties
      *
-     * @return HasPropertiesType
+     * @return static
      */
-    public function withProperties($properties): HasPropertiesType
+    public function withProperties($properties): self
     {
         self::assertClass('properties', [PropertyMap::class, 'array'], $properties);
 

tests/AliasTest.php renamed to tests/Unit/AliasTest.php

@@ -1,12 +1,14 @@
 <?php
 
-namespace WikibaseSolutions\CypherDSL\Tests;
+namespace WikibaseSolutions\CypherDSL\Tests\Unit;
 
 use PHPUnit\Framework\TestCase;
 use WikibaseSolutions\CypherDSL\Alias;
-use WikibaseSolutions\CypherDSL\Tests\Unit\TestHelper;
 use WikibaseSolutions\CypherDSL\Variable;
 
+/**
+ * @covers \WikibaseSolutions\CypherDSL\Alias
+ */
 class AliasTest extends TestCase
 {
     use TestHelper;