@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | } |
139 | 139 | |
140 | 140 | /** |
141 | - * @return mixed |
|
141 | + * @return string |
|
142 | 142 | */ |
143 | 143 | public function getName() |
144 | 144 | { |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | } |
157 | 157 | |
158 | 158 | /** |
159 | - * @return mixed |
|
159 | + * @return string |
|
160 | 160 | */ |
161 | 161 | public function getAlias() |
162 | 162 | { |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace AppBundle\Variable; |
4 | 4 | |
5 | -use AppBundle\Action\Executor\ExecutorInterface; |
|
6 | 5 | use AppBundle\Entity\Trigger; |
7 | 6 | use AppBundle\Entity\Variable; |
8 | 7 | use AppBundle\Entity\VariableHistory; |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | |
107 | 107 | if ($trigger->onActivate) { |
108 | 108 | $tParams = json_decode($trigger->activateParams, true); |
109 | - $tParams['variable']=$var->getValue(); |
|
109 | + $tParams['variable'] = $var->getValue(); |
|
110 | 110 | $this->actionService->executeReal( |
111 | 111 | $trigger->onActivate, |
112 | 112 | 'trigger:activate', |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | // Deactivation hooks |
122 | 122 | if ($trigger->onDeactivate) { |
123 | 123 | $tParams = json_decode($trigger->deactivateParams, true); |
124 | - $tParams['variable']=$var->getValue(); |
|
124 | + $tParams['variable'] = $var->getValue(); |
|
125 | 125 | |
126 | 126 | $this->actionService->executeReal( |
127 | 127 | $trigger->onDeactivate, |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | { |
13 | 13 | |
14 | 14 | public $allowedOperators = [ |
15 | - '>','<','>=','<=','==','!=' |
|
15 | + '>', '<', '>=', '<=', '==', '!=' |
|
16 | 16 | ]; |
17 | 17 | |
18 | 18 | /** |
@@ -187,6 +187,6 @@ discard block |
||
187 | 187 | |
188 | 188 | public function __toString() |
189 | 189 | { |
190 | - return $this->getName(). ($this->getState() ? ' (on)':' (off)'); |
|
190 | + return $this->getName().($this->getState() ? ' (on)' : ' (off)'); |
|
191 | 191 | } |
192 | 192 | } |