From 8fc77e54e01be2bfc6c2d5938fcd7735d4c9b3dd Mon Sep 17 00:00:00 2001
From: Javier Marín <javier@marinros.com>
Date: Tue, 15 Sep 2020 02:47:26 +0200
Subject: Improved support for null variables (#72)

* Added handler to define not found variables
Added support for string variables
Fixed strings and ints comparison error

* Check if variables have scalar types (int, float, string and bool)
Better $onVarNotFound logic

* Better support for null variables

* Better support for null variables

* Better support for null variables
---
 src/NXP/Classes/Calculator.php | 4 +---
 src/NXP/MathExecutor.php       | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/NXP/Classes/Calculator.php b/src/NXP/Classes/Calculator.php
index 49142df..4785a8f 100644
--- a/src/NXP/Classes/Calculator.php
+++ b/src/NXP/Classes/Calculator.php
@@ -64,9 +64,7 @@ class Calculator
                     $value = $variables[$variable];
                 } elseif ($onVarNotFound) {
                     $value = call_user_func($onVarNotFound, $variable);
-                }
-
-                if (!isset($value)) {
+                } else {
                     throw new UnknownVariableException($variable);
                 }
 
diff --git a/src/NXP/MathExecutor.php b/src/NXP/MathExecutor.php
index 434246a..f45335c 100644
--- a/src/NXP/MathExecutor.php
+++ b/src/NXP/MathExecutor.php
@@ -416,7 +416,7 @@ class MathExecutor
      */
     public function getVar(string $variable)
     {
-        if (!isset($this->variables[$variable])) {
+        if (!array_key_exists($variable, $this->variables)) {
             throw new UnknownVariableException("Variable ({$variable}) not set");
         }
         return $this->variables[$variable];
-- 
cgit v1.2.3