[AnnotationDriver] compatibility with Doctrine Common 3.x
This commit is contained in:
parent
6d724ad9ff
commit
a0d79b03e7
@ -128,6 +128,13 @@ class AnnotationDriver implements Driver
|
|||||||
|
|
||||||
$classAnnotations = $this->_reader->getClassAnnotations($class);
|
$classAnnotations = $this->_reader->getClassAnnotations($class);
|
||||||
|
|
||||||
|
// Compatibility with Doctrine Common 3.x
|
||||||
|
if ($classAnnotations && is_int(key($classAnnotations))) {
|
||||||
|
foreach ($classAnnotations as $annot) {
|
||||||
|
$classAnnotations[get_class($annot)] = $annot;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Evaluate Entity annotation
|
// Evaluate Entity annotation
|
||||||
if (isset($classAnnotations['Doctrine\ORM\Mapping\Entity'])) {
|
if (isset($classAnnotations['Doctrine\ORM\Mapping\Entity'])) {
|
||||||
$entityAnnot = $classAnnotations['Doctrine\ORM\Mapping\Entity'];
|
$entityAnnot = $classAnnotations['Doctrine\ORM\Mapping\Entity'];
|
||||||
@ -397,6 +404,13 @@ class AnnotationDriver implements Driver
|
|||||||
if ($method->isPublic() && $method->getDeclaringClass()->getName() == $class->name) {
|
if ($method->isPublic() && $method->getDeclaringClass()->getName() == $class->name) {
|
||||||
$annotations = $this->_reader->getMethodAnnotations($method);
|
$annotations = $this->_reader->getMethodAnnotations($method);
|
||||||
|
|
||||||
|
// Compatibility with Doctrine Common 3.x
|
||||||
|
if ($annotations && is_int(key($annotations))) {
|
||||||
|
foreach ($annotations as $annot) {
|
||||||
|
$annotations[get_class($annot)] = $annot;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (isset($annotations['Doctrine\ORM\Mapping\PrePersist'])) {
|
if (isset($annotations['Doctrine\ORM\Mapping\PrePersist'])) {
|
||||||
$metadata->addLifecycleCallback($method->getName(), \Doctrine\ORM\Events::prePersist);
|
$metadata->addLifecycleCallback($method->getName(), \Doctrine\ORM\Events::prePersist);
|
||||||
}
|
}
|
||||||
@ -442,6 +456,20 @@ class AnnotationDriver implements Driver
|
|||||||
{
|
{
|
||||||
$classAnnotations = $this->_reader->getClassAnnotations(new \ReflectionClass($className));
|
$classAnnotations = $this->_reader->getClassAnnotations(new \ReflectionClass($className));
|
||||||
|
|
||||||
|
// Compatibility with Doctrine Common 3.x
|
||||||
|
if ($classAnnotations && is_int(key($classAnnotations))) {
|
||||||
|
foreach ($classAnnotations as $annot) {
|
||||||
|
if ($annot instanceof \Doctrine\ORM\Mapping\Entity) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if ($annot instanceof \Doctrine\ORM\Mapping\MappedSuperclass) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
return ! isset($classAnnotations['Doctrine\ORM\Mapping\Entity']) &&
|
return ! isset($classAnnotations['Doctrine\ORM\Mapping\Entity']) &&
|
||||||
! isset($classAnnotations['Doctrine\ORM\Mapping\MappedSuperclass']);
|
! isset($classAnnotations['Doctrine\ORM\Mapping\MappedSuperclass']);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user