Minor fix to work with flysystem 3.x

wrklst · Feb 1, 2024 · 7b6dcd9 · 7b6dcd9
1 parent 46da262
commit 7b6dcd9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -3,9 +3,9 @@
     "description": "docx template manipulation class, based on mustache templating language",
     "keywords": ["laravel", "docx", "openxml", "template", "mustache", "php"],
     "require": {
-        "php" : ">=7.1.0",
+        "php" : ">=7.4.0",
         "mustache/mustache": "^2.12",
-        "intervention/image": "^2.5",
+        "intervention/image": "^2.7",
         "wrklst/zipper": "^1.0"
     },
     "homepage" : "https://github.com/wrklst/docxmustache",

diff --git a/src/WrkLst/DocxMustache/DocxMustache.php b/src/WrkLst/DocxMustache/DocxMustache.php
@@ -67,7 +67,7 @@ public function StoragePath($file)
         if ($this->useStoragePath) {
             return \Storage::disk($this->storageDisk)->path($file);
         }
-        $pathPrefix = \Storage::disk($this->storageDisk)->getDriver()->getAdapter()->getPathPrefix();
+        $pathPrefix = \Storage::disk($this->storageDisk)->path('');
         return $pathPrefix.$file;
     }
 
@@ -142,7 +142,7 @@ public function CopyTmplate()
 
     protected function exctractOpenXmlFile($file)
     {
-        $pathPrefix = \Storage::disk($this->storageDisk)->getDriver()->getAdapter()->getPathPrefix();
+        $pathPrefix = \Storage::disk($this->storageDisk)->path('');
         $this->zipper
             ->make($pathPrefix.$this->local_path.$this->template_file_name)
             ->extractTo($pathPrefix.$this->local_path, [$file], \Wrklst\Zipper\Zipper::WHITELIST);