diff --git a/UPGRADE_TO_2_2 b/UPGRADE_TO_2_2 index 0500e4599..76372b221 100644 --- a/UPGRADE_TO_2_2 +++ b/UPGRADE_TO_2_2 @@ -1,3 +1,19 @@ # Removed support for onUpdate in @JoinColumn The onUpdate foreign key handling makes absolutly no sense in an ORM. Additionally Oracle doesn't even support it. Support for it is removed. + +# Changes in Annotation Handling + +There have been some changes to the annotation handling in Common 2.2 again, that affect how people with old configurations +from 2.0 have to configure the annotation driver if they don't use `Configuration::newDefaultAnnotationDriver()`: + + // Register the ORM Annotations in the AnnotationRegistry + AnnotationRegistry::registerFile('path/to/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php'); + + $reader = new \Doctrine\Common\Annotations\SimpleAnnotationReader(); + $reader->addNamespace('Doctrine\ORM\Mapping'); + $reader = new \Doctrine\Common\Annotations\CachedReader($reader, new ArrayCache()); + + $driver = new AnnotationDriver($reader, (array)$paths); + + $config->setMetadataDriverImpl($driver); \ No newline at end of file diff --git a/build.properties.dev b/build.properties.dev index 7e72d6f1e..20e91dc37 100644 --- a/build.properties.dev +++ b/build.properties.dev @@ -8,6 +8,7 @@ report.dir=reports log.archive.dir=logs project.pirum_dir= project.download_dir= +project.xsd_dir= test.phpunit_configuration_file= test.phpunit_generate_coverage=0 test.pmd_reports=0 diff --git a/build.xml b/build.xml index 7981503a5..b36457f3d 100644 --- a/build.xml +++ b/build.xml @@ -223,7 +223,12 @@ - + + + + + + @@ -235,7 +240,7 @@ - +