From d09285e9d33128f4059b3166b7340b37d836a002 Mon Sep 17 00:00:00 2001
From: Asmir Mustafic <goetas@lignano.it>
Date: Wed, 26 Oct 2011 10:59:15 +0200
Subject: [PATCH] Collapse cascade all test (YAML too)

---
 lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php |  2 +-
 .../ORM/Tools/Export/Driver/YamlExporter.php         |  3 +++
 .../Export/AbstractClassMetadataExporterTest.php     | 12 ++++++++++--
 .../Doctrine.Tests.ORM.Tools.Export.User.dcm.yml     |  5 +++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
index 5c8d97327..f4f708e4e 100644
--- a/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
+++ b/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
@@ -276,7 +276,7 @@ class XmlExporter extends AbstractExporter
             if ($associationMapping['isCascadeDetach']) {
                 $cascade[] = 'cascade-detach';
             }
-            if(count($cascade) === 5){
+            if (count($cascade) === 5) {
                 $cascade  = array('cascade-all');
             }
             if ($cascade) {
diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php
index e8410db2d..de76c7bdd 100644
--- a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php
+++ b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php
@@ -147,6 +147,9 @@ class YamlExporter extends AbstractExporter
             if ($associationMapping['isCascadeDetach']) {
                 $cascade[] = 'detach';
             }
+            if (count($cascade) === 5) {
+                $cascade = array('all');
+            }
             $associationMappingArray = array(
                 'targetEntity' => $associationMapping['targetEntity'],
                 'cascade'     => $cascade,
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
index 925e51550..6ff3d1808 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
@@ -338,9 +338,17 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest
             $this->assertEquals(1, count($nodes));
 
             $this->assertEquals('cascade-all', $nodes[0]->getName());
-
+        } elseif ($type == 'yaml') {
+            
+            $yaml = new \Symfony\Component\Yaml\Parser();
+            $value = $yaml->parse(file_get_contents(__DIR__ . '/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.yml'));
+            
+            $this->assertTrue(isset($value['Doctrine\Tests\ORM\Tools\Export\ExportedUser']['oneToMany']['interests']['cascade']));
+            $this->assertEquals(1, count($value['Doctrine\Tests\ORM\Tools\Export\ExportedUser']['oneToMany']['interests']['cascade']));
+            $this->assertEquals('all', $value['Doctrine\Tests\ORM\Tools\Export\ExportedUser']['oneToMany']['interests']['cascade'][0]);
+           
         } else {
-            $this->markTestSkipped('Test aviable only for XML dirver');
+            $this->markTestSkipped('Test aviable only for '.$type.' dirver');
         }
     }
     public function __destruct()
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml b/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml
index 9231bb189..ee48d8511 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml
@@ -34,6 +34,11 @@ Doctrine\Tests\ORM\Tools\Export\User:
         number: ASC
       cascade: [ persist, merge ]
       orphanRemoval: true
+    interests:
+      targetEntity: Doctrine\Tests\ORM\Tools\Export\Interests
+      mappedBy: user
+      cascade: [ persist, merge, remove, refresh, detach ]
+      orphanRemoval: true            
   manyToMany:
     groups:
       targetEntity: Doctrine\Tests\ORM\Tools\Export\Group