Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-04-20 16:37:48 +02:00
Code Issues Projects Releases Wiki Activity

Catch php error in ruler evaluate. Unify all dates functions by using real DateTime objects and function date -> date_create and date_from_format -> date_create_from_format.

Browse source
This commit is contained in:
osaajani 2021-12-02 01:03:42 +01:00
parent 6bd18c95cc
commit 3f632e9db7
2 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
controllers/internals/Ruler.php
View file

@ -43,18 +43,15 @@ use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
{
try
{
$this->expression_language->parse($condition, array_keys($data));
//Use @ to hide notices on non defined vars
@$this->expression_language->parse($condition, array_keys($data));
return true;
}
catch (\Exception $e)
catch (\Throwable $t) //Catch both, exceptions and php error
{
return false;
}
catch (\Throwable $t)
{
//Just ignore non critical php warning and notice
}
}
/**
@ -69,11 +66,12 @@ use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
{
try
{
//Use @ to hide notices on non defined vars
@$result = $this->expression_language->evaluate($condition, $data);
return (bool) $result;
}
catch (\Exception $e)
catch (\Throwable $t) //Catch both, exceptions and php error
{
return null;
}