From 7dfca09ff6c292622f85a4dfde708c360c5addfc Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Thu, 19 Jun 2014 15:53:11 +0200
Subject: [PATCH 1/4] Minor CS fixes (`use` statements compliant with PSR-2)

---
 tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
index 09adb0617..c4c1f14a3 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
@@ -2,10 +2,9 @@
 
 namespace Doctrine\Tests\ORM\Mapping;
 
-use Doctrine\ORM\Mapping\ClassMetadata,
-    Doctrine\ORM\Mapping\ClassMetadataFactory,
-    Doctrine\ORM\Mapping\Driver\XmlDriver,
-    Doctrine\ORM\Mapping\Driver\YamlDriver;
+use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\ORM\Mapping\ClassMetadataFactory;
+use Doctrine\ORM\Mapping\Driver\XmlDriver;
 
 class XmlMappingDriverTest extends AbstractMappingDriverTest
 {

From 59720370f9e986a831f17b8f7857c2ca6c315912 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Thu, 19 Jun 2014 15:53:37 +0200
Subject: [PATCH 2/4] Corrected FQCN reference in `@expectedException`

---
 tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
index c4c1f14a3..d87b153dc 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
@@ -116,7 +116,7 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest
 
     /**
      * @group DDC-889
-     * @expectedException Doctrine\Common\Persistence\Mapping\MappingException
+     * @expectedException \Doctrine\Common\Persistence\Mapping\MappingException
      * @expectedExceptionMessage Invalid mapping file 'Doctrine.Tests.Models.DDC889.DDC889Class.dcm.xml' for class 'Doctrine\Tests\Models\DDC889\DDC889Class'.
      */
     public function testinvalidEntityOrMappedSuperClassShouldMentionParentClasses()

From e940ce1df6686558ae88db39fef574a4a1b80ea6 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Thu, 19 Jun 2014 15:54:43 +0200
Subject: [PATCH 3/4] Replacing `"` with `'` to avoid escaping warnings

---
 tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
index d87b153dc..f810e367d 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
@@ -23,9 +23,9 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest
         $mappingDriver->loadMetadataForClass($className, $class);
 
         $expectedMap = array(
-            "foo" => "Doctrine\Tests\ORM\Mapping\CTIFoo",
-            "bar" => "Doctrine\Tests\ORM\Mapping\CTIBar",
-            "baz" => "Doctrine\Tests\ORM\Mapping\CTIBaz",
+            'foo' => 'Doctrine\Tests\ORM\Mapping\CTIFoo',
+            'bar' => 'Doctrine\Tests\ORM\Mapping\CTIBar',
+            'baz' => 'Doctrine\Tests\ORM\Mapping\CTIBaz',
         );
 
         $this->assertEquals(3, count($class->discriminatorMap));

From 19b5e87cab61cca563db80714b90baca82d014d3 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Thu, 19 Jun 2014 16:05:12 +0200
Subject: [PATCH 4/4] `on-update` is not supported anymore

---
 .../ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml
index d7c5f2813..728425a71 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml
+++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml
@@ -54,7 +54,7 @@
 
         <one-to-one field="address" target-entity="Address" inversed-by="user">
             <cascade><cascade-remove /></cascade>
-            <join-column name="address_id" referenced-column-name="id" on-delete="CASCADE" on-update="CASCADE"/>
+            <join-column name="address_id" referenced-column-name="id" on-delete="CASCADE" />
         </one-to-one>
 
         <one-to-many field="phonenumbers" target-entity="Phonenumber" mapped-by="user" index-by="number" orphan-removal="true">