Merge pull request #33 from geimsdin/master

Update Rewrite.php

Author: daftspunk

src/DataWriter/FileWriter.php

@@ -62,7 +62,7 @@ public function write(string $item, $value, string $filename, string $fileExtens
         return !($this->files->put($path, $contents) === false);
     }
 
-    private function getPath(string $item, string $filename, string $ext = '.php'): string
+    private function getPath(string $item, string $filename, string $ext = '.php'): ?string
     {
         $file = "{$this->defaultPath}/{$filename}{$ext}";
 
@@ -88,4 +88,4 @@ private function hasKey(string $path, string $key): bool
 
         return $isset;
     }
-}
+}

src/DataWriter/Rewrite.php

@@ -48,16 +48,22 @@ public function toContent(string $contents, array $newValues, bool $useValidatio
 
         $result = eval('?>'.$contents);
 
+
         foreach ($newValues as $key => $expectedValue) {
             $parts = explode('.', $key);
 
             $array = $result;
             foreach ($parts as $part) {
+
                 if (!is_array($array) || !array_key_exists($part, $array)) {
                     throw new Exception(sprintf('Unable to rewrite key "%s" in config, does it exist?', $key));
                 }
+                if ( array_key_exists($part, $array) && is_string($array[$part])) {
+                    $array = $expectedValue;
+                } else {
+                    $array = $array[$part];
+                }
 
-                $array = $array[$part];
             }
             $actualValue = $array;