Merge branch '1.8' into master

FriendsOfSymfony · Jan 30, 2016 · 23dad88 · 23dad88
2 parents 6e64133 + 95dbe97
commit 23dad88
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Serializer/JMSSerializerAdapter.php b/Serializer/JMSSerializerAdapter.php
@@ -22,7 +22,7 @@
  *
  * @author Christian Flothmann <christian.flothmann@xabbuh.de>
  */
-final class JMSSerializerAdapter implements Serializer
+class JMSSerializerAdapter implements Serializer
 {
     /**
      * @internal

diff --git a/Serializer/SymfonySerializerAdapter.php b/Serializer/SymfonySerializerAdapter.php
@@ -19,7 +19,7 @@
  *
  * @author Christian Flothmann <christian.flothmann@xabbuh.de>
  */
-final class SymfonySerializerAdapter implements Serializer
+class SymfonySerializerAdapter implements Serializer
 {
     private $serializer;
 

diff --git a/Tests/Functional/SerializerErrorTest.php b/Tests/Functional/SerializerErrorTest.php
@@ -54,13 +54,13 @@ public function testSerializeExceptionXml($testCase, $expectedContent)
 
     public function serializeExceptionXmlProvider()
     {
-        $expectedSerializerContent = <<<XML
+        $expectedSerializerContent = <<<'XML'
 <?xml version="1.0"?>
 <response><code>500</code><message>Something bad happened.</message><errors/></response>
 
 XML;
 
-        $expectedJMSContent = <<<XML
+        $expectedJMSContent = <<<'XML'
 <?xml version="1.0" encoding="UTF-8"?>
 <result xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <code>500</code>
@@ -108,13 +108,13 @@ public function testSerializeInvalidFormXml($testCase, $expectedContent)
 
     public function serializeInvalidFormXmlProvider()
     {
-        $expectedSerializerContent = <<<XML
+        $expectedSerializerContent = <<<'XML'
 <?xml version="1.0"?>
 <response><code>400</code><message>Validation Failed</message><errors><children><name><errors>This value should not be blank.</errors></name></children></errors></response>
 
 XML;
 
-        $expectedJMSContent = <<<XML
+        $expectedJMSContent = <<<'XML'
 <?xml version="1.0" encoding="UTF-8"?>
 <result>
   <code>400</code>