Added tests

Author: dantleech

lib/Doctrine/ODM/PHPCR/DocumentClassMapper.php

@@ -30,8 +30,6 @@
  */
 class DocumentClassMapper implements DocumentClassMapperInterface
 {
-    const CLASS_PROPERTY = 'phpcr:class';
-
     private function expandClassName(DocumentManagerInterface $dm, $className = null)
     {
         if (null === $className) {
@@ -52,8 +50,8 @@ public function getClassName(DocumentManagerInterface $dm, NodeInterface $node,
     {
         $className = $this->expandClassName($dm, $className);
 
-        if ($node->hasProperty(self::CLASS_PROPERTY)) {
-            $nodeClassName = $node->getProperty(self::CLASS_PROPERTY)->getString();
+        if ($node->hasProperty('phpcr:class')) {
+            $nodeClassName = $node->getProperty('phpcr:class')->getString();
 
             if (!empty($className)
                 && $nodeClassName !== $className

lib/Doctrine/ODM/PHPCR/Tools/Console/Command/DocumentMigrateClassCommand.php

@@ -79,7 +79,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $mapper = $documentManager->getConfiguration()->getDocumentClassMapper();
 
         $input->setOption('query', sprintf(
-            'SELECT * FROM [nt:base] WHERE [phpcr:class] = "%s"',
+            'SELECT * FROM [nt:base] WHERE [%s] = "%s"',
             $classname
         ));
 

tests/Doctrine/Tests/Models/CMS/CmsArticleFolder.php

@@ -14,4 +14,9 @@ class CmsArticleFolder
      * @PHPCRODM\Id
      */
     public $id;
+
+    /**
+     * @PHPCRODM\Children()
+     */
+    public $articles;
 }

tests/Doctrine/Tests/Models/CMS/CmsBlogFolder.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Doctrine\Tests\Models\CMS;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
+
+/**
+ * @PHPCRODM\Document(requiredClasses={"Doctrine\Tests\Models\CMS\CmsBlogPost"})
+ */
+class CmsBlogFolder
+{
+    /**
+     * @PHPCRODM\Id()
+     */
+    public $id;
+
+    /**
+     * @PHPCRODM\Children()
+     */
+    public $posts;
+}
+

tests/Doctrine/Tests/Models/CMS/CmsBlogInvalidChild.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Documents;
+
+namespace Doctrine\Tests\Models\CMS;
+
+use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
+use Doctrine\ODM\PHPCR\DocumentRepository;
+use Doctrine\ODM\PHPCR\Id\RepositoryIdInterface;
+
+/**
+ * @PHPCRODM\Document()
+ */
+class CmsBlogInvalidChild
+{
+    /** @PHPCRODM\Id(strategy="parent") */
+    public $id;
+
+    /** @PHPCRODM\NodeName() */
+    public $name;
+
+    /** @PHPCRODM\ParentDocument() */
+    public $parent;
+}

tests/Doctrine/Tests/Models/CMS/CmsBlogPost.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Documents;
+
+namespace Doctrine\Tests\Models\CMS;
+
+use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
+use Doctrine\ODM\PHPCR\DocumentRepository;
+use Doctrine\ODM\PHPCR\Id\RepositoryIdInterface;
+
+/**
+ * @PHPCRODM\Document()
+ */
+class CmsBlogPost
+{
+    /** @PHPCRODM\Id(strategy="parent") */
+    public $id;
+
+    /** @PHPCRODM\NodeName() */
+    public $name;
+
+    /** @PHPCRODM\ParentDocument() */
+    public $parent;
+}

tests/Doctrine/Tests/ODM/PHPCR/Functional/UnitOfWorkTest.php

@@ -12,6 +12,10 @@
 use Doctrine\Tests\Models\CMS\CmsArticleFolder;
 use Doctrine\Tests\Models\CMS\CmsGroup;
 use Doctrine\Tests\Models\CMS\CmsArticle;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Tests\Models\CMS\CmsBlogPost;
+use Doctrine\Tests\Models\CMS\CmsBlogInvalidChild;
+use Doctrine\Tests\Models\CMS\CmsBlogFolder;
 
 /**
  * @group functional
@@ -193,7 +197,7 @@ public function testFetchingMultipleHierarchicalObjectsWithChildIdFirst()
      * @expectedException Doctrine\ODM\PHPCR\Exception\OutOfBoundsException
      * @expectedExceptionMessage Document "Doctrine\Tests\Models\CMS\CmsArticleFolder" does not allow children of type "Doctrine\Tests\Models\CMS\CmsGroup". Allowed child classes "Doctrine\Tests\Models\CMS\CmsArticle"
      */
-    public function testRestrictChildrenInvalidChildren()
+    public function testRequiredClassesInvalidChildren()
     {
         $articleFolder = new CmsArticleFolder();
         $articleFolder->id = '/functional/articles';
@@ -207,7 +211,7 @@ public function testRestrictChildrenInvalidChildren()
         $this->dm->flush();
     }
 
-    public function testRestrictChildrenValidChildren()
+    public function testRequiredClassesValidChildren()
     {
         $articleFolder = new CmsArticleFolder();
         $articleFolder->id = '/functional/articles';
@@ -226,7 +230,7 @@ public function testRestrictChildrenValidChildren()
      * @expectedException Doctrine\ODM\PHPCR\Exception\OutOfBoundsException
      * @expectedExceptionMessage Document "Doctrine\Tests\Models\CMS\CmsArticleFolder" does not allow children of type "Doctrine\Tests\Models\CMS\CmsGroup". Allowed child classes "Doctrine\Tests\Models\CMS\CmsArticle"
      */
-    public function testRestrictChildrenInvalidUpdate()
+    public function testRequiredClassesInvalidUpdate()
     {
         $articleFolder = new CmsArticleFolder();
         $articleFolder->id = '/functional/articles';
@@ -242,4 +246,68 @@ public function testRestrictChildrenInvalidUpdate()
         $this->dm->move($article, '/functional/articles/address');
         $this->dm->flush();
     }
+
+    public function testRequiredClassesAddToChildrenValid()
+    {
+        $post = new CmsBlogPost();
+        $post->name = 'hello';
+
+        $postFolder = new CmsBlogFolder();
+        $postFolder->id = '/functional/posts';
+        $postFolder->posts = new ArrayCollection([
+            $post
+        ]);
+
+        $this->dm->persist($postFolder);
+        $this->dm->flush();
+    }
+
+    /**
+     * @expectedException Doctrine\ODM\PHPCR\Exception\OutOfBoundsException
+     * @expectedExceptionMessage Document "Doctrine\Tests\Models\CMS\CmsBlogFolder" does not allow children of type "Doctrine\Tests\Models\CMS\CmsBlogInvalidChild". Allowed child classes "Doctrine\Tests\Models\CMS\CmsBlogPost"
+     */
+    public function testRequiredClassesAddToChildrenInvalid()
+    {
+        $post = new CmsBlogInvalidChild();
+        $post->name = 'hello';
+
+        $postFolder = new CmsBlogFolder();
+        $postFolder->id = '/functional/posts';
+        $postFolder->posts = new ArrayCollection([
+            $post
+        ]);
+
+        $this->dm->persist($postFolder);
+        $this->dm->flush();
+    }
+
+    /**
+     * @expectedException Doctrine\ODM\PHPCR\Exception\OutOfBoundsException
+     * @expectedExceptionMessage Document "Doctrine\Tests\Models\CMS\CmsBlogFolder" does not allow children of type "Doctrine\Tests\Models\CMS\CmsBlogInvalidChild". Allowed child classes "Doctrine\Tests\Models\CMS\CmsBlogPost"
+     */
+    public function testRequiredClassesAddToChildrenInvalidOnUpdate()
+    {
+        $post = new CmsBlogPost();
+        $post->name = 'hello';
+
+        $postFolder = new CmsBlogFolder();
+        $postFolder->id = '/functional/posts';
+        $postFolder->posts = new ArrayCollection([
+            $post
+        ]);
+
+        $this->dm->persist($postFolder);
+        $this->dm->flush();
+        $this->dm->clear();
+
+        $postFolder = $this->dm->find(null, '/functional/posts');
+
+        $post = new CmsBlogInvalidChild();
+        $post->name = 'wolrd';
+        $postFolder->posts->add($post);
+
+        $this->dm->persist($postFolder);
+        $this->dm->flush();
+        $this->dm->clear();
+    }
 }