Bugfix: plugin master jsonResponse() invalid return value

snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php

@@ -40,11 +40,6 @@ abstract class AbstractPlugin
 	 */
 	private $sPath;
 
-	/**
-	 * @var string
-	 */
-	private $sVersion;
-
 	/**
 	 * @var array
 	 */
@@ -57,9 +52,8 @@ abstract class AbstractPlugin
 
 	public function __construct()
 	{
-		$this->sName = '';
+		$this->sName = static::NAME;
 		$this->sPath = '';
-		$this->sVersion = '0.0';
 		$this->aConfigMap = null;
 
 		$this->oPluginManager = null;
@@ -100,11 +94,6 @@ abstract class AbstractPlugin
 		return $this->sName;
 	}
 
-	public function Version() : string
-	{
-		return $this->sVersion;
-	}
-
 	public function UseLangs(?bool $bLangs = null) : bool
 	{
 		if (null !== $bLangs)
@@ -122,7 +111,7 @@ abstract class AbstractPlugin
 
 	public function Hash() : string
 	{
-		return \md5($this->sName.'@'.$this->sVersion);
+		return \md5($this->sName . '@' . static::VERSION);
 	}
 
 	public function Supported() : string
@@ -264,7 +253,10 @@ abstract class AbstractPlugin
 		return $this;
 	}
 
-	protected function jsonResponse(string $sFunctionName, array $aData) : self
+	/**
+	 * @return mixed false|string|array
+	 */
+	protected function jsonResponse(string $sFunctionName, array $aData)
 	{
 		if ($this->oPluginManager)
 		{

snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php

@@ -119,7 +119,6 @@ class Manager
 			$oPlugin
 				->SetName($sName)
 				->SetPath(APP_PLUGINS_PATH.$sName)
-				->SetVersion($sClassName::VERSION)
 				->SetPluginManager($this)
 				->SetPluginConfig(new \RainLoop\Config\Plugin($sName, $oPlugin->ConfigMap()))
 			;
@@ -174,7 +173,17 @@ class Manager
 			if (\class_exists($sClassName) && \is_subclass_of($sClassName, 'RainLoop\\Plugins\\AbstractPlugin')) {
 				return $sClassName;
 			}
+			else
+			{
+				\trigger_error("Invalid plugin class {$sClassName}");
+			}
 		}
+		else
+		{
+			\trigger_error("Invalid plugin name {$sName}");
+		}
+
+		return null;
 	}
 
 	public function Actions() : \RainLoop\Actions
@@ -469,10 +478,8 @@ class Manager
 
 	/**
 	 * @param mixed $mData
-	 *
-	 * @return mixed
 	 */
-	public function JsonResponseHelper(string $sFunctionName, $mData)
+	public function JsonResponseHelper(string $sFunctionName, $mData) : array
 	{
 		return $this->oActions->DefaultResponse($sFunctionName, $mData);
 	}