Skip to content

Commit da6d208

Browse files
transistivetransistive
authored
Merge pull request #1 from wgevaert/name-generation
Revert 'Assignment as outer pattern' pull request by wgevaert
2 parents 9dc5091 + ee5f2d4 commit da6d208

31 files changed

+53
-121
lines changed

‎src/Alias.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ public function getVariable(): Variable
6262
{
6363
return $this->variable;
6464
}
65-
}
65+
}

‎src/BinaryOperator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
abstract class BinaryOperator implements QueryConvertable
3131
{
3232
use AliasableTrait;
33-
33+
3434
/**
3535
* @var bool Whether to insert parentheses around the expression
3636
*/

‎src/Clauses/CreateClause.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
namespace WikibaseSolutions\CypherDSL\Clauses;
2323

24-
use WikibaseSolutions\CypherDSL\Assignment;
2524
use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
2625
use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
2726

@@ -35,20 +34,18 @@ class CreateClause extends Clause
3534
use ErrorTrait;
3635

3736
/**
38-
* @var StructuralType[]|Assignment[] The patterns to create
37+
* @var StructuralType[] The patterns to create
3938
*/
4039
private array $patterns = [];
4140

4241
/**
4342
* Add a pattern to create.
4443
*
45-
* @param StructuralType|Assignment $pattern The pattern to create
44+
* @param StructuralType $pattern The pattern to create
4645
* @return CreateClause
4746
*/
48-
public function addPattern($pattern): self
47+
public function addPattern(StructuralType $pattern): self
4948
{
50-
$this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
51-
5249
$this->patterns[] = $pattern;
5350

5451
return $this;

‎src/Clauses/MatchClause.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
namespace WikibaseSolutions\CypherDSL\Clauses;
2323

24-
use WikibaseSolutions\CypherDSL\Assignment;
2524
use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
2625
use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
2726

@@ -35,7 +34,7 @@ class MatchClause extends Clause
3534
use ErrorTrait;
3635

3736
/**
38-
* @var StructuralType[]|Assignment[] List of patterns
37+
* @var StructuralType[] List of patterns
3938
*/
4039
private array $patterns = [];
4140

@@ -52,13 +51,11 @@ public function getPatterns(): array
5251
/**
5352
* Add a pattern to the match clause.
5453
*
55-
* @param StructuralType|Assignment $pattern
54+
* @param StructuralType $pattern
5655
* @return MatchClause
5756
*/
58-
public function addPattern($pattern): self
57+
public function addPattern(StructuralType $pattern): self
5958
{
60-
$this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
61-
6259
$this->patterns[] = $pattern;
6360

6461
return $this;

‎src/Clauses/MergeClause.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
namespace WikibaseSolutions\CypherDSL\Clauses;
2323

2424
use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
25-
use WikibaseSolutions\CypherDSL\Assignment;
2625
use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
2726

2827
/**
@@ -35,9 +34,9 @@ class MergeClause extends Clause
3534
use ErrorTrait;
3635

3736
/**
38-
* @var StructuralType|Assignment|null $pattern The pattern to merge
37+
* @var StructuralType|null $pattern The pattern to merge
3938
*/
40-
private $pattern = null;
39+
private ?StructuralType $pattern = null;
4140

4241
/**
4342
* @var Clause|null $createClause The clause to execute when the pattern is created
@@ -82,13 +81,11 @@ public function getPattern(): ?StructuralType
8281
/**
8382
* Sets the pattern to merge.
8483
*
85-
* @param StructuralType|Assignment $pattern The pattern to merge
84+
* @param StructuralType $pattern The pattern to merge
8685
* @return MergeClause
8786
*/
88-
public function setPattern($pattern): self
87+
public function setPattern(StructuralType $pattern): self
8988
{
90-
$this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
91-
9289
$this->pattern = $pattern;
9390

9491
return $this;

‎src/Clauses/OptionalMatchClause.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
namespace WikibaseSolutions\CypherDSL\Clauses;
2323

24-
use WikibaseSolutions\CypherDSL\Assignment;
2524
use WikibaseSolutions\CypherDSL\Traits\ErrorTrait;
2625
use WikibaseSolutions\CypherDSL\Types\StructuralTypes\StructuralType;
2726

@@ -35,7 +34,7 @@ class OptionalMatchClause extends Clause
3534
use ErrorTrait;
3635

3736
/**
38-
* @var StructuralType[]|Assignment[] List of patterns
37+
* @var StructuralType[] List of patterns
3938
*/
4039
private array $patterns = [];
4140

@@ -52,13 +51,11 @@ public function getPatterns(): array
5251
/**
5352
* Add a pattern to the optional match clause.
5453
*
55-
* @param StructuralType|Assignment $pattern
54+
* @param StructuralType $pattern
5655
* @return OptionalMatchClause
5756
*/
58-
public function addPattern($pattern): self
57+
public function addPattern(StructuralType $pattern): self
5958
{
60-
$this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
61-
6259
$this->patterns[] = $pattern;
6360

6461
return $this;

‎src/Clauses/SkipClause.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,4 @@ protected function getSubject(): string
7979

8080
return "";
8181
}
82-
}
82+
}

‎src/Literals/Literal.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -891,14 +891,16 @@ private static function makeTemporalMap(array $variables): PropertyMap
891891
return Query::map($map);
892892
}
893893

894-
private static function convertToNumeral($var) : NumeralType {
894+
private static function convertToNumeral($var): NumeralType
895+
{
895896
if ($var instanceof NumeralType) {
896897
return $var;
897898
}
898899
return self::decimal($var);
899900
}
900901

901-
private static function convertToString($var) : StringLiteral {
902+
private static function convertToString($var): StringLiteral
903+
{
902904
if ($var instanceof StringLiteral) {
903905
return $var;
904906
}

‎src/Patterns/Path.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public function relationshipUni(NodeType $node, ?string $type = null, $propertie
151151
*
152152
* @return Relationship
153153
*/
154-
private function buildRelationship(array $direction, ?string $type, $properties, $name): Relationship
154+
private function buildRelationship(array $direction, ?string $type, $properties, $name): Relationship
155155
{
156156
self::assertClass('properties', ['array', PropertyMap::class, 'null'], $properties);
157157
self::assertClass('name', ['string', Variable::class, 'null'], $name);
@@ -172,4 +172,4 @@ private function buildRelationship(array $direction, ?string $type, $properties
172172

173173
return $relationship;
174174
}
175-
}
175+
}

‎src/Query.php

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public static function rawExpression(string $expression): AnyType
217217
/**
218218
* Creates the MATCH clause.
219219
*
220-
* @param StructuralType|StructuralType[]|Assignment|Assignment[] $patterns A single pattern or a list of patterns
220+
* @param StructuralType|StructuralType[] $patterns A single pattern or a list of patterns
221221
*
222222
* @return $this
223223
* @see https://neo4j.com/docs/cypher-manual/current/clauses/match/
@@ -232,7 +232,7 @@ public function match($patterns): self
232232
}
233233

234234
foreach ($patterns as $pattern) {
235-
$this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
235+
$this->assertClass('pattern', StructuralType::class, $pattern);
236236

237237
$matchClause->addPattern($pattern);
238238
}
@@ -283,7 +283,7 @@ public function returning($expressions, bool $distinct = false): self
283283
/**
284284
* Creates the CREATE clause.
285285
*
286-
* @param StructuralType|StructuralType[]|Assignment|Assignment[] $patterns A single pattern or a list of patterns
286+
* @param StructuralType|StructuralType[] $patterns A single pattern or a list of patterns
287287
*
288288
* @return $this
289289
* @see https://neo4j.com/docs/cypher-manual/current/clauses/create/
@@ -298,7 +298,7 @@ public function create($patterns): self
298298
}
299299

300300
foreach ($patterns as $pattern) {
301-
$this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
301+
$this->assertClass('pattern', StructuralType::class, $pattern);
302302

303303
$createClause->addPattern($pattern);
304304
}
@@ -405,18 +405,16 @@ public function skip(NumeralType $limit): self
405405
/**
406406
* Creates the MERGE clause.
407407
*
408-
* @param StructuralType|Assignment $pattern The pattern to merge
408+
* @param StructuralType $pattern The pattern to merge
409409
* @param Clause|null $createClause The clause to execute when the pattern is created
410410
* @param Clause|null $matchClause The clause to execute when the pattern is matched
411411
*
412412
* @return $this
413413
* @see https://neo4j.com/docs/cypher-manual/current/clauses/merge/
414414
*
415415
*/
416-
public function merge($pattern, Clause $createClause = null, Clause $matchClause = null): self
416+
public function merge(StructuralType $pattern, Clause $createClause = null, Clause $matchClause = null): self
417417
{
418-
$this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
419-
420418
$mergeClause = new MergeClause();
421419
$mergeClause->setPattern($pattern);
422420

@@ -436,7 +434,7 @@ public function merge($pattern, Clause $createClause = null, Clause $matchClause
436434
/**
437435
* Creates the OPTIONAL MATCH clause.
438436
*
439-
* @param StructuralType|StructuralType[]|Assignment|Assignment[] $patterns A single pattern or a list of patterns
437+
* @param StructuralType|StructuralType[] $patterns A single pattern or a list of patterns
440438
*
441439
* @return $this
442440
* @see https://neo4j.com/docs/cypher-manual/current/clauses/optional-match/
@@ -451,7 +449,7 @@ public function optionalMatch($patterns): self
451449
}
452450

453451
foreach ($patterns as $pattern) {
454-
$this->assertClass('pattern', [StructuralType::class, Assignment::class], $pattern);
452+
$this->assertClass('pattern', StructuralType::class, $pattern);
455453

456454
$optionalMatchClause->addPattern($pattern);
457455
}

0 commit comments

Comments
 (0)