Merge pull request #183 from uwej711/fix_children_init

add removeChild and init children with Collection

Author: dbu

Model/MenuNodeBase.php

@@ -12,6 +12,8 @@
 
 namespace Symfony\Cmf\Bundle\MenuBundle\Model;
 
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Knp\Menu\NodeInterface;
 use Symfony\Cmf\Bundle\CoreBundle\Model\ChildInterface;
 
@@ -48,9 +50,9 @@ class MenuNodeBase implements NodeInterface, ChildInterface
     /**
      * Child menu nodes
      *
-     * @var MenuNode[]
+     * @var Collection
      */
-    protected $children = array();
+    protected $children;
 
     /**
      * Menu label.
@@ -149,6 +151,7 @@ class MenuNodeBase implements NodeInterface, ChildInterface
     public function __construct($name = null)
     {
         $this->name = $name;
+        $this->children = new ArrayCollection();
     }
 
     /**
@@ -443,6 +446,16 @@ public function addChild(MenuNode $child)
         return $child;
     }
 
+    /**
+     * Remove a child menu node
+     *
+     * @param MenuNode $child
+     */
+    public function removeChild(MenuNode $child)
+    {
+        $this->children->removeElement($child);
+    }
+
     /**
      * Gets the route parameters.
      *

Tests/Functional/Doctrine/Phpcr/MenuNodeTest.php

@@ -147,5 +147,14 @@ public function testMenuNode()
 
         $menuNode = $this->dm->findTranslation(null, '/test/test-node', 'fr');
         $this->assertEquals('fr', $menuNode->getLocale());
+
+        $child = $this->dm->find(null, '/test/test-node/child1');
+        $menuNode = $child->getParent();
+        $this->assertCount(1, $menuNode->getChildren());
+        $menuNode->removeChild($child);
+        $this->dm->flush();
+        $this->dm->clear();
+        $menuNode = $this->dm->find(null, '/test/test-node');
+        $this->assertCount(0, $menuNode->getChildren());
     }
 }