Merge branch 'main' into 6.0

Author: sebastianfeldmann

README.md

@@ -16,7 +16,7 @@ Get an in depth look into all the features and a short 'getting started' tutoria
 [![Code Coverage](https://scrutinizer-ci.com/g/sebastianfeldmann/phpbu/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/sebastianfeldmann/phpbu/?branch=master)
 [![PHP Website](https://img.shields.io/website-up-down-green-red/https/phpbu.de.svg)](https://phpbu.de)
 
-If you are not using php 7.4 or greater already you can still use phpbu version [6.0.20](https://phar.phpbu.de/phpbu-5.2.10.phar) \
+If you are not using php 8.0 or greater already you can still use phpbu version [6.0.20](https://phar.phpbu.de/phpbu-5.2.10.phar) \
 If you are not using php 7.2 or greater already you can still use phpbu version [5.2.10](https://phar.phpbu.de/phpbu-5.2.10.phar) \
 If you are behind php 7.0 you can still use phpbu version [4.0.10](https://phar.phpbu.de/phpbu-4.0.10.phar)
 

src/Backup/Rsync.php

@@ -110,7 +110,7 @@ protected function setupRsync(array $conf)
             $this->passwordFile = Util\Arr::getValue($conf, 'passwordFile', '');
             $this->excludes     = Util\Str::toList(Util\Arr::getValue($conf, 'exclude', ''), ':');
             $this->delete       = Util\Str::toBoolean(Util\Arr::getValue($conf, 'delete', ''), false);
-            $this->isDirSync    = Util\Str::toBoolean(Util\Arr::getValue($conf, 'dirsync', ''), false);
+            $this->isDirSync    = Util\Str::toBoolean(Util\Arr::getValue($conf, 'isDirSync', ''), false);
         }
     }
 

src/Log/Prometheus.php

@@ -102,6 +102,9 @@ public function onPhpbuEnd(End $event)
         $this->write('# TYPE phpbu_backup_duration gauge' . PHP_EOL);
         foreach ($this->backupStats as $backupName => $backupStats) {
             $duration = $this->backupStats[$backupName]['timeEnd'] - $this->backupStats[$backupName]['timeStart'];
+            if ($duration < 0) {
+                $duration = 0;
+            }
             $this->write('phpbu_backup_duration{name="' . $backupName . '"} ' . $duration . PHP_EOL);
         }
 
@@ -124,7 +127,7 @@ public function onPhpbuEnd(End $event)
         foreach ($this->backupStats as $backupName => $backupStats) {
             $this->write(
                 'phpbu_backup_size{name="' . $backupName . '"} ' .
-                $this->backupStats[$backupName]['size'] .
+                ($this->backupStats[$backupName]['size']  ?? "0") .
                 PHP_EOL
             );
         }