#20290 Изменить замену переменных

app/Service/StrReplaceByVariables.php

@@ -25,8 +25,8 @@ class StrReplaceByVariables
 
         foreach ($list as $key => $variable) {
 //            $list["{$this->delimer}{$key}{$this->delimer}"] = $variable;
+//            unset($list[$key]);
             $list[$key] = $variable;
-            unset($list[$key]);
         }
 
         $this->str = $str;

tests/Unit/ReplaceByVariablesTest.php

@@ -125,8 +125,8 @@ class ReplaceByVariablesTest extends TestCase
 
         $list = Variable::getListVariablesByDictionaryCampaign($this->dictionaryCampaign);
 
-        $this->assertEquals('String "custom var value"', StrReplaceByVariables::getInstance('String "%var%"', $list)->get());
-        $this->assertEquals('String "vartwo value"', StrReplaceByVariables::getInstance('String "%vartwo%"', $list)->get());
+        $this->assertEquals('String "custom var value"', StrReplaceByVariables::getInstance('String "var"', $list)->get());
+        $this->assertEquals('String "vartwo value"', StrReplaceByVariables::getInstance('String "vartwo"', $list)->get());
 
     }
 }