PHPLIB-1037: Ensure EntityMap is set before invoking observer callable (#1001)

jmikola · web-flow · commit 035d367d3c2e · 2022-11-03T00:53:40.000-04:00
This handles the case where a test fails prior to Context initialization (e.g. while populating initial data).
diff --git a/tests/UnifiedSpecTests/UnifiedTestRunner.php b/tests/UnifiedSpecTests/UnifiedTestRunner.php
@@ -125,7 +125,7 @@ public function run(UnifiedTestCase $test): void
              * succeeding or failing. Since the callable itself might throw, we
              * need to ensure doTearDown() will still be called. */
             try {
-                if (isset($this->entityMapObserver)) {
+                if (isset($this->entityMapObserver, $this->entityMap)) {
                     call_user_func($this->entityMapObserver, $this->entityMap);
                 }
             } finally {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function run(UnifiedTestCase $test): void`
`125`	`125`	`* succeeding or failing. Since the callable itself might throw, we`
`126`	`126`	`* need to ensure doTearDown() will still be called. */`
`127`	`127`	`try {`
`128`		`- if (isset($this->entityMapObserver)) {`
	`128`	`+ if (isset($this->entityMapObserver, $this->entityMap)) {`
`129`	`129`	`call_user_func($this->entityMapObserver, $this->entityMap);`
`130`	`130`	`}`
`131`	`131`	`} finally {`