Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

9.0 TASK: remove string union types in filters, to increase type safety #4094

Closed
wants to merge 2 commits into from
Closed

9.0 TASK: remove string union types in filters, to increase type safety #4094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11c231a
9.0 TASK: remove string union types in filters, to increase type safety
skurfuerst Mar 11, 2023
0230aba
Merge branch '9.0' into 90-remove-string-uniontypes
skurfuerst Mar 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions ...ontentRepository.Core/Classes/Projection/ContentGraph/Filter/FindBackReferencesFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static function create(): self
return new self(null);
}

public static function referenceName(ReferenceName|string $referenceName): self
public static function referenceName(ReferenceName $referenceName): self
{
return self::create()->with(referenceName: $referenceName);
}
Expand All @@ -42,11 +42,8 @@ public static function referenceName(ReferenceName|string $referenceName): self
* @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
*/
public function with(
ReferenceName|string $referenceName = null,
ReferenceName $referenceName = null,
): self {
if (is_string($referenceName)) {
$referenceName = ReferenceName::fromString($referenceName);
}
return new self(
$referenceName ?? $this->referenceName,
);
Expand Down
9 changes: 3 additions & 6 deletions Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Filter/FindChildNodesFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static function create(): self
return new self(null, null, null);
}

public static function nodeTypeConstraints(NodeTypeConstraints|string $nodeTypeConstraints): self
public static function nodeTypeConstraints(NodeTypeConstraints $nodeTypeConstraints): self
{
return self::create()->withNodeTypeConstraints($nodeTypeConstraints);
}
Expand All @@ -44,21 +44,18 @@ public static function nodeTypeConstraints(NodeTypeConstraints|string $nodeTypeC
* @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
*/
public function with(
NodeTypeConstraints|string $nodeTypeConstraints = null,
NodeTypeConstraints $nodeTypeConstraints = null,
int $limit = null,
int $offset = null
): self {
if (is_string($nodeTypeConstraints)) {
$nodeTypeConstraints = NodeTypeConstraints::fromFilterString($nodeTypeConstraints);
}
return new self(
$nodeTypeConstraints ?? $this->nodeTypeConstraints,
$limit ?? $this->limit,
$offset ?? $this->offset,
);
}

public function withNodeTypeConstraints(NodeTypeConstraints|string $nodeTypeConstraints): self
public function withNodeTypeConstraints(NodeTypeConstraints $nodeTypeConstraints): self
{
return $this->with(nodeTypeConstraints: $nodeTypeConstraints);
}
Expand Down
14 changes: 4 additions & 10 deletions ...ntentRepository.Core/Classes/Projection/ContentGraph/Filter/FindDescendantNodesFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static function create(): self
return new self(null, null);
}

public static function nodeTypeConstraints(NodeTypeConstraints|string $nodeTypeConstraints): self
public static function nodeTypeConstraints(NodeTypeConstraints $nodeTypeConstraints): self
{
return self::create()->with(nodeTypeConstraints: $nodeTypeConstraints);
}
Expand All @@ -44,22 +44,16 @@ public static function nodeTypeConstraints(NodeTypeConstraints|string $nodeTypeC
* @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
*/
public function with(
NodeTypeConstraints|string $nodeTypeConstraints = null,
SearchTerm|string $searchTerm = null,
NodeTypeConstraints $nodeTypeConstraints = null,
SearchTerm $searchTerm = null,
): self {
if (is_string($nodeTypeConstraints)) {
$nodeTypeConstraints = NodeTypeConstraints::fromFilterString($nodeTypeConstraints);
}
if (is_string($searchTerm)) {
$searchTerm = SearchTerm::fulltext($searchTerm);
}
return new self(
$nodeTypeConstraints ?? $this->nodeTypeConstraints,
$searchTerm ?? $this->searchTerm,
);
}

public function withSearchTerm(SearchTerm|string $searchTerm): self
public function withSearchTerm(SearchTerm $searchTerm): self
{
return $this->with(searchTerm: $searchTerm);
}
Expand Down
7 changes: 2 additions & 5 deletions ...epository.Core/Classes/Projection/ContentGraph/Filter/FindPrecedingSiblingNodesFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static function create(): self
return new self(null, null, null);
}

public static function nodeTypeConstraints(NodeTypeConstraints|string $nodeTypeConstraints): self
public static function nodeTypeConstraints(NodeTypeConstraints $nodeTypeConstraints): self
{
return self::create()->with(nodeTypeConstraints: $nodeTypeConstraints);
}
Expand All @@ -44,13 +44,10 @@ public static function nodeTypeConstraints(NodeTypeConstraints|string $nodeTypeC
* @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
*/
public function with(
NodeTypeConstraints|string $nodeTypeConstraints = null,
NodeTypeConstraints $nodeTypeConstraints = null,
int $limit = null,
int $offset = null,
): self {
if (is_string($nodeTypeConstraints)) {
$nodeTypeConstraints = NodeTypeConstraints::fromFilterString($nodeTypeConstraints);
}
return new self(
$nodeTypeConstraints ?? $this->nodeTypeConstraints,
$limit ?? $this->limit,
Expand Down
7 changes: 2 additions & 5 deletions Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Filter/FindReferencesFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static function create(): self
return new self(null);
}

public static function referenceName(ReferenceName|string $referenceName): self
public static function referenceName(ReferenceName $referenceName): self
{
return self::create()->with(referenceName: $referenceName);
}
Expand All @@ -43,11 +43,8 @@ public static function referenceName(ReferenceName|string $referenceName): self
* @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
*/
public function with(
ReferenceName|string $referenceName = null,
ReferenceName $referenceName = null,
): self {
if (is_string($referenceName)) {
$referenceName = ReferenceName::fromString($referenceName);
}
return new self(
$referenceName ?? $this->referenceName,
);
Expand Down
7 changes: 2 additions & 5 deletions Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Filter/FindSubtreeFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static function create(): self
return new self(null, null);
}

public static function nodeTypeConstraints(NodeTypeConstraints|string $nodeTypeConstraints): self
public static function nodeTypeConstraints(NodeTypeConstraints $nodeTypeConstraints): self
{
return self::create()->with(nodeTypeConstraints: $nodeTypeConstraints);
}
Expand All @@ -43,12 +43,9 @@ public static function nodeTypeConstraints(NodeTypeConstraints|string $nodeTypeC
* @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
*/
public function with(
NodeTypeConstraints|string $nodeTypeConstraints = null,
NodeTypeConstraints $nodeTypeConstraints = null,
int $maximumLevels = null,
): self {
if (is_string($nodeTypeConstraints)) {
$nodeTypeConstraints = NodeTypeConstraints::fromFilterString($nodeTypeConstraints);
}
return new self(
$nodeTypeConstraints ?? $this->nodeTypeConstraints,
$maximumLevels ?? $this->maximumLevels,
Expand Down
7 changes: 2 additions & 5 deletions ...pository.Core/Classes/Projection/ContentGraph/Filter/FindSucceedingSiblingNodesFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static function create(): self
return new self(null, null, null);
}

public static function nodeTypeConstraints(NodeTypeConstraints|string $nodeTypeConstraints): self
public static function nodeTypeConstraints(NodeTypeConstraints $nodeTypeConstraints): self
{
return self::create()->with(nodeTypeConstraints: $nodeTypeConstraints);
}
Expand All @@ -44,13 +44,10 @@ public static function nodeTypeConstraints(NodeTypeConstraints|string $nodeTypeC
* @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
*/
public function with(
NodeTypeConstraints|string $nodeTypeConstraints = null,
NodeTypeConstraints $nodeTypeConstraints = null,
int $limit = null,
int $offset = null,
): self {
if (is_string($nodeTypeConstraints)) {
$nodeTypeConstraints = NodeTypeConstraints::fromFilterString($nodeTypeConstraints);
}
return new self(
$nodeTypeConstraints ?? $this->nodeTypeConstraints,
$limit ?? $this->limit,
Expand Down