Merge pull request #112 from shadoWalker89/main

Add AbstractCliBasedDriver::launchProcess()
jolicode · Sep 30, 2024 · 1320ed1 · 1320ed1
2 parents b34dac1 + a4ed372
commit 1320ed1
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 10 deletions.
diff --git a/example/index.php b/example/index.php
@@ -32,4 +32,4 @@
 
 $driver = $notifier->getDriver();
 
-echo 'Notification ', $result ? 'successfully sent' : 'failed', ' with ', str_replace('Joli\\JoliNotif\\Driver\\', '', $driver::class), \PHP_EOL;
+echo 'Notification ', $result ? 'successfully sent' : 'failed', ' with ', str_replace('Joli\JoliNotif\Driver\\', '', $driver::class), \PHP_EOL;
diff --git a/src/DefaultNotifier.php b/src/DefaultNotifier.php
@@ -34,7 +34,7 @@ public function __construct(
         ?LoggerInterface $logger = null,
         /** @var list<DriverInterface> $additionalDrivers */
         private readonly array $additionalDrivers = [],
-        private readonly bool $useOnlyAdditionalDrivers = false
+        private readonly bool $useOnlyAdditionalDrivers = false,
     ) {
         $this->logger = $logger ?? new NullLogger();
     }

diff --git a/src/Driver/AbstractCliBasedDriver.php b/src/Driver/AbstractCliBasedDriver.php
@@ -81,7 +81,7 @@ public function send(Notification $notification): bool
         }
 
         $process = new Process(array_merge([$binary], $arguments));
-        $process->run();
+        $this->launchProcess($process);
 
         return $this->handleExitCode($process);
     }
@@ -125,6 +125,11 @@ protected function isBinaryAvailable(): bool
         return $process->isSuccessful();
     }
 
+    protected function launchProcess(Process $process): void
+    {
+        $process->run();
+    }
+
     /**
      * Return whether the process executed successfully.
      */

diff --git a/src/Driver/AppleScriptDriver.php b/src/Driver/AppleScriptDriver.php
@@ -42,18 +42,18 @@ public function getPriority(): int
 
     protected function getCommandLineArguments(Notification $notification): array
     {
-        $script = 'display notification "' . str_replace('"', '\\"', $notification->getBody() ?? '') . '"';
+        $script = 'display notification "' . str_replace('"', '\"', $notification->getBody() ?? '') . '"';
 
         if ($notification->getTitle()) {
-            $script .= ' with title "' . str_replace('"', '\\"', $notification->getTitle()) . '"';
+            $script .= ' with title "' . str_replace('"', '\"', $notification->getTitle()) . '"';
         }
 
         if ($notification->getOption('subtitle')) {
-            $script .= ' subtitle "' . str_replace('"', '\\"', (string) $notification->getOption('subtitle')) . '"';
+            $script .= ' subtitle "' . str_replace('"', '\"', (string) $notification->getOption('subtitle')) . '"';
         }
 
         if ($notification->getOption('sound')) {
-            $script .= ' sound name "' . str_replace('"', '\\"', (string) $notification->getOption('sound')) . '"';
+            $script .= ' sound name "' . str_replace('"', '\"', (string) $notification->getOption('sound')) . '"';
         }
 
         return [

diff --git a/src/Driver/NotifuDriver.php b/src/Driver/NotifuDriver.php
@@ -13,6 +13,7 @@
 
 use Joli\JoliNotif\Notification;
 use JoliCode\PhpOsHelper\OsHelper;
+use Symfony\Component\Process\Process;
 
 /**
  * This driver can be used on Windows Seven and provides its own binaries if
@@ -71,4 +72,14 @@ protected function getCommandLineArguments(Notification $notification): array
 
         return $arguments;
     }
+
+    protected function launchProcess(Process $process): void
+    {
+        $process->start();
+    }
+
+    protected function handleExitCode(Process $process): bool
+    {
+        return true;
+    }
 }
diff --git a/src/Driver/SnoreToastDriver.php b/src/Driver/SnoreToastDriver.php
@@ -75,8 +75,13 @@ protected function getCommandLineArguments(Notification $notification): array
         return $arguments;
     }
 
+    protected function launchProcess(Process $process): void
+    {
+        $process->start();
+    }
+
     protected function handleExitCode(Process $process): bool
     {
-        return 0 < $process->getExitCode();
+        return true;
     }
 }
diff --git a/src/Exception/InvalidNotificationException.php b/src/Exception/InvalidNotificationException.php
@@ -21,7 +21,7 @@ public function __construct(
         Notification $notification,
         string $message = '',
         int $code = 0,
-        ?\Throwable $previous = null
+        ?\Throwable $previous = null,
     ) {
         $this->notification = $notification;
 

diff --git a/src/Exception/NoSupportedNotifierException.php b/src/Exception/NoSupportedNotifierException.php
@@ -21,7 +21,7 @@ class NoSupportedNotifierException extends \RuntimeException implements Exceptio
     public function __construct(
         string $message = 'No supported notifier',
         int $code = 0,
-        ?\Throwable $previous = null
+        ?\Throwable $previous = null,
     ) {
         parent::__construct($message, $code, $previous);
     }