remove array-align

Author: lsmith77

src/PrettyVarExport.php

@@ -4,29 +4,39 @@
 
 class PrettyVarExport
 {
-    // code from https://gist.github.com/lithrel/a224edb1ed2975992c73
-    public function call($var, array $opts = [])
+    public function call($translations)
     {
-        $opts = array_merge(['indent' => '', 'tab' => '    ', 'array-align' => false], $opts);
-        switch (gettype($var)) {
-            case 'array':
-                $r = [];
-                $indexed = array_keys($var) === range(0, count($var) - 1);
-                $lengths = array_map('strlen', array_map('trim', array_keys($var)));
-                $maxLength = ($opts['array-align'] && count($lengths) > 0) ? max($lengths) + 2 : 0;
-                foreach ($var as $key => $value) {
-                    $key = str_replace("'' . \"\\0\" . '*' . \"\\0\" . ", "", $this->call($key));
-                    $r[] = $opts['indent'] . $opts['tab']
-                        . ($indexed ? '' : str_pad($key, $maxLength) . ' => ')
-                        . $this->call($value, array_merge($opts, ['indent' => $opts['indent'] . $opts['tab']]));
-                }
-                return "[\n" . implode(",\n", $r) . "\n" . $opts['indent'] . "]";
-            case 'boolean':
-                return $var ? 'true' : 'false';
-            case 'NULL':
-                return 'null';
-            default:
-                return var_export($var, true);
+        $content = "[";
+
+        $content .= $this->stringLineMaker($translations);
+
+        $content .= "\n]";
+
+        return $content;
+    }
+
+    /**
+     * Write the lines of the inner array of the language file.
+     *
+     * @param $array
+     * @return string
+     */
+    private function stringLineMaker($array, $prepend = '')
+    {
+        $output = '';
+
+        foreach ($array as $key => $value) {
+            if (is_array($value)) {
+                $value = $this->stringLineMaker($value, $prepend.'    ');
+
+                $output .= "\n{$prepend}    '{$key}' => [{$value}\n{$prepend}    ],";
+            } else {
+                $value = str_replace('\"', '"', addslashes($value));
+
+                $output .= "\n{$prepend}    '{$key}' => '{$value}',";
+            }
         }
+
+        return $output;
     }
 }

src/SourceSaver.php

@@ -54,15 +54,17 @@ public function call($sourceEdit, $sourceLocale)
 
         if ($this->filesystem->exists($groupFile)) {
             $translations = $this->filesystem->getRequire($groupFile);
-
+dd($translations);
             $translations = $this->applySourceEditInTranslations($translations, $sourceEdit);
 
             $fileContent = <<<'EOT'
-<?php
+<?php 
+
 return {{translations}};
 EOT;
+            $fileContent = rtrim($fileContent);
 
-            $prettyTranslationsExport = $this->prettyVarExport->call($translations, ['array-align' => true]);
+            $prettyTranslationsExport = $this->prettyVarExport->call($translations);
             $fileContent  = str_replace('{{translations}}', $prettyTranslationsExport, $fileContent);
 
             $this->filesystem->put($groupFile, $fileContent);

src/TranslationSaver.php

@@ -68,11 +68,13 @@ private function save($locale, $group, $translations)
         $this->filesystem->makeDirectory($dir, 0777, true, true);
 
         $fileContent = <<<'EOT'
-<?php
+<?php 
+
 return {{translations}};
 EOT;
+        $fileContent = rtrim($fileContent);
 
-        $prettyTranslationsExport = $this->prettyVarExport->call($translations, ['array-align' => true]);
+        $prettyTranslationsExport = $this->prettyVarExport->call($translations);
         $fileContent = str_replace('{{translations}}', $prettyTranslationsExport, $fileContent);
 
         $this->filesystem->put($dir . DIRECTORY_SEPARATOR . $group . '.php', $fileContent);