From 4d8212b01499edbbbb66c3a20511a3482e2ffac7 Mon Sep 17 00:00:00 2001
From: Luciano Righetti <luciano.righetti@gmail.com>
Date: Tue, 13 Feb 2024 13:54:29 +0100
Subject: [PATCH] chg: update supervisorphp/supervisor to v5

---
 composer.json                        | 10 +++++-----
 src/Lib/Tools/BackgroundJobsTool.php | 14 ++++----------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/composer.json b/composer.json
index 1aaac1cc5..7b3fc6fa1 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
-    "name": "cakephp/app",
-    "description": "CakePHP skeleton app",
+    "name": "misp/misp",
+    "description": "MISP: Open Source Threat Intelligence Platform & Open Standards For Threat Information Sharing",
     "homepage": "https://cakephp.org",
     "type": "project",
-    "license": "MIT",
+    "license": " AGPL-3.0",
     "require": {
         "php": ">=8.0",
         "admad/cakephp-social-auth": "^1.1",
@@ -19,7 +19,7 @@
         "pear/crypt_gpg": "^1.6",
         "php-http/message": "^1.16",
         "php-http/message-factory": "^1.1",
-        "supervisorphp/supervisor": "^4.0"
+        "supervisorphp/supervisor": "^5.0"
     },
     "require-dev": {
         "cakephp/bake": "^2.0.3",
@@ -86,4 +86,4 @@
             "php-http/discovery": true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lib/Tools/BackgroundJobsTool.php b/src/Lib/Tools/BackgroundJobsTool.php
index af8bc03c4..24486bdf7 100644
--- a/src/Lib/Tools/BackgroundJobsTool.php
+++ b/src/Lib/Tools/BackgroundJobsTool.php
@@ -387,7 +387,7 @@ class BackgroundJobsTool
         foreach ($procs as $proc) {
             if ($proc->offsetGet('group') === self::MISP_WORKERS_PROCESS_GROUP) {
                 $name = explode("_", $proc->offsetGet('name'))[0];
-                if ($name === $queue && $proc->offsetGet('state') != \Supervisor\Process::RUNNING) {
+                if ($name === $queue && $proc->offsetGet('state') != \Supervisor\ProcessStates::Running) {
                     return $this->getSupervisor()->startProcess(
                         sprintf(
                             '%s:%s',
@@ -514,7 +514,7 @@ class BackgroundJobsTool
      */
     public function getSupervisorStatus(): bool
     {
-        return $this->getSupervisor()->getState()['statecode'] === \Supervisor\Supervisor::RUNNING;
+        return $this->getSupervisor()->getState()['statecode'] === \Supervisor\ProcessStates::Running;
     }
 
     /**
@@ -664,12 +664,6 @@ class BackgroundJobsTool
             )
         );
 
-        if (class_exists('Supervisor\Connector\XmlRpc')) {
-            // for compatibility with older versions of supervisor
-            $connector = new \Supervisor\Connector\XmlRpc($client);
-            return new \Supervisor\Supervisor($connector);
-        }
-
         return new \Supervisor\Supervisor($client);
     }
 
@@ -727,9 +721,9 @@ class BackgroundJobsTool
     private function convertProcessStatus(int $stateId): int
     {
         switch ($stateId) {
-            case \Supervisor\Process::RUNNING:
+            case \Supervisor\ProcessStates::Running:
                 return Worker::STATUS_RUNNING;
-            case \Supervisor\Process::UNKNOWN:
+            case \Supervisor\ProcessStates::Unknown:
                 return Worker::STATUS_UNKNOWN;
             default:
                 return Worker::STATUS_FAILED;