Commit 4997f2c1 authored by Shakarim Sapa's avatar Shakarim Sapa

- Устранены лишние методы;

- Добавлено переопределение свойства конфиг для вызываемого условия;
parent 44a03949
...@@ -65,8 +65,9 @@ class Conditions { ...@@ -65,8 +65,9 @@ class Conditions {
*/ */
public function getConditions(){ public function getConditions(){
$data = array(); $data = array();
foreach(self::$config as $condition) { foreach(self::$config as $key=>$condition) {
$class = $condition['class']::init(); $class = $condition['class']::init();
$class->config = self::$config[$key];
$data[$class::CONDITION_ID] = $class; $data[$class::CONDITION_ID] = $class;
} }
return $data; return $data;
...@@ -78,45 +79,15 @@ class Conditions { ...@@ -78,45 +79,15 @@ class Conditions {
* @return null * @return null
*/ */
public function getConditionById($id){ public function getConditionById($id){
foreach(self::$config as $condition) {
$class = $condition['class']::init();
if ($class::CONDITION_ID==$id)
return $class;
}
return null;
}
/**
* @param $id
* @return null
*/
public function getConfigById($id){
foreach(self::$config as $key=>$condition) { foreach(self::$config as $key=>$condition) {
$class = $condition['class']::init(); $class = $condition['class']::init();
$class->config = self::$config[$key];
if ($class::CONDITION_ID==$id) if ($class::CONDITION_ID==$id)
return [$key => $condition]; return $class;
} }
return null; return null;
} }
/**
* @param $id
* @return array
*/
public function getParamsById($id){
$result = [];
foreach(self::$config as $key=>$condition) {
$class = $condition['class']::init();
if ($class::CONDITION_ID==$id)
if (isset($condition['params']) && count($condition['params'])>0) {
foreach($condition['params'] as $param_key=>$param_value) {
$result[$param_key] = $param_value;
}
}
}
return $result;
}
/** /**
* @param $param * @param $param
* @return string * @return string
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment