fix: update dependencies and text intermediate timers

bingo-soft · Dec 25, 2023 · 4821028 · 4821028
1 parent 8e58d03
commit 4821028
Show file tree

Hide file tree

Showing 101 changed files with 352 additions and 312 deletions.
diff --git a/LOG.txt b/LOG.txt
@@ -0,0 +1,5 @@
+*** Service (0) executed at 2023-12-25T11:56:20+03:00
+*** Service (0) executed at 2023-12-25T12:12:01+03:00
+*** Service (0) executed at 2023-12-25T12:13:14+03:00
+*** Service (0) executed at 2023-12-25T12:14:15+03:00
+*** Service (0) executed at 2023-12-25T12:15:35+03:00
diff --git a/composer.lock b/composer.lock
diff --git a/examples/QuickStart/EngineStarterService/src/Bootstrap.php b/examples/QuickStart/EngineStarterService/src/Bootstrap.php
@@ -45,9 +45,6 @@ public function run(): void
         } catch (\Throwable $throwable) {
             fwrite(STDERR, $throwable->getMessage() . PHP_EOL);
             exit(1);
-        } catch (\Exception $exception) {
-            fwrite(STDERR, $exception->getMessage() . PHP_EOL);
-            exit(1);
         }
     }
 }
diff --git a/src/Application/Impl/EmbeddedProcessApplication.php b/src/Application/Impl/EmbeddedProcessApplication.php
@@ -31,7 +31,7 @@ public function execute(callable $callable)
     {
         try {
             return $callable();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             fwrite(STDERR, $e->getMessage() . "\n");
             //throw LOG.processApplicationExecutionException(e);
         }

diff --git a/src/Commons/Logging/BaseLogger.php b/src/Commons/Logging/BaseLogger.php
@@ -20,7 +20,7 @@ public static function createLogger($loggerClass, $projectCode, ?string $name, ?
             $logger->componentId = $componentId;
             $logger->delegateLogger = new ExtLogger($name);
             return $logger;
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             fwrite(STDERR, sprintf("Unable to instantiate logger '%s'", $loggerClass) . "\n");
             throw new \Exception(sprintf("Unable to instantiate logger '%s'", $loggerClass));
         }

diff --git a/src/Impl/AbstractQuery.php b/src/Impl/AbstractQuery.php
@@ -267,7 +267,7 @@ protected function evaluateExpressions(): void
             try {
                 $method = $this->getMethod($methodName);
                 $method->invoke($this, $value);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 throw new ProcessEngineException("Unable to access method '" . $methodName . "' on class '" . get_class($this) . "'", $e);
             }
         }

diff --git a/src/Impl/Application/ProcessApplicationManager.php b/src/Impl/Application/ProcessApplicationManager.php
@@ -110,7 +110,7 @@ protected function createJobExecutorRegistrations(array $deploymentIds): void
 
             $registeredDeployments = &Context::getProcessEngineConfiguration()->getRegisteredDeployments();
             $registeredDeployments = array_merge($registeredDeployments, $deploymentIds);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             //throw LOG.exceptionWhileRegisteringDeploymentsWithJobExecutor(e);
             throw new \Exception("exceptionWhileRegisteringDeploymentsWithJobExecutor");
         }
@@ -126,7 +126,7 @@ protected function removeJobExecutorRegistrations(array $deploymentIds): void
                     unset($registeredDeployments[$id]);
                 }
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             //LOG.exceptionWhileUnregisteringDeploymentsWithJobExecutor(e);
             throw new \Exception("exceptionWhileUnregisteringDeploymentsWithJobExecutor");
         }

diff --git a/src/Impl/BootstrapEngineCommand.php b/src/Impl/BootstrapEngineCommand.php
@@ -125,7 +125,7 @@ protected function databaseInstallationId(CommandContext $commandContext): ?stri
         try {
             $installationIdProperty = $commandContext->getPropertyManager()->findPropertyById(self::INSTALLATION_PROPERTY_NAME);
             return $installationIdProperty !== null ? $installationIdProperty->getValue() : null;
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             //LOG.couldNotSelectInstallationId(e.getMessage());
             return null;
         }

diff --git a/src/Impl/Bpmn/Behavior/AbstractBpmnActivityBehavior.php b/src/Impl/Bpmn/Behavior/AbstractBpmnActivityBehavior.php
@@ -72,7 +72,7 @@ protected function executeWithErrorPropagation(ActivityExecutionInterface $execu
             if (is_callable($toExecute)) {
                 $toExecute();
             }
-        } catch (\Exception $ex) {
+        } catch (\Throwable $ex) {
             if ($activityInstanceId == $execution->getActivityInstanceId()) {
                 try {
                     BpmnExceptionHandler::propagateException($execution, $ex);

diff --git a/src/Impl/Bpmn/Behavior/CallableElementActivityBehavior.php b/src/Impl/Bpmn/Behavior/CallableElementActivityBehavior.php
@@ -160,7 +160,7 @@ protected function invokeVarMappingDelegation(DelegateInvocation $delegation): v
     {
         try {
             Context::getProcessEngineConfiguration()->getDelegateInterceptor()->handleInvocation($delegation);
-        } catch (\Exception $ex) {
+        } catch (\Throwable $ex) {
             throw new ProcessEngineException($ex->getMessage(), $ex);
         }
     }

diff --git a/src/Impl/Bpmn/Behavior/ShellActivityBehavior.php b/src/Impl/Bpmn/Behavior/ShellActivityBehavior.php
@@ -107,7 +107,7 @@ public function execute(/*ActivityExecutionInterface*/$execution): void
                     $execution->setVariable($this->errorCodeVariableStr, intval($errorCode));
                 }
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             //throw LOG.shellExecutionException(e);
             throw $e;
         }

diff --git a/src/Impl/Bpmn/Diagram/ProcessDiagramLayoutFactory.php b/src/Impl/Bpmn/Diagram/ProcessDiagramLayoutFactory.php
@@ -86,7 +86,7 @@ protected function parseXml($bpmnXmlStream): DomDocumentExt
         try {
             $meta = stream_get_meta_data($bpmnXmlStream);
             $bpmnModel->loadXML(fread($bpmnXmlStream, filesize($meta['uri'])));
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             throw new ProcessEngineException("Error while parsing BPMN model.", $e);
         }
         return $bpmnModel;
@@ -162,7 +162,7 @@ protected function getDiagramBoundsFromImage($resource, int $offsetTop = 0, int
             try {
                 $meta = stream_get_meta_data($resource);
                 $image = (new PImage())->read($meta['uri']);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 throw new ProcessEngineException("Error while reading process diagram image.", $e);
             }
             $diagramBoundsImage = $this->getDiagramBoundsFromImage($image, $offsetTop, $offsetBottom);

diff --git a/src/Impl/Bpmn/Helper/BpmnExceptionHandler.php b/src/Impl/Bpmn/Helper/BpmnExceptionHandler.php
@@ -111,7 +111,7 @@ public function isFulfilled($element = null): bool
                     return $this->errorDeclarationFinder->getErrorEventDefinition() !== null || $element === null;
                 }
             });
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             //LOG.errorPropagationException(execution.getActivityInstanceId(), e);
 
             // separate the exception handling to support a fail-safe error propagation

diff --git a/src/Impl/Bpmn/Parser/BpmnParse.php b/src/Impl/Bpmn/Parser/BpmnParse.php
@@ -413,7 +413,7 @@ protected function getImporter(?string $importType, Element $theImport): ?XMLImp
                     $newInstance = new CxfWSDLImporter();
                     $this->importers[$importType] = $newInstance;
                     return $newInstance;
-                } catch (\Exception $e) {
+                } catch (\Throwable $e) {
                     $this->addError("Could not find importer for type " . $importType, $theImport);
                 }
             }
@@ -615,7 +615,7 @@ public function parseProcess(Element $processElement): ProcessDefinitionEntity
         try {
             $historyTimeToLive = $processElement->attributeNS(self::BPMN_EXTENSIONS_NS_PREFIX, "historyTimeToLive", Context::getProcessEngineConfiguration()->getHistoryTimeToLive());
             $processDefinition->setHistoryTimeToLive(ParseUtil::parseHistoryTimeToLive($historyTimeToLive));
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->addError(new BpmnParseException($e->getMessage(), $processElement, $e));
         }
 
@@ -2534,7 +2534,7 @@ protected function parsePriority(Element $element, ?string $priorityAttribute):
                 // constant values must be valid integers
                 try {
                     $value = intval($priorityAttributeValue);
-                } catch (\Exception $e) {
+                } catch (\Throwable $e) {
                     $this->addError("Value '" . $priorityAttributeValue . "' for attribute '" . $priorityAttribute . "' is not a valid number", $element);
                 }
             }
@@ -4896,7 +4896,7 @@ public function parseDoubleAttribute(Element $element, ?string $attributeName, ?
         } else {
             try {
                 return floatval($doubleText);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $this->addError("Cannot parse " . $attributeName . ": " . $e->getMessage(), $element);
             }
         }

diff --git a/src/Impl/Calendar/CycleBusinessCalendar.php b/src/Impl/Calendar/CycleBusinessCalendar.php
@@ -26,7 +26,7 @@ public function resolveDuedate(?string $duedateDescription, $startDate = null, i
                 $cron = new CronExpression($duedateDescription);
                 return $cron->getNextRunDate($startDate ?? ClockUtil::getCurrentTime(...$args));
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             //throw LOG.exceptionWhileParsingCronExpresison(duedateDescription, e);
             throw $e;
         }

diff --git a/src/Impl/Calendar/DueDateBusinessCalendar.php b/src/Impl/Calendar/DueDateBusinessCalendar.php
@@ -26,7 +26,7 @@ public function resolveDuedate(?string $duedateDescription, $startDate = null, i
             } else {
                 return new \DateTime($duedateDescription);
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             throw $e;
         }
     }

diff --git a/src/Impl/Calendar/DurationBusinessCalendar.php b/src/Impl/Calendar/DurationBusinessCalendar.php
@@ -11,7 +11,7 @@ public function resolveDuedate(?string $duedateDescription, $startDate = null, i
         try {
             $dh = new DurationHelper($duedateDescription, $startDate);
             return $dh->getDateAfter($startDate);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             throw $e;
         }
     }

diff --git a/src/Impl/Cfg/ProcessEngineConfigurationImpl.php b/src/Impl/Cfg/ProcessEngineConfigurationImpl.php
@@ -1368,7 +1368,7 @@ protected function initHistoryTimeToLive(): void
     {
         try {
             ParseUtil::parseHistoryTimeToLive($this->historyTimeToLive);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             //throw LOG.invalidPropertyValue("historyTimeToLive", historyTimeToLive, e);
             throw new \Exception("historyTimeToLive");
         }
@@ -1378,7 +1378,7 @@ protected function initBatchOperationsHistoryTimeToLive(): void
     {
         try {
             ParseUtil::parseHistoryTimeToLive($this->batchOperationHistoryTimeToLive);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             //throw LOG.invalidPropertyValue("batchOperationHistoryTimeToLive", batchOperationHistoryTimeToLive, e);
             throw new \Exception("batchOperationHistoryTimeToLive");
         }
@@ -1393,7 +1393,7 @@ protected function initBatchOperationsHistoryTimeToLive(): void
                 }
                 try {
                     ParseUtil::parseHistoryTimeToLive($timeToLive);
-                } catch (\Exception $e) {
+                } catch (\Throwable $e) {
                     //throw LOG.invalidPropertyValue("history time to live for " + batchOperation + " batch operations", timeToLive, e);
                     throw new \Exception("history time to live ...");
                 }
@@ -1747,7 +1747,6 @@ protected function initDataSource(): void
         'pdo_pgsql' => [
             \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION,
             \PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC,
-            \PDO::ATTR_EMULATE_PREPARES => true,
             UnpooledDataSource::RECONNECT_ATTEMPTS_OPTION => 5,
             UnpooledDataSource::RECONNECT_DELAY_OPTION => 1
         ]
@@ -1807,14 +1806,14 @@ public function initDatabaseType(): void
             //LOG.debugDatabaseType(databaseType);
 
             //$this->initDatabaseVendorAndVersion(databaseMetaData);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             //LOG.databaseConnectionAccessException(e);
         } finally {
             /*try {
                 if ($connection !== null) {
                     $connection->close();
                 }
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 //LOG.databaseConnectionCloseException(e);
             }*/
         }
@@ -1878,7 +1877,7 @@ protected function initSqlSessionFactory(): void
                 if ($this->isUseSharedSqlSessionFactory) {
                     $this->cachedSqlSessionFactory = $this->sqlSessionFactory;
                 }
-            /*} catch (\Exception $e) {
+            /*} catch (\Throwable $e) {
                 throw new ProcessEngineException("Error while building ibatis SqlSessionFactory: " . $e->getMessage());
             } finally {
                 IoUtil::closeSilently($inputStream);

diff --git a/src/Impl/Cmd/CreateMigrationPlanCmd.php b/src/Impl/Cmd/CreateMigrationPlanCmd.php
@@ -129,7 +129,7 @@ protected function getProcessDefinition(CommandContext $commandContext, ?string
         try {
             return $commandContext->getProcessEngineConfiguration()
             ->getDeploymentCache()->findDeployedProcessDefinitionById($id);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             //throw LOG.processDefinitionDoesNotExist(id, type);
             throw new \Exception("processDefinitionDoesNotExist");
         }

diff --git a/src/Impl/Cmd/DefaultJobRetryCmd.php b/src/Impl/Cmd/DefaultJobRetryCmd.php
@@ -55,7 +55,7 @@ public function execute(CommandContext $commandContext, ...$args)
         } else {
             try {
                 $this->executeCustomStrategy($commandContext, $job, $activity);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 //LOG.debugFallbackToDefaultRetryStrategy();
                 $this->executeStandardStrategy($commandContext);
             }
@@ -166,7 +166,7 @@ protected function getFailedJobRetryTimeCycle(JobEntity $job, ?ExpressionInterfa
 
         try {
             $value = $expression->getValue($execution, $execution);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             //LOG.exceptionWhileParsingExpression(jobId, e.getCause().getMessage());
         }
 

diff --git a/src/Impl/Cmd/DeleteDeploymentCmd.php b/src/Impl/Cmd/DeleteDeploymentCmd.php
@@ -94,7 +94,7 @@ public function execute(CommandContext $commandContext, ...$args)
         } finally {
             try {
                 $commandContext->getTransactionContext()->addTransactionListener(TransactionState::ROLLED_BACK, $listener);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 //TX_LOG.debugTransactionOperation("Could not register transaction synchronization. Probably the TX has already been rolled back by application code.");
                 $listener->execute($commandContext);
             }

diff --git a/src/Impl/Cmd/DeleteHistoricVariableInstanceCmd.php b/src/Impl/Cmd/DeleteHistoricVariableInstanceCmd.php
@@ -68,7 +68,7 @@ public function execute(CommandContext $commandContext, ...$args)
             }/*elseif ($variable.getCaseDefinitionId() !== null) {
                 definition = commandContext.getProcessEngineConfiguration().getDeploymentCache().findDeployedCaseDefinitionById(variable.getCaseDefinitionId());
             }*/
-        } catch (\Exception $nve) {
+        } catch (\Throwable $nve) {
             // definition has been deleted already
         }
         $commandContext->getOperationLogManager()->logHistoricVariableOperation(

diff --git a/src/Impl/Cmd/DeleteHistoricVariableInstancesByProcessInstanceIdCmd.php b/src/Impl/Cmd/DeleteHistoricVariableInstancesByProcessInstanceIdCmd.php
@@ -59,7 +59,7 @@ public function execute(CommandContext $commandContext, ...$args)
             $definition = $commandContext->getProcessEngineConfiguration()->getDeploymentCache()->findDeployedProcessDefinitionById(
                 $instance->getProcessDefinitionId()
             );
-        } catch (\Exception $nve) {
+        } catch (\Throwable $nve) {
             // definition has been deleted already
         }
         $commandContext->getOperationLogManager()->logHistoricVariableOperation(

diff --git a/src/Impl/Cmd/DeleteProcessDefinitionsByIdsCmd.php b/src/Impl/Cmd/DeleteProcessDefinitionsByIdsCmd.php
@@ -205,11 +205,12 @@ protected function deleteProcessDefinitions(ProcessDefinitionGroup $group): void
             $configuration = Context::getProcessEngineConfiguration();
             $deploymentCache = $configuration->getDeploymentCache();
             $newLatestProcessDefinition = $deploymentCache->resolveProcessDefinition($newLatestProcessDefinition);
-
-            $deployers = $configuration->getDeployers();
-            foreach ($deployers as $deployer) {
-                if ($deployer instanceof BpmnDeployer) {
-                    $deployer->addEventSubscriptions($newLatestProcessDefinition);
+            if ($newLatestProcessDefinition !== null) {
+                $deployers = $configuration->getDeployers();
+                foreach ($deployers as $deployer) {
+                    if ($deployer instanceof BpmnDeployer) {
+                        $deployer->addEventSubscriptions($newLatestProcessDefinition);
+                    }
                 }
             }
         }

diff --git a/src/Impl/Cmd/DeployCmd.php b/src/Impl/Cmd/DeployCmd.php
@@ -320,7 +320,7 @@ protected function registerWithJobExecutor(CommandContext $commandContext, Deplo
             );
             try {
                 $commandContext->getTransactionContext()->addTransactionListener(TransactionState::ROLLED_BACK, $listener);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 //TX_LOG.debugTransactionOperation("Could not register transaction synchronization. Probably the TX has already been rolled back by application code.");
                 $listener->execute($commandContext);
             }

diff --git a/src/Impl/Cmd/ExecuteJobsCmd.php b/src/Impl/Cmd/ExecuteJobsCmd.php
@@ -103,7 +103,7 @@ public function execute(CommandContext $commandContext, ...$args)
             $commandContext->registerCommandContextListener($this->jobFailureCollector);
             $commandContext->setCurrentJob($job);
             $job->execute($commandContext, ...$args);
-        } catch (\Exception $t) {
+        } catch (\Throwable $t) {
             $failedActivityId = Context::getCommandInvocationContext()
                 ->getProcessDataContext()
                 ->getLatestActivityId();

diff --git a/src/Impl/Cmd/Optimize/OptimizeHistoricVariableUpdateQueryCmd.php b/src/Impl/Cmd/Optimize/OptimizeHistoricVariableUpdateQueryCmd.php
@@ -92,7 +92,7 @@ protected function resolveTypedValues(array &$variableUpdates): void
                 if ($this->shouldFetchValue($entity)) {
                     try {
                         $entity->getTypedValue(false);
-                    } catch (\Exception $t) {
+                    } catch (\Throwable $t) {
                         // do not fail if one of the variables fails to load
                         //LOG.exceptionWhileGettingValueForVariable(t);
                     }

diff --git a/src/Impl/Cmd/SaveTaskCmd.php b/src/Impl/Cmd/SaveTaskCmd.php
@@ -55,7 +55,7 @@ public function execute(CommandContext $commandContext, ...$args)
                 $this->task->insert();
                 $operation = UserOperationLogEntryInterface::OPERATION_TYPE_CREATE;
                 $this->task->executeMetrics(Metrics::ACTIVTY_INSTANCE_START, $commandContext);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 throw new NotValidException($e->getMessage(), $e);
             }
 

diff --git a/src/Impl/Context/Context.php b/src/Impl/Context/Context.php
@@ -182,13 +182,13 @@ public static function executeWithinProcessApplication($callback, ProcessApplica
                 $wrappedCallback = new ProcessApplicationClassloaderInterceptor($callback);
                 // execute wrapped callback
                 return $processApplication->execute($wrappedCallback, $invocationContext);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 // unwrap exception
                 throw new ProcessEngineException("Unexpected exeption while executing within process application ", $e);
             } finally {
                 self::removeCurrentProcessApplication();
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             throw new ProcessEngineException("Cannot switch to process application '" . $paName . "' for execution: " . $e->getMessage(), $e);
         }
     }

diff --git a/src/Impl/Core/Operation/AbstractEventAtomicOperation.php b/src/Impl/Core/Operation/AbstractEventAtomicOperation.php
@@ -35,7 +35,7 @@ public function execute(CoreExecution $execution, ...$args): void
 
                 try {
                     $execution->invokeListener($listener);
-                } catch (\Exception $ex) {
+                } catch (\Throwable $ex) {
                     $this->eventNotificationsFailed($execution, $ex);
                     // do not continue listener invocation once a listener has failed
                     return;

diff --git a/src/Impl/Db/EntityManager/Cache/DbEntityCache.php b/src/Impl/Db/EntityManager/Cache/DbEntityCache.php
@@ -56,7 +56,7 @@ public function get(?string $type, ?string $id = null)
             }
             try {
                 return $dbEntity;
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 //throw LOG.entityCacheLookupException(type, id, dbEntity.getClass(), e);
                 throw new \Exception("entityCacheLookupException");
             }

diff --git a/src/Impl/Db/EntityManager/DbEntityManager.php b/src/Impl/Db/EntityManager/DbEntityManager.php
@@ -314,7 +314,7 @@ protected function flushDbOperations(
             $flushResult = null;
             try {
                 $flushResult = $this->persistenceSession->executeDbOperations($operationsToFlush);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 // Top level persistence exception
                 //throw LOG.flushDbOperationUnexpectedException(allOperations, e);
                 throw new \Exception("flushDbOperationUnexpectedException");