Merge branch 'develop' into epic/FOUR-26611

Author: sanjacornelius

ProcessMaker/Multitenancy/SwitchTenant.php

@@ -111,6 +111,14 @@ private function overrideConfigs(Application $app, IsTenant $tenant)
                     $config['root']
                 ));
             }
+            // URLs
+            if (isset($config['url'])) {
+                $this->setConfig('filesystems.disks.' . $disk . '.url', str_replace(
+                    $this->landlordConfig('app.url'),
+                    $tenant->config['app.url'],
+                    $config['url']
+                ));
+            }
         }
         $app->useStoragePath($newStoragePath);
 

ProcessMaker/Traits/TaskResourceIncludes.php

@@ -64,6 +64,10 @@ private function includeDraft()
             // but drafts are disabled so we need to delete it now that
             // it's been accessed.
             $draft->delete();
+
+            // Return null to prevent the frontend from trying to load
+            // files from the deleted draft
+            return ['draft' => null];
         }
 
         return ['draft' => $draft];

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "processmaker/processmaker",
-    "version": "4.15.11+mt",
+    "version": "2026.1.1",
     "description": "BPM PHP Software",
     "keywords": [
         "php bpm processmaker"
@@ -11,7 +11,6 @@
     "prefer-stable": true,
     "require": {
         "php": "^8.3",
-        "aws/aws-sdk-php": "3.337.3",
         "babenkoivan/elastic-scout-driver": "^4.0",
         "bacon/bacon-qr-code": "^2.0",
         "codegreencreative/laravel-samlidp": "^5.2",
@@ -34,13 +33,12 @@
         "lavary/laravel-menu": "^1.8",
         "lcobucci/jwt": "^4.2",
         "league/commonmark": "^2.7",
-        "league/flysystem-aws-s3-v3": "^3.29",
         "mateusjunges/laravel-kafka": "^2.4",
         "mittwald/vault-php": "^2.1",
-        "moontoast/math": "^1.2",
         "mustache/mustache": "^2.14",
         "openai-php/client": "^0.10.3",
         "openai-php/laravel": "^0.10.2",
+        "paragonie/sodium_compat": "^2.5",
         "php-amqplib/php-amqplib": "^3.7",
         "php-http/promise": "~1.2.0",
         "pion/laravel-chunk-upload": "^1.5",
@@ -109,11 +107,10 @@
             "Gmail"
         ],
         "processmaker": {
-            "build": "1a91bb61",
+            "build": "607f0513",
             "cicd-enabled": true,
             "custom": {
-                "package-ellucian-ethos": "1.19.7",
-                "package-plaid": "1.6.0",
+                "package-ellucian-ethos": "1.19.8",
                 "paypal-package": "dev-fall",
                 "pps-adsync": "dev-fall",
                 "ps_ethos": "dev-main",
@@ -150,45 +147,45 @@
                 "connector-idp": "1.14.0",
                 "connector-pdf-print": "1.23.1",
                 "connector-send-email": "1.32.13",
-                "connector-slack": "1.9.3",
+                "connector-slack": "1.9.4",
                 "docker-executor-node-ssr": "1.7.2",
                 "package-ab-testing": "1.4.0",
                 "package-actions-by-email": "1.22.9",
-                "package-advanced-user-manager": "1.13.1",
-                "package-ai": "1.16.10",
-                "package-analytics-reporting": "1.11.1",
-                "package-auth": "1.24.10",
-                "package-collections": "2.27.1",
+                "package-advanced-user-manager": "1.13.2",
+                "package-ai": "1.16.11",
+                "package-analytics-reporting": "1.11.2",
+                "package-auth": "1.24.11",
+                "package-collections": "2.27.2",
                 "package-comments": "1.16.2",
                 "package-conversational-forms": "1.15.0",
                 "package-data-sources": "1.34.3",
                 "package-decision-engine": "1.16.1",
                 "package-dynamic-ui": "1.28.3",
                 "package-email-start-event": "1.0.8",
-                "package-files": "1.23.3",
+                "package-files": "1.23.4",
                 "package-googleplaces": "1.12.0",
                 "package-photo-video": "1.6.1",
-                "package-pm-blocks": "1.12.6",
+                "package-pm-blocks": "1.12.7",
                 "package-process-documenter": "1.12.0",
                 "package-process-optimization": "1.10.0",
                 "package-product-analytics": "1.5.11",
-                "package-projects": "1.12.5",
+                "package-projects": "1.12.6",
                 "package-rpa": "1.1.1",
-                "package-savedsearch": "1.43.6",
+                "package-savedsearch": "1.43.7",
                 "package-slideshow": "1.4.3",
                 "package-smart-extract": "dev-develop",
                 "package-signature": "1.15.2",
                 "package-testing": "1.8.1",
-                "package-translations": "2.14.4",
+                "package-translations": "2.14.5",
                 "package-versions": "1.13.0",
-                "package-vocabularies": "2.17.0",
-                "package-webentry": "2.29.11",
+                "package-vocabularies": "2.17.1",
+                "package-webentry": "2.29.12",
                 "package-api-testing": "1.3.1",
                 "package-variable-finder": "1.0.5",
                 "packages": "^0"
             },
             "docker-executors": {
-                "docker-executor-java": "1.0.4",
+                "docker-executor-java": "1.0.5",
                 "docker-executor-python": "1.0.1",
                 "docker-executor-csharp": "1.0.2"
             },