Merge pull request #20 from theonly27/theonly

Updated Syntax for Laravel 9

Author: sarfraznawaz2005

src/BackupManager.php

@@ -46,13 +46,25 @@ public function getBackups()
         $filesData = [];
 
         foreach ($files as $index => $file) {
-            $filesData[] = [
-                'name' => $file['basename'],
-                'size_raw' => $file['size'],
-                'size' => $this->formatSizeUnits($file['size']),
-                'type' => $file['basename'][0] === 'd' ? 'Database' : 'Files',
-                'date' => date('M d Y', $this->getFileTimeStamp($file))
-            ];
+            if (!is_array($file)) {
+                $name = str_replace(config('backupmanager.backups.backup_path')."/","",$file->path());
+                $array = explode('_', $name);
+                $filesData[] = [
+                    'name' => end($array),
+                    'size_raw' => $file->fileSize(),
+                    'size' => $this->formatSizeUnits($file->fileSize()),
+                    'type' => $array[0] === 'd' ? 'Database' : 'Files',
+                    'date' => date('M d Y', $this->getFileTimeStamp($file))
+                ];
+            }else{
+                $filesData[] = [
+                    'name' => $file['basename'],
+                    'size_raw' => $file['size'],
+                    'size' => $this->formatSizeUnits($file['size']),
+                    'type' => $file['basename'][0] === 'd' ? 'Database' : 'Files',
+                    'date' => date('M d Y', $this->getFileTimeStamp($file))
+                ];
+            }
         }
 
         // sort by date
@@ -377,16 +389,19 @@ protected function deleteOldBackups()
         }
     }
 
-    protected function getFileTimeStamp(array $file)
+    protected function getFileTimeStamp($file)
     {
-        if (isset($file['timestamp'])) {
-            return $file['timestamp'];
-        }
-
-        // otherwise get date from file name
-        $array = explode('_', $file['filename']);
+        if ($file instanceof \League\Flysystem\FileAttributes) {
+            return $file->lastModified();
+        }else{
+            if (isset($file['timestamp'])) {
+                return $file['timestamp'];
+            }
+            // otherwise get date from file name
+            $array = explode('_', $file['filename']);
 
-        return strtotime(end($array));
+            return strtotime(end($array));
+        }
     }
 
     protected function formatSizeUnits($size)

src/Http/Controllers/BackupManagerController.php

@@ -213,7 +213,7 @@ protected function sendMail($body)
                         $message
                             ->subject(config('backupmanager.mail.mail_subject', 'BackupManager Alert'))
                             ->to($email)
-                            ->setBody($body, 'text/html');
+                            ->text($body);
                     });
                 }
             }