Merge pull request #20 from laravel-notification-channels/laravel9

Tob0t · web-flow · commit f1383edd4517 · 2022-06-29T17:38:23.000+02:00
Support Laravel 9
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,19 @@
 
 All notable changes to `microsoft-teams` will be documented in this file
 
-## 1.1.0 - 2021-01-05
+## 1.1.3 - 2022-06-21
+Update Readme to support Laravel 9.x
+
+## 1.1.2 - 2022-06-03
 Changed registered notification driver from 'teams' to 'microsoftTeams' to be consistent. Current Release now accepts both names.
 Please use 'microsoftTeams' for all calls since 'teams' will be removed with the next major release.
 
+## 1.1.1 - 2022-01-21
+Support Laravel 9.x
+
+## 1.1.0 - 2020-09-10
+Support Laravel 8.x
+
 ## 1.0.1 - 2020-04-27
 
 ### Breaking Change
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/laravel-notification-channels/microsoft-teams/master.svg?style=flat-square)](https://scrutinizer-ci.com/g/laravel-notification-channels/microsoft-teams/?branch=master)
 [![Total Downloads](https://img.shields.io/packagist/dt/laravel-notification-channels/microsoft-teams.svg?style=flat-square)](https://packagist.org/packages/laravel-notification-channels/microsoft-teams)
 
-This package makes it easy to send notifications using [Microsoft Teams](https://products.office.com/en-US/microsoft-teams/group-chat-software) with Laravel 5.5+, 6.x, 7.x and 8.x
+This package makes it easy to send notifications using [Microsoft Teams](https://products.office.com/en-US/microsoft-teams/group-chat-software) with Laravel 5.5+, 6.x, 7.x, 8.x and 9.x
 
 ```php
 return MicrosoftTeamsMessage::create()
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?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="MicrosoftTeams Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="MicrosoftTeams Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
 </phpunit>
diff --git a/tests/MicrosoftTeamsChannelTest.php b/tests/MicrosoftTeamsChannelTest.php
@@ -52,19 +52,17 @@ public function it_can_send_a_notification()
 
         $channel = new MicrosoftTeamsChannel($this->microsoftTeams);
 
-        $response = $channel->send(new TestNotifiable, new TestNotification);
+        $response = $channel->send(new TestNotifiable(), new TestNotification());
         $this->assertEquals(200, $response->getStatusCode());
     }
 
     /** @test */
     public function it_does_not_send_a_notification_if_the_notifiable_does_not_provide_a_microsoft_teams_channel()
     {
-        $this->markTestSkipped('Needs to be solved in Laravel 9');
-
         $this->expectException(CouldNotSendNotification::class);
 
         $channel = new MicrosoftTeamsChannel($this->microsoftTeams);
-        $channel->send(new TestNotifiableWithoutRoute, new TestNotificationNoWebhookUrl);
+        $channel->send(new TestNotifiableWithoutRoute(), new TestNotificationNoWebhookUrl());
     }
 
     /** @test */
@@ -87,7 +85,7 @@ public function it_does_send_a_notification_if_the_notifiable_does_not_provide_a
 
         $channel = new MicrosoftTeamsChannel($this->microsoftTeams);
 
-        $response = $channel->send(new TestNotifiableWithoutRoute, new TestNotificationWithToParam);
+        $response = $channel->send(new TestNotifiableWithoutRoute(), new TestNotificationWithToParam());
         $this->assertEquals(200, $response->getStatusCode());
     }
 }
@@ -120,7 +118,7 @@ class TestNotification extends Notification
 {
     public function toMicrosoftTeams()
     {
-        return (new MicrosoftTeamsMessage)
+        return (new MicrosoftTeamsMessage())
             ->title('Hello, MicrosoftTeams!')
             ->content('This is my content.');
     }
@@ -138,7 +136,7 @@ class TestNotificationNoWebhookUrl extends Notification
      */
     public function toMicrosoftTeams($notifiable): MicrosoftTeamsMessage
     {
-        return (new MicrosoftTeamsMessage)
+        return (new MicrosoftTeamsMessage())
             ->title('Hello, MicrosoftTeams!')
             ->content('This is my content.');
     }
@@ -156,7 +154,7 @@ class TestNotificationWithToParam extends Notification
      */
     public function toMicrosoftTeams($notifiable): MicrosoftTeamsMessage
     {
-        return (new MicrosoftTeamsMessage)
+        return (new MicrosoftTeamsMessage())
             ->title('Hello, MicrosoftTeams!')
             ->content('This is my content.')
             ->to('https://outlook.office.com/webhook/abc-01234/IncomingWebhook/def-567');

Original file line number	Diff line number	Diff line change
`@@ -52,19 +52,17 @@ public function it_can_send_a_notification()`
`52`	`52`
`53`	`53`	`$channel = new MicrosoftTeamsChannel($this->microsoftTeams);`
`54`	`54`
`55`		`- $response = $channel->send(new TestNotifiable, new TestNotification);`
	`55`	`+ $response = $channel->send(new TestNotifiable(), new TestNotification());`
`56`	`56`	`$this->assertEquals(200, $response->getStatusCode());`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/** @test */`
`60`	`60`	`public function it_does_not_send_a_notification_if_the_notifiable_does_not_provide_a_microsoft_teams_channel()`
`61`	`61`	`{`
`62`		`- $this->markTestSkipped('Needs to be solved in Laravel 9');`
`63`		`-`
`64`	`62`	`$this->expectException(CouldNotSendNotification::class);`
`65`	`63`
`66`	`64`	`$channel = new MicrosoftTeamsChannel($this->microsoftTeams);`
`67`		`- $channel->send(new TestNotifiableWithoutRoute, new TestNotificationNoWebhookUrl);`
	`65`	`+ $channel->send(new TestNotifiableWithoutRoute(), new TestNotificationNoWebhookUrl());`
`68`	`66`	`}`
`69`	`67`
`70`	`68`	`/** @test */`
`@@ -87,7 +85,7 @@ public function it_does_send_a_notification_if_the_notifiable_does_not_provide_a`
`87`	`85`
`88`	`86`	`$channel = new MicrosoftTeamsChannel($this->microsoftTeams);`
`89`	`87`
`90`		`- $response = $channel->send(new TestNotifiableWithoutRoute, new TestNotificationWithToParam);`
	`88`	`+ $response = $channel->send(new TestNotifiableWithoutRoute(), new TestNotificationWithToParam());`
`91`	`89`	`$this->assertEquals(200, $response->getStatusCode());`
`92`	`90`	`}`
`93`	`91`	`}`
`@@ -120,7 +118,7 @@ class TestNotification extends Notification`
`120`	`118`	`{`
`121`	`119`	`public function toMicrosoftTeams()`
`122`	`120`	`{`
`123`		`- return (new MicrosoftTeamsMessage)`
	`121`	`+ return (new MicrosoftTeamsMessage())`
`124`	`122`	`->title('Hello, MicrosoftTeams!')`
`125`	`123`	`->content('This is my content.');`
`126`	`124`	`}`
`@@ -138,7 +136,7 @@ class TestNotificationNoWebhookUrl extends Notification`
`138`	`136`	`*/`
`139`	`137`	`public function toMicrosoftTeams($notifiable): MicrosoftTeamsMessage`
`140`	`138`	`{`
`141`		`- return (new MicrosoftTeamsMessage)`
	`139`	`+ return (new MicrosoftTeamsMessage())`
`142`	`140`	`->title('Hello, MicrosoftTeams!')`
`143`	`141`	`->content('This is my content.');`
`144`	`142`	`}`
`@@ -156,7 +154,7 @@ class TestNotificationWithToParam extends Notification`
`156`	`154`	`*/`
`157`	`155`	`public function toMicrosoftTeams($notifiable): MicrosoftTeamsMessage`
`158`	`156`	`{`
`159`		`- return (new MicrosoftTeamsMessage)`
	`157`	`+ return (new MicrosoftTeamsMessage())`
`160`	`158`	`->title('Hello, MicrosoftTeams!')`
`161`	`159`	`->content('This is my content.')`
`162`	`160`	`->to('https://outlook.office.com/webhook/abc-01234/IncomingWebhook/def-567');`