Merge pull request #277 from phil-davis/precise-clark-notation-v3

More precise parseClarkNotation return type (v3)

Author: phil-davis

lib/Service.php

@@ -281,7 +281,7 @@ public function writeValueObject(object $object, ?string $contextUri = null): st
      *
      * If the string was invalid, it will throw an InvalidArgumentException.
      *
-     * @return array{string|null, string}
+     * @return array{string, string}
      *
      * @throws \InvalidArgumentException
      */

lib/Writer.php

@@ -134,7 +134,7 @@ public function startElement($name): bool
             } else {
                 // An empty namespace means it's the global namespace. This is
                 // allowed, but it mustn't get a prefix.
-                if ('' === $namespace || null === $namespace) {
+                if ('' === $namespace) {
                     $result = $this->startElement($localName);
                     $this->writeAttribute('xmlns', '');
                 } else {

tests/Sabre/Xml/ServiceTest.php

@@ -346,12 +346,14 @@ public function testWriteVoNotFound(): void
         $service->writeValueObject(new \stdClass());
     }
 
-    public function testParseClarkNotation(): void
+    /**
+     * @param array<string> $expected
+     *
+     * @dataProvider provideParseClarkNotationInput
+     */
+    public function testParseClarkNotation(string $clark, array $expected): void
     {
-        self::assertEquals([
-            'http://sabredav.org/ns',
-            'elem',
-        ], Service::parseClarkNotation('{http://sabredav.org/ns}elem'));
+        self::assertEquals($expected, Service::parseClarkNotation($clark));
     }
 
     public function testParseClarkNotationFail(): void
@@ -360,6 +362,17 @@ public function testParseClarkNotationFail(): void
         Service::parseClarkNotation('http://sabredav.org/ns}elem');
     }
 
+    /**
+     * @return array<int, list{string, array<string>}>
+     */
+    public function provideParseClarkNotationInput(): iterable
+    {
+        return [
+            ['{http://sabredav.org/ns}elem', ['http://sabredav.org/ns', 'elem']],
+            ['{}elem', ['', 'elem']],
+        ];
+    }
+
     /**
      * @return array<int, array<int, string|resource|false>>
      */