Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 2 deletions system/Database/BaseBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -3591,13 +3591,16 @@ protected function setBind(string $key, $value = null, bool $escape = true): str
/**
* Returns a clone of a Base Builder with reset query builder values.
*
* @return $this
* @return static
*
* @deprecated
*/
protected function cleanClone()
{
return (clone $this)->from([], true)->resetQuery();
$clone = clone $this;
$clone->from([], true);

return $clone->resetQuery();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion system/Router/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@ public function executeAfterAttributes(RequestInterface $request, ResponseInterf
* Returns the route attributes collected during routing
* for the current route.
*
* @return array{class: list<string>, method: list<string>}
* @return array{class: list<RouteAttributeInterface>, method: list<RouteAttributeInterface>}
*/
public function getRouteAttributes(): array
{
Expand Down
3 changes: 1 addition & 2 deletions utils/phpstan-baseline/loader.neon
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# total 1480 errors
# total 1478 errors

includes:
- argument.type.neon
Expand All @@ -17,5 +17,4 @@ includes:
- property.nonObject.neon
- property.notFound.neon
- property.phpDocType.neon
- return.type.neon
- staticMethod.notFound.neon
13 changes: 0 additions & 13 deletions utils/phpstan-baseline/return.type.neon

This file was deleted.

Loading