mirror of
https://github.com/doctrine/orm.git
synced 2026-03-24 06:52:09 +01:00
[PR #335] [MERGED] association/attribute override #8043
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/doctrine/orm/pull/335
Author: @FabioBatSilva
Created: 4/14/2012
Status: ✅ Merged
Merged: 4/29/2012
Merged by: @guilhermeblanco
Base:
master← Head:DDC-964📝 Commits (10+)
30fdf8dadded support for @AssociationOverride9e010cbadded xml/yml drivers3085c52fix docblock and remove white spaces2f67750added tags on doctrine-mapping.xsd4df3c75added missing ''85790f0support for attribute overridef63cb95add annotations56fb103update docblock5c7d7c6remove duplicated 'require_once'fa140d8remove wrong conflit mark📊 Changes
29 files changed (+1587 additions, -175 deletions)
View changed files
📝
doctrine-mapping.xsd(+33 -0)➕
lib/Doctrine/ORM/Mapping/AssociationOverride.php(+56 -0)➕
lib/Doctrine/ORM/Mapping/AssociationOverrides.php(+41 -0)➕
lib/Doctrine/ORM/Mapping/AttributeOverride.php(+47 -0)➕
lib/Doctrine/ORM/Mapping/AttributeOverrides.php(+41 -0)📝
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php(+90 -6)📝
lib/Doctrine/ORM/Mapping/Column.php(+1 -1)📝
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php(+154 -55)📝
lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php(+5 -1)📝
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php(+125 -53)📝
lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php(+136 -51)📝
lib/Doctrine/ORM/Mapping/JoinTable.php(+1 -1)📝
lib/Doctrine/ORM/Mapping/MappingException.php(+22 -0)➕
tests/Doctrine/Tests/Models/DDC964/DDC964Address.php(+123 -0)➕
tests/Doctrine/Tests/Models/DDC964/DDC964Admin.php(+47 -0)➕
tests/Doctrine/Tests/Models/DDC964/DDC964Group.php(+70 -0)➕
tests/Doctrine/Tests/Models/DDC964/DDC964Guest.php(+44 -0)➕
tests/Doctrine/Tests/Models/DDC964/DDC964User.php(+155 -0)📝
tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php(+125 -7)📝
tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php(+42 -0)...and 9 more files
📄 Description
http://www.doctrine-project.org/jira/browse/DDC-964
#218
Hi guys
This patch adds support for AssociationOverride and AttributeOverride.
All drivers are available and some code are changed.
Please take a look again. =)
Thanks
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.