Merge pull request #13 from ivinteractive/master

iv-craig · web-flow · commit 9b202d2dd4b3 · 2023-02-17T12:51:03.000-05:00
Support Laravel 10; Drop support for EOL PHP &amp; Laravel versions
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# InterFAX notification channel for Laravel 6.x/7.x/8.x/9.x
+# InterFAX notification channel for Laravel 9.x, 10.x
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/laravel-notification-channels/interfax.svg?style=flat-square)](https://packagist.org/packages/laravel-notification-channels/interfax)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
@@ -142,4 +142,4 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
 
 ## License
 
-The MIT License (MIT). Please see [License File](LICENSE.md) for more information.
+The MIT License (MIT). Please see [License File](LICENSE.md) for more information.
diff --git a/composer.json b/composer.json
@@ -12,16 +12,17 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8.0",
-        "illuminate/notifications": "^6.0|^7.0|^8.0|^9.0",
-        "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
-        "interfax/interfax": "^1.1"
+        "php": "^8.0",
+        "illuminate/notifications": "^9.0|^10.0",
+        "illuminate/support": "^9.0|^10.0",
+        "interfax/interfax": "^2.0",
+        "psr/log": "^2.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
         "mpdf/mpdf": "^8.0",
-        "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0",
-        "phpunit/phpunit": "^8.0|^9.3.3"
+        "orchestra/testbench": "^7.0|^8.0",
+        "phpunit/phpunit": "^9.5.10|^10.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <coverage>
     <include>
       <directory suffix=".php">src/</directory>
diff --git a/tests/InterfaxChannelTest.php b/tests/InterfaxChannelTest.php
@@ -37,7 +37,7 @@ public function setUp(): void
     /** @test */
     public function it_can_send_notification_with_a_single_file()
     {
-        $this->interfax->shouldReceive('deliver')
+        $this->interfax->expects('deliver')
             ->once()
             ->with([
                 'faxNumber' => '12345678901',
@@ -57,7 +57,7 @@ public function it_can_send_notification_with_a_single_file()
     /** @test */
     public function it_can_send_notification_with_files()
     {
-        $this->interfax->shouldReceive('deliver')
+        $this->interfax->expects('deliver')
             ->once()
             ->with([
                 'faxNumber' => '12345678901',
@@ -83,7 +83,7 @@ public function it_can_send_notification_with_files()
     /** @test */
     public function it_can_send_notification_pdf_as_stream()
     {
-        $this->interfax->shouldReceive('deliver')
+        $this->interfax->expects('deliver')
             ->with(Mockery::on(function ($output) {
                 if ($output['faxNumber'] !== '12345678901') {
                     return false;
@@ -117,7 +117,7 @@ public function it_can_send_notification_html_as_stream()
 
         app('filesystem')->put($filename, '<html><body><h1>Test file contents</h1></body></html>');
 
-        $this->interfax->shouldReceive('deliver')
+        $this->interfax->expects('deliver')
             ->with(Mockery::on(function ($output) {
                 if ($output['faxNumber'] !== '12345678901') {
                     return false;
@@ -153,15 +153,16 @@ public function it_can_return_early_when_no_fax_number_provided()
     public function it_can_refresh_the_file_response()
     {
         $this->resource
-             ->shouldReceive('refresh')
+             ->expects('refresh')
+             ->times(3)
              ->andReturn((object) [
                  'status' => -1,
              ], (object) [
                  'status' => 0,
              ]);
 
         $this->interfax
-             ->shouldReceive('deliver')
+             ->expects('deliver')
              ->andReturn($this->resource);
 
         $this->channel->send(new TestNotifiable, new TestNotificationWithRefresh);
@@ -175,15 +176,16 @@ public function it_can_throw_the_exception()
         $testResource = new TestResource;
 
         $this->resource
-             ->shouldReceive('refresh')
+             ->expects('refresh')
+             ->times(2)
              ->andReturn($testResource);
 
         $this->resource
-             ->shouldReceive('attributes')
+             ->expects('attributes')
              ->andReturn($testResource->attributes());
 
         $this->interfax
-             ->shouldReceive('deliver')
+             ->expects('deliver')
              ->andReturn($this->resource);
 
         $this->channel->send(new TestNotifiable, new TestNotificationWithRefresh);
