Merge branch 'v2.4.x' into patch-1

Author: AkenRoberts

CHANGELOG.md

@@ -25,7 +25,11 @@ a release.
 
 ### Translatable
 #### Fixed
-- Return `parent` instead of throwing Exception for Translatable (#2018)
+- Return default AST executor instead of throwing Exception in Walker (#2018)
+
+### Tree
+#### Fixed
+- Remove hard-coded parent column name in repository prev/next sibling queries [#2020]
 
 ## [2.4.37] - 2019-03-17
 ### Translatable

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

@@ -426,7 +426,7 @@ public function getNextSiblingsQueryBuilder($node, $includeSelf = false)
             $qb->setParameter('pid', $wrappedParent->getIdentifier());
         } else if (isset($config['root']) && !$parent) {
             $qb->andWhere($qb->expr()->eq('node.'.$config['root'], ':root'));
-            $qb->andWhere($qb->expr()->isNull('node.parent'));
+            $qb->andWhere($qb->expr()->isNull('node.'.$config['parent']));
             $method = $config['rootIdentifierMethod'];
             $qb->setParameter('root', $node->$method());
         } else {
@@ -503,7 +503,7 @@ public function getPrevSiblingsQueryBuilder($node, $includeSelf = false)
             $qb->setParameter('pid', $wrappedParent->getIdentifier());
         } else if (isset($config['root']) && !$parent) {
             $qb->andWhere($qb->expr()->eq('node.'.$config['root'], ':root'));
-            $qb->andWhere($qb->expr()->isNull('node.parent'));
+            $qb->andWhere($qb->expr()->isNull('node.'.$config['parent']));
             $method = $config['rootIdentifierMethod'];
             $qb->setParameter('root', $node->$method());
         } else {