fix: exceptions handling (#189)

* fix: exception handling * style: formatting * fix: return type
NotFoundNL · Jan 31, 2024 · e7a302f · e7a302f
1 parent 9362bac
commit e7a302f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/Helpers/SitebossHelper.php b/src/Helpers/SitebossHelper.php
@@ -40,7 +40,7 @@ public static function config(string $code, bool $failOnMissing = true): string|
         return self::$config[$code]['value'];
     }
 
-    public static function mail(string $to_name, string $to_email, string $subject, $html, $data = false)
+    public static function mail(string $to_name, string $to_email, string $subject, $html, $data = false): ?int
     {
         $sendgrid_api_key = self::config('sendgrid_api_key', true);
         $sendgrid_sender_email = self::config('sendgrid_sender_email', true);
@@ -60,22 +60,16 @@ public static function mail(string $to_name, string $to_email, string $subject,
             }
         }
 
-        // if ($data != false) {
-        //     // HTML is a Twig template with data
-        //     if(!site::$page->twig)
-        //     {
-        //         site::$page->getTwig();
-        //     }
-        //     $html = site::$page->twig->render($html, $data);
-        // }
         $email->addContent('text/html', $html);
         $sendgrid = new \SendGrid($sendgrid_api_key);
         try {
             $response = $sendgrid->send($email);
 
             return $response->statusCode();
         } catch (\Exception $e) {
-            echo 'Caught exception: '.$e->getMessage()."\n";
+            Log::error('Caught exception: '.$e->getMessage());
+
+            return null;
         }
     }
 

diff --git a/src/Services/ClamAV/ClamAV.php b/src/Services/ClamAV/ClamAV.php
@@ -94,7 +94,7 @@ private static function getClamAVSocket(): string
             $unixSocket = config('clamav.unix_socket');
 
             return 'unix://'.$unixSocket;
-        } else {
+        } elseif ($preferredSocket === 'tcp') {
             $tcpSocket = config('clamav.tcp_socket');
 
             return $tcpSocket;