Merge pull request #1911 from nclavaud/fix_undefined_root_identifier_method

l3pp4rd · web-flow · commit 0b7bdbefd3d1 · 2018-05-14T13:22:54.000+03:00
[tree] Test for property existence
diff --git a/lib/Gedmo/Tree/Strategy/ORM/Nested.php b/lib/Gedmo/Tree/Strategy/ORM/Nested.php
@@ -125,7 +125,7 @@ public function processScheduledInsertion($em, $node, AdapterInterface $ea)
         if (isset($config['level'])) {
             $meta->getReflectionProperty($config['level'])->setValue($node, 0);
         }
-        if (isset($config['root']) && !$meta->hasAssociation($config['root']) && !$config['rootIdentifierMethod']) {
+        if (isset($config['root']) && !$meta->hasAssociation($config['root']) && !isset($config['rootIdentifierMethod'])) {
             $meta->getReflectionProperty($config['root'])->setValue($node, 0);
         } else if (isset($config['rootIdentifierMethod']) && is_null($meta->getReflectionProperty($config['root'])->getValue($node))) {
             $meta->getReflectionProperty($config['root'])->setValue($node, 0);

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function processScheduledInsertion($em, $node, AdapterInterface $ea)`
`125`	`125`	`if (isset($config['level'])) {`
`126`	`126`	`$meta->getReflectionProperty($config['level'])->setValue($node, 0);`
`127`	`127`	`}`
`128`		`- if (isset($config['root']) && !$meta->hasAssociation($config['root']) && !$config['rootIdentifierMethod']) {`
	`128`	`+ if (isset($config['root']) && !$meta->hasAssociation($config['root']) && !isset($config['rootIdentifierMethod'])) {`
`129`	`129`	`$meta->getReflectionProperty($config['root'])->setValue($node, 0);`
`130`	`130`	`} else if (isset($config['rootIdentifierMethod']) && is_null($meta->getReflectionProperty($config['root'])->getValue($node))) {`
`131`	`131`	`$meta->getReflectionProperty($config['root'])->setValue($node, 0);`