Merge pull request #74 from TheDragonCode/1.x

The `without-*` options was renamed to `except-*`

Author: andrey-helldar

README.md

@@ -85,8 +85,8 @@ By default, only those Issues and Pull Requests that have been closed or merged
 But you can define the parameters yourself:
 
 ```Bash
--i, --without-issues  Exclude issues from processing
--s, --without-pulls   Exclude Pull Requests from processing
+-i, --except-issues  Exclude issues from processing
+-p, --except-pulls   Exclude Pull Requests from processing
 -o, --with-open       Process including open Issues and Pull Requests
 -n, --no-interaction  Do not ask any interactive question
 -q, --quiet           Do not output any message
@@ -95,7 +95,7 @@ But you can define the parameters yourself:
 For example:
 
 ```Bash
-# without issues + with open
+# except issues + with open
 notifications read qwerty -ion
 ```
 

app/Commands/ReadCommand.php

@@ -15,8 +15,8 @@ class ReadCommand extends Command
 {
     protected $signature = 'read'
         . ' {repository?* : Full or partial repository names}'
-        . ' {--i|without-issues : Exclude issues from processing}'
-        . ' {--s|without-pulls : Exclude Pull Requests from processing}'
+        . ' {--i|except-issues : Exclude issues from processing}'
+        . ' {--p|except-pulls : Exclude Pull Requests from processing}'
         . ' {--o|with-open : Process including open Issues and Pull Requests}'
         . ' {--token= : Specifies the token to use}';
 
@@ -55,8 +55,8 @@ protected function read(array $repositories): void
     {
         $this->gitHub()
             ->repositories($repositories)
-            ->withoutIssues($this->withoutIssues())
-            ->withoutPulls($this->withoutPulls())
+            ->exceptIssues($this->exceptIssues())
+            ->exceptPulls($this->exceptPulls())
             ->withOpen($this->withOpen())
             ->when(
                 $this->shouldBeAll($repositories),
@@ -68,8 +68,8 @@ protected function read(array $repositories): void
     protected function shouldBeAll(array $repositories): bool
     {
         return empty($repositories)
-            && ! $this->withoutIssues()
-            && ! $this->withoutPulls()
+            && ! $this->exceptIssues()
+            && ! $this->exceptPulls()
             && $this->withOpen();
     }
 
@@ -93,14 +93,14 @@ protected function repositories(): array
             ->all();
     }
 
-    protected function withoutIssues(): bool
+    protected function exceptIssues(): bool
     {
-        return $this->option('without-issues');
+        return $this->option('except-issues');
     }
 
-    protected function withoutPulls(): bool
+    protected function exceptPulls(): bool
     {
-        return $this->option('without-pulls');
+        return $this->option('except-pulls');
     }
 
     protected function withOpen(): bool

app/Services/GitHub.php

@@ -17,9 +17,9 @@ class GitHub
 {
     protected array $repositories = [];
 
-    protected bool $withoutIssues = false;
+    protected bool $exceptIssues = false;
 
-    protected bool $withoutPulls = false;
+    protected bool $exceptPulls = false;
 
     protected bool $withOpen = false;
 
@@ -40,16 +40,16 @@ public function repositories(array $repositories): self
         return $this;
     }
 
-    public function withoutIssues(bool $withoutIssues): self
+    public function exceptIssues(bool $exceptIssues): self
     {
-        $this->withoutIssues = $withoutIssues;
+        $this->exceptIssues = $exceptIssues;
 
         return $this;
     }
 
-    public function withoutPulls(bool $withoutPulls): self
+    public function exceptPulls(bool $exceptPulls): self
     {
-        $this->withoutPulls = $withoutPulls;
+        $this->exceptPulls = $exceptPulls;
 
         return $this;
     }
@@ -151,11 +151,11 @@ protected function shouldSkip(NotificationData $notification, ItemData $item): b
             return true;
         }
 
-        if ($this->withoutIssues && $notification->type === 'Issue') {
+        if ($this->exceptIssues && $notification->type === 'Issue') {
             return true;
         }
 
-        if ($this->withoutPulls && $notification->type === 'PullRequest') {
+        if ($this->exceptPulls && $notification->type === 'PullRequest') {
             return true;
         }