Merge pull request #67 from laravel-notification-channels/laravel-shift-l12-compatibility

Kovah · web-flow · commit 4c7dd17db487 · 2025-02-25T23:26:48.000+01:00
Laravel shift l12 compatibility
diff --git a/.editorconfig b/.editorconfig
@@ -13,3 +13,6 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.{yaml,yml}]
+indent_size = 2
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,8 +1,10 @@
 name: Tests
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   test:
@@ -13,20 +15,54 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.3, 8.2, 8.1]
-        laravel: ['8.*', '9.*', '10.*', '11.*']
+        php: [ 8.4, 8.3, 8.2, 8.1 ]
+        laravel: [ '10.*', '11.*', '12.*' ]
         include:
           - laravel: 10.*
             testbench: 8.*
-          - laravel: 9.*
-            testbench: 7.*
-          - laravel: 8.*
-            testbench: 6.*
           - laravel: 11.*
             testbench: 9.*
+          - laravel: 12.*
+            testbench: 10.*
         exclude:
           - laravel: 11.*
             php: 8.1
+          - laravel: 12.*
+            php: 8.1
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set correct PHP version
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: pcov
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --prefer-stable --prefer-dist --no-interaction --no-suggest
+
+      - name: Execute tests
+        run: vendor/bin/phpunit -c phpunit.xml.dist
+
+  test-legacy:
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [ 8.4, 8.3, 8.2, 8.1 ]
+        laravel: [ '8.*', '9.*' ]
+        include:
+          - laravel: 8.*
+            testbench: 6.*
+          - laravel: 9.*
+            testbench: 7.*
 
     steps:
       - name: Checkout code
@@ -44,4 +80,5 @@ jobs:
           composer update --prefer-stable --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests
-        run: vendor/bin/phpunit
+        run: vendor/bin/phpunit -c phpunit.xml.legacy.dist
+
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/.phpunit.cache
 /vendor
 build
 .phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -9,19 +9,24 @@
             "email": "mail@casperboone.nl",
             "homepage": "https://casperboone.nl",
             "role": "Developer"
+        },
+        {
+            "name": "Kevin Woblick",
+            "email": "contact@woblick.dev",
+            "homepage": "https://woblick.dev",
+            "role": "Developer"
         }
     ],
     "require": {
         "php": "^8.1",
         "guzzlehttp/guzzle": "^7.0.1",
-        "illuminate/notifications": "^8.0 || ^9.0 || ^10.0 || ^11.0",
-        "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0"
+        "illuminate/notifications": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
+        "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.1",
-        "phpunit/phpunit": "^9.3 || ^10.5",
-        "orchestra/testbench": "^8.0 || ^9.0",
-        "dms/phpunit-arraysubset-asserts": ">=0.1.0"
+        "phpunit/phpunit": "^9.3 || ^10.5 || ^11.5.3",
+        "orchestra/testbench": "^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
     },
     "suggest": {
         "ext-exif": "Required for image attachment support"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         executionOrder="depends,defects"
+         beStrictAboutOutputDuringTests="true"
+         displayDetailsOnPhpunitDeprecations="true"
+         failOnRisky="true">
+
     <testsuites>
         <testsuite name="Laravel Pushover Notifications Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <coverage>
+
+    <source restrictNotices="true" restrictWarnings="true">
         <include>
-            <directory suffix=".php">./src</directory>
+            <directory>src</directory>
         </include>
+    </source>
+
+    <coverage>
         <report>
             <html outputDirectory="build/coverage"/>
             <text outputFile="build/coverage.txt"/>
             <clover outputFile="build/logs/clover.xml"/>
         </report>
     </coverage>
+
     <logging>
         <junit outputFile="build/report.junit.xml"/>
     </logging>
diff --git a/phpunit.xml.legacy.dist b/phpunit.xml.legacy.dist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         verbose="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
+    <testsuites>
+        <testsuite name="Laravel Pushover Notifications Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <coverage>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <report>
+            <html outputDirectory="build/coverage"/>
+            <text outputFile="build/coverage.txt"/>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
+    </coverage>
+    <logging>
+        <junit outputFile="build/report.junit.xml"/>
+    </logging>
+</phpunit>
diff --git a/src/PushoverReceiver.php b/src/PushoverReceiver.php
@@ -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;
     }
 }
diff --git a/tests/PushoverChannelTest.php b/tests/PushoverChannelTest.php
@@ -47,14 +47,15 @@ public function it_can_send_a_message_to_pushover(): void
     {
         $notifiable = new Notifiable;
 
-        $this->notification->shouldReceive('toPushover')
+        $this->notification
+            ->shouldReceive('toPushover')
             ->with($notifiable)
             ->andReturn($this->message);
 
-        $this->pushover->shouldReceive('send')
+        $this->pushover
+            ->shouldReceive('send')
             ->with(Mockery::subset([
                 'user' => 'pushover-key-30characters-long',
-                'device' => '',
             ]), $notifiable)
             ->once();
 
@@ -66,11 +67,13 @@ public function it_can_send_a_message_to_pushover_using_a_pushover_receiver(): v
     {
         $notifiable = new NotifiableWithPushoverReceiver;
 
-        $this->notification->shouldReceive('toPushover')
+        $this->notification
+            ->shouldReceive('toPushover')
             ->with($notifiable)
             ->andReturn($this->message);
 
-        $this->pushover->shouldReceive('send')
+        $this->pushover
+            ->shouldReceive('send')
             ->with(Mockery::subset([
                 'user' => 'pushover-key-30characters-long',
                 'device' => 'iphone,desktop',
diff --git a/tests/PushoverReceiverTest.php b/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());
     }
 }
diff --git a/tests/PushoverServiceProviderTest.php b/tests/PushoverServiceProviderTest.php
@@ -2,7 +2,7 @@
 
 namespace NotificationChannels\Pushover\Test;
 
-use Illuminate\Contracts\Foundation\Application;
+use GuzzleHttp\Client as HttpClient;
 use Illuminate\Support\Facades\Config;
 use Mockery;
 use NotificationChannels\Pushover\Pushover;
@@ -15,30 +15,27 @@ class PushoverServiceProviderTest extends TestCase
     /** @var PushoverServiceProvider */
     protected $provider;
 
-    /** @var Application */
-    protected $app;
-
     public function setUp(): void
     {
         parent::setUp();
 
-        $this->app = Mockery::mock(Application::class);
         $this->provider = new PushoverServiceProvider($this->app);
-
-        $this->app->shouldReceive('flush');
     }
 
     /** @test */
     public function it_gives_an_instantiated_pushover_object_when_the_channel_asks_for_it(): void
     {
         Config::shouldReceive('get')->with('services.pushover.token', null)->once()->andReturn('test-token');
+        Config::shouldReceive('get')->with('database.default')->andReturn('array');
+        Config::shouldReceive('get')->with('database.connections.array')->andReturn(['driver' => 'array']);
 
-        $this->app->shouldReceive('when')->with(PushoverChannel::class)->once()->andReturn($this->app);
-        $this->app->shouldReceive('needs')->with(Pushover::class)->once()->andReturn($this->app);
-        $this->app->shouldReceive('give')->with(Mockery::on(function ($pushover) {
-            return $pushover() instanceof Pushover;
-        }))->once();
+        $this->app->when(PushoverChannel::class)->needs(Pushover::class)->give(function () {
+            return new Pushover(Mockery::mock(HttpClient::class), 'test-token');
+        });
 
         $this->provider->boot();
+
+        $pushover = $this->app->get(PushoverChannel::class);
+        $this->assertInstanceOf(PushoverChannel::class, $pushover);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/.phpunit.cache`
`1`	`2`	`/vendor`
`2`	`3`	`build`
`3`	`4`	`.phpunit.result.cache`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace NotificationChannels\Pushover\Test;`
`4`	`4`
`5`		`-use DMS\PHPUnitExtensions\ArraySubset\Assert;`
`6`	`5`	`use NotificationChannels\Pushover\PushoverReceiver;`
`7`	`6`	`use Orchestra\Testbench\TestCase;`
`8`	`7`
`@@ -20,23 +19,30 @@ public function it_can_set_up_a_receiver_with_an_user_key()`
`20`	`19`	`{`
`21`	`20`	`$pushoverReceiver = PushoverReceiver::withUserKey('pushover-key');`
`22`	`21`
`23`		`- Assert::assertArraySubset(['user' => 'pushover-key'], $pushoverReceiver->toArray());`
	`22`	`+ $this->assertEquals([`
	`23`	`+ 'user' => 'pushover-key',`
	`24`	`+ ], $pushoverReceiver->toArray());`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`/** @test */`
`27`	`28`	`public function it_can_set_up_a_receiver_with_a_group_key()`
`28`	`29`	`{`
`29`	`30`	`$pushoverReceiver = PushoverReceiver::withGroupKey('pushover-key');`
`30`	`31`
`31`		`- Assert::assertArraySubset(['user' => 'pushover-key'], $pushoverReceiver->toArray());`
	`32`	`+ $this->assertEquals([`
	`33`	`+ 'user' => 'pushover-key',`
	`34`	`+ ], $pushoverReceiver->toArray());`
`32`	`35`	`}`
`33`	`36`
`34`	`37`	`/** @test */`
`35`	`38`	`public function it_can_set_up_a_receiver_with_an_application_token()`
`36`	`39`	`{`
`37`	`40`	`$pushoverReceiver = PushoverReceiver::withUserKey('pushover-key')->withApplicationToken('pushover-token');`
`38`	`41`
`39`		`- Assert::assertArraySubset(['user' => 'pushover-key', 'token' => 'pushover-token'], $pushoverReceiver->toArray());`
	`42`	`+ $this->assertEquals([`
	`43`	`+ 'user' => 'pushover-key',`
	`44`	`+ 'token' => 'pushover-token',`
	`45`	`+ ], $pushoverReceiver->toArray());`
`40`	`46`	`}`
`41`	`47`
`42`	`48`	`/** @test */`
`@@ -54,24 +60,34 @@ public function it_can_add_a_single_device_to_the_receiver()`
`54`	`60`	`{`
`55`	`61`	`$this->pushoverReceiver->toDevice('iphone');`
`56`	`62`
`57`		`- Assert::assertArraySubset(['device' => 'iphone'], $this->pushoverReceiver->toArray());`
	`63`	`+ $this->assertEquals([`
	`64`	`+ 'user' => 'pushover-key',`
	`65`	`+ 'device' => 'iphone',`
	`66`	`+ ], $this->pushoverReceiver->toArray());`
`58`	`67`	`}`
`59`	`68`
`60`	`69`	`/** @test */`
`61`	`70`	`public function it_can_add_multiple_devices_to_the_receiver()`
`62`	`71`	`{`
`63`		`- $this->pushoverReceiver->toDevice('iphone')`
	`72`	`+ $this->pushoverReceiver`
	`73`	`+ ->toDevice('iphone')`
`64`	`74`	`->toDevice('desktop')`
`65`	`75`	`->toDevice('macbook');`
`66`	`76`
`67`		`- Assert::assertArraySubset(['device' => 'iphone,desktop,macbook'], $this->pushoverReceiver->toArray());`
	`77`	`+ $this->assertEquals([`
	`78`	`+ 'user' => 'pushover-key',`
	`79`	`+ 'device' => 'iphone,desktop,macbook',`
	`80`	`+ ], $this->pushoverReceiver->toArray());`
`68`	`81`	`}`
`69`	`82`
`70`	`83`	`/** @test */`
`71`	`84`	`public function it_can_add_an_array_of_devices_to_the_receiver()`
`72`	`85`	`{`
`73`	`86`	`$this->pushoverReceiver->toDevice(['iphone', 'desktop', 'macbook']);`
`74`	`87`
`75`		`- Assert::assertArraySubset(['device' => 'iphone,desktop,macbook'], $this->pushoverReceiver->toArray());`
	`88`	`+ $this->assertEquals([`
	`89`	`+ 'user' => 'pushover-key',`
	`90`	`+ 'device' => 'iphone,desktop,macbook',`
	`91`	`+ ], $this->pushoverReceiver->toArray());`
`76`	`92`	`}`
`77`	`93`	`}`