fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix CR

Browse Source
This commit is contained in:
Marco Antonio Nina Mena
2017-10-19 11:39:00 -04:00
parent 5fe388fc90
commit 11498fca10
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/PMPluginRegistry.php
View File

@@ -1375,7 +1375,7 @@ class PMPluginRegistry
$classFile = $baseSrcPluginPath . $apiPath . 'Ext' . $className . '.php'; $classFile = $baseSrcPluginPath . $apiPath . 'Ext' . $className . '.php';
if (file_exists($classFile)) { if (file_exists($classFile)) {
if (empty($this->_restExtendServices[$namespace])) { if (empty($this->_restExtendServices[$namespace])) {
$this->_restExtendServices[$namespace] = new \stdClass(); $this->_restExtendServices[$namespace] = new stdClass();
} }
$this->_restExtendServices[$namespace]->{$className} = [ $this->_restExtendServices[$namespace]->{$className} = [
'filePath' => $classFile, 'filePath' => $classFile,

26
workflow/engine/src/ProcessMaker/Plugins/PluginRegistry.php
View File

@@ -92,7 +92,7 @@ class PluginRegistry
public static function newInstance() public static function newInstance()
{ {
self::$instance = new PluginRegistry(); self::$instance = new PluginRegistry();
if (! is_object(self::$instance) || get_class(self::$instance) != "ProcessMaker\Plugins\PluginRegistry") { if (!is_object(self::$instance) || get_class(self::$instance) != "ProcessMaker\Plugins\PluginRegistry") {
throw new Exception("Can't load main PluginRegistry object."); throw new Exception("Can't load main PluginRegistry object.");
} }
return self::$instance; return self::$instance;
@@ -122,10 +122,10 @@ class PluginRegistry
$plugin->sDescription, $plugin->sDescription,
$plugin->sSetupPage, $plugin->sSetupPage,
$plugin->iVersion, $plugin->iVersion,
isset($plugin->sCompanyLogo) ? $plugin->sCompanyLogo: '', isset($plugin->sCompanyLogo) ? $plugin->sCompanyLogo : '',
isset($plugin->aWorkspaces) ? $plugin->aWorkspaces: [], isset($plugin->aWorkspaces) ? $plugin->aWorkspaces : [],
isset($plugin->enable) ? $plugin->enable: false, isset($plugin->enable) ? $plugin->enable : false,
isset($plugin->bPrivate) ? $plugin->bPrivate: false isset($plugin->bPrivate) ? $plugin->bPrivate : false
); );
$this->_aPluginDetails[$Namespace] = $detail; $this->_aPluginDetails[$Namespace] = $detail;
} }
@@ -204,6 +204,7 @@ class PluginRegistry
} }
Cache::pull(self::NAME_CACHE); Cache::pull(self::NAME_CACHE);
} }
/** /**
* Get the plugin details, by filename * Get the plugin details, by filename
* @param string $Filename * @param string $Filename
@@ -476,7 +477,7 @@ class PluginRegistry
if (isset($this->_aPluginDetails[$Namespace])) { if (isset($this->_aPluginDetails[$Namespace])) {
/** @var PluginDetail $detail */ /** @var PluginDetail $detail */
$detail = $this->_aPluginDetails[$Namespace]; $detail = $this->_aPluginDetails[$Namespace];
$className= $detail->getClassName(); $className = $detail->getClassName();
/** @var enterprisePlugin $oPlugin */ /** @var enterprisePlugin $oPlugin */
$oPlugin = new $className($detail->getNamespace(), $detail->getFile()); $oPlugin = new $className($detail->getNamespace(), $detail->getFile());
$oPlugin->setup(); $oPlugin->setup();
@@ -857,13 +858,13 @@ class PluginRegistry
require_once($classFile); require_once($classFile);
$sClassNameA = substr($this->_aPluginDetails[$trigger->getNamespace()]->getClassName(), 0, 1) . $sClassNameA = substr($this->_aPluginDetails[$trigger->getNamespace()]->getClassName(), 0, 1) .
str_replace( str_replace(
['Plugin','plugin'], ['Plugin', 'plugin'],
'Class', 'Class',
substr($this->_aPluginDetails[$trigger->getNamespace()]->getClassName(), 1) substr($this->_aPluginDetails[$trigger->getNamespace()]->getClassName(), 1)
); );
$sClassNameB = substr($this->_aPluginDetails[$trigger->getNamespace()]->getClassName(), 0, 1) . $sClassNameB = substr($this->_aPluginDetails[$trigger->getNamespace()]->getClassName(), 0, 1) .
str_replace( str_replace(
['Plugin','plugin'], ['Plugin', 'plugin'],
'class', 'class',
substr($this->_aPluginDetails[$trigger->getNamespace()]->getClassName(), 1) substr($this->_aPluginDetails[$trigger->getNamespace()]->getClassName(), 1)
); );
@@ -891,7 +892,7 @@ class PluginRegistry
public function existsTrigger($TriggerId) public function existsTrigger($TriggerId)
{ {
$found = false; $found = false;
/** @var TriggerDetail $trigger */ /** @var TriggerDetail $trigger */
foreach ($this->_aTriggers as $trigger) { foreach ($this->_aTriggers as $trigger) {
if ($trigger->equalTriggerId($TriggerId)) { if ($trigger->equalTriggerId($TriggerId)) {
//review all folders registered for this namespace //review all folders registered for this namespace
@@ -1125,7 +1126,8 @@ class PluginRegistry
$ActionSave, $ActionSave,
$ActionExecute, $ActionExecute,
$ActionGetFields $ActionGetFields
) { )
{
$found = false; $found = false;
/** @var CaseSchedulerPlugin $caseScheduler */ /** @var CaseSchedulerPlugin $caseScheduler */
foreach ($this->_aCaseSchedulerPlugin as $caseScheduler) { foreach ($this->_aCaseSchedulerPlugin as $caseScheduler) {
@@ -1248,9 +1250,9 @@ class PluginRegistry
$baseSrcPluginPath = PATH_PLUGINS . $Namespace . PATH_SEP . 'src'; $baseSrcPluginPath = PATH_PLUGINS . $Namespace . PATH_SEP . 'src';
$apiPath = PATH_SEP . 'Services' . PATH_SEP . 'Ext' . PATH_SEP; $apiPath = PATH_SEP . 'Services' . PATH_SEP . 'Ext' . PATH_SEP;
$classFile = $baseSrcPluginPath . $apiPath . 'Ext' . $ClassName . '.php'; $classFile = $baseSrcPluginPath . $apiPath . 'Ext' . $ClassName . '.php';
if (\file_exists($classFile)) { if (file_exists($classFile)) {
if (empty($this->_restExtendServices[$Namespace])) { if (empty($this->_restExtendServices[$Namespace])) {
$this->_restExtendServices[$Namespace] = new \stdClass(); $this->_restExtendServices[$Namespace] = new stdClass();
} }
$this->_restExtendServices[$Namespace]->{$ClassName} = [ $this->_restExtendServices[$Namespace]->{$ClassName} = [
'filePath' => $classFile, 'filePath' => $classFile,