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
12 changes: 10 additions & 2 deletions generator/src/Parameter.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,15 @@ public function isVariadic(): bool

public function isNullable(): bool
{
return $this->type->isNullable();
if ($this->type->isNullable()) {
return true;
}

if ($this->getDefaultValue() === "null") {
return true;
}

return $this->getDefaultValue() === "NULL";
}

/*
Expand All @@ -93,7 +101,7 @@ public function getInitializer(): string

public function hasDefaultValue(): bool
{
return isset($this->parameter->initializer);
return property_exists($this->parameter, 'initializer') && $this->parameter->initializer !== null;
}

public function getDefaultValue(): ?string
Expand Down
18 changes: 17 additions & 1 deletion generator/src/WritePhpFunction.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,21 @@ private function displayParamsWithType(array $params): string
$optDetected = false;

foreach ($params as $param) {
$paramAsString = $param->getSignatureType();
$paramAsString = '';
$typeDetected = false;

// parameters can not have type void
if ($param->getSignatureType() !== 'void') {
$paramAsString = $param->getSignatureType();
}

if ($paramAsString !== '') {
$paramAsString .= ' ';
if ($param->isNullable() && $paramAsString[0] !== "?") {
$paramAsString = "?" . $paramAsString;
}

$typeDetected = true;
}

$paramName = $param->getParameterName();
Expand All @@ -160,6 +172,10 @@ private function displayParamsWithType(array $params): string
$paramAsString .= ' = '.$this->defaultValueToString($defaultValue);
} elseif ($optDetected && !$param->isVariadic()) {
$paramAsString .= ' = null';

if ($typeDetected && $paramAsString[0] !== "?") {
$paramAsString = "?" . $paramAsString;
}
}
$paramsAsString[] = $paramAsString;
}
Expand Down
Loading