Adjust tests to be compatible with newer Laravel versions, also remove device from sent data if no device was set

Author: Kovah

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.3, 8.2, 8.1]
+        php: [8.4, 8.3, 8.2, 8.1]
         laravel: ['8.*', '9.*', '10.*', '11.*', '12.*']
         include:
           - laravel: 10.*

composer.json

@@ -20,8 +20,7 @@
     "require-dev": {
         "mockery/mockery": "^1.3.1",
         "phpunit/phpunit": "^9.3 || ^10.5 || ^11.5.3",
-        "orchestra/testbench": "^8.0 || ^9.0 || ^10.0",
-        "dms/phpunit-arraysubset-asserts": ">=0.1.0"
+        "orchestra/testbench": "^8.0 || ^9.0 || ^10.0"
     },
     "suggest": {
         "ext-exif": "Required for image attachment support"

src/PushoverReceiver.php

@@ -11,7 +11,7 @@ class PushoverReceiver
     /**
      * PushoverReceiver constructor.
      *
-     * @param  string  $key  User or group key.
+     * @param string $key User or group key.
      */
     protected function __construct(string $key)
     {
@@ -21,7 +21,7 @@ protected function __construct(string $key)
     /**
      * Create new Pushover receiver with an user key.
      *
-     * @param  string  $userKey  Pushover user key.
+     * @param string $userKey Pushover user key.
      * @return PushoverReceiver
      */
     public static function withUserKey(string $userKey): PushoverReceiver
@@ -32,7 +32,7 @@ public static function withUserKey(string $userKey): PushoverReceiver
     /**
      * Create new Pushover receiver with a group key.
      *
-     * @param  string  $groupKey  Pushover group key.
+     * @param string $groupKey Pushover group key.
      * @return PushoverReceiver
      */
     public static function withGroupKey(string $groupKey): PushoverReceiver
@@ -45,7 +45,7 @@ public static function withGroupKey(string $groupKey): PushoverReceiver
     /**
      * Send the message to a specific device.
      *
-     * @param  array|string  $device
+     * @param array|string $device
      * @return PushoverReceiver
      */
     public function toDevice(array|string $device): static
@@ -81,9 +81,18 @@ public function withApplicationToken($token): static
      */
     public function toArray(): array
     {
-        return array_merge([
+        $data = [
             'user' => $this->key,
-            'device' => implode(',', $this->devices),
-        ], $this->token ? ['token' => $this->token] : []);
+        ];
+
+        if (!empty($this->devices)) {
+            $data['device'] = implode(',', $this->devices);
+        }
+
+        if ($this->token) {
+            $data['token'] = $this->token;
+        }
+
+        return $data;
     }
 }

tests/PushoverReceiverTest.php

@@ -2,7 +2,6 @@
 
 namespace NotificationChannels\Pushover\Test;
 
-use DMS\PHPUnitExtensions\ArraySubset\Assert;
 use NotificationChannels\Pushover\PushoverReceiver;
 use Orchestra\Testbench\TestCase;
 
@@ -20,23 +19,30 @@ public function it_can_set_up_a_receiver_with_an_user_key()
     {
         $pushoverReceiver = PushoverReceiver::withUserKey('pushover-key');
 
-        Assert::assertArraySubset(['user' => 'pushover-key'], $pushoverReceiver->toArray());
+        $this->assertEquals([
+            'user' => 'pushover-key',
+        ], $pushoverReceiver->toArray());
     }
 
     /** @test */
     public function it_can_set_up_a_receiver_with_a_group_key()
     {
         $pushoverReceiver = PushoverReceiver::withGroupKey('pushover-key');
 
-        Assert::assertArraySubset(['user' => 'pushover-key'], $pushoverReceiver->toArray());
+        $this->assertEquals([
+            'user' => 'pushover-key',
+        ], $pushoverReceiver->toArray());
     }
 
     /** @test */
     public function it_can_set_up_a_receiver_with_an_application_token()
     {
         $pushoverReceiver = PushoverReceiver::withUserKey('pushover-key')->withApplicationToken('pushover-token');
 
-        Assert::assertArraySubset(['user' => 'pushover-key', 'token' => 'pushover-token'], $pushoverReceiver->toArray());
+        $this->assertEquals([
+            'user' => 'pushover-key',
+            'token' => 'pushover-token',
+        ], $pushoverReceiver->toArray());
     }
 
     /** @test */
@@ -54,24 +60,34 @@ public function it_can_add_a_single_device_to_the_receiver()
     {
         $this->pushoverReceiver->toDevice('iphone');
 
-        Assert::assertArraySubset(['device' => 'iphone'], $this->pushoverReceiver->toArray());
+        $this->assertEquals([
+            'user' => 'pushover-key',
+            'device' => 'iphone',
+        ], $this->pushoverReceiver->toArray());
     }
 
     /** @test */
     public function it_can_add_multiple_devices_to_the_receiver()
     {
-        $this->pushoverReceiver->toDevice('iphone')
+        $this->pushoverReceiver
+            ->toDevice('iphone')
             ->toDevice('desktop')
             ->toDevice('macbook');
 
-        Assert::assertArraySubset(['device' => 'iphone,desktop,macbook'], $this->pushoverReceiver->toArray());
+        $this->assertEquals([
+            'user' => 'pushover-key',
+            'device' => 'iphone,desktop,macbook',
+        ], $this->pushoverReceiver->toArray());
     }
 
     /** @test */
     public function it_can_add_an_array_of_devices_to_the_receiver()
     {
         $this->pushoverReceiver->toDevice(['iphone', 'desktop', 'macbook']);
 
-        Assert::assertArraySubset(['device' => 'iphone,desktop,macbook'], $this->pushoverReceiver->toArray());
+        $this->assertEquals([
+            'user' => 'pushover-key',
+            'device' => 'iphone,desktop,macbook',
+        ], $this->pushoverReceiver->toArray());
     }
 }