fix(php): use count instead of ->count() to avoid bug in c-extension

protobuf-github-bot · copybara-github · commit 9fbce6259770 · 2025-05-20T10:56:31.000-07:00
PiperOrigin-RevId: 761147122
diff --git a/php/tests/GeneratedClassTest.php b/php/tests/GeneratedClassTest.php
@@ -130,6 +130,27 @@ public function testDeprecatedFieldGetterDoesNotThrowWarning()
         $this->assertEquals(0, $deprecationCount);
     }
 
+    public function testDeprecatedFieldSetterDoesNotThrowWarningForRepeatedAndMapFieldsWithEmptyArrays()
+    {
+        // temporarily change error handler to capture the deprecated errors
+        $deprecationCount = 0;
+        set_error_handler(function ($errno, $errstr) use (&$deprecationCount) {
+            if (false !== strpos($errstr, ' is deprecated.')) {
+                $deprecationCount++;
+            }
+        }, E_USER_DEPRECATED);
+
+
+        // This behavior exists because otherwise the deprecation is thrown on serializeToJsonString
+        $message = new TestMessage();
+        $message->setDeprecatedRepeatedInt32([]); // repeated field
+        $message->setDeprecatedMapInt32Int32([]); // map field
+
+        restore_error_handler();
+
+        $this->assertEquals(0, $deprecationCount);
+    }
+
     public function testDeprecatedFieldGetterThrowsWarningWithValue()
     {
         $message = new TestMessage([
diff --git a/src/google/protobuf/compiler/php/php_generator.cc b/src/google/protobuf/compiler/php/php_generator.cc
@@ -221,7 +221,7 @@ std::string DefaultForField(const FieldDescriptor* field) {
 
 std::string DeprecatedConditionalForField(const FieldDescriptor* field) {
   if (field->is_repeated()) {
-    return absl::StrCat("$this->", field->name(), "->count() !== 0");
+    return absl::StrCat("count($this->", field->name(), ") !== 0");
   }
   if (field->real_containing_oneof() != nullptr) {
     return absl::StrCat("$this->hasOneof(", field->number(), ")");
@@ -749,7 +749,7 @@ void GenerateFieldAccessor(const FieldDescriptor* field, const Options& options,
 
   if (field->options().deprecated() &&
       (field->is_map() || field->is_repeated())) {
-    printer->Print("if ($arr->count() !== 0) {\n    ^deprecation_trigger^}\n",
+    printer->Print("if (count($arr) !== 0) {\n    ^deprecation_trigger^}\n",
                    "deprecation_trigger", deprecation_trigger);
   }
 
