symfony
diff --git a/‎src/Symfony/Component/Translation/Loader/XliffFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Loader/XliffFileLoader.php
+3-3Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/Translation/Loader/XliffFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Loader/XliffFileLoader.php
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
+17-3Lines changed: 17 additions & 3 deletions b/‎src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
+17-3Lines changed: 17 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Translation/Tests/fixtures/resources-notes-meta.xlf
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/fixtures/resources-notes-meta.xlf
+10Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Translation/Tests/fixtures/resources-notes-meta.xlf
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/fixtures/resources-notes-meta.xlf
+10Lines changed: 10 additions & 0 deletions
@@ -146,16 +146,16 @@ private function extractXliff2(\DOMDocument $dom, MessageCatalogue $catalogue, $
             }
 
             if (isset($unit->notes)) {
-                $metadata['notes'] = [];
+                $metadata['notes'] = array();
                 foreach ($unit->notes->note as $noteNode) {
-                    $note = [];
+                    $note = array();
                     foreach ($noteNode->attributes() as $key => $value) {
                         $note[$key] = (string) $value;
                     }
                     $note['content'] = (string) $noteNode;
                     $metadata['notes'][] = $note;
                 }
-             }
+            }
 
             $catalogue->setMetadata((string) $source, $metadata, $domain);
         }
 
@@ -93,12 +93,17 @@ public function testFormatCatalogueWithNotesMetadata()
         $catalogue = new MessageCatalogue('en_US');
         $catalogue->add(array(
             'foo' => 'bar',
+            'baz' => 'biz',
         ));
         $catalogue->setMetadata('foo', array('notes' => array(
             array('category' => 'state', 'content' => 'new'),
             array('category' => 'approved', 'content' => 'true'),
             array('category' => 'section', 'content' => 'user login', 'priority' => '1'),
         )));
+        $catalogue->setMetadata('baz', array('notes' => array(
+            array('id' => 'x', 'content' => 'x_content'),
+            array('appliesTo' => 'target', 'category'=>'quality', 'content' => 'Fuzzy'),
+        )));
 
         $dumper = new XliffFileDumper();
 
 
@@ -192,15 +192,16 @@ public function testLoadVersion2()
     public function testLoadVersion2WithNoteMeta()
     {
         $loader = new XliffFileLoader();
-        $resource =  __DIR__.'/../fixtures/resources-notes-meta.xlf';
+        $resource = __DIR__.'/../fixtures/resources-notes-meta.xlf';
         $catalogue = $loader->load($resource, 'en', 'domain1');
 
         $this->assertEquals('en', $catalogue->getLocale());
         $this->assertEquals(array(new FileResource($resource)), $catalogue->getResources());
         $this->assertSame(array(), libxml_get_errors());
 
-        $this->assertTrue($catalogue->defines('foo'));
-        $metadata = $catalogue->getMetadata('foo');
+        // test for "foo" metadata
+        $this->assertTrue($catalogue->defines('foo', 'domain1'));
+        $metadata = $catalogue->getMetadata('foo', 'domain1');
         $this->assertNotEmpty($metadata);
         $this->assertCount(3, $metadata['notes']);
 
@@ -213,5 +214,18 @@ public function testLoadVersion2WithNoteMeta()
         $this->assertEquals('section', $metadata['notes'][2]['category']);
         $this->assertEquals('1', $metadata['notes'][2]['priority']);
         $this->assertEquals('user login', $metadata['notes'][2]['content']);
+
+        // test for "baz" metadata
+        $this->assertTrue($catalogue->defines('baz', 'domain1'));
+        $metadata = $catalogue->getMetadata('baz', 'domain1');
+        $this->assertNotEmpty($metadata);
+        $this->assertCount(2, $metadata['notes']);
+
+        $this->assertEquals('x', $metadata['notes'][0]['id']);
+        $this->assertEquals('x_content', $metadata['notes'][0]['content']);
+
+        $this->assertEquals('target', $metadata['notes'][1]['appliesTo']);
+        $this->assertEquals('quality', $metadata['notes'][1]['category']);
+        $this->assertEquals('Fuzzy', $metadata['notes'][1]['content']);
     }
 }
@@ -12,5 +12,15 @@
         <target>bar</target>
       </segment>
     </unit>
+    <unit id="uqWglk0">
+      <notes>
+        <note id="x">x_content</note>
+        <note appliesTo="target" category="quality">Fuzzy</note>
+      </notes>
+      <segment>
+        <source>baz</source>
+        <target>biz</target>
+      </segment>
+    </unit>
   </file>
 </xliff>
Original file line number	Diff line number	Diff line change
`@@ -146,16 +146,16 @@ private function extractXliff2(\DOMDocument $dom, MessageCatalogue $catalogue, $`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`if (isset($unit->notes)) {`
`149`		`- $metadata['notes'] = [];`
	`149`	`+ $metadata['notes'] = array();`
`150`	`150`	`foreach ($unit->notes->note as $noteNode) {`
`151`		`- $note = [];`
	`151`	`+ $note = array();`
`152`	`152`	`foreach ($noteNode->attributes() as $key => $value) {`
`153`	`153`	`$note[$key] = (string) $value;`
`154`	`154`	`}`
`155`	`155`	`$note['content'] = (string) $noteNode;`
`156`	`156`	`$metadata['notes'][] = $note;`
`157`	`157`	`}`
`158`		`- }`
	`158`	`+ }`
`159`	`159`
`160`	`160`	`$catalogue->setMetadata((string) $source, $metadata, $domain);`
`161`	`161`	`}`