fix subnamespace collections matching in ModelValidator

Author: pscheit

Diff for: lib/Webforge/Doctrine/Compiler/Model.php

@@ -37,7 +37,7 @@ public function getAssociationFor(GeneratedEntity $entity, GeneratedProperty $pr
     foreach ($this->associations as $associationsPair) {
       if (
         $associationsPair->owning->property === $property && $entity->equals($associationsPair->owning->entity) ||
-        $associationsPair->inverse->property === $property && $entity->equals($associationsPair->inverse->entity)
+        isset($associationsPair->inverse) && $associationsPair->inverse->property === $property && $entity->equals($associationsPair->inverse->entity)
         ) {
         return $associationsPair;
       }

Diff for: lib/Webforge/Doctrine/Compiler/ModelValidator.php

@@ -145,8 +145,14 @@ protected function validateType(stdClass $property, stdClass $entity, Model $mod
         throw new InvalidModelException(sprintf("The type: '%s' cannot be parsed for entity '%s'.", $typeName, $entity->fqn), 0, $e);
       }
 
-      if ($type instanceof CollectionType && $type->getType() instanceof ObjectType && $model->hasEntity($referenceEntityName = $type->getType()->getClass()->getName())) {
-        $type = new EntityCollectionReference($model->getEntity($referenceEntityName));
+      if ($type instanceof CollectionType && $type->getType() instanceof ObjectType) {
+        if ($model->hasEntity($referenceEntityName = $type->getType()->getClass()->getFQN())) { // FQN is here subnamespace + name
+          $type = new EntityCollectionReference($model->getEntity($referenceEntityName));
+        } else {
+          throw new InvalidModelException(
+            sprintf("The entityName '%s' in type from property %s::%s cannot be found in model. Did you misspelled the name of the entity?", $referenceEntityName, $entity->fqn, $property->name)
+          );
+        }
       }
     }
 

Diff for: lib/Webforge/Doctrine/Compiler/Test/ModelBase.php

@@ -36,7 +36,7 @@ protected function assertIsMappedBy($mappedBy, Array $association) {
   }
 
   protected function assertIsInversedBy($mappedBy, Array $association) {
-    $this->assertEquals($mappedBy, $association['inversedBy'], 'is invseredBy does not match');
+    $this->assertEquals($mappedBy, $association['inversedBy'], 'is inversedBy does not match');
   }
 
   protected function assertHasTargetENtity($fqn, Array $association) {

Diff for: model-tests/ModelAssociationsOneToManyTest.php

@@ -93,4 +93,14 @@ public function testManyToOneDoctrineMetadata() {
     $this->assertHasTargetEntity($this->authorClass, $author);
     $this->assertIsInversedBy('writtenPosts', $author);
   }
+
+  public function testManyToOneWithSubNamespacesMetadata() {
+    $paragraphClass = $this->elevateFull('ACME\Blog\Entities\ContentStream\Paragraph');
+    $streamClass = $this->elevateFull('ACME\Blog\Entities\ContentStream\Stream');
+    $metadata = $this->assertDoctrineMetadata($streamClass);
+
+    $paragraphs = $this->assertAssociationMapping('paragraphs', $metadata);
+
+    $this->assertHasTargetEntity($paragraphClass, $paragraphs);
+  }
 }

Diff for: tests/Webforge/Doctrine/Compiler/CompilerAcceptanceTest.php

@@ -73,7 +73,6 @@ public function testThrowsModelException_WhenAssociationsAreAmbigous() {
             "id": { "type": "DefaultId" },
             "author": { "type": "Author" },
             "revisor": { "type": "Author", "nullable": true },
-            "categories": { "type": "Collection<Category>", "isOwning": true },
             "created": { "type": "DateTime" },
             "modified": { "type": "DateTime", "nullable": true }
           },

Diff for: tests/Webforge/Doctrine/Compiler/ModelValidatorTest.php

@@ -77,7 +77,7 @@ public function testLikesShortPropertiesWithOnlyTypeAndName() {
 
           "properties": {
             "id": "DefaultId",
-            "posts": { "type": "Collection<Post>" }
+            "label": { "type": "String" }
           }
         }
       ]
@@ -169,6 +169,19 @@ public function testDoesNotLikeMalFormedTypes() {
     ));
   }
 
+  public function testDoesNotLikeCollectionTypesWithWrongEntityName() {
+    $this->assertInvalid($this->wrapEntity(
+      (object) array(
+        "name"=>"User",
+        "properties"=>(object) array(
+          "email"=>(object) array(
+            'type'=>'Collection<NonExistingEntity>'
+          )
+        )
+      )
+    ));
+  }
+
   public function testDoesNotLikeEntitiesThatArentExisting() {
     $jsonModel = <<<'JSON'
     {