Merge pull request #1680 from teohhanhui/closure-repo

Fix hardcoded field names in ClosureTreeRepository

Author: l3pp4rd

lib/Gedmo/Tree/Entity/Repository/ClosureTreeRepository.php

@@ -448,8 +448,8 @@ public function verify()
                 SELECT node.$nodeIdField AS id, node.$levelField AS node_level, MAX(c.depth) AS closure_level
                 FROM {$nodeMeta->name} AS node
                 INNER JOIN {$closureMeta->name} AS c WITH c.descendant = node.$nodeIdField
-                GROUP BY node.id, node.level
-                HAVING node_level IS NULL OR node_level <> closure_level
+                GROUP BY node.$nodeIdField, node.$levelField
+                HAVING node.$levelField IS NULL OR node.$levelField <> MAX(c.depth) + 1
             ")->setMaxResults($maxResults);
 
             if ($invalidLevelsCount = count($q->getScalarResult())) {
@@ -574,16 +574,16 @@ public function updateLevelValues()
                 SELECT node.$nodeIdField AS id, node.$levelField AS node_level, MAX(c.depth) AS closure_level
                 FROM {$nodeMeta->name} AS node
                 INNER JOIN {$closureMeta->name} AS c WITH c.descendant = node.$nodeIdField
-                GROUP BY node.id, node.level
-                HAVING node_level IS NULL OR node_level <> closure_level
+                GROUP BY node.$nodeIdField, node.$levelField
+                HAVING node.$levelField IS NULL OR node.$levelField <> MAX(c.depth) + 1
             ")->setMaxResults($batchSize)->setCacheable(false);
             do {
                 $entries = $q->getScalarResult();
                 $this->_em->getConnection()->beginTransaction();
                 foreach ($entries as $entry) {
                     unset($entry['node_level']);
                     $this->_em->createQuery("
-                      UPDATE {$nodeMeta->name} AS node SET node.$levelField = :closure_level WHERE node.$nodeIdField = :id
+                      UPDATE {$nodeMeta->name} AS node SET node.$levelField = (:closure_level + 1) WHERE node.$nodeIdField = :id
                     ")->execute($entry);
                 }
                 $this->_em->getConnection()->commit();