Merge pull request #304 from Stratadox/master

Fix #303: Pass metadata dirs and expression evaluator to JMS serializer builder

Author: goetas

src/HateoasBuilder.php

@@ -192,6 +192,9 @@ public function build(): Hateoas
                 }
             });
 
+        $this->serializerBuilder->addMetadataDirs($this->metadataDirs);
+        $this->serializerBuilder->setExpressionEvaluator($this->expressionEvaluator);
+
         $jmsSerializer = $this->serializerBuilder->build();
 
         return new Hateoas($jmsSerializer, $linkHelper);

tests/Hateoas/Tests/Fixtures/NoAnnotations.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hateoas\Tests\Fixtures;
+
+class NoAnnotations
+{
+    private $id;
+    private $number;
+    private $unused = 'N/A';
+
+    public function __construct(string $id, int $number)
+    {
+        $this->id = $id;
+        $this->number = $number;
+    }
+
+    public function id(): string
+    {
+        return $this->id;
+    }
+
+    public function number(): int
+    {
+        return $this->number;
+    }
+}

tests/Hateoas/Tests/Fixtures/config/Hateoas.Tests.Fixtures.NoAnnotations.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<serializer>
+    <class name="Hateoas\Tests\Fixtures\NoAnnotations" xmlns:h="https://github.com/willdurand/Hateoas" xml-root-name="resource">
+        <h:relation rel="self">
+            <h:href uri="https://github.com/willdurand/Hateoas/issues/303" />
+        </h:relation>
+        <property name="unused" exclude="true" />
+        <property name="id" exclude="true" />
+        <virtual-property name="id" expression="'id-' ~ object.id()" />
+    </class>
+</serializer>

tests/Hateoas/Tests/HateoasBuilderTest.php

@@ -8,6 +8,7 @@
 use Hateoas\Tests\Fixtures\AdrienBrault;
 use Hateoas\Tests\Fixtures\CircularReference1;
 use Hateoas\Tests\Fixtures\CircularReference2;
+use Hateoas\Tests\Fixtures\NoAnnotations;
 use Hateoas\Tests\Fixtures\WithAlternativeRouter;
 use Hateoas\UrlGenerator\CallableUrlGenerator;
 use JMS\Serializer\SerializationContext;
@@ -160,4 +161,27 @@ public function testWithNullInEmbedded()
             $hateoas->serialize($reference1, 'json', SerializationContext::create()->setSerializeNull(true))
         );
     }
+
+    public function testWithXmlRootNameFromXmlConfiguration()
+    {
+        $hateoas = HateoasBuilder::create()
+            ->addMetadataDir(self::rootPath() . '/Fixtures/config')
+            ->build();
+
+        $resource = new NoAnnotations('#303', 303);
+
+        $this->assertSame(
+            <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<resource>
+  <id><![CDATA[id-#303]]></id>
+  <number>303</number>
+  <link rel="self" href="https://github.com/willdurand/Hateoas/issues/303"/>
+</resource>
+
+XML
+            ,
+            $hateoas->serialize($resource, 'xml')
+        );
+    }
 }