Merge pull request #1778 from BoShurik/tree-root-node-setter

Fix tree root setter for roots with association mapping

Author: l3pp4rd

lib/Gedmo/Tree/Strategy/ORM/Nested.php

@@ -388,10 +388,11 @@ public function updateNode(EntityManager $em, $node, $parent, $position = 'First
                 $wrapped->setPropertyValue($config['right'], $right);
             }
             $newRoot = $parentRoot;
-        } elseif (!isset($config['root'])) {
+        } elseif (!isset($config['root']) ||
+            ($meta->isSingleValuedAssociation($config['root']) && ($newRoot = $meta->getFieldValue($node, $config['root'])))) {
 
             if (!isset($this->treeEdges[$meta->name])) {
-                $this->treeEdges[$meta->name] = $this->max($em, $config['useObjectClass']) + 1;
+                $this->treeEdges[$meta->name] = $this->max($em, $config['useObjectClass'], $newRoot) + 1;
             }
 
             $level = 0;