Skip to content

Commit e6c6689

Browse files
Merge pull request #22 from theonly27/theonly
Variable checking for the previous version of php or laravel
2 parents 4a6b472 + d9e4bfb commit e6c6689

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/BackupManager.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public function getBackups()
4646
$filesData = [];
4747

4848
foreach ($files as $index => $file) {
49-
if (!is_array($file)) {
50-
$name = str_replace(config('backupmanager.backups.backup_path')."/","",$file->path());
49+
if ($file instanceof \League\Flysystem\FileAttributes) {
50+
$name = str_replace($this->backupPath,"",$file->path());
5151
$array = explode('_', $name);
5252
$filesData[] = [
5353
'name' => $name,
@@ -378,12 +378,17 @@ protected function deleteOldBackups()
378378
if ($file['type'] !== 'file') {
379379
continue;
380380
}
381+
if (empty($file['basename'])) {
382+
$filename = $file->path();
383+
}else{
384+
$filename = $this->backupPath . $file['basename'];
385+
}
381386

382387
if ($now - $this->getFileTimeStamp($file) >= 60 * 60 * 24 * $daysOldToDelete) {
383-
if (Storage::disk($this->disk)->exists($this->backupPath . $file['basename'])) {
384-
Storage::disk($this->disk)->delete($this->backupPath . $file['basename']);
385-
386-
Log::info('Deleted old backup file: ' . $file['basename']);
388+
if (Storage::disk($this->disk)->exists($filename)) {
389+
Storage::disk($this->disk)->delete($filename);
390+
$name = str_replace($this->backupPath,"",$filename);
391+
Log::info('Deleted old backup file: ' . $name);
387392
}
388393
}
389394
}

0 commit comments

Comments
 (0)