Error handling

Author: mxgross

Command/EasyBackupBackupCommand.php

@@ -10,16 +10,15 @@
 namespace KimaiPlugin\EasyBackupBundle\Command;
 
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Security\Core\Exception\RuntimeException;
 
 use KimaiPlugin\EasyBackupBundle\Service\EasyBackupService;
 
 // the name of the command is what users type after "php bin/console"
 
-class EasyBackupBackupCommand extends ContainerAwareCommand
+class EasyBackupBackupCommand extends Command
 {
     protected static $defaultName = 'EasyBackup:backup';
     // the command description shown when running "php bin/console list"

Controller/EasyBackupController.php

@@ -21,6 +21,7 @@
 use Symfony\Component\Routing\Annotation\Route;
 
 use KimaiPlugin\EasyBackupBundle\Service\EasyBackupService;
+use Symfony\Component\Security\Core\Exception\RuntimeException;
 
 #[IsGranted('easy_backup')]
 #[Route('/admin/easy-backup')]
@@ -124,15 +125,15 @@ public function indexAction(): Response
     #[Route('/create_backup', name: 'create_backup', methods: ['GET', 'POST'])]
     public function createBackupAction(): Response
     {
-        $log = $this->easyBackupService->createBackup();
+        try {
+            $this->easyBackupService->createBackup();
+        } catch (RuntimeException $e) {
+            $this->flashError($e->getMessage());
 
-        if (preg_match('/ERROR/i', $log)) {
-            $this->flashError('backup.action.create.error');
-        } else {
+        } finally {
             $this->flashSuccess('backup.action.create.success');
+            return $this->redirectToRoute('easy_backup'); 
         }
-
-        return $this->redirectToRoute('easy_backup');
     }
 
     /**

Service/EasyBackupService.php

@@ -16,6 +16,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\Security\Core\Exception\RuntimeException;
 
 /**
  * @Service
@@ -75,7 +76,7 @@ private function log(string $logLevel, string $message): void
             $dateTime = date('Y-m-d H:i:s');
             $this->filesystem->appendToFile($logFile, "[$dateTime] $logLevel: $message" . PHP_EOL);
         } catch (\Exception $e) {
-            $this->flashError('filesystem.mkdir.error.backupDir');
+            throw new RuntimeException('filesystem.mkdir.error.backupDir');
         }
     }
 
@@ -262,8 +263,8 @@ public function backupDatabase(string $sqlDumpName): void
             $errorsStr = trim($errorsStr, PHP_EOL);
 
             if (!empty($errorsStr)) {
-                $this->flashError($errorsStr);
                 $this->log(self::LOG_ERROR_PREFIX, $errorsStr);
+                throw new RuntimeException($errorsStr);
             }
         }
     }
@@ -298,18 +299,18 @@ public function zipData(string $source, string $destination): bool
                         $zip->addFromString(basename($source), file_get_contents($source) ?: '');
                     }
                 } else {
-                    $this->flashError('backup.action.zip.error.destination');
                     $this->log(self::LOG_ERROR_PREFIX, "Couldn't open '$destination'.");
+                    throw new RuntimeException('backup.action.zip.error.destination');
                 }
 
                 return $zip->close();
             } else {
-                $this->flashError('backup.action.zip.error.source');
                 $this->log(self::LOG_ERROR_PREFIX, "Source file not found: '$source'.");
+                throw new RuntimeException('backup.action.zip.error.source');
             }
         } else {
-            $this->flashError('backup.action.zip.error.extension');
             $this->log(self::LOG_ERROR_PREFIX, "Extension 'zip' not found!");
+            throw new RuntimeException('backup.action.zip.error.extension');
         }
 
         return false;
@@ -345,10 +346,10 @@ public function execute(string $cmd, string $workdir = null): array
     public function getKimaiVersion(bool $full = false): string
     {
         if ($full) {
-            return Constants::SOFTWARE . ' - ' . Constants::VERSION; // . ' ' . Constants::STATUS;
+            return Constants::SOFTWARE . ' - ' . Constants::VERSION; // . ' ' . Constants::STATUS; TODO
         }
 
-        return Constants::VERSION; // . ' ' . Constants::STATUS;
+        return Constants::VERSION; // . ' ' . Constants::STATUS; // TODO
     }
 
     public function getExistingBackups(): array