fix: Made code stricter

Author: alexsoft

src/Pushbullet.php

@@ -1,5 +1,7 @@
 <?php
 
+ declare(strict_types=1);
+
 namespace NotificationChannels\Pushbullet;
 
 use Exception;
@@ -10,10 +12,10 @@
 class Pushbullet
 {
     /** @var string */
-    protected $token;
+    private $token;
 
     /** @var \GuzzleHttp\Client */
-    protected $httpClient;
+    private $httpClient;
 
     /**
      * Create small Pushbullet client.
@@ -24,7 +26,6 @@ class Pushbullet
     public function __construct($token, HttpClient $httpClient)
     {
         $this->token = $token;
-
         $this->httpClient = $httpClient;
     }
 
@@ -33,7 +34,7 @@ public function __construct($token, HttpClient $httpClient)
      *
      * @return string
      */
-    protected function getPushbulletUrl()
+    private function getPushbulletUrl(): string
     {
         return 'https://api.pushbullet.com/v2/pushes';
     }
@@ -43,7 +44,7 @@ protected function getPushbulletUrl()
      *
      * @return array
      */
-    protected function getHeaders()
+    private function getHeaders(): array
     {
         return [
             'Access-Token' => $this->token,

src/PushbulletChannel.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace NotificationChannels\Pushbullet;
 
 use Illuminate\Notifications\Notification;
@@ -9,10 +11,8 @@
 
 class PushbulletChannel
 {
-    /**
-     * @var \NotificationChannels\Pushbullet\Pushbullet
-     */
-    protected $pushbullet;
+    /** @var \NotificationChannels\Pushbullet\Pushbullet */
+    private $pushbullet;
 
     /**
      * Create pushbullet notification channel.
@@ -31,7 +31,7 @@ public function __construct(Pushbullet $pushbullet)
      *
      * @throws \NotificationChannels\Pushbullet\Exceptions\CouldNotSendNotification
      */
-    public function send($notifiable, Notification $notification)
+    public function send($notifiable, Notification $notification): void
     {
         if (! $target = $this->getTarget($notifiable)) {
             return;
@@ -45,12 +45,13 @@ public function send($notifiable, Notification $notification)
 
     /**
      * @param $notifiable
+     *
      * @return  \NotificationChannels\Pushbullet\Targets\Targetable|void
      */
-    protected function getTarget($notifiable)
+    private function getTarget($notifiable): ?Targetable
     {
         if (! $target = $notifiable->routeNotificationFor('pushbullet')) {
-            return;
+            return null;
         }
 
         if ($target instanceof Targetable) {

src/PushbulletMessage.php

@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace NotificationChannels\Pushbullet;
 
 use NotificationChannels\Pushbullet\Targets\Targetable;
 
 class PushbulletMessage
 {
-    const TYPE_NOTE = 'note';
-    const TYPE_LINK = 'link';
+    private const TYPE_NOTE = 'note';
+    private const TYPE_LINK = 'link';
 
     /**
      * Type of message (currently: note or link).
@@ -45,7 +47,7 @@ class PushbulletMessage
      *
      * @return static
      */
-    public static function create($message)
+    public static function create($message): self
     {
         return new static($message);
     }
@@ -63,7 +65,7 @@ public function __construct($message)
      *
      * @return $this
      */
-    public function target(Targetable $targetable)
+    public function target(Targetable $targetable): self
     {
         $this->target = $targetable;
 
@@ -75,9 +77,9 @@ public function target(Targetable $targetable)
      *
      * @return $this
      */
-    public function note()
+    public function note(): self
     {
-        $this->type = static::TYPE_NOTE;
+        $this->type = self::TYPE_NOTE;
 
         return $this;
     }
@@ -87,9 +89,9 @@ public function note()
      *
      * @return $this
      */
-    public function link()
+    public function link(): self
     {
-        $this->type = static::TYPE_LINK;
+        $this->type = self::TYPE_LINK;
 
         return $this;
     }
@@ -101,7 +103,7 @@ public function link()
      *
      * @return $this
      */
-    public function title($title)
+    public function title($title): self
     {
         $this->title = $title;
 
@@ -115,7 +117,7 @@ public function title($title)
      *
      * @return $this
      */
-    public function message($message)
+    public function message($message): self
     {
         $this->message = $message;
 
@@ -129,7 +131,7 @@ public function message($message)
      *
      * @return $this
      */
-    public function url($url)
+    public function url($url): self
     {
         $this->url = $url;
 
@@ -141,7 +143,7 @@ public function url($url)
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         $payload = [
             'type' => $this->type,
@@ -159,15 +161,15 @@ public function toArray()
     /**
      * @return bool
      */
-    private function isLink()
+    private function isLink(): bool
     {
-        return $this->type === static::TYPE_LINK;
+        return $this->type === self::TYPE_LINK;
     }
 
     /**
      * @return array
      */
-    private function getUrlParameter()
+    private function getUrlParameter(): array
     {
         return $this->isLink() ? ['url' => $this->url] : [];
     }

src/PushbulletServiceProvider.php

@@ -1,24 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 namespace NotificationChannels\Pushbullet;
 
 use GuzzleHttp\Client as HttpClient;
 use Illuminate\Support\ServiceProvider;
 
 class PushbulletServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the application services.
-     */
     public function boot()
     {
-        // Bootstrap code here.
         $this->app->when(PushbulletChannel::class)
             ->needs(Pushbullet::class)
             ->give(function () {
                 $config = config('services.pushbullet');
 
-                return new Pushbullet($config['access_token'], new HttpClient);
+                return new Pushbullet($config['access_token'], new HttpClient());
             });
     }
 }

tests/PushbulletMessageTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace NotificationChannels\Pushbullet\Test;
 
 use NotificationChannels\Pushbullet\PushbulletMessage;
@@ -12,6 +14,14 @@
  */
 class PushbulletMessageTest extends TestCase
 {
+    /** @test */
+    public function message_can_be_created_by_static_function()
+    {
+        $message = PushbulletMessage::create('Hello');
+
+        $this->assertEquals('Hello', $message->message);
+    }
+
     /** @test */
     public function message_can_be_instantiated_with_text()
     {
@@ -25,7 +35,7 @@ public function new_message_is_of_note_type()
     {
         $message = new PushbulletMessage('Hello');
 
-        $this->assertEquals(PushbulletMessage::TYPE_NOTE, $message->type);
+        $this->assertEquals('note', $message->type);
     }
 
     /** @test */
@@ -35,7 +45,7 @@ public function message_can_be_set_to_link_type()
 
         $message->link();
 
-        $this->assertEquals(PushbulletMessage::TYPE_LINK, $message->type);
+        $this->assertEquals('link', $message->type);
     }
 
     /** @test */
@@ -47,7 +57,7 @@ public function message_can_be_set_to_note_type()
 
         $message->note();
 
-        $this->assertEquals(PushbulletMessage::TYPE_NOTE, $message->type);
+        $this->assertEquals('note', $message->type);
     }
 
     /** @test */