Skip to content

PHP: Fix constant refrrences format and add missing objectExists option for PHP templates #880

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

Merged
merged 2 commits into from
Oct 27, 2025
Merged

PHP: Fix constant refrrences format and add missing objectExists option for PHP templates #880

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
c9a6b84
Fix constant refrences format and add missing option for PHP templates
spinillos Oct 24, 2025
648c374
Update tests
spinillos Oct 24, 2025
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
10 changes: 6 additions & 4 deletions internal/jennies/php/rawtypes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ func (jenny RawTypes) Generate(context languages.Context) (codejen.Files, error)
files := make(codejen.Files, 0, len(context.Schemas))

jenny.shaper = &shape{context: context}
jenny.tmpl = jenny.tmpl.Funcs(templateHelpers(templateDeps{
config: jenny.config,
context: context,
}))
jenny.tmpl = jenny.tmpl.
Funcs(templateHelpers(templateDeps{
config: jenny.config,
context: context,
})).
Funcs(common.TypesTemplateHelpers(context))

// generate typehints with a compiler pass
context.Schemas, err = (&AddTypehintsComments{config: jenny.config}).Process(context.Schemas)
Expand Down
2 changes: 1 addition & 1 deletion internal/jennies/php/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ func (formatter *typeFormatter) constantRefValue(def ast.ConstantReferenceType)
return formatter.formatEnumValue(obj, def)
}
if obj.Type.IsScalar() {
return formatter.config.fullNamespaceRef(formatPackageName(def.ReferredPkg) + "\\" + formatObjectName(def.ReferredType))
return formatter.config.fullNamespaceRef(formatPackageName(def.ReferredPkg) + "\\Constants::" + formatConstantName(def.ReferredType))
}

return "unknown"
Expand Down
4 changes: 2 additions & 2 deletions ...pes/constant_reference_as_default/PHPRawTypes/src/ConstantReferenceAsDefault/MyStruct.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class MyStruct implements \JsonSerializable

public function __construct()
{
$this->aString = \Grafana\Foundation\ConstantReferenceAsDefault\ConstantRefString;
$this->optString = \Grafana\Foundation\ConstantReferenceAsDefault\ConstantRefString;
$this->aString = \Grafana\Foundation\ConstantReferenceAsDefault\Constants::CONSTANT_REF_STRING;
$this->optString = \Grafana\Foundation\ConstantReferenceAsDefault\Constants::CONSTANT_REF_STRING;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ...nce_discriminator/PHPRawTypes/src/ConstantReferenceDiscriminator/GridLayoutUsingValue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class GridLayoutUsingValue implements \JsonSerializable
*/
public function __construct(?string $gridLayoutProperty = null)
{
$this->kind = \Grafana\Foundation\ConstantReferenceDiscriminator\GridLayoutKindType;
$this->kind = \Grafana\Foundation\ConstantReferenceDiscriminator\Constants::GRID_LAYOUT_KIND_TYPE;
$this->gridLayoutProperty = $gridLayoutProperty ?: "";
}

Expand Down
2 changes: 1 addition & 1 deletion ...e_discriminator/PHPRawTypes/src/ConstantReferenceDiscriminator/GridLayoutWithoutValue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class GridLayoutWithoutValue implements \JsonSerializable
*/
public function __construct(?string $gridLayoutProperty = null)
{
$this->kind = \Grafana\Foundation\ConstantReferenceDiscriminator\GridLayoutKindType;
$this->kind = \Grafana\Foundation\ConstantReferenceDiscriminator\Constants::GRID_LAYOUT_KIND_TYPE;
$this->gridLayoutProperty = $gridLayoutProperty ?: "";
}

Expand Down
2 changes: 1 addition & 1 deletion ...nce_discriminator/PHPRawTypes/src/ConstantReferenceDiscriminator/RowsLayoutUsingValue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class RowsLayoutUsingValue implements \JsonSerializable
*/
public function __construct(?string $rowsLayoutProperty = null)
{
$this->kind = \Grafana\Foundation\ConstantReferenceDiscriminator\RowsLayoutKindType;
$this->kind = \Grafana\Foundation\ConstantReferenceDiscriminator\Constants::ROWS_LAYOUT_KIND_TYPE;
$this->rowsLayoutProperty = $rowsLayoutProperty ?: "";
}

Expand Down
2 changes: 1 addition & 1 deletion ...e_discriminator/PHPRawTypes/src/ConstantReferenceDiscriminator/RowsLayoutWithoutValue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class RowsLayoutWithoutValue implements \JsonSerializable
*/
public function __construct(?string $rowsLayoutProperty = null)
{
$this->kind = \Grafana\Foundation\ConstantReferenceDiscriminator\RowsLayoutKindType;
$this->kind = \Grafana\Foundation\ConstantReferenceDiscriminator\Constants::ROWS_LAYOUT_KIND_TYPE;
$this->rowsLayoutProperty = $rowsLayoutProperty ?: "";
}

Expand Down