Johannes Schmitt 4f585a3d63 Merge branch 'master' of github.com:doctrine/doctrine2 into ValueObjects ...

Conflicts:
	UPGRADE.md
	lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php

2014-01-04 17:52:32 +01:00

..

php

Merge branch 'DDC-2732'

2014-01-02 23:33:56 +01:00

Symfony

Removing code from the simplified drivers, use SymfonyFileLocator instead

2012-07-04 20:59:21 +02:00

xml

Merge branch 'master' of github.com:doctrine/doctrine2 into ValueObjects

2014-01-04 17:52:32 +01:00

yaml

Merge branch 'DDC-2732'

2014-01-02 23:33:56 +01:00

AbstractMappingDriverTest.php

Merge branch 'DDC-2732'

2014-01-02 23:33:56 +01:00

AnnotationDriverTest.php

Fixed typos

2013-03-11 00:08:58 +00:00

AnsiQuoteStrategyTest.php

ANSI compliant quote strategy

2013-06-21 16:05:59 -04:00

BasicInheritanceMappingTest.php

Refix test

2013-03-14 20:12:20 +01:00

ClassMetadataBuilderTest.php

Removed FieldBuilder::unsigned() method as it is only supported by MySQL

2014-01-03 09:48:38 +00:00

ClassMetadataFactoryTest.php

Fixed typos

2013-03-11 00:08:58 +00:00

ClassMetadataLoadEventTest.php

[DDC-1610] Add test and fix wakeup reflection in combination with event listener

2012-01-21 13:58:25 +01:00

ClassMetadataTest.php

[DDC-2700] Add test and fix CS.

2014-01-02 23:50:15 +01:00

EntityListenerResolverTest.php

split override test

2013-01-29 12:14:53 -02:00

NamingStrategyTest.php

move naming classes to Doctrine\ORM\Mapping

2011-12-24 12:01:25 -02:00

PHPMappingDriverTest.php

Removing deprecated StaticPHPDriver and PHPDriver

2012-07-10 02:31:30 +02:00

QuoteStrategyTest.php

Fix CS and test configuration

2012-06-18 14:43:01 -03:00

StaticPHPMappingDriverTest.php

Removing deprecated StaticPHPDriver and PHPDriver

2012-07-10 02:31:30 +02:00

XmlMappingDriverTest.php

Fix XmlDriver to accept embeddables

2013-12-07 16:40:54 +01:00

YamlMappingDriverTest.php

Fix DDC-2069

2012-10-20 00:28:38 -03:00