Merge pull request #2894 from antograssiot/composite-identifiers-parsing

Allow to extract blank values from composite identifier

Author: dunglas

src/Identifier/CompositeIdentifierParser.php

@@ -33,7 +33,7 @@ public static function parse(string $identifier): array
     {
         $matches = [];
         $identifiers = [];
-        $num = preg_match_all('/(\w+)=(?<=\w=)(.+?)(?=;\w+=)|(\w+)=([^;]+);?$/', $identifier, $matches, PREG_SET_ORDER);
+        $num = preg_match_all('/(\w+)=(?<=\w=)(.*?)(?=;\w+=)|(\w+)=([^;]*);?$/', $identifier, $matches, PREG_SET_ORDER);
 
         foreach ($matches as $i => $match) {
             if ($i === $num - 1) {

tests/Identifier/CompositeIdentifierParserTest.php

@@ -37,6 +37,8 @@ public function variousIdentifiers(): array
             'a=test;b=bar;foo;c=123' => ['a' => 'test', 'b' => 'bar;foo', 'c' => '123'],
             'a=test;b=bar ;foo;c=123;459;barz=123asgfjasdg4;' => ['a' => 'test', 'b' => 'bar ;foo', 'c' => '123;459', 'barz' => '123asgfjasdg4'],
             'foo=test=bar;;bar=bazzz;' => ['foo' => 'test=bar;', 'bar' => 'bazzz'],
+            'foo=test=bar;bar=;test=foo' => ['foo' => 'test=bar', 'bar' => '', 'test' => 'foo'],
+            'foo=test=bar;bar=' => ['foo' => 'test=bar', 'bar' => ''],
         ]]];
     }
 }