PHP 8.0 support 🚀 and more (#7)

* update composer for Laravel 6.0.4

* update composer for Laravel ^6.0

* update composer for Laravel ^7.0

* Update composer.json to use Laravel 6, 7 and 8

* Update Travis CI config to use PHP >= 7.2

* Remove HipChat and Raven drivers because Monolog 2.0 removed them

* Laravel >= 8.0 doesn't support PHP 7.2

Update Travis CI config to ignore errors on PHP 7.2

* Tweak Travis CI config

To ignore errors only when testing with PHP 7.2 and Laravel 8

* Fix Travis CI config

To allow failures only when testing with PHP 7.2 and Laravel 8

* Clean Travis CI config

* Use 'next' branch for monolog-mailgun and monolog-sms

* Fix PHP 7.4 error with PHPUnit

See: sebastianbergmann/phpunit#3728

* PHP 8.0 support

* Add Sentry driver to replace Raven

Because RavenHandler was removed from Monolog since version 2.0

* Update CHANGELOG and README

* Fix Sentry driver

Fix commit fd624a1

* Run tests with PHP 8.0 on Travis CI

* Clean Composer file

Use the upcoming 'tylercd100/monolog-mailgun' 3.0.0 and
'tylercd100/monolog-sms' 2.0.0 versions

Co-authored-by: Robbie Love <[email protected]>

Author: tortuetorche

.travis.yml

@@ -2,6 +2,9 @@ language: php
 
 php:
     - 7.2
+    - 7.3
+    - 7.4
+    - 8.0snapshot
 
 env:
     matrix:
@@ -10,7 +13,7 @@ env:
 
 before_script:
 - travis_retry composer self-update
-- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
+- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
 
 script:
   - vendor/bin/phpunit --coverage-clover build/logs/clover.xml

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to `laravel-notify` will be documented in this file.
 
+### Unreleased
+- Updated for Laravel 7 and 8
+- Add support for PHP 7.3, 7.4, 8.0
+- Removed support for Laravel 5.5, 5.6, 5.7, 5.8
+- Removed support for PHP 7.0, 7.1
+- Removed deprecated RavenHandler handler, use sentry/sentry 3.x and their Sentry\Monolog\Handler instead
+- Removed deprecated HipChat handler, migrate to Slack and use SlackWebhookHandler or SlackHandler instead
+
 ### 3.0.0
 - Updated for Laravel 6
 

README.md

@@ -13,12 +13,11 @@ Currently supported notification channels via [Monolog](https://github.com/Selda
 - Email
 - [Pushover](https://pushover.net/)
 - [Slack](https://slack.com/)
-- [Hipchat](https://www.hipchat.com/)
 - [Fleephook](https://fleep.io/)
 - [Flowdock](https://www.flowdock.com/)
 - [Plivo](https://www.plivo.com/) an SMS messaging service.
 - [Twilio](https://www.twilio.com/) an SMS messaging service.
-- [Sentry](https://getsentry.com) via [Raven](https://github.com/getsentry/raven-php)
+- [Sentry](https://getsentry.com) via [Sentry SDK for PHP](https://github.com/getsentry/sentry-php)
 - [Mailgun](https://mailgun.com)
 
 ## Version Compatibility
@@ -30,7 +29,9 @@ Currently supported notification channels via [Monolog](https://github.com/Selda
  5.3.x    | 1.x
  5.4.x    | 1.x
  5.5.x    | 2.x
- 6.x      | 3.x
+ 6.x      | 3.x and 4.x
+ 7.x      | 4.x
+ 8.x      | 4.x
 
 ## Installation
 
@@ -66,14 +67,13 @@ Notify::info("This is a info message with context!",['user'=>$user, 'data'=>$dat
 ## Other Features
 Laravel Notify also exposes extra Facades. To use them you will need to add them to your `config/app.php` file in your aliases array.
 ```php
-"HipChat"   => Tylercd100\Notify\Facades\HipChat::class,
 "Pushover"  => Tylercd100\Notify\Facades\Pushover::class,
 "Flowdock"  => Tylercd100\Notify\Facades\Flowdock::class,
 "FleepHook" => Tylercd100\Notify\Facades\FleepHook::class,
 "Slack"     => Tylercd100\Notify\Facades\Slack::class,
 "Plivo"     => Tylercd100\Notify\Facades\Plivo::class,
 "Twilio"    => Tylercd100\Notify\Facades\Twilio::class,
-"Raven"     => Tylercd100\Notify\Facades\Raven::class,
+"Sentry"    => Tylercd100\Notify\Facades\Sentry::class,
 "Mailgun"   => Tylercd100\Notify\Facades\Mailgun::class,
 ```
 And then use them like this

composer.json

@@ -25,22 +25,27 @@
             "Tylercd100\\Notify\\Tests\\": "tests/"
         }
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "require": {
-        "illuminate/support": "^6.0",
-        "monolog/monolog": "^1.11",
-        "php": "^7.2",
+        "illuminate/support": "^6.0|^7.0|^8.0",
+        "monolog/monolog": "^2.0",
+        "php": "^7.2|^8.0",
         "psr/log": "^1.0",
-        "tylercd100/monolog-mailgun": "^2.0",
-        "tylercd100/monolog-sms":"^1.2"
+        "tylercd100/monolog-mailgun": "^3.0",
+        "tylercd100/monolog-sms":"^2.0"
     },
     "require-dev": {
-        "sentry/sentry": "~1.7",
-        "phpunit/phpunit": "^8.0",
-        "orchestra/testbench": "^4.0"
+        "sentry/sentry": "dev-php8-support",
+        "symfony/options-resolver": "^5.1",
+        "http-interop/http-factory-guzzle": "^1.0.0",
+        "php-http/guzzle7-adapter": "^0.2.0",
+        "phpunit/phpunit": "^8.4|^9.3.3",
+        "mockery/mockery": "~1.3.3|^1.4.2",
+        "orchestra/testbench": "^4.0|^5.0|^6.0"
     },
     "suggest": {
-        "sentry/sentry": "Required to use the Raven driver for Sentry (~1.7)."
+        "sentry/sentry": "Required to use the Sentry driver (~3.0)."
     },
     "extra": {
         "providers": [

config/notify.php

@@ -46,20 +46,18 @@
     ],
 
     /**
-     * HipChat settings
+     * Flowdock settings
      */
-    'hipchat'=>[
-        'token' => env('HIPCHAT_APP_TOKEN'),
-        'room'  => 'room',
-        'name'  => 'name',
-        'notify'=> true,
+    'flowdock'=>[
+        'token' => env('FLOWDOCK_APP_TOKEN'),
     ],
 
     /**
-     * Flowdock settings
+     * Sentry settings
      */
-    'flowdock'=>[
-        'token' => env('FLOWDOCK_APP_TOKEN'),
+    'sentry'=>[
+        'dsn'    => env('SENTRY_DSN'),
+        'level' => 'info',
     ],
 
     /**
@@ -89,13 +87,5 @@
         'to'     => env('TWILIO_TO'),
         'from'   => env('TWILIO_FROM'),
         'limit'  => 160,
-    ],
-    
-    /**
-     * Raven settings
-     */
-    'raven'=>[
-        'dsn'    => env('RAVEN_DSN'),
-        'level' => 'info',
     ]
 ];

src/Drivers/Raven.php

@@ -4,13 +4,14 @@
 
 use Tylercd100\Notify;
 
-class HipChat extends Base
+class Sentry extends Base
 {
     /**
      * Returns a list of driver names to load
      * @return array An array of drivers to use
      */
-    protected function getDrivers(){
-        return ['hipchat'];
+    protected function getDrivers()
+    {
+        return ['sentry'];
     }
-}
+}

src/Drivers/HipChat.php renamed to src/Drivers/Sentry.php

@@ -7,7 +7,7 @@
 /**
  * @see \Illuminate\Filesystem\Filesystem
  */
-class Raven extends Facade
+class Sentry extends Facade
 {
     /**
      * Get the registered name of the component.
@@ -16,6 +16,6 @@ class Raven extends Facade
      */
     protected static function getFacadeAccessor()
     {
-        return 'notify-raven';
+        return 'notify-sentry';
     }
-}
+}

src/Facades/HipChat.php

@@ -19,10 +19,10 @@ class MonologHandlerFactory
      */
     public static function create($name, array $config = [], $title = null){
         $handler = call_user_func([MonologHandlerFactory::class,$name], $config, $title);
-        
+
         // Keep newline characters
-        $format = ['fleephook', 'hipchat', 'mail', 'mailgun', 'pushover', 'raven', 'slack'];
-        
+        $format = ['fleephook', 'mail', 'mailgun', 'pushover', 'slack', 'sentry'];
+
         if(in_array($name, $format)) {
             $handler->setFormatter(new LineFormatter(null, null, true));
         }
@@ -203,22 +203,24 @@ protected static function twilio(array $config = [], $title = null){
     }
 
     /**
-     * Returns a RavenHandler
+     * Returns a SentryHandler
      * @param  array  $config An array of config values to use
      * @param  string $title The title/subject to use
-     * @return \Monolog\Handler\RavenHandler
+     * @return \Sentry\Monolog\Handler
      */
-    protected static function raven(array $config = [], $title = null){
+    protected static function sentry(array $config = [], $title = null)
+    {
         $defaults = [
             'dsn'    => null,
             'level'  => Logger::ERROR,
             'bubble' => true,
         ];
 
         $c = array_merge($defaults, $config);
+        $client = \Sentry\ClientBuilder::create(Arr::only($c, 'dsn'))->getClient();
 
-        return new \Monolog\Handler\RavenHandler(
-            new \Raven_Client($c['dsn'], Arr::except($c, ['dsn'])),
+        return new \Sentry\Monolog\Handler(
+            new \Sentry\State\Hub($client),
             $c['level'],
             $c['bubble']
         );
@@ -255,39 +257,6 @@ protected static function slack(array $config = [], $title = null){
             $c['includeContextAndExtra']);
     }
 
-    /**
-     * Returns a HipChatHandler
-     * @param  array  $config An array of config values to use
-     * @param  string $title The title/subject to use
-     * @return \Monolog\Handler\HipChatHandler
-     */
-    protected static function hipchat(array $config = [], $title = null){
-        $defaults = [
-            'name'    => 'Monolog',
-            'notify'  => false,
-            'level'   => Logger::DEBUG,
-            'bubble'  => true,
-            'useSSL'  => true,
-            'format'  => 'text',
-            'host'    => 'api.hipchat.com',
-            'version' => 'v1'
-        ];
-
-        $c = array_merge($defaults,$config);
-
-        return new \Monolog\Handler\HipChatHandler(
-            $c['token'],
-            $c['room'],
-            $c['name'],
-            $c['notify'],
-            $c['level'],
-            $c['bubble'],
-            $c['useSSL'],
-            $c['format'],
-            $c['host'],
-            $c['version']);
-    }
-
     /**
      * Creates Mail Monolog Handler
      * @param  array  $config An array of config values to use

src/Facades/Raven.php renamed to src/Facades/Sentry.php

@@ -6,13 +6,12 @@
 use Tylercd100\Notify\Drivers\FleepHook;
 use Tylercd100\Notify\Drivers\Flowdock;
 use Tylercd100\Notify\Drivers\FromConfig;
-use Tylercd100\Notify\Drivers\HipChat;
 use Tylercd100\Notify\Drivers\Mail;
 use Tylercd100\Notify\Drivers\Mailgun;
 use Tylercd100\Notify\Drivers\Plivo;
 use Tylercd100\Notify\Drivers\Pushover;
-use Tylercd100\Notify\Drivers\Raven;
 use Tylercd100\Notify\Drivers\Slack;
+use Tylercd100\Notify\Drivers\Sentry;
 use Tylercd100\Notify\Drivers\Twilio;
 
 class NotifyServiceProvider extends ServiceProvider
@@ -24,12 +23,11 @@ public function register() {
             'notify' => FromConfig::class,
             'notify-fleephook' => FleepHook::class,
             'notify-flowdock' => Flowdock::class,
-            'notify-hipchat' => HipChat::class,
             'notify-mail' => Mail::class,
             'notify-mailgun' => Mailgun::class,
             'notify-plivo' => Plivo::class,
             'notify-pushover' => Pushover::class,
-            'notify-raven' => Raven::class,
+            'notify-sentry' => Sentry::class,
             'notify-slack' => Slack::class,
             'notify-twilio' => Twilio::class,
         ];
@@ -41,7 +39,7 @@ public function boot()
     {
         $this->publishes([
             __DIR__ . '/../../config/notify.php' => base_path('config/notify.php'),
-        ]);   
+        ]);
     }
 
     private function registerSingletonsFromMap($map){
@@ -51,4 +49,4 @@ private function registerSingletonsFromMap($map){
             });
         }
     }
-}
+}