AVRO-4046: Respect writer's schema for default values (#3127)

Only use default values from reader's schema for fields that are not defined in the writer's schema

Co-authored-by: Michel Hartmann <[email protected]>

lang/php/lib/Datum/AvroIODatumReader.php

@@ -358,6 +358,7 @@ public function readRecord($writers_schema, $readers_schema, $decoder)
             }
         }
         // Fill in default values
+        $writers_fields = $writers_schema->fieldsHash();
         foreach ($readers_fields as $field_name => $field) {
             if (isset($writers_fields[$field_name])) {
                 continue;

lang/php/test/IODatumReaderTest.php

@@ -37,7 +37,7 @@ public function testSchemaMatching()
 JSON;
         $readers_schema = $writers_schema;
         $this->assertTrue(AvroIODatumReader::schemasMatch(
-            AvroSchema::parse($writers_schema),
+                AvroSchema::parse($writers_schema),
             AvroSchema::parse($readers_schema)));
     }
 
@@ -90,4 +90,36 @@ public function testRecordNullField()
 
         $this->assertSame('0200', bin2hex($bin));
     }
+
+    public function testRecordFieldWithDefault()
+    {
+        $schema = AvroSchema::parse(<<<_JSON
+{
+  "name": "RecordWithDefaultValue",
+  "type": "record",
+  "fields": [
+    {
+      "name": "field1",
+      "type": "string",
+      "default": "default"
+    }
+  ]
+}
+_JSON
+        );
+
+        $io = new AvroStringIO();
+        $writer = new AvroIODatumWriter();
+        $writer->writeData($schema, ['field1' => "foobar"], new AvroIOBinaryEncoder($io));
+
+        $bin = $io->string();
+        $reader = new AvroIODatumReader();
+        $record = $reader->readRecord(
+            $schema,
+            $schema,
+            new AvroIOBinaryDecoder(new AvroStringIO($bin))
+        );
+
+        $this->assertEquals(['field1' => "foobar"], $record);
+    }
 }