Merge pull request #19232 from jtattermusch/php_dots_in_metadata_keys

PHP: Allow dots in metadata keys

src/php/lib/Grpc/BaseStub.php

@@ -241,10 +241,10 @@ class BaseStub
     {
         $metadata_copy = [];
         foreach ($metadata as $key => $value) {
-            if (!preg_match('/^[A-Za-z\d_-]+$/', $key)) {
+            if (!preg_match('/^[.A-Za-z\d_-]+$/', $key)) {
                 throw new \InvalidArgumentException(
                     'Metadata keys must be nonempty strings containing only '.
-                    'alphanumeric characters, hyphens and underscores'
+                    'alphanumeric characters, hyphens, underscores and dots'
                 );
             }
             $metadata_copy[strtolower($key)] = $value;

src/php/tests/generated_code/AbstractGeneratedCodeTest.php

@@ -71,6 +71,33 @@ abstract class AbstractGeneratedCodeTest extends PHPUnit_Framework_TestCase
         $call = self::$client->Div($div_arg, [' ' => 'abc123']);
     }
 
+    public function testMetadata()
+    {
+        $div_arg = new Math\DivArgs();
+        $call = self::$client->Div($div_arg, ['somekey' => ['abc123']]);
+    }
+
+    public function testMetadataKey()
+    {
+        $div_arg = new Math\DivArgs();
+        $call = self::$client->Div($div_arg, ['somekey_-1' => ['abc123']]);
+    }
+
+    public function testMetadataKeyWithDot()
+    {
+        $div_arg = new Math\DivArgs();
+        $call = self::$client->Div($div_arg, ['someKEY._-1' => ['abc123']]);
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testMetadataInvalidKey()
+    {
+        $div_arg = new Math\DivArgs();
+        $call = self::$client->Div($div_arg, ['(somekey)' => ['abc123']]);
+    }
+
     public function testGetCallMetadata()
     {
         $div_arg = new Math\DivArgs();