Fix get reference to start event in call activity

rc2pc2 · Feb 4, 2020 · 66dec20 · 66dec20
1 parent d3695f3
commit 66dec20
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/ProcessMaker/Models/CallActivity.php b/ProcessMaker/Models/CallActivity.php
@@ -8,11 +8,10 @@
 use ProcessMaker\Nayra\Bpmn\Events\ActivityCompletedEvent;
 use ProcessMaker\Nayra\Contracts\Bpmn\ActivityInterface;
 use ProcessMaker\Nayra\Contracts\Bpmn\CallActivityInterface;
+use ProcessMaker\Nayra\Contracts\Bpmn\ErrorInterface;
+use ProcessMaker\Nayra\Contracts\Bpmn\FlowInterface;
 use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
 use ProcessMaker\Nayra\Contracts\Engine\ExecutionInstanceInterface;
-use ProcessMaker\Nayra\Contracts\Bpmn\FlowInterface;
-use ProcessMaker\Nayra\Contracts\Bpmn\ErrorInterface;
-use ProcessMaker\Nayra\Contracts\Bpmn\CallableElementInterface;
 
 /**
  * Call Activity model
@@ -76,7 +75,7 @@ protected function callSubprocess(TokenInterface $token, FlowInterface $sequence
             }
         }
 
-        $startEvent = $startId ? $callable->ownerDocument->getElementInstanceById($startId) : null;
+        $startEvent = $startId ? $callable->getOwnerDocument()->getElementInstanceById($startId) : null;
 
         $dataStore->setData($data);
         $instance = $callable->call($dataStore, $startEvent);
@@ -145,7 +144,7 @@ public function getCalledElement()
         $calledElementRef = $this->getProperty(CallActivityInterface::BPMN_PROPERTY_CALLED_ELEMENT);
         $refs = explode('-', $calledElementRef);
         if (count($refs) === 1) {
-            return $this->ownerDocument->getElementInstanceById($calledElementRef);
+            return $this->getOwnerDocument()->getElementInstanceById($calledElementRef);
         } elseif (count($refs) === 2) {
             // Capability to reuse other processes inside a process
             $process = Process::findOrFail($refs[1]);