From 40fe59e664c425ad0037b077270f2931063fb454 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Mon, 4 May 2026 13:46:58 -0700 Subject: [PATCH 1/3] fix property names which contain dollar sign --- .../___api_className___/___models_className___.php.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generator/src/googleapis/codegen/languages/php/default/templates/___api_className___/___models_className___.php.tmpl b/generator/src/googleapis/codegen/languages/php/default/templates/___api_className___/___models_className___.php.tmpl index 28b75a3f3b6..6d4bd301430 100644 --- a/generator/src/googleapis/codegen/languages/php/default/templates/___api_className___/___models_className___.php.tmpl +++ b/generator/src/googleapis/codegen/languages/php/default/templates/___api_className___/___models_className___.php.tmpl @@ -33,8 +33,10 @@ class {{ model.className }} extends {% if model.superClass %}{{ model.superClass {% endif %}{% if model.has_gapi %} protected $internal_gapi_mappings = [ {% for property in model.properties %} - {% if not property.member_name_is_json_name %} + {% if not property.member_name_is_json_name and not "$" in property.wireName %} "{{ property.memberName }}" => "{{ property.wireName }}", + {% elif not property.member_name_is_json_name and "$" in property.wireName %} + "{{ property.memberName }}" => '{{ property.wireName }}', {% endif %} {% endfor %} ]; From 20e8081bcf738635a8d9a51c733ae9476d401b4e Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Mon, 4 May 2026 13:51:43 -0700 Subject: [PATCH 2/3] manually fix goldens --- .../tests/testdata/golden/php/default/kitchen_sink.golden | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generator/tests/testdata/golden/php/default/kitchen_sink.golden b/generator/tests/testdata/golden/php/default/kitchen_sink.golden index 0ca6dfad67c..0754ea1f289 100755 --- a/generator/tests/testdata/golden/php/default/kitchen_sink.golden +++ b/generator/tests/testdata/golden/php/default/kitchen_sink.golden @@ -3379,8 +3379,8 @@ namespace Google\Service\KitchSink; class SubmissionAttribution extends \Google\Model { protected $internal_gapi_mappings = [ - "avatarUrl" => "$avatarUrl", - "object" => "$object", + "avatarUrl" => '$avatarUrl', + "object" => '$object', ]; /** * A member with a $ in the name From b459b7e11e869f750737c28f18c1bdb786135762 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Wed, 6 May 2026 07:44:39 -0700 Subject: [PATCH 3/3] clean up logic --- .../___api_className___/___models_className___.php.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generator/src/googleapis/codegen/languages/php/default/templates/___api_className___/___models_className___.php.tmpl b/generator/src/googleapis/codegen/languages/php/default/templates/___api_className___/___models_className___.php.tmpl index 6d4bd301430..729195b9813 100644 --- a/generator/src/googleapis/codegen/languages/php/default/templates/___api_className___/___models_className___.php.tmpl +++ b/generator/src/googleapis/codegen/languages/php/default/templates/___api_className___/___models_className___.php.tmpl @@ -33,11 +33,11 @@ class {{ model.className }} extends {% if model.superClass %}{{ model.superClass {% endif %}{% if model.has_gapi %} protected $internal_gapi_mappings = [ {% for property in model.properties %} - {% if not property.member_name_is_json_name and not "$" in property.wireName %} + {% if not property.member_name_is_json_name %}{% if not "$" in property.wireName %} "{{ property.memberName }}" => "{{ property.wireName }}", - {% elif not property.member_name_is_json_name and "$" in property.wireName %} + {% else %} "{{ property.memberName }}" => '{{ property.wireName }}', - {% endif %} + {% endif %}{% endif %} {% endfor %} ]; {% endif %}{% for property in model.properties %}