Merge pull request #94 from jolicode/tweaks

Fix permissions on Windows notifiers binaries
jolicode · May 24, 2023 · 54eaea5 · 54eaea5
2 parents a6ceac9 + 39ba3f3
commit 54eaea5
Show file tree

Hide file tree

Showing 27 changed files with 11 additions and 252 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changes between versions
 
+## Not yet released
+
+* Fixed permissions on Windows notifiers binaries
+
 ## 2.5.0 (2022-12-24)
 
 * Dropped support for PHP 7.4

diff --git a/bin/notifu/notifu.exe b/bin/notifu/notifu.exe
diff --git a/bin/snoreToast/snoretoast-x86.exe b/bin/snoreToast/snoretoast-x86.exe
diff --git a/example/index.php b/example/index.php
@@ -31,4 +31,4 @@
 
 $result = $notifier->send($notification);
 
-echo 'Notification ', $result ? 'successfully sent' : 'failed', ' with ', get_class($notifier), \PHP_EOL;
+echo 'Notification ', $result ? 'successfully sent' : 'failed', ' with ', $notifier::class, \PHP_EOL;
diff --git a/src/Notifier/AppleScriptNotifier.php b/src/Notifier/AppleScriptNotifier.php
@@ -19,9 +19,6 @@
  */
 class AppleScriptNotifier extends CliBasedNotifier
 {
-    /**
-     * {@inheritdoc}
-     */
     public function isSupported(): bool
     {
         if (OsHelper::isMacOS() && version_compare(OsHelper::getMacOSVersion(), '10.9.0', '>=')) {
@@ -31,25 +28,16 @@ public function isSupported(): bool
         return false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getBinary(): string
     {
         return 'osascript';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority(): int
     {
         return static::PRIORITY_LOW;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getCommandLineArguments(Notification $notification): array
     {
         $script = 'display notification "' . str_replace('"', '\\"', $notification->getBody()) . '"';

diff --git a/src/Notifier/CliBasedNotifier.php b/src/Notifier/CliBasedNotifier.php
@@ -30,9 +30,6 @@ abstract class CliBasedNotifier implements Notifier
      */
     private int $support = self::SUPPORT_UNKNOWN;
 
-    /**
-     * {@inheritdoc}
-     */
     public function isSupported(): bool
     {
         if (self::SUPPORT_UNKNOWN !== $this->support) {
@@ -56,9 +53,6 @@ public function isSupported(): bool
         return false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function send(Notification $notification): bool
     {
         if (!$notification->getBody()) {

diff --git a/src/Notifier/GrowlNotifyNotifier.php b/src/Notifier/GrowlNotifyNotifier.php
@@ -18,25 +18,16 @@
  */
 class GrowlNotifyNotifier extends CliBasedNotifier
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getBinary(): string
     {
         return 'growlnotify';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority(): int
     {
         return static::PRIORITY_HIGH;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getCommandLineArguments(Notification $notification): array
     {
         $arguments = [

diff --git a/src/Notifier/KDialogNotifier.php b/src/Notifier/KDialogNotifier.php
@@ -19,25 +19,16 @@
  */
 class KDialogNotifier extends CliBasedNotifier
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getBinary(): string
     {
         return 'kdialog';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority(): int
     {
         return static::PRIORITY_HIGH;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getCommandLineArguments(Notification $notification): array
     {
         $arguments = [];

diff --git a/src/Notifier/NotifuNotifier.php b/src/Notifier/NotifuNotifier.php
@@ -20,57 +20,36 @@
  */
 class NotifuNotifier extends CliBasedNotifier implements BinaryProvider
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getBinary(): string
     {
         return 'notifu';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority(): int
     {
         return static::PRIORITY_LOW;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function canBeUsed(): bool
     {
         return OsHelper::isWindows() && OsHelper::isWindowsSeven();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRootDir(): string
     {
         return \dirname(__DIR__, 2) . '/bin/notifu';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getEmbeddedBinary(): string
     {
         return 'notifu.exe';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getExtraFiles(): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getCommandLineArguments(Notification $notification): array
     {
         $arguments = [

diff --git a/src/Notifier/NotifySendNotifier.php b/src/Notifier/NotifySendNotifier.php
@@ -19,25 +19,16 @@
  */
 class NotifySendNotifier extends CliBasedNotifier
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getBinary(): string
     {
         return 'notify-send';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority(): int
     {
         return static::PRIORITY_MEDIUM;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getCommandLineArguments(Notification $notification): array
     {
         $arguments = [];

diff --git a/src/Notifier/NullNotifier.php b/src/Notifier/NullNotifier.php
@@ -16,25 +16,16 @@
 
 class NullNotifier implements Notifier
 {
-    /**
-     * {@inheritdoc}
-     */
     public function isSupported(): bool
     {
         return true;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority(): int
     {
         return static::PRIORITY_LOW;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function send(Notification $notification): bool
     {
         return false;

diff --git a/src/Notifier/SnoreToastNotifier.php b/src/Notifier/SnoreToastNotifier.php
@@ -21,60 +21,38 @@
  */
 class SnoreToastNotifier extends CliBasedNotifier implements BinaryProvider
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getBinary(): string
     {
         return 'snoretoast';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority(): int
     {
         return static::PRIORITY_MEDIUM;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function canBeUsed(): bool
     {
         return
             (OsHelper::isWindows() && OsHelper::isWindowsEightOrHigher())
-            || OsHelper::isWindowsSubsystemForLinux()
-        ;
+            || OsHelper::isWindowsSubsystemForLinux();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRootDir(): string
     {
         return \dirname(__DIR__, 2) . '/bin/snoreToast';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getEmbeddedBinary(): string
     {
         return 'snoretoast-x86.exe';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getExtraFiles(): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getCommandLineArguments(Notification $notification): array
     {
         $arguments = [
@@ -95,9 +73,6 @@ protected function getCommandLineArguments(Notification $notification): array
         return $arguments;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function handleExitCode(Process $process): bool
     {
         return 0 < $process->getExitCode();

diff --git a/src/Notifier/TerminalNotifierNotifier.php b/src/Notifier/TerminalNotifierNotifier.php
@@ -20,25 +20,16 @@
  */
 class TerminalNotifierNotifier extends CliBasedNotifier
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getBinary(): string
     {
         return 'terminal-notifier';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority(): int
     {
         return static::PRIORITY_MEDIUM;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getCommandLineArguments(Notification $notification): array
     {
         $arguments = [

diff --git a/src/Notifier/ToasterNotifier.php b/src/Notifier/ToasterNotifier.php
@@ -22,52 +22,33 @@
  */
 class ToasterNotifier extends CliBasedNotifier implements BinaryProvider
 {
-    /**
-     * {@inheritdoc}
-     */
     public function getBinary(): string
     {
         return 'toast';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getPriority(): int
     {
         return static::PRIORITY_MEDIUM;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function canBeUsed(): bool
     {
         return
             (OsHelper::isWindows() && OsHelper::isWindowsEightOrHigher())
-            || OsHelper::isWindowsSubsystemForLinux()
-        ;
+            || OsHelper::isWindowsSubsystemForLinux();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRootDir(): string
     {
         return \dirname(__DIR__, 2) . '/bin/toaster';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getEmbeddedBinary(): string
     {
         return 'toast.exe';
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getExtraFiles(): array
     {
         return [
@@ -76,9 +57,6 @@ public function getExtraFiles(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getCommandLineArguments(Notification $notification): array
     {
         $arguments = [
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,4 @@

		$result = $notifier->send($notification);

		echo 'Notification ', $result ? 'successfully sent' : 'failed', ' with ', get_class($notifier), \PHP_EOL;
		echo 'Notification ', $result ? 'successfully sent' : 'failed', ' with ', $notifier::class, \PHP_EOL;