RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-01 04:51:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/#1064-xsd-on-update-removal'

Browse Source
This commit is contained in:
Marco Pivetta 2014-06-19 16:06:03 +02:00
commit 84a0fddaf4
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
View File

@ -2,10 +2,9 @@
namespace Doctrine\Tests\ORM\Mapping; namespace Doctrine\Tests\ORM\Mapping;
use Doctrine\ORM\Mapping\ClassMetadata, use Doctrine\ORM\Mapping\ClassMetadata;
Doctrine\ORM\Mapping\ClassMetadataFactory, use Doctrine\ORM\Mapping\ClassMetadataFactory;
Doctrine\ORM\Mapping\Driver\XmlDriver, use Doctrine\ORM\Mapping\Driver\XmlDriver;
Doctrine\ORM\Mapping\Driver\YamlDriver;
class XmlMappingDriverTest extends AbstractMappingDriverTest class XmlMappingDriverTest extends AbstractMappingDriverTest
{ {
@ -24,9 +23,9 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest
$mappingDriver->loadMetadataForClass($className, $class); $mappingDriver->loadMetadataForClass($className, $class);
$expectedMap = array( $expectedMap = array(
"foo" => "Doctrine\Tests\ORM\Mapping\CTIFoo", 'foo' => 'Doctrine\Tests\ORM\Mapping\CTIFoo',
"bar" => "Doctrine\Tests\ORM\Mapping\CTIBar", 'bar' => 'Doctrine\Tests\ORM\Mapping\CTIBar',
"baz" => "Doctrine\Tests\ORM\Mapping\CTIBaz", 'baz' => 'Doctrine\Tests\ORM\Mapping\CTIBaz',
); );
$this->assertEquals(3, count($class->discriminatorMap)); $this->assertEquals(3, count($class->discriminatorMap));
@ -117,7 +116,7 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest
/** /**
* @group DDC-889 * @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'. * @expectedExceptionMessage Invalid mapping file 'Doctrine.Tests.Models.DDC889.DDC889Class.dcm.xml' for class 'Doctrine\Tests\Models\DDC889\DDC889Class'.
*/ */
public function testinvalidEntityOrMappedSuperClassShouldMentionParentClasses() public function testinvalidEntityOrMappedSuperClassShouldMentionParentClasses()

2
tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml
View File

@ -54,7 +54,7 @@
<one-to-one field="address" target-entity="Address" inversed-by="user"> <one-to-one field="address" target-entity="Address" inversed-by="user">
<cascade><cascade-remove /></cascade> <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-one>
<one-to-many field="phonenumbers" target-entity="Phonenumber" mapped-by="user" index-by="number" orphan-removal="true"> <one-to-many field="phonenumbers" target-entity="Phonenumber" mapped-by="user" index-by="number" orphan-removal="true">