feat(workspace): add logManagerAction for package install/upgrade/remove

core/src/Revolution/Processors/Workspace/Packages/Install.php

@@ -86,14 +86,26 @@ public function process()
         $this->modx->log(modX::LOG_LEVEL_WARN, $msg);
         $this->modx->log(modX::LOG_LEVEL_INFO, 'COMPLETED');
 
+        $isUpgrade = $this->package->previousVersionInstalled();
         $this->modx->invokeEvent('OnPackageInstall', [
             'package' => $this->package,
-            'action' => $this->package->previousVersionInstalled() ? xPDOTransport::ACTION_UPGRADE : xPDOTransport::ACTION_INSTALL,
+            'action' => $isUpgrade ? xPDOTransport::ACTION_UPGRADE : xPDOTransport::ACTION_INSTALL,
         ]);
 
+        $this->logManagerAction();
+
         return $this->success($msg);
     }
 
+    /**
+     * Log package install or upgrade to Manager Log.
+     */
+    public function logManagerAction()
+    {
+        $action = $this->package->previousVersionInstalled() ? 'package_upgrade' : 'package_install';
+        $this->modx->logManagerAction($action, modTransportPackage::class, $this->package->getPrimaryKey());
+    }
+
     public function clearCache()
     {
         $this->modx->cacheManager->refresh([

core/src/Revolution/Processors/Workspace/Packages/Remove.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of MODX Revolution.
  *
@@ -154,10 +155,20 @@ public function cleanup()
         sleep(2);
         $this->modx->log(modX::LOG_LEVEL_INFO, 'COMPLETED');
 
+        $this->logManagerAction();
+
         $this->modx->invokeEvent('OnPackageRemove', [
             'package' => $this->package,
         ]);
 
         return $this->success();
     }
+
+    /**
+     * Log package remove to Manager Log.
+     */
+    public function logManagerAction()
+    {
+        $this->modx->logManagerAction('package_remove', modTransportPackage::class, $this->package->getPrimaryKey());
+    }
 }

core/src/Revolution/Processors/Workspace/Packages/Uninstall.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of MODX Revolution.
  *
@@ -79,7 +80,9 @@ public function process()
         ];
 
         if ($this->package->uninstall($options) === false) {
-            return $this->failure(sprintf($this->modx->lexicon('package_err_uninstall'), ['signature' => $this->package->get('signature')], $this->package->getPrimaryKey()));
+            return $this->failure($this->modx->lexicon('package_err_uninstall', [
+                'signature' => $this->package->get('signature'),
+            ]));
         }
 
         $this->modx->log(modX::LOG_LEVEL_WARN,
@@ -100,7 +103,7 @@ public function process()
 
     public function logManagerAction()
     {
-        $this->modx->logManagerAction('package_uninstall', modTransportPackage::class, $this->package->get('id'));
+        $this->modx->logManagerAction('package_uninstall', modTransportPackage::class, $this->package->getPrimaryKey());
     }
 
     public function clearCache()

core/src/Revolution/Processors/Workspace/Packages/Update.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of MODX Revolution.
  *
@@ -82,6 +83,6 @@ public function process()
 
     public function logManagerAction()
     {
-        $this->modx->logManagerAction('package_update', modTransportPackage::class, $this->package->get('id'));
+        $this->modx->logManagerAction('package_update', modTransportPackage::class, $this->package->getPrimaryKey());
     }
 }

core/src/Revolution/Processors/Workspace/Packages/Version/Remove.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of MODX Revolution.
  *
@@ -126,6 +127,6 @@ public function removeTransportDirectory()
 
     public function logManagerAction()
     {
-        $this->modx->logManagerAction('package_remove', modTransportPackage::class, $this->package->get('id'));
+        $this->modx->logManagerAction('package_remove', modTransportPackage::class, $this->package->getPrimaryKey());
     }
 }