Merge pull request #67 from jdavidbakr/master

Updating for Laravel 6.0

Author: fwartner

.travis.yml

@@ -1,22 +1,23 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
+    - 5.6
+    - 7.0
+    - 7.1
+    - 7.2
 
 env:
-  matrix:
-    - COMPOSER_FLAGS="--prefer-lowest"
-    - COMPOSER_FLAGS=""
+    matrix:
+        - COMPOSER_FLAGS="--prefer-lowest"
+        - COMPOSER_FLAGS=""
 
 before_script:
-  - travis_retry composer self-update
-  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
+    - travis_retry composer self-update
+    - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
 
 script:
-  - phpunit --coverage-text --coverage-clover=coverage.clover
+    - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
 after_script:
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+    - wget https://scrutinizer-ci.com/ocular.phar
+    - php ocular.phar code-coverage:upload --format=php-clover coverage.clover

composer.json

@@ -14,14 +14,14 @@
     "require": {
         "php": ">=5.5.9",
         "twilio/sdk": "~5.16",
-        "illuminate/notifications": "^5.1",
-        "illuminate/support": "^5.1",
-        "illuminate/events": "^5.1",
-        "illuminate/queue": "^5.1"
+        "illuminate/notifications": "^5.1|^6.0",
+        "illuminate/support": "^5.1|^6.0",
+        "illuminate/events": "^5.1|^6.0",
+        "illuminate/queue": "^5.1|^6.0"
     },
     "require-dev": {
         "mockery/mockery": "^0.9.5",
-        "phpunit/phpunit": "4.*"
+        "phpunit/phpunit": "5.*"
     },
     "autoload": {
         "psr-4": {

src/TwilioProvider.php

@@ -2,6 +2,7 @@
 
 namespace NotificationChannels\Twilio;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\ServiceProvider;
 use Twilio\Rest\Client as TwilioService;
 
@@ -23,14 +24,14 @@ public function boot()
 
         $this->app->bind(TwilioService::class, function () {
             $config = $this->app['config']['services.twilio'];
-            $account_sid = array_get($config, 'account_sid');
-            $username = array_get($config, 'username');
+            $account_sid = Arr::get($config, 'account_sid');
+            $username = Arr::get($config, 'username');
             if (! empty($username)) {
-                $password = array_get($config, 'password');
+                $password = Arr::get($config, 'password');
 
                 return new TwilioService($username, $password, $account_sid);
             } else {
-                $auth_token = array_get($config, 'auth_token');
+                $auth_token = Arr::get($config, 'auth_token');
 
                 return new TwilioService($account_sid, $auth_token);
             }