Update jackiedo/dotenv-editor dependency version

userfrosting · Dec 12, 2023 · c0a3245 · c0a3245
1 parent 3b14a0b
commit c0a3245
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "illuminate/cache": "^8.5",
         "illuminate/container": "^8.5",
         "illuminate/redis": "^8.5",
-        "jackiedo/dotenv-editor": "^1.2",
+        "jackiedo/dotenv-editor": "^2.1",
         "symfony/console": "^5.1",
         "symfony/yaml": ">=4.4",
         "ezyang/htmlpurifier": "^4.7.0",

diff --git a/src/Support/DotenvEditor/DotenvEditor.php b/src/Support/DotenvEditor/DotenvEditor.php
@@ -12,9 +12,10 @@
 
 use InvalidArgumentException;
 use Jackiedo\DotenvEditor\DotenvEditor as Editor;
-use Jackiedo\DotenvEditor\DotenvFormatter;
+use Jackiedo\DotenvEditor\Workers\Formatters\Formatter;
 use Jackiedo\DotenvEditor\DotenvReader;
 use Jackiedo\DotenvEditor\DotenvWriter;
+use Jackiedo\DotenvEditor\Workers\Parsers\ParserV3;
 
 /**
  * Implementation of Jackiedo DotenvEditor for use in UserFrosting.
@@ -31,9 +32,12 @@ class DotenvEditor extends Editor
      */
     public function __construct(string $backupPath = '', bool $autoBackup = true)
     {
-        $this->formatter = new DotenvFormatter();
-        $this->reader = new DotenvReader($this->formatter);
-        $this->writer = new DotenvWriter($this->formatter);
+        $formatter = new Formatter();
+        $parser    = new ParserV3();
+
+        $this->reader = new DotenvReader($parser);
+        $this->writer = new DotenvWriter($formatter);
+
         $this->backupPath = $backupPath;
         $this->autoBackup = $autoBackup;
     }
@@ -45,31 +49,18 @@ public function __construct(string $backupPath = '', bool $autoBackup = true)
      * @param bool        $restoreIfNotFound Restore this file from other file if it's not found
      * @param string|null $restorePath       The file path you want to restore from
      *
-     * @return DotenvEditor
+     * @return Editor
      */
-    public function load($filePath = null, $restoreIfNotFound = false, $restorePath = null)
+    public function load(?string $filePath = null, bool $restoreIfNotFound = false, ?string $restorePath = null)
     {
         //Fail if path is null to maintain compatibility with Jackiedo\DotenvEditor
         if (is_null($filePath)) {
             throw new InvalidArgumentException('File path cannot be null');
         }
 
-        $this->resetContent();
         $this->filePath = $filePath;
 
-        $this->reader->load($this->filePath);
-
-        if (file_exists($this->filePath)) {
-            $this->writer->setBuffer($this->getContent());
-
-            return $this;
-        } elseif ($restoreIfNotFound) {
-            $this->restore($restorePath);
-
-            return $this;
-        } else {
-            return $this;
-        }
+        return parent::load($filePath, $restoreIfNotFound, $restorePath);
     }
 
     /**