From c13545527faa6c0b74c93fc731bffa862f68aefd Mon Sep 17 00:00:00 2001
From: Thomas Peterson <info@thomas-peterson.de>
Date: Wed, 29 Jan 2020 15:13:12 +0100
Subject: [PATCH 1/3] Fix Calc

---
 src/Calc/Calc.php            | 6 +++++-
 src/Calc/CalcValues.php      | 9 +++++++--
 tests/Customer/A/formels.txt | 6 +++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Calc/Calc.php b/src/Calc/Calc.php
index 417daec..523b6d8 100644
--- a/src/Calc/Calc.php
+++ b/src/Calc/Calc.php
@@ -85,7 +85,11 @@ class Calc
             if($collection->getName() == "opt") continue;
             if($collection->getFormel() != "") {
                 $formel = $this->formelCalc->parse($collection->getFormel());
-                eval('$var = ' . $formel . ';');
+                if(preg_match("/^[a-z](.*)/", $formel)) {
+                    eval('$var = "' . $formel . '";');
+                }else{
+                    eval('$var = ' . $formel . ';');
+                }
             }else{
                 if(!isset($this->engine->getVariables()[$collection->getName()])) {
                     $var = 'XXXXXXXXXXXX';
diff --git a/src/Calc/CalcValues.php b/src/Calc/CalcValues.php
index 9dc95b9..1febd14 100644
--- a/src/Calc/CalcValues.php
+++ b/src/Calc/CalcValues.php
@@ -90,7 +90,12 @@ class CalcValues
             if($collection->getName() == "opt") continue;
             if($collection->getFormel() != "") {
                 $formel = $this->formelCalc->parse($collection->getFormel());
-                eval('$var = ' . $formel . ';');
+                if(preg_match("/^[a-z](.*)/", $formel)) {
+                    eval('$var = "' . $formel . '";');
+                }else{
+                    eval('$var = ' . $formel . ';');
+                }
+
             }else{
                 if(!isset($this->engine->getVariables()[$collection->getName()])) {
                     $var = 'XXXXXXXX';
@@ -126,4 +131,4 @@ class CalcValues
         return $price;
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/Customer/A/formels.txt b/tests/Customer/A/formels.txt
index 42fb7de..b71179f 100644
--- a/tests/Customer/A/formels.txt
+++ b/tests/Customer/A/formels.txt
@@ -693,10 +693,10 @@ if(!function_exists('getSammelformMengenAbschlagPlano')) {
     function getMaschine($breite, $hoehe) {
         if($breite > 49 || $hoehe > 49) {
 
-            return '"kba"';
+            return 'kba';
         }
 
-        return '"gto"';
+        return 'gto';
     }
 
     function getGeiferRand($format) {
@@ -730,4 +730,4 @@ if(!function_exists('getSammelformMengenAbschlagPlano')) {
     }
 
 
-}
\ No newline at end of file
+}

From f329b3f63d9871257721c9952ed9a390b9be0b27 Mon Sep 17 00:00:00 2001
From: Thomas Peterson <info@thomas-peterson.de>
Date: Wed, 29 Jan 2020 21:24:31 +0100
Subject: [PATCH 2/3] Fix Calc

---
 src/Option/Type/Template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Option/Type/Template.php b/src/Option/Type/Template.php
index 6f5b819..489ab66 100644
--- a/src/Option/Type/Template.php
+++ b/src/Option/Type/Template.php
@@ -12,7 +12,7 @@ class Template extends Base
     /**
      * @return String
      */
-    public function getSelect(): String
+    public function getSelect()
     {
         return $this->select;
     }
@@ -20,7 +20,7 @@ class Template extends Base
     /**
      * @param String $select
      */
-    public function setSelect(String $select): void
+    public function setSelect(String $select)
     {
         $this->select = $select;
     }

From f1620d8f8b95a5ad36018524c49643fb40dd4ba0 Mon Sep 17 00:00:00 2001
From: Thomas Peterson <info@thomas-peterson.de>
Date: Wed, 29 Jan 2020 21:28:09 +0100
Subject: [PATCH 3/3] Fix Calc

---
 src/Option/Type/Template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Option/Type/Template.php b/src/Option/Type/Template.php
index 489ab66..01471c8 100644
--- a/src/Option/Type/Template.php
+++ b/src/Option/Type/Template.php
@@ -20,7 +20,7 @@ class Template extends Base
     /**
      * @param String $select
      */
-    public function setSelect(String $select)
+    public function setSelect($select)
     {
         $this->select = $select;
     }