Automap properties in many-to-many and one-to-many relations

Author: na2axl

src/LightQL/Annotations/ManyToManyAnnotation.php

@@ -55,13 +55,6 @@ class ManyToManyAnnotation extends Annotation
      */
     public $entity;
 
-    /**
-     * The entity property which map the many-to-many relation.
-     *
-     * @var string
-     */
-    public $mappedBy;
-
     /**
      * The referenced table name of the many-to-many relation.
      *

src/LightQL/Annotations/OneToManyAnnotation.php

@@ -54,11 +54,4 @@ class OneToManyAnnotation extends Annotation
      * @var string
      */
     public $entity;
-
-    /**
-     * The entity property which map the many-to-many relation.
-     *
-     * @var string
-     */
-    public $mappedBy;
 }

src/LightQL/Sessions/Facade.php

@@ -325,7 +325,7 @@ private function _fetchManyToMany(&$entity, $property)
     {
         $manyToMany = Annotations::ofProperty($entity, $property, "@manyToMany");
         $referencedEntityAnnotations = Annotations::ofClass($manyToMany[0]->entity, "@entity");
-        $mappedPropertyAnnotation = Annotations::ofProperty($manyToMany[0]->entity, $manyToMany[0]->mappedBy, "@manyToMany");
+        $mappedPropertyAnnotation = Annotations::ofProperty($manyToMany[0]->entity, $this->_getCollectionPropertyName($this->getEntityClassName()), "@manyToMany");
 
         if ($manyToMany[0]->referencedTable !== $mappedPropertyAnnotation[0]->referencedTable) {
             throw new EntityException("Inconsistent @manyToMany annotation. The referenced table is different on both sides.");
@@ -364,7 +364,7 @@ private function _fetchOneToMany(&$entity, $property)
     {
         $oneToMany = Annotations::ofProperty($entity, $property, "@oneToMany");
         $referencedEntityAnnotations = Annotations::ofClass($oneToMany[0]->entity, "@entity");
-        $mappedPropertyAnnotation = Annotations::ofProperty($oneToMany[0]->entity, $oneToMany[0]->mappedBy, "@manyToOne");
+        $mappedPropertyAnnotation = Annotations::ofProperty($oneToMany[0]->entity, $this->_getCollectionPropertyName($this->getEntityClassName()), "@manyToOne");
 
         $lightql = $this->entityManager->getLightQL();