Merge branch 'master' of https://gitlab.com/printshopcreator/calc

src/Calc/Calc.php

@@ -85,7 +85,11 @@ class Calc
             if($collection->getName() == "opt") continue;
             if($collection->getFormel() != "") {
                 $formel = $this->formelCalc->parse($collection->getFormel());
+                if(preg_match("/^[a-z](.*)/", $formel)) {
+                    eval('$var = "' . $formel . '";');
+                }else{
                     eval('$var = ' . $formel . ';');
+                }
             }else{
                 if(!isset($this->engine->getVariables()[$collection->getName()])) {
                     $var = 'XXXXXXXXXXXX';

src/Calc/CalcValues.php

@@ -90,7 +90,12 @@ class CalcValues
             if($collection->getName() == "opt") continue;
             if($collection->getFormel() != "") {
                 $formel = $this->formelCalc->parse($collection->getFormel());
+                if(preg_match("/^[a-z](.*)/", $formel)) {
+                    eval('$var = "' . $formel . '";');
+                }else{
                     eval('$var = ' . $formel . ';');
+                }
+
             }else{
                 if(!isset($this->engine->getVariables()[$collection->getName()])) {
                     $var = 'XXXXXXXX';

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($select)
     {
         $this->select = $select;
     }

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) {